From 3721b2e20c31a21335ee7d29e4f9f267da1cf2f6 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 29 Sep 2015 13:33:27 -0300 Subject: [PATCH 1/2] fix only derivation path in advanced information --- src/js/controllers/preferencesInformation.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index a8dc7fab4..9841f7003 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', var fc = profileService.focusedClient; var c = fc.credentials; + var basePath = 'xpub' $scope.walletName = c.walletName; $scope.walletId = c.walletId; @@ -27,6 +28,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', i = 0, e = addrs.pop(); while (i++ < 10 && e) { + e.path = basePath + e.path.substring(1); last10.push(e); e = addrs.pop(); } @@ -62,7 +64,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', var body = 'Copay Wallet' + fc.walletName + ' Addresses\n Only Main Addresses are shown.\n\n'; body += '\n\n'; body += addrs.map(function(v) { - return addrs.address, addrs.path, formatDate(addrs.createdOn); + return addrs.address, basePath + addrs.path.substring(1), formatDate(addrs.createdOn); }).join('\n'); var properties = { From 54f955bc454f888b4cee576a5f999a3d9be2a549 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 29 Sep 2015 15:09:45 -0300 Subject: [PATCH 2/2] change variable name --- src/js/controllers/preferencesInformation.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index 9841f7003..1dd4c3a64 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', var fc = profileService.focusedClient; var c = fc.credentials; - var basePath = 'xpub' + var base = 'xpub' $scope.walletName = c.walletName; $scope.walletId = c.walletId; @@ -28,7 +28,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', i = 0, e = addrs.pop(); while (i++ < 10 && e) { - e.path = basePath + e.path.substring(1); + e.path = base + e.path.substring(1); last10.push(e); e = addrs.pop(); } @@ -64,7 +64,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', var body = 'Copay Wallet' + fc.walletName + ' Addresses\n Only Main Addresses are shown.\n\n'; body += '\n\n'; body += addrs.map(function(v) { - return addrs.address, basePath + addrs.path.substring(1), formatDate(addrs.createdOn); + return addrs.address, base + addrs.path.substring(1), formatDate(addrs.createdOn); }).join('\n'); var properties = {