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

Merge pull request #3809 from matiu/bug/refresh-multisig

Browse source 
fix refresh in multisig
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-22 12:49:00 -03:00
commit c10151dc4f
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/controllers/walletHome.js
View file

@ -259,7 +259,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.openTxpModal = function(tx, copayers, isGlidera) { this.openTxpModal = function(tx, copayers, isGlidera) {
$rootScope.modalOpened = true; $rootScope.modalOpened = true;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var refreshUntilItChanges = false;
var currentSpendUnconfirmed = configWallet.spendUnconfirmed; var currentSpendUnconfirmed = configWallet.spendUnconfirmed;
var ModalInstanceCtrl = function($scope, $modalInstance) { var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.error = null; $scope.error = null;
@ -278,8 +277,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} }
} }
$scope.tx = tx; $scope.tx = tx;
refreshUntilItChanges = false;
$scope.currentSpendUnconfirmed = currentSpendUnconfirmed; $scope.currentSpendUnconfirmed = currentSpendUnconfirmed;
$scope.getShortNetworkName = function() { $scope.getShortNetworkName = function() {
@ -341,7 +338,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}); });
return; return;
} }
refreshUntilItChanges = true;
$modalInstance.close(txp); $modalInstance.close(txp);
return; return;
}); });
@ -404,7 +400,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (memo) if (memo)
$log.info(memo); $log.info(memo);
refreshUntilItChanges = true;
$modalInstance.close(txpb); $modalInstance.close(txpb);
} }
}); });
@ -442,11 +437,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
if (txp) { if (txp) {
txStatus.notify(txp, function() { txStatus.notify(txp, function() {
$scope.$emit('Local/TxProposalAction', refreshUntilItChanges); $scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted');
}); });
} else { } else {
$timeout(function() { $timeout(function() {
$scope.$emit('Local/TxProposalAction', refreshUntilItChanges); $scope.$emit('Local/TxProposalAction');
}, 100); }, 100);
} }
}); });
@ -857,7 +852,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} else { } else {
go.walletHome(); go.walletHome();
txStatus.notify(txp, function() { txStatus.notify(txp, function() {
$scope.$emit('Local/TxProposalAction', true); $scope.$emit('Local/TxProposalAction', txp.status == 'broadcasted');
}); });
}; };
}); });