From cebe9507f169d42451c5a16391e0e260dfb8b325 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Fri, 3 Aug 2018 13:13:29 +0200
Subject: [PATCH] Make the "to"-address field work in new style + BTC
 transactions fix

---
 src/js/controllers/review.controller.js | 2 +-
 src/js/services/incomingData.js         | 2 +-
 www/views/review.html                   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index b3addc64f..7d8efbfac 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -531,7 +531,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
     if (tx.coin === 'bch') {
       tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr;
     } else {
-      tx.displayAddress = entry.address;
+      tx.displayAddress = tx.toAddress;
     }
 
     addressbookService.get(tx.coin+tx.toAddress, function(err, addr) { // Check if the recipient is a contact
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index fb8d8868a..55a453dab 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -386,7 +386,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       'notify': $state.current.name == 'tabs.send' ? false : true
     });
     $timeout(function() {
-      $state.transitionTo('tabs.send.amount', {
+      $state.transitionTo('tabs.send.origin', {
         toAddress: toAddress,
         coin: coin,
         noPrefix: 1
diff --git a/www/views/review.html b/www/views/review.html
index 2e7823f69..2f8a4ee3a 100644
--- a/www/views/review.html
+++ b/www/views/review.html
@@ -48,7 +48,9 @@
             <p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p>
           </div>
           <div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address'">
-            <div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded"><span class="prefix">qz9cq</span><span class="mid">q5pryv9hnqwa8q8mccmynk9uf4vlu5nxer</span><span class="suffix">pzmc</span></div>
+            <div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded">
+              <span class="prefix">{{vm.destination.address.substring(0,5)}}</span><span class="mid">{{vm.destination.address.substring(5,vm.destination.address.length-4)}}</span><span class="suffix">{{vm.destination.address.substring(vm.destination.address.length-4)}}</span>
+            </div>
           </div>
         </div>
       </div>