show currency in address book view

This commit is contained in:
Kadir Sekha 2017-11-02 16:31:34 +09:00
commit 620bd97864
2 changed files with 15 additions and 10 deletions

View file

@ -1,22 +1,23 @@
'use strict'; '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.isChromeApp = platformInfo.isChromeApp;
$scope.addressbookEntry = {}; $scope.addressbookEntry = {};
var coin;
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.addressbookEntry = {}; $scope.addressbookEntry = {};
$scope.addressbookEntry.name = data.stateParams.name; $scope.addressbookEntry.name = data.stateParams.name;
$scope.addressbookEntry.email = data.stateParams.email; $scope.addressbookEntry.email = data.stateParams.email;
$scope.addressbookEntry.address = data.stateParams.address; $scope.addressbookEntry.address = data.stateParams.address;
$scope.addressbookEntry.coin = data.stateParams.coin;
var cashAddress = bitcoreCash.Address.isValid($scope.addressbookEntry.address, 'livenet'); var bitcoinAlias = (config.bitcoinAlias || defaults.bitcoinAlias).toUpperCase();
if (cashAddress) { var bitcoinCashAlias = (config.bitcoinCashAlias || defaults.bitcoinCashAlias).toUpperCase();
coin = 'bch'; $scope.coinAlias = data.stateParams.coin == 'bch' ? bitcoinCashAlias : bitcoinAlias;
} else {
coin = 'btc';
}
}); });
$scope.sendTo = function() { $scope.sendTo = function() {
@ -27,7 +28,7 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f
toAddress: $scope.addressbookEntry.address, toAddress: $scope.addressbookEntry.address,
toName: $scope.addressbookEntry.name, toName: $scope.addressbookEntry.name,
toEmail: $scope.addressbookEntry.email, toEmail: $scope.addressbookEntry.email,
coin: coin coin: $scope.addressbookEntry.coin
}); });
}, 100); }, 100);
}; };

View file

@ -26,6 +26,10 @@
<span class="address-book-field-label" translate>Address</span> <span class="address-book-field-label" translate>Address</span>
<span>{{addressbookEntry.address}}</span> <span>{{addressbookEntry.address}}</span>
</div> </div>
<div class="item item-text-wrap" copy-to-clipboard="addressbookEntry.coin">
<span class="address-book-field-label" translate>Coin</span>
<span>{{coinAlias}}</span>
</div>
<div class="item item-divider"></div> <div class="item item-divider"></div>
<div class="item item-icon-right has-click" ng-click="sendTo()"> <div class="item item-icon-right has-click" ng-click="sendTo()">
<span class="positive" translate>Send Money</span> <span class="positive" translate>Send Money</span>
@ -35,6 +39,6 @@
<div class="item has-click" ng-click="remove(addressbookEntry.address)"> <div class="item has-click" ng-click="remove(addressbookEntry.address)">
<span class="assertive" translate>Remove</span> <span class="assertive" translate>Remove</span>
</div> </div>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>