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

Fix next address

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-11-14 12:31:38 -03:00
commit 7e9d47c8e9
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/js/controllers/tab-receive.js
View file

@ -31,7 +31,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.loadAddresses = function(wallet, index) { $scope.loadAddresses = function(wallet, index) {
walletService.getAddress(wallet, false, function(err, addr) { walletService.getAddress(wallet, false, function(err, addr) {
$scope.walletAddrs[wallet.id] = addr || null; $scope.walletAddrs[wallet.id] = addr;
}); });
} }
@ -95,13 +95,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.$on('Wallet/Changed', function(event, wallet) { $scope.$on('Wallet/Changed', function(event, wallet) {
$scope.wallet = wallet;
$scope.walletIndex = lodash.findIndex($scope.wallets, function(wallet) {
return wallet.id == $scope.wallet.id;
});
if (!$scope.walletAddrs[wallet.id]) $scope.setAddress(false);
else $scope.addr = $scope.walletAddrs[wallet.id];
$scope.$apply();
if (!wallet) { if (!wallet) {
$log.debug('No wallet provided'); $log.debug('No wallet provided');
return; return;
@ -112,6 +105,18 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
} }
$scope.wallet = wallet; $scope.wallet = wallet;
$log.debug('Wallet changed: ' + wallet.name); $log.debug('Wallet changed: ' + wallet.name);
$scope.walletIndex = lodash.findIndex($scope.wallets, function(wallet) {
return wallet.id == $scope.wallet.id;
});
if (!$scope.walletAddrs[wallet.id]) $scope.setAddress(false);
else $scope.addr = $scope.walletAddrs[wallet.id];
$timeout(function() {
$scope.$apply();
}, 100);
}); });
$scope.updateCurrentWallet = function() { $scope.updateCurrentWallet = function() {
@ -135,6 +140,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.loadAddresses(wallet); $scope.loadAddresses(wallet);
}); });
listeners = [ listeners = [
$rootScope.$on('bwsEvent', function(e, walletId, type, n) { $rootScope.$on('bwsEvent', function(e, walletId, type, n) {
// Update current address // Update current address

15
src/js/services/walletService.js
View file

@ -800,17 +800,20 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
}; };
root.getAddress = function(wallet, forceNew, cb) { root.getAddress = function(wallet, forceNew, cb) {
storageService.getLastAddress(wallet.id, function(err, addr) { storageService.getLastAddress(wallet.id, function(err, addr) {
if (err) return cb(err); if (err) return cb(err);
if (!forceNew && addr) return cb(null, addr); if (!forceNew && addr) return cb(null, addr);
createAddress(wallet, function(err, _addr) { root.isReady(wallet, function(err) {
if (err) return cb(err, addr); if (err) return cb(err);
storageService.storeLastAddress(wallet.id, _addr, function() {
if (err) return cb(err); createAddress(wallet, function(err, _addr) {
return cb(null, _addr); if (err) return cb(err, addr);
storageService.storeLastAddress(wallet.id, _addr, function() {
if (err) return cb(err);
return cb(null, _addr);
});
}); });
}); });
}); });