From 91487cf74c9f10d0a0796e9620d0f480c6bc7fd8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Tue, 7 Aug 2018 15:02:29 +0900
Subject: [PATCH] shapeshift add the toAddress in the tx. Sending works.

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

diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index 6ae2a51c0..eb3fde53e 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -111,9 +111,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
   }
 
   vm.approve = function() {
-
-    if (vm.thirdParty.id === 'shapeshift')
-      return;
+      
     if (!tx || !vm.originWallet) return;
 
     if (vm.paymentExpired) {
@@ -491,7 +489,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
           $ionicLoading.hide();
           shapeshiftService.shiftIt(vm.originWallet.coin, toWallet.coin, withdrawalAddr, returnAddr, function onShiftIt(shapeshiftData) {
             vm.memo = 'ShapeShift Order:\nhttps://www.shapeshift.io/#/status/' + shapeshiftData.orderId;
-            toAddress = shapeshiftData.toAddress;
+            tx.toAddress = shapeshiftData.toAddress;
             vm.destination.address = toAddress;
             vm.destination.kind = 'shapeshift';
           });