From 324088b5dbfe059e4dd636ee343c4840aebfffbb Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 16:04:54 -0400 Subject: [PATCH] handle proposal creation --- src/js/controllers/confirm.js | 6 +++++- src/js/services/walletService.js | 2 +- www/views/confirm.html | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 862dbac7c..3665f1042 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -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) { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index a3218b90c..0b0de6491 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -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); diff --git a/www/views/confirm.html b/www/views/confirm.html index d8051350b..9f551ab5e 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -82,6 +82,7 @@ slide-success-show="sendStatus === 'success'" slide-success-on-confirm="onSuccessConfirm()" > - Payment Sent + Payment Sent + Proposal Created