From 79d6b4d7adbd808fd99609e5d8c8e9bbce2ab7bc Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Wed, 25 Jul 2018 16:05:07 +0200
Subject: [PATCH] confirm screen: display address + back button logic in
 origin/destination screens

---
 src/js/controllers/confirm.js            | 10 ++++++++--
 src/js/controllers/sendFlowController.js |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index b57d2ca08..36035d627 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, $ionicLoading, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, $ionicLoading, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bitcoinCashJsService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) {
 
   var countDown = null;
   var FEE_TOO_HIGH_LIMIT_PER = 15;
@@ -173,6 +173,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
         setupTx(tx);
       }
     } catch (e) {
+      console.log(e);
       var message = gettextCatalog.getString('Invalid address');
       popupService.showAlert(null, message, function () {
         $ionicHistory.nextViewOptions({
@@ -187,7 +188,12 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     }
   });
 
-  var setupTx = function(networkName, data) {
+  var setupTx = function(tx) {
+    if (tx.coin === 'bch') {
+      tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr;
+    } else {
+      tx.displayAddress = entry.address;
+    }
 
     // Other Scope vars
     $scope.isCordova = isCordova;
diff --git a/src/js/controllers/sendFlowController.js b/src/js/controllers/sendFlowController.js
index 400751867..a4d9d6537 100644
--- a/src/js/controllers/sendFlowController.js
+++ b/src/js/controllers/sendFlowController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('sendFlowController', function($scope, $rootScope, $state, $stateParams, $log, configService, gettextCatalog, profileService) {
+angular.module('copayApp.controllers').controller('sendFlowController', function($scope, $rootScope, $state, $stateParams, $log, $ionicHistory, configService, gettextCatalog, profileService) {
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     var config = configService.getSync().wallet.settings;
@@ -60,4 +60,9 @@ angular.module('copayApp.controllers').controller('sendFlowController', function
     }
     $state.transitionTo(getNextStep(), $scope.params);
   };
+
+  $scope.goBack = function() {
+    $ionicHistory.goBack();
+  }
+
 });
\ No newline at end of file