diff --git a/src/js/controllers/addressbookView.js b/src/js/controllers/addressbookView.js index 9d1c49840..a3c2c3551 100644 --- a/src/js/controllers/addressbookView.js +++ b/src/js/controllers/addressbookView.js @@ -1,22 +1,23 @@ 'use strict'; -angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, lodash, addressbookService, popupService, $ionicHistory, platformInfo, gettextCatalog, bitcoreCash) { +angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, lodash, addressbookService, popupService, $ionicHistory, platformInfo, gettextCatalog, configService) { + + var config = configService.getSync(); + var defaults = configService.getDefaults(); + $scope.isChromeApp = platformInfo.isChromeApp; $scope.addressbookEntry = {}; - var coin; $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.addressbookEntry = {}; $scope.addressbookEntry.name = data.stateParams.name; $scope.addressbookEntry.email = data.stateParams.email; $scope.addressbookEntry.address = data.stateParams.address; + $scope.addressbookEntry.coin = data.stateParams.coin; - var cashAddress = bitcoreCash.Address.isValid($scope.addressbookEntry.address, 'livenet'); - if (cashAddress) { - coin = 'bch'; - } else { - coin = 'btc'; - } + var bitcoinAlias = (config.bitcoinAlias || defaults.bitcoinAlias).toUpperCase(); + var bitcoinCashAlias = (config.bitcoinCashAlias || defaults.bitcoinCashAlias).toUpperCase(); + $scope.coinAlias = data.stateParams.coin == 'bch' ? bitcoinCashAlias : bitcoinAlias; }); $scope.sendTo = function() { @@ -27,7 +28,7 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f toAddress: $scope.addressbookEntry.address, toName: $scope.addressbookEntry.name, toEmail: $scope.addressbookEntry.email, - coin: coin + coin: $scope.addressbookEntry.coin }); }, 100); }; diff --git a/www/views/addressbook.view.html b/www/views/addressbook.view.html index 228dd71b4..b2c9fdfdc 100644 --- a/www/views/addressbook.view.html +++ b/www/views/addressbook.view.html @@ -26,6 +26,10 @@ Address {{addressbookEntry.address}} +
+ Coin + {{coinAlias}} +
Send Money @@ -35,6 +39,6 @@
Remove
-
+