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

Merge pull request #3559 from bitpay/v1.5

Browse source 
Merge into v1.6 from v1.5
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-01 14:50:49 -03:00
commit 486b24eeb1
19 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ angular.module('copayApp.controllers').controller('exportController',
return;
}
$rootScope.$emit('Local/BackupDone');
notification.success(gettext('Success'), gettext('Encrypted export file saved'));
go.walletHome();
});
@ -96,6 +97,7 @@ angular.module('copayApp.controllers').controller('exportController',
self.error = true;
} else {
self.error = false;
$rootScope.$emit('Local/BackupDone');
}
return cb(ew);
});

18
src/js/controllers/index.js
View file

@ -434,9 +434,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
};
// This handles errors from BWS/index with are nomally
// trigger from async events (like updates)
self.handleError = function(err) {
$log.warn('Client ERROR:', err);
// trigger from async events (like updates).
// Debounce function avoids multiple popups
var _handleError = function(err) {
$log.warn('Client ERROR: ', err);
if (err.code === 'NOT_AUTHORIZED') {
self.notAuthorized = true;
go.walletHome();
@ -449,6 +450,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.showErrorPopup(msg);
}
};
self.handleError = lodash.debounce(_handleError, 1000);
self.openWallet = function() {
var fc = profileService.focusedClient;
$timeout(function() {
@ -940,9 +944,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$log.warn('Showing err popup:' + msg);
self.showAlert = {
msg: msg,
close: function(err) {
close: function() {
self.showAlert = null;
if (cb) return cb(err);
if (cb) return cb();
},
};
$timeout(function() {
@ -1371,10 +1375,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
);
});
$rootScope.$on('Local/ShowAlert', function(event, msg, cb) {
self.showErrorPopup(msg, cb);
});
$rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) {
self.askPassword = {
isSetup: isSetup,