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

fix offline notifications

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-14 12:51:49 -03:00
commit d21c9320c4
8 changed files with 40 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/history.js
View file

@ -9,7 +9,6 @@ angular.module('copayApp.controllers').controller('historyController',
var fc = profileService.focusedClient;
var config = configService.getSync().wallet.settings;
var formatAmount = profileService.formatAmount;
this.unitToSatoshi = config.unitToSatoshi;
this.satToUnit = 1 / this.unitToSatoshi;
this.unitName = config.unitName;
@ -42,10 +41,9 @@ angular.module('copayApp.controllers').controller('historyController',
this.openTxModal = function(btx) {
var self = this;
var fc = profileService.focusedClient;
var ModalInstanceCtrl = function($scope, $modalInstance, profileService) {
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.btx = btx;
$scope.settings = config;
$scope.btx.amountStr = profileService.formatAmount(btx.amount);
$scope.color = fc.backgroundColor;
$scope.getAmount = function(amount) {
@ -73,11 +71,6 @@ angular.module('copayApp.controllers').controller('historyController',
});
};
this.formatAmount = function(amount) {
return profileService.formatAmount(amount);
};
this.hasAction = function(actions, action) {
return actions.hasOwnProperty('create');
};

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

@ -15,9 +15,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self[processName] = isOn;
self.onGoingProcess[processName] = isOn;
// derived rules
self.hideBalance = self.updatingBalance || self.updatingStatus || self.openingWallet;
var name;
self.anyOnGoingProcess = lodash.any(self.onGoingProcess, function(isOn, processName) {
if (isOn)
@ -26,6 +23,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
});
// The first one
self.onGoingProcessName = name;
$timeout(function() {
$rootScope.$apply();
});
};
self.setFocusedWallet = function() {
@ -147,14 +147,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}
self.skipHistory = skip || 0;
$timeout(function() {
self.setOngoingProcess('updatingTxHistory', true);
$log.debug('Updating Transaction History');
self.txHistoryError = false;
self.updatingTxHistory = true;
fc.getTxHistory({
skip: self.skipHistory,
limit: self.limitHistory + 1
}, function(err, txs) {
self.setOngoingProcess('updatingTxHistory', false);
self.updatingTxHistory = false;
if (err) {
$log.debug('TxHistory ERROR:', err);
self.handleError(err);
@ -346,6 +346,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.notAuthorized = false;
self.setOngoingProcess('recreating', false);
if (err) {
self.clientError = 'Could not recreate wallet:' + err;
$rootScope.$apply();
return;
}
profileService.setWalletClients();
$timeout(function() {
$rootScope.$emit('Local/WalletImported', self.walletId);
@ -375,6 +381,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
c.scanning = false;
if (self.walletId == walletId)
self.setOngoingProcess('scanning', false);
self.clientError = 'Could not scan wallet:' + err;
$rootScope.$apply();
}
});
};