From a6b3b204bd28280f6b7a15a5b09d0c8bfc2ccd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 22 Sep 2016 10:03:38 -0300
Subject: [PATCH 1/2] fix okay button on status modal and others

---
 public/views/confirm.html             | 4 ++--
 public/views/modals/txp-details.html  | 2 +-
 src/js/controllers/modals/txStatus.js | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/views/confirm.html b/public/views/confirm.html
index 9dc6c42f8..29afd3027 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -49,6 +49,6 @@
       </div>
     </div>
   </ion-content>
-  <button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
-  <accept class="accept-slide" ng-if="isCordova"></accept>
+  <button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
+  <accept class="accept-slide" ng-if="isCordova && fee"></accept>
 </ion-view>
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index e551c6294..b340e1bf5 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -162,5 +162,5 @@
     </div>
   </ion-content>
   <button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
-  <accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired"></accept>
+  <accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
 </ion-modal-view>
diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js
index 8d596ee6f..ea27d5921 100644
--- a/src/js/controllers/modals/txStatus.js
+++ b/src/js/controllers/modals/txStatus.js
@@ -1,10 +1,12 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $log, addressbookService) {
+angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) {
 
   if ($scope.cb) $timeout($scope.cb, 100);
 
   $scope.cancel = function() {
+    $ionicHistory.clearHistory();
+    $state.go('tabs.home');
     $scope.txStatusModal.hide();
   };
 

From 868e6b086f03007a17608860b6a05b8163104377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 22 Sep 2016 10:30:35 -0300
Subject: [PATCH 2/2] show add to address book only from tab send

---
 public/views/modals/tx-status.html    | 4 ++--
 src/js/controllers/modals/txStatus.js | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html
index 53fbd1e46..6d808fafb 100644
--- a/public/views/modals/tx-status.html
+++ b/public/views/modals/tx-status.html
@@ -7,10 +7,10 @@
     <div class="size-16 text-gray m10v">
       <span translate>Sent</span>
     </div>
-    <div class="text-center m20t" ng-if="entryExist">
+    <div class="text-center m20t" ng-if="entryExist || !fromSendTab">
       <a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
     </div>
-    <div class="collect-address" ng-if="!entryExist">
+    <div class="collect-address" ng-if="!entryExist && fromSendTab">
       <div class="row">
         <p translate class="col">Would you like to add this address to your address book?</p>
       </div>
diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js
index ea27d5921..ceb4065f8 100644
--- a/src/js/controllers/modals/txStatus.js
+++ b/src/js/controllers/modals/txStatus.js
@@ -12,12 +12,17 @@ angular.module('copayApp.controllers').controller('txStatusController', function
 
   $scope.save = function(addressbookEntry) {
     $scope.txStatusModal.hide();
+    $ionicHistory.nextViewOptions({
+      disableAnimate: true,
+      disableBack: true
+    });
     $state.go('tabs.send.addressbook', {
       fromSendTab: true,
       addressbookEntry: addressbookEntry
-    })
+    });
   }
 
+  $scope.fromSendTab = $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount";
   addressbookService.list(function(err, ab) {
     if (err) $log.error(err);
     if (ab[$scope.tx.toAddress]) {