From db4a6069e9c8230b1764ae760b97a81dcca86684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 12 Oct 2016 10:53:27 -0300
Subject: [PATCH 1/2] fix confirmation popup

---
 src/js/controllers/confirm.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 77cd8b4c9..eb12cd094 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -308,17 +308,20 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       var cancelText = gettextCatalog.getString('Cancel');
 
       if (!spendingPassEnabled && !touchIdEnabled) {
-        if (isCordova && bigAmount) {
-          popupService.showConfirm(null, message, okText, cancelText, function(ok) {
-            if (!ok) {
-              $scope.sendStatus = '';
-              $timeout(function() {
-                $scope.$apply();
-              });
-              return;
-            }
-            publishAndSign(wallet, txp, onSendStatusChange);
-          });
+        if (isCordova) {
+          if (bigAmount) {
+            popupService.showConfirm(null, message, okText, cancelText, function(ok) {
+              if (!ok) {
+                $scope.sendStatus = '';
+                $timeout(function() {
+                  $scope.$apply();
+                });
+                return;
+              }
+              publishAndSign(wallet, txp, onSendStatusChange);
+            });
+          }
+          else publishAndSign(wallet, txp, onSendStatusChange);
         }
         else {
           popupService.showConfirm(null, message, okText, cancelText, function(ok) {

From 06cfcafd031e6033a7b1ba12322476db2299c337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 12 Oct 2016 11:04:05 -0300
Subject: [PATCH 2/2] fixes

---
 src/js/controllers/confirm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index eb12cd094..d8dc250c0 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -297,7 +297,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
       var config = configService.getSync();
       var spendingPassEnabled = walletService.isEncrypted(wallet);
-      var touchIdEnabled = config.touchIdFor && !config.touchIdFor[wallet.id];
+      var touchIdEnabled = config.touchIdFor && config.touchIdFor[wallet.id];
       var isCordova = $scope.isCordova;
       var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20;
       var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', {