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] 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();
   };