diff --git a/src/js/controllers/addressbookAdd.js b/src/js/controllers/addressbookAdd.js
index 267acc154..f5730c8e2 100644
--- a/src/js/controllers/addressbookAdd.js
+++ b/src/js/controllers/addressbookAdd.js
@@ -1,13 +1,20 @@
'use strict';
-angular.module('copayApp.controllers').controller('addressbookAddController', function($scope, $state, $stateParams, $timeout, $ionicHistory, gettextCatalog, addressbookService, popupService) {
+angular.module('copayApp.controllers').controller('addressbookAddController', function($scope, $state, $stateParams, $timeout, $ionicHistory, gettextCatalog, addressbookService, popupService, configService) {
+
+ var config = configService.getSync();
+ var defaults = configService.getDefaults();
+
+ $scope.bitcoinAlias = (config.bitcoinAlias || defaults.bitcoinAlias).toUpperCase();
+ $scope.bitcoinCashAlias = (config.bitcoinCashAlias || defaults.bitcoinCashAlias).toUpperCase();
$scope.fromSendTab = $stateParams.fromSendTab;
$scope.addressbookEntry = {
'address': $stateParams.addressbookEntry || '',
'name': '',
- 'email': ''
+ 'email': '',
+ 'coin': 'btc'
};
$scope.onQrCodeScannedAddressBook = function(data, addressbookForm) {
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index d2fc01851..1c9e1ec83 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -87,15 +87,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
originalList = originalList.concat(walletList);
}
}
-
- var getCoin = function(address) {
- var cashAddress = bitcoreCash.Address.isValid(address, 'livenet');
- if (cashAddress) {
- return 'bch';
- }
- return 'btc';
- };
-
+
var updateContactsList = function(cb) {
var config = configService.getSync();
var defaults = configService.getDefaults();
@@ -107,14 +99,13 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
var completeContacts = [];
lodash.each(ab, function(v, k) {
- var c = getCoin(k);
completeContacts.push({
name: lodash.isObject(v) ? v.name : v,
address: k,
email: lodash.isObject(v) ? v.email : null,
recipientType: 'contact',
- coin: c,
- displayCoin: (c == 'bch'
+ coin: v.coin,
+ displayCoin: (v.coin == 'bch'
? (config.bitcoinCashAlias || defaults.bitcoinCashAlias)
: (config.bitcoinAlias || defaults.bitcoinAlias)).toUpperCase(),
getAddress: function(cb) {
diff --git a/www/views/addressbook.add.html b/www/views/addressbook.add.html
index 8c78f5ab2..64a3c8ee2 100644
--- a/www/views/addressbook.add.html
+++ b/www/views/addressbook.add.html
@@ -50,6 +50,15 @@