From 5cb3d7521df0fbb42f44ebf01c641d6565441abb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Fri, 21 Sep 2018 10:23:02 +0200
Subject: [PATCH 1/2] Fix modal

---
 src/js/services/onGoingProcess.js     | 10 ++++++----
 src/js/services/shapeshift.service.js |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js
index 9c25c3c26..422be070f 100644
--- a/src/js/services/onGoingProcess.js
+++ b/src/js/services/onGoingProcess.js
@@ -74,10 +74,8 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
     root.onGoingProcessName = name;
 
     var showName = $filter('translate')(processNames[name] || name);
-
-    if (customHandler) {
-      customHandler(processName, showName, isOn);
-    } else if (root.onGoingProcessName) {
+    
+    if (root.onGoingProcessName) {
       var tmpl;
       if (isWindowsPhoneApp) tmpl = '<div>' + showName + '</div>';
       else tmpl = '<div class="item-icon-left">' + showName + '<ion-spinner class="spinner-stable" icon="lines"></ion-spinner></div>';
@@ -87,6 +85,10 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
     } else {
       $ionicLoading.hide();
     }
+
+    if (customHandler) {
+      customHandler(processName, showName, isOn);
+    } 
   };
 
   return root;
diff --git a/src/js/services/shapeshift.service.js b/src/js/services/shapeshift.service.js
index 77f0de297..73410e478 100644
--- a/src/js/services/shapeshift.service.js
+++ b/src/js/services/shapeshift.service.js
@@ -57,7 +57,7 @@ angular
     function shiftIt(coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) {
       // Test if the amount is correct depending on the min and max
       if (!amount || typeof amount !== 'number') {
-        cb(new Error(gettextCatalog.getString('Amount is not defined'))));
+        cb(new Error(gettextCatalog.getString('Amount is not defined')));
       } else if (amount < service.marketData.minimum) {
         cb(new Error(gettextCatalog.getString('Amount is below the minimun')));
       } else if (amount > service.marketData.maxLimit) {

From a8e5c212f08abc13cff85b5484166714ba5773f2 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Fri, 21 Sep 2018 11:41:20 +0200
Subject: [PATCH 2/2] Fix : Check if the status could be set before checking
 the balance.

---
 src/js/controllers/shapeshift.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js
index 0dac21a11..652f54c34 100644
--- a/src/js/controllers/shapeshift.js
+++ b/src/js/controllers/shapeshift.js
@@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
     walletsBtc = profileService.getWallets({coin: 'btc'});
     walletsBch = profileService.getWallets({coin: 'bch'});
     $scope.fromWallets = lodash.filter(walletsBtc.concat(walletsBch), function(w) {
-      return w.status.balance.availableAmount > 0;
+      return (w.status && w.status.balance && w.status.balance.availableAmount > 0);
     });
 
     $scope.singleFromWallet = $scope.fromWallets.length === 1;