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

new key test, upgrades to bwc 2.7.0

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-06-14 12:28:21 -03:00
commit 52a20334e1
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
4 changed files with 55 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.isPrivKeyEncrypted = fc.isPrivKeyEncrypted();
self.externalSource = fc.getPrivKeyExternalSourceName();
self.account = fc.credentials.account;
self.incorrectDerivation = fc.incorrectDerivation;
self.incorrectDerivation = fc.keyDerivationOk === false;
if (self.externalSource == 'trezor')
self.account++;
@ -1388,6 +1388,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
};
self.isInFocus = function(walletId) {
var fc = profileService.focusedClient;
return fc && fc.credentials.walletId == walletId;
};
self.setAddressbook = function(ab) {
if (ab) {
self.addressbook = ab;
@ -1408,12 +1413,17 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.tab = 'walletHome';
});
$rootScope.$on('Local/ValidatingWallet', function() {
ongoingProcess.set('validatingWallet', true);
$rootScope.$on('Local/ValidatingWallet', function(ev, walletId) {
if (self.isInFocus(walletId)) {
ongoingProcess.set('validatingWallet', true);
}
});
$rootScope.$on('Local/ProfileBound', function() {
ongoingProcess.set('validatingWallet', false);
$rootScope.$on('Local/ValidatingWalletEnded', function(ev, walletId, isOK) {
if (self.isInFocus(walletId)) {
ongoingProcess.set('validatingWallet', false);
self.incorrectDerivation = isOK === false;
}
});
$rootScope.$on('Local/ClearHistory', function(event) {
@ -1475,8 +1485,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
$rootScope.$on('Local/WalletCompleted', function(event, walletId) {
var fc = profileService.focusedClient;
if (fc && fc.credentials.walletId == walletId) {
if (self.isInFocus(walletId)) {
// reset main wallet variables
self.setFocusedWallet();
go.walletHome();