From 753d2aea69a2e1daed1e244a0abea2062778eb96 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Wed, 8 Aug 2018 15:31:36 +0200
Subject: [PATCH 1/2] remove bottom menu on wallet selector + remove swipe back
 feature on review screen

---
 www/views/review.html         | 2 +-
 www/views/walletSelector.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/views/review.html b/www/views/review.html
index 2349c315d..cb7f21fbc 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -1,4 +1,4 @@
-<ion-view id="view-review" hide-tabs>
+<ion-view id="view-review" can-swipe-back="false" hide-tabs>
   <ion-nav-bar class="bar-royal {{vm.origin.currency.toLowerCase()}}">
     <ion-nav-title>
       {{'Review Transaction' | translate}}
diff --git a/www/views/walletSelector.html b/www/views/walletSelector.html
index 2da97eadb..2e4c4bc31 100644
--- a/www/views/walletSelector.html
+++ b/www/views/walletSelector.html
@@ -1,4 +1,4 @@
-<ion-view id="wallet-origin-destination" show-tabs>
+<ion-view id="wallet-origin-destination" hide-tabs>
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{sendFlowTitle}}</ion-nav-title>
     <ion-nav-back-button ng-click="goBack()"></ion-nav-back-button>

From 51921a1a1d4207013a9fa89bdc5340ab6e3bead4 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Wed, 8 Aug 2018 22:32:18 +0900
Subject: [PATCH 2/2] Fix shapeshift flow go back available

---
 src/js/controllers/shapeshift.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js
index ade7afb5b..4bf3db764 100644
--- a/src/js/controllers/shapeshift.js
+++ b/src/js/controllers/shapeshift.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $state, $interval, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) {
+angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $state, $timeout, $ionicHistory, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) {
   var walletsBtc = [];
   var walletsBch = [];
 
@@ -66,8 +66,14 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
     var params = {
       thirdParty: JSON.stringify({id: 'shapeshift'})
     };
+
     $state.go('tabs.home').then(function() {
-      $state.transitionTo('tabs.send.origin', params);
+      $ionicHistory.clearHistory();
+      $state.go('tabs.send').then(function() {
+        $timeout(function () {
+          $state.transitionTo('tabs.send.origin', params);
+        }, 60);
+      });
     });
   }
 });