diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js index d0e36efe6..0c6863d9e 100644 --- a/src/js/controllers/amazon.js +++ b/src/js/controllers/amazon.js @@ -82,7 +82,8 @@ angular.module('copayApp.controllers').controller('amazonController', $scope.giftCards = lodash.isEmpty(gcds) ? null : gcds; $timeout(function() { $scope.$digest(); - }); + $ionicScrollDelegate.resize(); + }, 10); }); }); } 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.updatePendingGiftCards(); - $timeout(function() { - $ionicScrollDelegate.resize(); - }, 10); }); }; diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js index a26d87dd9..4d82bc337 100644 --- a/src/js/services/amazonService.js +++ b/src/js/services/amazonService.js @@ -8,7 +8,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo * Development: 'testnet' * Production: 'livenet' */ - credentials.NETWORK = 'testnet'; + credentials.NETWORK = 'livenet'; if (credentials.NETWORK == 'testnet') { credentials.BITPAY_API_URL = "https://test.bitpay.com"; diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index 3248a7be2..dab0a629a 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -40,10 +40,10 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'sending2faCode': gettext('Sending 2FA code...'), 'buyingBitcoin': gettext('Buying Bitcoin...'), 'sellingBitcoin': gettext('Selling Bitcoin...'), - 'updateGiftCards': gettext('Updating Gift Cards...'), - 'updateGiftCard': gettext('Updating Gift Card...'), - 'cancelGiftCard': gettext('Canceling Gift Card...'), - 'createGiftCard': gettext('Creating Gift Card...') + 'updateGiftCards': 'Updating Gift Cards...', + 'updateGiftCard': 'Updating Gift Card...', + 'cancelGiftCard': 'Canceling Gift Card...', + 'createGiftCard': 'Creating Gift Card...' }; root.clear = function() {