diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 7f642f3b2..65ab4f363 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -283,6 +283,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ } var stateParams = { cardId: $scope.cardId, + cardAmountUSD: amountUSD, toName: $scope.toName, toAmount: payProDetails.amount, toAddress: payProDetails.toAddress, diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 80a46e2b3..888406ce1 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -31,6 +31,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( var isWallet = data.stateParams.isWallet || 'false'; $scope.isWallet = (isWallet.toString().trim().toLowerCase() == 'true' ? true : false); $scope.cardId = data.stateParams.cardId; + $scope.cardAmountUSD = data.stateParams.cardAmountUSD; $scope.toAddress = data.stateParams.toAddress; $scope.toName = data.stateParams.toName; $scope.toEmail = data.stateParams.toEmail; @@ -132,9 +133,13 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.amountStr = txFormatService.formatAmountStr(toAmount); $scope.displayAmount = getDisplayAmount($scope.amountStr); $scope.displayUnit = getDisplayUnit($scope.amountStr); - txFormatService.formatAlternativeStr(toAmount, function(v) { - $scope.alternativeAmountStr = v; - }); + if ($scope.cardAmountUSD) { + $scope.alternativeAmountStr = $filter('formatFiatAmount')($scope.cardAmountUSD) + ' USD'; + } else { + txFormatService.formatAlternativeStr(toAmount, function(v) { + $scope.alternativeAmountStr = v; + }); + } if ($scope.isGlidera == 'buy') $scope.getBuyPrice(); if ($scope.isGlidera == 'sell') $scope.getSellPrice(); }; diff --git a/src/js/routes.js b/src/js/routes.js index 290f2393b..3f76267a9 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1031,7 +1031,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.bitpayCard.confirm', { - url: '/confirm/:cardId/:toAddress/:toName/:toAmount/:toEmail/:description', + url: '/confirm/:cardId/:cardAmountUSD/:toAddress/:toName/:toAmount/:toEmail/:description', views: { 'tab-home@tabs': { controller: 'confirmController',