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

Minor bug fixes

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-23 12:07:56 -03:00
commit 3292ad382d
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
8 changed files with 60 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,10 +5,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.isCordova = platformInfo.isCordova;
$scope.isNW = platformInfo.isNW;
$scope.wallets = profileService.getWallets({
onlyComplete: true
});
$scope.checkTips = function(force) {
storageService.getReceiveTipsAccepted(function(err, accepted) {
if (err) $log.warn(err);
@ -25,16 +21,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
});
};
$scope.$on('Wallet/Changed', function(event, wallet) {
if (!wallet) {
$log.debug('No wallet provided');
return;
}
$scope.wallet = wallet;
$log.debug('Wallet changed: ' + wallet.name);
$scope.setAddress();
});
$scope.shareAddress = function(addr) {
if ($scope.generatingAddress) return;
if ($scope.isCordova) {
@ -61,5 +47,19 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
}, 1);
};
if (!$scope.isCordova) $scope.checkTips();
$scope.$on("$ionicView.enter", function(event, data) {
if (!$scope.isCordova) $scope.checkTips();
$scope.wallets = profileService.getWallets({
onlyComplete: true
});
$scope.$on('Wallet/Changed', function(event, wallet) {
if (!wallet) {
$log.debug('No wallet provided');
return;
}
$scope.wallet = wallet;
$log.debug('Wallet changed: ' + wallet.name);
$scope.setAddress();
});
});
});