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

fixes

Browse source
This commit is contained in:
Gabriel Bazán 2016-12-22 12:32:43 -03:00
commit 3bef5ce7ff
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/amazon.js
View file

@ -82,7 +82,8 @@ angular.module('copayApp.controllers').controller('amazonController',
$scope.giftCards = lodash.isEmpty(gcds) ? null : gcds; $scope.giftCards = lodash.isEmpty(gcds) ? null : gcds;
$timeout(function() { $timeout(function() {
$scope.$digest(); $scope.$digest();
}); $ionicScrollDelegate.resize();
}, 10);
}); });
}); });
} else $log.debug("pending gift card not available yet"); } else $log.debug("pending gift card not available yet");
@ -107,9 +108,6 @@ angular.module('copayApp.controllers').controller('amazonController',
$scope.$on('modal.hidden', function() { $scope.$on('modal.hidden', function() {
$scope.updatePendingGiftCards(); $scope.updatePendingGiftCards();
$timeout(function() {
$ionicScrollDelegate.resize();
}, 10);
}); });
}; };

2
src/js/services/amazonService.js
View file

@ -8,7 +8,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
* Development: 'testnet' * Development: 'testnet'
* Production: 'livenet' * Production: 'livenet'
*/ */
credentials.NETWORK = 'testnet'; credentials.NETWORK = 'livenet';
if (credentials.NETWORK == 'testnet') { if (credentials.NETWORK == 'testnet') {
credentials.BITPAY_API_URL = "https://test.bitpay.com"; credentials.BITPAY_API_URL = "https://test.bitpay.com";

8
src/js/services/onGoingProcess.js
View file

@ -40,10 +40,10 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
'sending2faCode': gettext('Sending 2FA code...'), 'sending2faCode': gettext('Sending 2FA code...'),
'buyingBitcoin': gettext('Buying Bitcoin...'), 'buyingBitcoin': gettext('Buying Bitcoin...'),
'sellingBitcoin': gettext('Selling Bitcoin...'), 'sellingBitcoin': gettext('Selling Bitcoin...'),
'updateGiftCards': gettext('Updating Gift Cards...'), 'updateGiftCards': 'Updating Gift Cards...',
'updateGiftCard': gettext('Updating Gift Card...'), 'updateGiftCard': 'Updating Gift Card...',
'cancelGiftCard': gettext('Canceling Gift Card...'), 'cancelGiftCard': 'Canceling Gift Card...',
'createGiftCard': gettext('Creating Gift Card...') 'createGiftCard': 'Creating Gift Card...'
}; };
root.clear = function() { root.clear = function() {