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

move addresses view to settings

Browse source
This commit is contained in:
Gabriel Bazán 2017-05-03 17:08:18 -03:00
commit e76924cb74
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/addresses.js
View file

@ -130,8 +130,16 @@ angular.module('copayApp.controllers').controller('addressesController', functio
$scope.scan = function() {
walletService.startScan($scope.wallet);
$ionicHistory.nextViewOptions({
disableAnimate: true,
historyRoot: true
});
$ionicHistory.clearHistory();
$state.go('tabs.home');
$state.go('tabs.home').then(function() {
$state.transitionTo('tabs.wallet', {
walletId: $scope.wallet.credentials.walletId
});
});
};
$scope.sendByEmail = function() {

2
src/js/controllers/preferencesAdvancedController.js
View file

@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('preferencesAdvancedController
$scope.wallet = wallet;
$scope.goToAddresses = function() {
$state.go('tabs.receive.addresses', {
$state.go('tabs.settings.addresses', {
walletId: $stateParams.walletId,
});
};

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

@ -13,11 +13,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
});
};
$scope.setAddress = function(forceNew) {
$scope.setAddress = function() {
if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return;
$scope.addr = null;
$scope.generatingAddress = true;
walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
walletService.getAddress($scope.wallet, false, function(err, addr) {
$scope.generatingAddress = false;
if (err) {