From db7eee984bfe8304c309c32600171e61b18d5997 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Tue, 7 Aug 2018 14:48:43 +1200
Subject: [PATCH] Error handling for Shapeshift, and UI for destination wallet.

---
 src/js/controllers/review.controller.js | 21 ++++++++++++++++++---
 www/views/review.html                   |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index ce453cd8a..6ae2a51c0 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -470,11 +470,26 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
       }
 
       var toWallet = profileService.getWallet(destinationWalletId);
+      vm.destination.name = toWallet.name;
+      vm.destination.color = toWallet.color;
+      vm.destination.currency = toWallet.coin.toUpperCase();
+
       $ionicLoading.show();
-      walletService.getAddress(vm.originWallet, false, function onWalletAddress(err, returnAddr) {
-        walletService.getAddress(toWallet, false, function onWalletAddress(err, withdrawalAddr) {
+      walletService.getAddress(vm.originWallet, false, function onReturnWalletAddress(err, returnAddr) {
+        if (err) {
           $ionicLoading.hide();
-          shapeshiftService.shiftIt(vm.originWallet.coin, toWallet.coin, withdrawalAddr, returnAddr, function(shapeshiftData) {
+          popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString());
+          return;
+        } 
+        walletService.getAddress(toWallet, false, function onWithdrawalWalletAddress(err, withdrawalAddr) {
+          if (err) {
+            $ionicLoading.hide();
+            popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString());
+            return;
+          } 
+
+          $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;
             vm.destination.address = toAddress;
diff --git a/www/views/review.html b/www/views/review.html
index 4eb4763d7..9edd672ec 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -37,7 +37,7 @@
         <div class="item item-compact" translate>To:</div>
         <div class="item item-gutterless item-complex item-avatar">
           <div class="item-content item-content-avatar"
-          ng-if="vm.destination.kind === 'contact' || vm.destination.kind === 'wallet'">
+          ng-if="vm.destination.kind === 'contact' || vm.destination.kind === 'wallet' || vm.destination.kind == 'shapeshift'">
             <img src="img/contact-placeholder.svg" class="bg" ng-if="vm.destination.kind === 'contact'">
             <i class="icon big-icon-svg theme-circle theme-circle-services" ng-if="vm.destination.kind === 'wallet' || vm.destination.kind === 'shapeshift'">
                 <div class="bg icon-wallet"