anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix currency

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-05 12:09:48 -03:00
commit f6d7a50b00
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
5 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/bitpayCard.js
View file

@ -184,7 +184,6 @@ 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({
@ -204,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();
});

21
src/js/controllers/topup.js
View file

@ -91,28 +91,17 @@ angular.module('copayApp.controllers').controller('topUpController', function($s
}
$scope.onWalletSelect($scope.wallets[0]); // Default first wallet
var currencyCode = bitpayCardService.getAvailableCurrency();
var code;
switch(currencyCode) {
case 'EUR':
$scope.currencySymbol = '€';
break;
case 'GBP':
$scope.currencySymbol = '£';
break;
default : $scope.currencySymbol = '$';
};
bitpayCardService.getRates(currencyCode, 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;
});
});
});

12
src/js/services/bitpayCardService.js
View file

@ -1,6 +1,6 @@
'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) {
@ -41,16 +41,6 @@ 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'