From c302c312df9c0ab7a328bef77116cd7831092836 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 14 Sep 2015 16:32:12 -0300 Subject: [PATCH 1/2] fixes wallet info for no created wallets --- public/views/backup.html | 7 +++++-- public/views/preferencesInformation.html | 11 ++++++----- src/js/controllers/index.js | 1 + src/js/controllers/preferencesInformation.js | 8 ++++++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index 81b588697..cd0f03788 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -70,7 +70,10 @@
- {{word}} + + {{$index}}. + {{word}} +
@@ -105,7 +108,7 @@
You can safely install your wallet on another device and use it from multiple devices at the same time. - + Learn more about Copay backups
diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index c8f043b53..f1c1506c4 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -55,7 +55,7 @@

Extended Public Keys

  • -
    Copayer {{$index}} +
    Copayer {{$index}}
    @@ -63,8 +63,11 @@
    • + + +

      Last Wallet Addresses

    • @@ -76,9 +79,6 @@
      • - - -
    • Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.
      • @@ -89,9 +89,10 @@ Send all by email +
    - +

      Balance By Address

    • {{a.address}} diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index dffc4733a..3286b14a9 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -81,6 +81,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.currentFeeLevel = null; self.notAuthorized = false; self.txHistory = []; + self.balanceByAddress = null; self.txHistoryPaging = false; self.pendingTxProposalsCountForUs = null; self.setSpendUnconfirmed(); diff --git a/src/js/controllers/preferencesInformation.js b/src/js/controllers/preferencesInformation.js index e8ca8c4f4..a8dc7fab4 100644 --- a/src/js/controllers/preferencesInformation.js +++ b/src/js/controllers/preferencesInformation.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesInformation', - function($scope, $log, lodash, profileService) { + function($scope, $log, $timeout, lodash, profileService) { var fc = profileService.focusedClient; var c = fc.credentials; @@ -14,6 +14,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation', $scope.M = c.m; $scope.N = c.n; $scope.pubKeys = lodash.pluck(c.publicKeyRing, 'xPubKey'); + $scope.addrs = null; fc.getMainAddresses({ doNotVerify: true @@ -22,7 +23,6 @@ angular.module('copayApp.controllers').controller('preferencesInformation', $log.warn(err); return; }; - var last10 = [], i = 0, e = addrs.pop(); @@ -31,6 +31,10 @@ angular.module('copayApp.controllers').controller('preferencesInformation', e = addrs.pop(); } $scope.addrs = last10; + $timeout(function() { + $scope.$apply(); + }); + }); this.sendAddrs = function() { From 252b1a5ff0100faa44024318f3260a7c542b6e69 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 15 Sep 2015 09:21:31 -0300 Subject: [PATCH 2/2] better display of the seed --- public/views/backup.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/public/views/backup.html b/public/views/backup.html index cd0f03788..e31ba08bf 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -65,13 +65,17 @@
    + +
    +
    + Your wallet seed: +
    +
    +
    - -
    - - {{$index}}. + {{word}}