From c600b81137ff3e7642af2a1f6a50e5db1f906219 Mon Sep 17 00:00:00 2001 From: Kadir Sekha Date: Wed, 31 Jan 2018 16:10:19 -0400 Subject: [PATCH] copy address from send and amount screen --- src/js/controllers/tab-send.js | 3 ++- www/views/amount.html | 2 +- www/views/confirm.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 489d7c4e7..6e761e59e 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, configService) { +angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, configService, bitcoinCashJsService) { var originalList; var CONTACTS_SHOW_LIMIT; @@ -199,6 +199,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( $log.debug('Got toAddress:' + addr + ' | ' + item.name); return $state.transitionTo('tabs.send.amount', { recipientType: item.recipientType, + displayAddress: item.coin == 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr, toAddress: addr, toName: item.name, toEmail: item.email, diff --git a/www/views/amount.html b/www/views/amount.html index 05f1929e2..3822ce730 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -25,7 +25,7 @@ - {{toName || displayAddress || toAddress}} + {{toName || displayAddress || toAddress}} diff --git a/www/views/confirm.html b/www/views/confirm.html index 5f59d6dbc..8bed9035f 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -32,7 +32,7 @@ -
+
{{tx.toName}}