From 50287bba2fd66468ce92620fe55cca6014fd1db1 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Tue, 11 Oct 2016 16:46:06 -0300
Subject: [PATCH 1/3] fix edit memo

---
 src/js/controllers/modals/txDetails.js | 29 +++++++++++++-------------
 src/js/services/walletService.js       |  6 ++++++
 www/views/walletDetails.html           |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index a77a95b26..3186a7f4b 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -27,16 +27,23 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
   };
 
   function updateMemo() {
-    wallet.getTxNote({
-      txid: $scope.btx.txid
-    }, function(err, note) {
+    walletService.getTxNote(wallet, $scope.btx.txid, function(err, note) {
       if (err || !note) {
         $log.debug(gettextCatalog.getString('Could not fetch transaction note'));
         return;
       }
-      $scope.note = note;
-      $timeout(function() {
-        $scope.$apply();
+      $scope.btx.note = note;
+
+      walletService.getTx(wallet, $scope.btx.txid, function(err, tx) {
+        if (err) {
+          $log.error(err);
+          return;
+        }
+
+        tx.note = note;
+        $timeout(function() {
+          $scope.$apply();
+        });
       });
     });
   };
@@ -91,19 +98,13 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
         body: text
       };
 
-      wallet.editTxNote(args, function(err) {
+      walletService.editTxNote(wallet, args, function(err, res) {
         if (err) {
           $log.debug('Could not save tx comment');
           return;
         }
         // This is only to refresh the current screen data
-        $scope.btx.note = null;
-        if (args.body) {
-          $scope.btx.note = {};
-          $scope.btx.note.body = text;
-          $scope.btx.note.editedByName = wallet.credentials.copayerName;
-          $scope.btx.note.editedOn = Math.floor(Date.now() / 1000);
-        }
+        updateMemo();
         $scope.btx.searcheableString = null;
         $timeout(function() {
           $scope.$apply();
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 84bfea06a..173ed6bec 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -512,6 +512,12 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
     });
   };
 
+  root.editTxNote = function(wallet, args, cb) {
+    wallet.editTxNote(args, function(err, res) {
+      return cb(err, res);
+    });
+  };
+
   root.getTxp = function(wallet, txpid, cb) {
     wallet.getTx(txpid, function(err, txp) {
       if (err) return cb(err);
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 135287375..595f4b250 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -124,7 +124,7 @@
       </div>
 
       <div class="card list" ng-show="txHistory[0]">
-        <div class="item" ng-repeat="btx in txHistory track by btx.txid" ng-click="openTxModal(btx)">
+        <div class="item" ng-repeat="btx in txHistory track by $index" ng-click="openTxModal(btx)">
           <span class="item-note text-right">
             <span class="size-16"  ng-class="{'text-bold': btx.recent}">
               <span ng-if="btx.action == 'received'">+</span>

From 8d9b937806fa85f954206b2a333a25a014bf907d Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 12 Oct 2016 10:19:27 -0300
Subject: [PATCH 2/3] improve error message

---
 src/js/controllers/modals/txDetails.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js
index 3186a7f4b..adb7ddda6 100644
--- a/src/js/controllers/modals/txDetails.js
+++ b/src/js/controllers/modals/txDetails.js
@@ -28,10 +28,13 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
 
   function updateMemo() {
     walletService.getTxNote(wallet, $scope.btx.txid, function(err, note) {
-      if (err || !note) {
-        $log.debug(gettextCatalog.getString('Could not fetch transaction note'));
+      if (err) {
+        $log.warn('Could not fetch transaction note ' + err);
         return;
       }
+
+      if (!note) return;
+
       $scope.btx.note = note;
 
       walletService.getTx(wallet, $scope.btx.txid, function(err, tx) {
@@ -100,7 +103,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
 
       walletService.editTxNote(wallet, args, function(err, res) {
         if (err) {
-          $log.debug('Could not save tx comment');
+          $log.debug('Could not save tx comment ' + err);
           return;
         }
         // This is only to refresh the current screen data

From 634e151ae5bed7464082edbac3a6289081ae2b80 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Wed, 12 Oct 2016 11:04:29 -0300
Subject: [PATCH 3/3] update bwc version

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

diff --git a/package.json b/package.json
index 40253d2d0..413a04a81 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "angular": "1.4.6",
     "angular-mocks": "1.4.10",
     "bhttp": "^1.2.1",
-    "bitcore-wallet-client": "4.2.1",
+    "bitcore-wallet-client": "4.3.1",
     "bower": "^1.7.9",
     "chai": "^3.5.0",
     "cordova": "5.4.1",