From f2bd2525c840e60d8ad8c67db30542ae71556a86 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 24 Aug 2016 14:16:28 -0300 Subject: [PATCH 1/2] navigate to import/join --- src/js/controllers/import.js | 8 +------- src/js/controllers/join.js | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 4dcfad174..672fcede0 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('importController', - function($scope, $rootScope, $timeout, $log, profileService, configService, notification, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) { + function($scope, $rootScope, $timeout, $log, profileService, configService, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) { var isChromeApp = platformInfo.isChromeApp; var isDevel = platformInfo.isDevel; @@ -110,7 +110,6 @@ angular.module('copayApp.controllers').controller('importController', }); $rootScope.$emit('Local/WalletImported', client.credentials.walletId); - notification.success(gettext('Success'), gettext('Your wallet has been imported correctly')); $state.go('tabs.home'); }); }, 100); @@ -138,7 +137,6 @@ angular.module('copayApp.controllers').controller('importController', }); $rootScope.$emit('Local/WalletImported', client.credentials.walletId); - notification.success(gettext('Success'), gettext('Your wallet has been imported correctly')); $state.go('tabs.home'); }); }, 100); @@ -159,7 +157,6 @@ angular.module('copayApp.controllers').controller('importController', }); } $rootScope.$emit('Local/WalletImported', walletId); - notification.success(gettext('Success'), gettext('Your wallet has been imported correctly')); $state.go('tabs.home'); }); }, 100); @@ -189,7 +186,6 @@ angular.module('copayApp.controllers').controller('importController', }); $rootScope.$emit('Local/WalletImported', client.credentials.walletId); - notification.success(gettext('Success'), gettext('Your wallet has been imported correctly')); $state.go('tabs.home'); }); }, 100); @@ -324,7 +320,6 @@ angular.module('copayApp.controllers').controller('importController', $log.debug('Remote preferences saved for:' + wallet.walletId) }); $rootScope.$emit('Local/WalletImported', wallet.walletId); - notification.success(gettext('Success'), gettext('Your wallet has been imported correctly')); $state.go('tabs.home'); }); }, 100); @@ -402,7 +397,6 @@ angular.module('copayApp.controllers').controller('importController', $log.debug('Remote preferences saved for:' + wallet.walletId) }); $rootScope.$emit('Local/WalletImported', wallet.walletId); - notification.success(gettext('Success'), gettext('Your wallet has been imported correctly')); $state.go('tabs.home'); }); }, 100); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 45535318e..3c1650d83 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('joinController', - function($scope, $rootScope, $timeout, $state, notification, profileService, configService, storageService, applicationService, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log) { + function($scope, $rootScope, $timeout, $state, profileService, configService, storageService, applicationService, gettext, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log) { var isChromeApp = platformInfo.isChromeApp; var isDevel = platformInfo.isDevel; From 49b2c1a08cbae1ad51be8f5b8358ab9e4ebcea50 Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 24 Aug 2016 14:24:41 -0300 Subject: [PATCH 2/2] fix state --- src/js/controllers/import.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 672fcede0..3aad8690f 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('importController', - function($scope, $rootScope, $timeout, $log, profileService, configService, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) { + function($scope, $rootScope, $timeout, $log, $state, profileService, configService, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) { var isChromeApp = platformInfo.isChromeApp; var isDevel = platformInfo.isDevel;