diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 8f2f36e11..c17cdf4a1 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -203,6 +203,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi self.balance = cards[0].balance; self.currencySymbol = cards[0].currencySymbol; self.updatedOn = cards[0].updatedOn; + self.currency = cards[0].currency; } self.update(); }); diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js index ef536706e..ce9ff7964 100644 --- a/src/js/controllers/topup.js +++ b/src/js/controllers/topup.js @@ -91,17 +91,17 @@ angular.module('copayApp.controllers').controller('topUpController', function($s } $scope.onWalletSelect($scope.wallets[0]); // Default first wallet - bitpayCardService.getRates('USD', function(err, data) { - if (err) $log.error(err); - $scope.rate = data.rate; - }); - bitpayCardService.get({ cardId: cardId, noRefresh: true }, function(err, card) { if (err) { showErrorAndBack(null, err); return; } $scope.cardInfo = card[0]; + bitpayCardService.setCurrencySymbol($scope.cardInfo); + bitpayCardService.getRates($scope.cardInfo.currency, 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..7c38abafd 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -1,13 +1,13 @@ 'use strict'; -angular.module('copayApp.services').factory('bitpayCardService', function($log, $rootScope, $filter, lodash, storageService, bitauthService, platformInfo, moment, appIdentityService, bitpayService, nextStepsService, configService, txFormatService, appConfigService) { +angular.module('copayApp.services').factory('bitpayCardService', function($log, $rootScope, $filter, lodash, storageService, bitauthService, platformInfo, moment, appIdentityService, bitpayService, nextStepsService, txFormatService, appConfigService) { var root = {}; var _setError = function(msg, e) { $log.error(msg); var error = (e && e.data && e.data.error) ? e.data.error : msg; return error; - }; + }; var _processTransactions = function(invoices, history) { invoices = invoices ||  []; diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index c13d1ee96..5f0a43e71 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: bitpayCard.currency})" no-low-fee> {{'Add Funds'|translate}} diff --git a/www/views/topup.html b/www/views/topup.html index 5cf7a85af..61e8c800c 100644 --- a/www/views/topup.html +++ b/www/views/topup.html @@ -19,7 +19,8 @@
{{amountUnitStr}}
- @ {{rate | currency:'$':2}} per BTC + @ + {{rate | currency:cardInfo.currencySymbol:2}} per BTC ...