Merge pull request #6333 from gabrielbazan7/fix/successMsg

fix copayers actions list update and message when success view is shown
bitpay · Jun 29, 2017 · 92773c3 · 92773c3
2 parents 3a49053 + 08977b7
commit 92773c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -185,6 +185,6 @@
   <slide-to-accept-success
     slide-success-show="sendStatus === 'success'"
     slide-success-on-confirm="onSuccessConfirm()">
-    {{'Payment Sent' | translate}}
+    {{successText}}
   </slide-to-accept-success>
 </ion-modal-view>