From 6c46ec2bcab7315df92dbefd417bd13682e3ee09 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Tue, 7 Aug 2018 14:23:53 +1200
Subject: [PATCH] Fix for some changes which broke Shapeshift flow.

---
 src/js/controllers/review.controller.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index 7c8bd784d..ce453cd8a 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -78,6 +78,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
     originWalletId = data.stateParams.fromWalletId;
     satoshis = parseInt(data.stateParams.amount, 10);
     toAddress = data.stateParams.toAddress;
+    destinationWalletId = data.stateParams.toWalletId;
     
     vm.originWallet = profileService.getWallet(originWalletId);
     vm.origin.currency = vm.originWallet.coin.toUpperCase();
@@ -257,7 +258,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
     try {
       if (vm.destination.kind === 'wallet') { // This is a wallet-to-wallet transfer
         $ionicLoading.show();
-        var toWallet = profileService.getWallet(data.stateParams.toWalletId);
+        var toWallet = profileService.getWallet(destinationWalletId);
 
         // We need an address to send to, so we ask the walletService to create a new address for the toWallet.
         console.log('Getting address for wallet...');
@@ -468,7 +469,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
         vm.thirdParty.data = {};
       }
 
-      var toWallet = profileService.getWallet(data.stateParams.toWalletId);
+      var toWallet = profileService.getWallet(destinationWalletId);
       $ionicLoading.show();
       walletService.getAddress(vm.originWallet, false, function onWalletAddress(err, returnAddr) {
         walletService.getAddress(toWallet, false, function onWalletAddress(err, withdrawalAddr) {