diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 65ab4f363..4baa76831 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -71,7 +71,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ var config = configService.getSync().wallet.settings; $scope.unitName = config.unitName; - $scope.alternativeIsoCode = config.alternativeIsoCode; + $scope.alternativeIsoCode = !!$scope.cardId || !!$scope.isGiftCard ? 'USD' : config.alternativeIsoCode; $scope.specificAmount = $scope.specificAlternativeAmount = ''; $scope.isCordova = platformInfo.isCordova; unitToSatoshi = config.unitToSatoshi; @@ -304,7 +304,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ try { uuid = profileService.getWallets({ onlyComplete: true, - network: 'livenet', + network: amazonService.getEnvironment(), })[0].id; } catch (err) { ongoingProcess.set('Preparing transaction...', false); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 888406ce1..0e4902538 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -135,6 +135,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.displayUnit = getDisplayUnit($scope.amountStr); if ($scope.cardAmountUSD) { $scope.alternativeAmountStr = $filter('formatFiatAmount')($scope.cardAmountUSD) + ' USD'; + } else if ($scope.giftCardAmountUSD) { + $scope.alternativeAmountStr = $filter('formatFiatAmount')($scope.giftCardAmountUSD) + ' USD'; } else { txFormatService.formatAlternativeStr(toAmount, function(v) { $scope.alternativeAmountStr = v;