From 7ce562ec648746153ae86e95c989d7f791469baa Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Thu, 9 Aug 2018 16:11:29 +1200
Subject: [PATCH] Fix for Shapeshift now appearing again on Review Transaction
 screen.

---
 src/js/controllers/review.controller.js | 8 +++-----
 src/js/controllers/shapeshift.js        | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index 2b42339ce..0e5ceedce 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -88,11 +88,9 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
     coin = vm.originWallet.coin;
 
     if (sendFlowData.thirdParty) {
-      // vm.thirdParty = JSON.parse(sendFlowData.thirdParty); // Parse stringified JSON-object
-      if (vm.thirdParty) {
-        handleThirdPartyInitIfBip70();
-        handleThirdPartyInitIfShapeshift();
-      }
+      vm.thirdParty = sendFlowData.thirdParty;
+      handleThirdPartyInitIfBip70();
+      handleThirdPartyInitIfShapeshift();
     }
 
     configService.get(function onConfig(err, configCache) {
diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js
index 4ede8a94f..3538ebe1a 100644
--- a/src/js/controllers/shapeshift.js
+++ b/src/js/controllers/shapeshift.js
@@ -69,6 +69,8 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
       }
     };
 
+    // Starting new send flow, so ensure everything is reset
+    sendFlowService.clear();
     $state.go('tabs.home').then(function() {
       $ionicHistory.clearHistory();
       $state.go('tabs.send').then(function() {