From 10315d13b8d5147354af1a59f8b2a2fa0f6ebbe9 Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Mon, 16 Jan 2017 17:12:55 -0300
Subject: [PATCH] check last signer

---
 src/js/controllers/confirm.js           | 18 +++++-------------
 src/js/controllers/modals/txpDetails.js | 22 +++++++---------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 1ee427e60..7a3915b8f 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -59,22 +59,14 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   function applyButtonText(multisig) {
     $scope.buttonText = $scope.isCordova ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' ';
 
-    if ($scope.paypro) {
-      $scope.buttonText += gettextCatalog.getString('to pay');
-      return;
-    }
-
     if ($scope.isGlidera || $scope.isGiftCard || $scope.cardId) {
       $scope.buttonText += gettextCatalog.getString('to complete');
-      return;
-    }
-
-    if (multisig) {
+    } else if ($scope.paypro) {
+      $scope.buttonText += gettextCatalog.getString('to pay');
+    } else if (multisig) {
       $scope.buttonText += gettextCatalog.getString('to accept');
-      return;
-    }
-
-    $scope.buttonText += gettextCatalog.getString('to send');
+    } else
+      $scope.buttonText += gettextCatalog.getString('to send');
   };
 
   function setwallets() {
diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js
index ee2904a43..5c58d3447 100644
--- a/src/js/controllers/modals/txpDetails.js
+++ b/src/js/controllers/modals/txpDetails.js
@@ -22,25 +22,17 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
     applyButtonText();
   };
 
-  function applyButtonText(multisig) {
+  function applyButtonText() {
     $scope.buttonText = $scope.isCordova ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' ';
 
-    if ($scope.paypro) {
-      $scope.buttonText += gettextCatalog.getString('to pay');
-      return;
-    }
+    var lastSigner = lodash.filter($scope.tx.actions, {
+      type: 'accept'
+    }).length == $scope.tx.requiredSignatures - 1;
 
-    if ($scope.isGlidera || $scope.isGiftCard || $scope.cardId) {
-      $scope.buttonText += gettextCatalog.getString('to complete');
-      return;
-    }
-
-    if (multisig) {
+    if (lastSigner)
+      $scope.buttonText += gettextCatalog.getString('to send');
+    else
       $scope.buttonText += gettextCatalog.getString('to accept');
-      return;
-    }
-
-    $scope.buttonText += gettextCatalog.getString('to send');
   };
 
   function getDisplayAmount(amountStr) {