From 77f62100760a60fb46d2d3e578d86dc6f900c15b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Thu, 9 Aug 2018 13:15:21 +0900
Subject: [PATCH] Fix pop state on the send flow

---
 src/js/controllers/amount.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index d07f77c3f..b945be92c 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -68,6 +68,10 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
   function onBeforeEnter(event, data) {
     console.log('amount onBeforeEnter sendflow ', sendFlowService.getState());
 
+    if (data.direction == "back") {
+      sendFlowService.popState();
+    }
+    
     initCurrencies();
 
     passthroughParams = sendFlowService;
@@ -210,7 +214,6 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
   }
 
   function goBack() {
-    sendFlowService.popState();
     $ionicHistory.goBack();
   }