diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 8f2f36e11..24863eebc 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -184,6 +184,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.cardId = data.stateParams.id; + $scope.currency = bitpayCardService.getAvailableCurrency(); if (!$scope.cardId) { $ionicHistory.nextViewOptions({ diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js index ef536706e..9dfca6863 100644 --- a/src/js/controllers/topup.js +++ b/src/js/controllers/topup.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('topUpController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicConfig, lodash, popupService, profileService, ongoingProcess, walletService, configService, platformInfo, bitpayService, bitpayCardService, payproService, bwcError, txFormatService, sendMaxService) { +angular.module('copayApp.controllers').controller('topUpController', function($scope, $log, $state, $timeout, $ionicHistory, $ionicConfig, $sce, lodash, popupService, profileService, ongoingProcess, walletService, configService, platformInfo, bitpayService, bitpayCardService, payproService, bwcError, txFormatService, sendMaxService) { var amount; var currency; @@ -91,7 +91,19 @@ angular.module('copayApp.controllers').controller('topUpController', function($s } $scope.onWalletSelect($scope.wallets[0]); // Default first wallet - bitpayCardService.getRates('USD', function(err, data) { + var currencyCode = bitpayCardService.getAvailableCurrency(); + var code; + switch(currencyCode) { + case 'EUR': + code = '€'; + break; + case 'GBP': + code = '£'; + break; + default : code = '$'; + }; + $scope.htmlCurrencyCode = $sce.trustAsHtml(code); + bitpayCardService.getRates(currencyCode, function(err, data) { if (err) $log.error(err); $scope.rate = data.rate; }); diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index 01e92de04..b4a747255 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -7,7 +7,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log, $log.error(msg); var error = (e && e.data && e.data.error) ? e.data.error : msg; return error; - }; + }; var _processTransactions = function(invoices, history) { invoices = invoices ||  []; @@ -41,6 +41,16 @@ angular.module('copayApp.services').factory('bitpayCardService', function($log, return history; }; + root.getAvailableCurrency = function() { + var config = configService.getSync().wallet.settings; + // ONLY "USD", "EUR" and "GBP" + switch (config.alternativeIsoCode) { + case 'EUR': return 'EUR'; + case 'GBP': return 'GBP'; + default: return 'USD' + }; + }; + root.sync = function(apiContext, cb) { var json = { method: 'getDebitCards' diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index c13d1ee96..c1e6ad9c6 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -23,7 +23,7 @@ + ui-sref="tabs.bitpayCard.amount({nextStep: 'tabs.bitpayCard.topup', currency: currency})" no-low-fee> {{'Add Funds'|translate}} diff --git a/www/views/topup.html b/www/views/topup.html index 5cf7a85af..42f5f4003 100644 --- a/www/views/topup.html +++ b/www/views/topup.html @@ -19,7 +19,9 @@
{{amountUnitStr}}
- @ {{rate | currency:'$':2}} per BTC + @ + + {{rate | currency:' ':2}} per BTC ...