From 34566e13a7d7207963206e501663d5908fd894d9 Mon Sep 17 00:00:00 2001
From: Marty Alcala <marty@bitpay.com>
Date: Mon, 10 Oct 2016 14:33:55 -0400
Subject: [PATCH] allow user to cancel a transaction when using the slide to
 pay component

---
 src/js/controllers/confirm.js              | 10 ++++++++--
 src/js/directives/slideToAccept.js         | 20 +++++++++++---------
 src/sass/views/includes/slideToAccept.scss |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index ba66bcb26..9258e521d 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -297,13 +297,19 @@ angular.module('copayApp.controllers').controller('confirmController', function(
       if (!spendingPassEnabled && !touchIdEnabled) {
         if (isCordova && bigAmount) {
           popupService.showConfirm(null, message, okText, cancelText, function(ok) {
-            if (!ok) return;
+            if (!ok) {
+              $scope.sendStatus = '';
+              return;
+            }
             publishAndSign(wallet, txp, onSendStatusChange);
           });
         }
         else {
           popupService.showConfirm(null, message, okText, cancelText, function(ok) {
-            if (!ok) return;
+            if (!ok) {
+              $scope.sendStatus = '';
+              return;
+            }
             publishAndSign(wallet, txp, onSendStatusChange);
           });
         }
diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js
index f47a60d70..a396e2b0d 100644
--- a/src/js/directives/slideToAccept.js
+++ b/src/js/directives/slideToAccept.js
@@ -33,9 +33,13 @@ angular.module('copayApp.directives')
         scope.displaySendStatus = '';
 
         scope.$watch('sendStatus', function() {
-          if(scope.sendStatus === 'success') {
-            scope.displaySendStatus = '';
+          if(!scope.sendStatus) {
             reset();
+          } else if(scope.sendStatus === 'success') {
+            scope.displaySendStatus = '';
+            $timeout(function() {
+              reset();
+            }, 500);
           } else {
             scope.displaySendStatus = scope.sendStatus;
           }
@@ -79,13 +83,11 @@ angular.module('copayApp.directives')
         }
 
         function reset() {
-          $timeout(function() {
-            scope.isSlidFully = false;
-            isSliding = false;
-            setNewSliderStyle(getKnobWidthPercentage());
-            setNewBitcoinStyle(0);
-            setNewTextStyle(0);
-          }, 500);
+          scope.isSlidFully = false;
+          isSliding = false;
+          setNewSliderStyle(getKnobWidthPercentage());
+          setNewBitcoinStyle(0);
+          setNewTextStyle(0);
         }
 
         function setNewSliderStyle(pct) {
diff --git a/src/sass/views/includes/slideToAccept.scss b/src/sass/views/includes/slideToAccept.scss
index 4257097b8..55ef91f06 100644
--- a/src/sass/views/includes/slideToAccept.scss
+++ b/src/sass/views/includes/slideToAccept.scss
@@ -93,9 +93,9 @@ slide-to-accept {
       text-transform: capitalize;
       transform: translateY(2rem);
       opacity: 0;
-      transition: transform 250ms ease, opacity 250ms ease;
 
       &.enter {
+        transition: transform 250ms ease, opacity 250ms ease;
         transform: translateY(0);
         opacity: 1;
       }