anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fixes wallet info for no created wallets

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-09-14 16:32:12 -03:00
commit c302c312df
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
public/views/backup.html
View file

@ -70,7 +70,10 @@
<div class="small-centered p10t p10b large-centered medium-centered large-8 medium-8 small-10 columns enable_text_select" style="border:1px solid gray; background:#eee;
">
<span class="m10r" ng-repeat="word in wordsC.mnemonicWords">{{word}} </span>
<span class="m10r" ng-repeat="word in wordsC.mnemonicWords">
<b>{{$index}}.</b>
{{word}}
</span>
</div>
<div class="box-notification large-centered medium-centered small-centered large-8 medium-8 small-10 columns m10t" ng-show="wordsC.mnemonicHasPassphrase">
@ -105,7 +108,7 @@
<div class="row m20t" ng-show="index.n==1">
<div class="columns size-14 text-gray">
<span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span>
<a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')" translate>
<a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/blob/master/README.md#copay-backups-and-recovery')" translate>
Learn more about Copay backups
</a>
</div>

11
public/views/preferencesInformation.html
View file

@ -55,7 +55,7 @@
<h4 class="title m0" translate>Extended Public Keys</h4>
<li class="line-b p10" ng-repeat="pk in pubKeys">
<div class="row">
<div class="small-3 columns">Copayer {{$index}}
<div class="small-3 columns" translate>Copayer</span> {{$index}}
</div>
<div class="small-9 columns oh enable_text_select text-gray" style="text-overflow:ellipsis">
@ -63,8 +63,11 @@
</div>
</div>
</li>
</ul>
<ul class="no-bullet m0 size-14" ng-show="addrs">
<h4 class="title m0" translate>Last Wallet Addresses</h4>
<li class="line-b p20" ng-repeat="a in addrs">
<div class="enable_text_select" style="text-overflow:ellipsis">
@ -76,9 +79,6 @@
</span>
</div>
</li>
<li class="line-b p10 text-centered text-gray size-12">
<span translate>Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.</span>
</li>
@ -89,9 +89,10 @@
<span translate>Send all by email</span>
</button>
</li>
</ul>
<ul class="no-bullet m0 size-14" ng-show="index.balanceByAddress">
<h4 class="title m0" translate>Balance By Address</h4>
<li class="line-b p20 enable_text_select" ng-repeat="a in index.balanceByAddress">
{{a.address}}

1
src/js/controllers/index.js
View file

@ -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();

8
src/js/controllers/preferencesInformation.js
View file

@ -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() {