From 237cc2f58cafa982df78fa825d399e4190b7fe96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 13 Oct 2016 10:03:09 -0300
Subject: [PATCH 1/3] remove hasClick and use isCordova

---
 src/js/controllers/confirm.js           |  1 -
 src/js/controllers/modals/txpDetails.js |  1 -
 src/js/services/platformInfo.js         | 16 ----------------
 www/views/confirm.html                  |  6 +++---
 www/views/modals/txp-details.html       |  6 +++---
 5 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 3fa1febeb..f5f494367 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -32,7 +32,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       throw ('bad params');
     }
     $scope.isCordova = platformInfo.isCordova;
-    $scope.hasClick = platformInfo.hasClick;
     $scope.data = {};
 
     var config = configService.getSync().wallet;
diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js
index 853383dd1..081826b1c 100644
--- a/src/js/controllers/modals/txpDetails.js
+++ b/src/js/controllers/modals/txpDetails.js
@@ -17,7 +17,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
     $scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
     $scope.color = $scope.wallet.color;
     $scope.data = {};
-    $scope.hasClick = platformInfo.hasClick;
     $scope.displayAmount = getDisplayAmount(tx.amountStr);
     $scope.displayUnit = getDisplayUnit(tx.amountStr);
     initActionList();
diff --git a/src/js/services/platformInfo.js b/src/js/services/platformInfo.js
index 9ba4a6d9f..f634e8f0f 100644
--- a/src/js/services/platformInfo.js
+++ b/src/js/services/platformInfo.js
@@ -39,21 +39,5 @@ angular.module('copayApp.services').factory('platformInfo', function($window) {
   ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW;
   ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW;
 
-  ret.hasClick = false;
-
-  if($window.sessionStorage.getItem('hasClick')) {
-    ret.hasClick = true;
-  }
-
-  $window.addEventListener('mousedown', function() {
-    ret.hasClick = true;
-    $window.sessionStorage.setItem('hasClick', 'true');
-  });
-
-  $window.addEventListener('touchstart', function() {
-    ret.hasClick = false;
-    $window.sessionStorage.removeItem('hasClick');
-  });
-
   return ret;
 });
diff --git a/www/views/confirm.html b/www/views/confirm.html
index 01aa35e97..b71ee5bb2 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -7,7 +7,7 @@
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds}">
+  <ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds}">
     <div class="list">
       <div class="item head">
         <div class="sending-label">
@@ -60,13 +60,13 @@
     </div>
     <click-to-accept
       ng-click="approve(statusChangeHandler)"
-      ng-if="hasClick && wallets[0]"
+      ng-if="!isCordova && wallets[0]"
       click-send-status="sendStatus">
       Click to pay
     </click-to-accept>
   </ion-content>
   <slide-to-accept
-    ng-if="!hasClick && wallets[0]"
+    ng-if="isCordova && wallets[0]"
     slide-on-confirm="onConfirm()"
     slide-send-status="sendStatus">
     Slide to pay
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html
index 6f8573994..f0011f515 100644
--- a/www/views/modals/txp-details.html
+++ b/www/views/modals/txp-details.html
@@ -11,7 +11,7 @@
     </button>
   </ion-header-bar>
 
-  <ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && !hasClick}">
+  <ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && isCordova}">
     <div class="list">
       <div class="item head">
         <div class="sending-label">
@@ -152,7 +152,7 @@
 
     <click-to-accept
       ng-click="onConfirm(statusChangeHandler)"
-      ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
+      ng-if="tx.pendingForUs && canSign && !paymentExpired && !isCordova"
       click-send-status="sendStatus">
       Click to accept
     </click-to-accept>
@@ -168,7 +168,7 @@
   </ion-content>
 
   <slide-to-accept
-    ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
+    ng-if="tx.pendingForUs && canSign && !paymentExpired && isCordova"
     slide-on-confirm="onConfirm()"
     slide-send-status="sendStatus">
     Slide to accept

From 9030eba0b86af6e5f7c5c75db3a971de42198f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 13 Oct 2016 10:24:15 -0300
Subject: [PATCH 2/3] show feelevel, remove arrow, add margin left to memo

---
 src/js/controllers/confirm.js |  4 ++--
 www/views/confirm.html        | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index f5f494367..e58419fb3 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     $scope.data = {};
 
     var config = configService.getSync().wallet;
-    $scope.feeLevel = config.settings ? config.settings.feeLevel : '';
+    $scope.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
 
     $scope.toAmount = parseInt($scope.toAmount);
     $scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
@@ -273,7 +273,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     txp.message = description;
     txp.payProUrl = paypro;
     txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
-    txp.feeLevel = config.settings.feeLevel || 'normal';
+    txp.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
     txp.dryRun = dryRun;
 
     walletService.createTx(wallet, txp, function(err, ctxp) {
diff --git a/www/views/confirm.html b/www/views/confirm.html
index b71ee5bb2..5e816bf6b 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -42,19 +42,18 @@
           </div>
           <i class="icon bp-arrow-right"></i>
         </a>
-        <a class="item single-line item-icon-right" ng-hide="insuffientFunds">
-          <span class="label" translate>{{'Add Memo'|translate}}</span>
-          <span class="item-note">
+        <a class="item single-line item-icon-right" ng-hide="insuffientFunds" ng-click="showDescriptionPopup()">
+          <span class="label" translate>Add Memo</span>
+          <span class="item-note m10l">
             {{description}}
           </span>
           <i class="icon bp-arrow-right"></i>
         </a>
-        <a class="item single-line item-icon-right" ng-hide="insuffientFunds">
-          <span class="label" translate>Fee</span>
+        <a class="item single-line" ng-hide="insuffientFunds">
+          <span class="label" translate>Fee: {{feeLevel}}</span>
           <span class="item-note">
             {{fee}}
           </span>
-          <i class="icon bp-arrow-right"></i>
         </a>
       </div>
     </div>

From 4895b7f6b1f9be74d149124d4e80fd23fc6be7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 13 Oct 2016 10:32:44 -0300
Subject: [PATCH 3/3] loading fee

---
 www/views/confirm.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/views/confirm.html b/www/views/confirm.html
index 5e816bf6b..30f060e46 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -52,7 +52,7 @@
         <a class="item single-line" ng-hide="insuffientFunds">
           <span class="label" translate>Fee: {{feeLevel}}</span>
           <span class="item-note">
-            {{fee}}
+            {{fee || '...'}}
           </span>
         </a>
       </div>