From 7cd8923e754d6d4620504ed1743111ac40f618be Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 22 May 2015 17:16:55 -0300
Subject: [PATCH 1/2] show memo in log

---
 bower.json                       |  2 +-
 src/js/controllers/walletHome.js | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/bower.json b/bower.json
index 3688bf161..ec2a76197 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,7 @@
     "foundation-icon-fonts": "*",
     "ng-lodash": "~0.2.0",
     "angular-moment": "~0.9.0",
-    "angular-bitcore-wallet-client": "^0.0.22",
+    "angular-bitcore-wallet-client": "^0.0.25",
     "angular-ui-router": "~0.2.13",
     "qrcode-decoder-js": "*",
     "fastclick": "*",
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 84bcfb095..5d1971aa4 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -91,10 +91,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
   var parseError = function(err) {
     if (err.message) {
-      if (err.message.indexOf('CORS')>=0) {
+      if (err.message.indexOf('CORS') >= 0) {
         err.message = gettext('Could not connect wallet service. Check your Internet connexion and your wallet service configuration.');
       }
-      if (err.message.indexOf('TIMEDOUT')>=0) {
+      if (err.message.indexOf('TIMEDOUT') >= 0) {
         err.message = gettext('Wallet service timed out. Check your Internet connexion and your wallet service configuration.');
       }
     }
@@ -208,7 +208,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
               if (txpHasRequiredSignatures) {
                 self.setOngoingProcess(gettext('Broadcasting transaction'));
                 $scope.loading = true;
-                fc.broadcastTxProposal(txpsi, function(err, txpsb) {
+                fc.broadcastTxProposal(txpsi, function(err, txpsb, memo) {
                   self.setOngoingProcess();
                   $scope.loading = false;
                   if (err) {
@@ -216,6 +216,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
                     $scope.error = gettext('Could not broadcast transaction. Please try again.');
                     $scope.$digest();
                   } else {
+                    if (memo)
+                      $log.info(memo);
                     $modalInstance.close(txpsb);
                   }
                 });
@@ -274,7 +276,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         $scope.loading = true;
         $scope.error = null;
         $timeout(function() {
-          fc.broadcastTxProposal(txp, function(err, txpb) {
+          fc.broadcastTxProposal(txp, function(err, txpb, memo) {
             self.setOngoingProcess();
             $scope.loading = false;
             if (err) {
@@ -282,6 +284,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
               $scope.error = err.message || gettext('Could not send transaction. Please try again.');
               $scope.$digest();
             } else {
+
+              if (memo)
+                $log.info(memo);
               $modalInstance.close(txpb);
             }
           });
@@ -616,13 +621,17 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
       if (signedTx.status == 'accepted') {
         self.setOngoingProcess(gettext('Broadcasting transaction'));
-        fc.broadcastTxProposal(signedTx, function(err, btx) {
+
+        fc.broadcastTxProposal(signedTx, function(err, btx, memo) {
           self.setOngoingProcess();
           if (err) {
             $scope.error = gettext('Transaction not broadcasted. Please try again.');
             $scope.$digest();
             return cb(err);
           }
+          if (memo)
+            $log.info(memo);
+
           txStatus.notify(btx, function() {
             $scope.$emit('Local/TxProposalAction');
             return cb();

From 46bbe63f38f72670789a7adedceafab5ff8e0532 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 22 May 2015 20:39:02 -0300
Subject: [PATCH 2/2] update deps

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index ec2a76197..a741c8997 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,7 @@
     "foundation-icon-fonts": "*",
     "ng-lodash": "~0.2.0",
     "angular-moment": "~0.9.0",
-    "angular-bitcore-wallet-client": "^0.0.25",
+    "angular-bitcore-wallet-client": "^0.0.23",
     "angular-ui-router": "~0.2.13",
     "qrcode-decoder-js": "*",
     "fastclick": "*",