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

WIP, rebasing.

Browse source
This commit is contained in:
Andy Phillipson 2017-02-07 15:49:42 -05:00
commit 162d84e2d2
5 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f
return;
}
if (paired) {
bitpayCardService.sync(apiContext, function(err, cards) {
bitpayCardService.sync(apiContext, function(err, data) {
if (err) {
popupService.showAlert(gettextCatalog.getString('Error updating Debit Cards'), err);
return;

4
src/js/controllers/tab-settings.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, appConfigService, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayAccountService, bitpayCardService, storageService, glideraService, gettextCatalog) {
angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, appConfigService, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayAccountService, bitpayCardService, storageService, glideraService, gettextCatalog, buyAndSellService) {
var updateConfig = function() {
var isCordova = platformInfo.isCordova;
@ -34,7 +34,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
});
if ($scope.bitpayCardEnabled) {
bitpayCardService.getBitpayDebitCards(function(err, cards) {
bitpayCardService.getCards(function(err, cards) {
if (err) $log.error(err);
$scope.bitpayCards = cards && cards.length > 0;
});