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

timing changes when switching wallets

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-02-23 11:12:49 -03:00
commit d572ddd2e9
1 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -286,6 +286,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
tries = tries || 0;
opts = opts || {};
var walletId = profileService.focusedClient.credentials.walletId
if (opts.untilItChanges && lodash.isUndefined(initStatusHash)) {
initStatusHash = _walletStatusHash();
$log.debug('Updating status until it changes. initStatusHash:' + initStatusHash)
@ -312,6 +314,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var fc = profileService.focusedClient;
if (!fc) return;
// If not untilItChanges...trigger history update now
if (opts.triggerTxUpdate && !opts.untilItChanges) {
$timeout(function() {
self.debounceUpdateHistory();
}, 1);
}
$timeout(function() {
if (!opts.quiet)
@ -321,7 +331,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
get(function(err, walletStatus) {
var currentStatusHash = _walletStatusHash(walletStatus);
$log.debug('Status update. hash:' + currentStatusHash + ' Try:' + tries);
if (!err && opts.untilItChanges && initStatusHash == currentStatusHash && tries < 7) {
if (!err && opts.untilItChanges && initStatusHash == currentStatusHash && tries < 7 && walletId == profileService.focusedClient.credentials.walletId) {
return $timeout(function() {
$log.debug('Retrying update... Try:' + tries)
return self.updateAll({
@ -331,9 +341,14 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}, initStatusHash, ++tries);
}, 1400 * tries);
}
if (walletId != profileService.focusedClient.credentials.walletId)
return;
if (!opts.quiet)
self.setOngoingProcess('updatingStatus', false);
if (err) {
self.handleError(err);
return;
@ -358,7 +373,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$emit('Local/BalanceUpdated', walletStatus.balance);
$rootScope.$apply();
if (opts.triggerTxUpdate) {
if (opts.triggerTxUpdate && opts.untilItChanges) {
$timeout(function() {
self.debounceUpdateHistory();
}, 1);
@ -878,12 +893,17 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var confirmedTxs = self.removeSoftConfirmedTx(txsFromLocal);
var endingTxid = confirmedTxs[0] ? confirmedTxs[0].txid : null;
// First update
if (walletId == profileService.focusedClient.credentials.walletId) {
self.completeHistory = txsFromLocal;
self.setCompactTxHistory();
}
if (historyUpdateInProgress[walletId])
return;
historyUpdateInProgress[walletId] = true;
function getNewTxs(newTxs, skip, i_cb) {
self.getTxsFromServer(client, skip, endingTxid, requestLimit, function(err, res, shouldContinue) {
@ -978,14 +998,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (!fc) return;
var walletId = fc.credentials.walletId;
if (!fc.isComplete() || historyUpdateInProgress[walletId]) {
self.updatingTxHistory = historyUpdateInProgress[walletId];
if (!fc.isComplete()) {
return;
}
$log.debug('Updating Transaction History');
self.txHistoryError = false;
historyUpdateInProgress[walletId] = self.updatingTxHistory = true;
self.updatingTxHistory = true;
$timeout(function() {
self.updateLocalTxHistory(fc, function(err) {
@ -1015,7 +1034,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.throttledUpdateHistory = lodash.throttle(function() {
self.updateHistory();
}, 10000);
}, 5000);
self.showErrorPopup = function(msg, cb) {
$log.warn('Showing err popup:' + msg);
@ -1050,7 +1069,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
};
self.openMenu = function() {
profileService.isDisclaimerAccepted(function(val){
profileService.isDisclaimerAccepted(function(val) {
if (val) go.swipe(true);
else
$log.debug('Disclaimer not accepted, cannot open menu');
@ -1312,7 +1331,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
quiet: true
});
self.debounceUpdateHistory();
}, 4000, {
}, 2000, {
leading: false,
trailing: true
});
@ -1465,7 +1484,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
$rootScope.$on('Local/NewFocusedWallet', function() {
self.setUxLanguage();
self.setFocusedWallet();
self.debounceUpdateHistory();
self.updateHistory();
storageService.getCleanAndScanAddresses(function(err, walletId) {
if (walletId && profileService.walletClients[walletId]) {
$log.debug('Clear last address cache and Scan ', walletId);