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

Merge pull request #223 from JDonadio/bug/notification-service

Browse source 
Navigate to import/join
This commit is contained in:
Matias Alejo Garcia 2016-08-24 15:30:12 -03:00 • committed by GitHub
commit 4e4e529b34
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/import.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('importController', 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, $state, profileService, configService, sjcl, gettext, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService) {
var isChromeApp = platformInfo.isChromeApp; var isChromeApp = platformInfo.isChromeApp;
var isDevel = platformInfo.isDevel; var isDevel = platformInfo.isDevel;
@ -110,7 +110,6 @@ angular.module('copayApp.controllers').controller('importController',
}); });
$rootScope.$emit('Local/WalletImported', client.credentials.walletId); $rootScope.$emit('Local/WalletImported', client.credentials.walletId);
notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
$state.go('tabs.home'); $state.go('tabs.home');
}); });
}, 100); }, 100);
@ -138,7 +137,6 @@ angular.module('copayApp.controllers').controller('importController',
}); });
$rootScope.$emit('Local/WalletImported', client.credentials.walletId); $rootScope.$emit('Local/WalletImported', client.credentials.walletId);
notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
$state.go('tabs.home'); $state.go('tabs.home');
}); });
}, 100); }, 100);
@ -159,7 +157,6 @@ angular.module('copayApp.controllers').controller('importController',
}); });
} }
$rootScope.$emit('Local/WalletImported', walletId); $rootScope.$emit('Local/WalletImported', walletId);
notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
$state.go('tabs.home'); $state.go('tabs.home');
}); });
}, 100); }, 100);
@ -189,7 +186,6 @@ angular.module('copayApp.controllers').controller('importController',
}); });
$rootScope.$emit('Local/WalletImported', client.credentials.walletId); $rootScope.$emit('Local/WalletImported', client.credentials.walletId);
notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
$state.go('tabs.home'); $state.go('tabs.home');
}); });
}, 100); }, 100);
@ -324,7 +320,6 @@ angular.module('copayApp.controllers').controller('importController',
$log.debug('Remote preferences saved for:' + wallet.walletId) $log.debug('Remote preferences saved for:' + wallet.walletId)
}); });
$rootScope.$emit('Local/WalletImported', wallet.walletId); $rootScope.$emit('Local/WalletImported', wallet.walletId);
notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
$state.go('tabs.home'); $state.go('tabs.home');
}); });
}, 100); }, 100);
@ -402,7 +397,6 @@ angular.module('copayApp.controllers').controller('importController',
$log.debug('Remote preferences saved for:' + wallet.walletId) $log.debug('Remote preferences saved for:' + wallet.walletId)
}); });
$rootScope.$emit('Local/WalletImported', wallet.walletId); $rootScope.$emit('Local/WalletImported', wallet.walletId);
notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
$state.go('tabs.home'); $state.go('tabs.home');
}); });
}, 100); }, 100);

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

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('joinController', 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 isChromeApp = platformInfo.isChromeApp;
var isDevel = platformInfo.isDevel; var isDevel = platformInfo.isDevel;