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

handle proposal creation

Browse source
This commit is contained in:
Marty Alcala 2016-10-10 16:04:54 -04:00
commit 324088b5db
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/confirm.js
View file

@ -331,7 +331,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
};
function statusChangeHandler(processName, showName, isOn) {
if(processName === 'broadcastingTx' && !isOn) {
console.log('in statusChangeHandler', processName, showName, isOn);
console.log('$scope.wallet', $scope.wallet);
if(
(processName === 'broadcastingTx' ||
((processName === 'signingTx') && $scope.wallet.m > 1)) && !isOn) {
$scope.sendStatus = 'success';
$scope.$digest();
} else if(showName) {

2
src/js/services/walletService.js
View file

@ -937,7 +937,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
ongoingProcess.set('signingTx', true, customStatusHandler);
root.signTx(wallet, publishedTxp, password, function(err, signedTxp) {
ongoingProcess.set('signingTx', false);
ongoingProcess.set('signingTx', false, customStatusHandler);
root.invalidateCache(wallet);

3
www/views/confirm.html
View file

@ -82,6 +82,7 @@
slide-success-show="sendStatus === 'success'"
slide-success-on-confirm="onSuccessConfirm()"
>
Payment Sent
<span ng-hide="wallet.m > 1">Payment Sent</span>
<span ng-show="wallet.m > 1">Proposal Created</span>
</slide-to-accept-success>
</ion-view>