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

handler for untilItchanges to txps

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-05-30 14:28:18 -03:00
commit e9d90d16fa
2 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -136,6 +136,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.copayerId = fc.credentials.copayerId;
$scope.loading = null;
$scope.color = fc.backgroundColor;
$scope.refreshUntilItChanges = false;
$scope.getShortNetworkName = function() {
return fc.credentials.networkName.substring(0, 4);
@ -223,7 +224,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (memo)
$log.info(memo);
txpsb.refreshUntilItChanges = true;
$scope.refreshUntilItChanges = true;
$modalInstance.close(txpsb);
}
});
@ -249,6 +250,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.error = err.message || gettext('Could not reject payment. Check you connection and try again');
$scope.$digest();
} else {
$scope.refreshUntilItChanges = true;
$modalInstance.close(txpr);
}
});
@ -272,6 +274,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.$digest();
return;
}
$scope.refreshUntilItChanges = true;
$modalInstance.close();
});
}, 100);
@ -294,7 +297,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (memo)
$log.info(memo);
txpb.refreshUntilItChanges = true;
$scope.refreshUntilItChanges = true;
$modalInstance.close(txpb);
}
});
@ -323,15 +326,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
});
modalInstance.result.then(function(txp) {
var refreshUntilItChanges = txp ? txp.refreshUntilItChanges : null;
self.setOngoingProcess();
if (txp) {
txStatus.notify(txp, function() {
$scope.$emit('Local/TxProposalAction', refreshUntilItChanges);
$scope.$emit('Local/TxProposalAction', $scope.refreshUntilItChanges);
});
} else {
$timeout(function() {
$scope.$emit('Local/TxProposalAction');
$scope.$emit('Local/TxProposalAction', $scope.refreshUntilItChanges);
}, 100);
}
});