From 08977b77c01eb787fcdaf44c25ea061d7a7b5ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 29 Jun 2017 14:35:43 -0300 Subject: [PATCH] fix copayers actions list update and message when success view is shown --- src/js/controllers/modals/txpDetails.js | 8 ++++++-- www/views/modals/txp-details.html | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index a021a9a90..68c6d0778 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -10,6 +10,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.loading = null; $scope.isCordova = platformInfo.isCordova; $scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + $scope.copayers = $scope.wallet.status.wallet.copayers; $scope.copayerId = $scope.wallet.credentials.copayerId; $scope.isShared = $scope.wallet.credentials.n > 1; $scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal(); @@ -36,10 +37,13 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi type: 'accept' }).length == $scope.tx.requiredSignatures - 1; - if (lastSigner) + if (lastSigner) { $scope.buttonText += gettextCatalog.getString('to send'); - else + $scope.successText = gettextCatalog.getString('Payment Sent'); + } else { $scope.buttonText += gettextCatalog.getString('to accept'); + $scope.successText = gettextCatalog.getString('Payment Accepted'); + } }; function initActionList() { diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index f53abe405..c8f750da5 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -185,6 +185,6 @@ - {{'Payment Sent' | translate}} + {{successText}}