From ee84235d3adf8e149bdf8769877359ce0e5c14b0 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Fri, 10 Aug 2018 14:05:46 +0900
Subject: [PATCH 1/2] Top bar message

---
 src/js/controllers/walletSelectorController.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/js/controllers/walletSelectorController.js b/src/js/controllers/walletSelectorController.js
index 74ed874d4..89d77cc3e 100644
--- a/src/js/controllers/walletSelectorController.js
+++ b/src/js/controllers/walletSelectorController.js
@@ -34,6 +34,9 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
         }
         break;
       default:
+        if (!stateParams.thirdParty) {
+          $scope.sendFlowTitle = gettextCatalog.getString('Send');
+        }
        // nop
     }
 

From 9e28c4ec4539a32bfa33b90ef005b3bfc357a0ae Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Fri, 10 Aug 2018 17:20:04 +0900
Subject: [PATCH 2/2] Fix bug send max with thirdparty (Shapeshift)

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

diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 8e458045e..00c9461f5 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -464,7 +464,7 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
     };
 
     if (vm.thirdParty) {
-      confirmData['thirdParty'] = this.thirdParty;
+      confirmData.thirdParty = vm.thirdParty;
     }
 
     sendFlowService.pushState(confirmData);