diff --git a/src/payment/data/utils.js b/src/payment/data/utils.js index eb3f07607..85675331f 100644 --- a/src/payment/data/utils.js +++ b/src/payment/data/utils.js @@ -218,7 +218,7 @@ export const localizedCurrencySelector = () => { */ export const getPropsToRemoveFractionZeroDigits = ({ price, shouldRemoveFractionZeroDigits }) => { let props = {}; - if (shouldRemoveFractionZeroDigits) { + if (shouldRemoveFractionZeroDigits && price !== null && price !== undefined) { const fractionValue = price.toString().split('.')[1]; if (!fractionValue || parseInt(fractionValue, 10) === 0) { // don't show 0's if fraction is 0 diff --git a/src/subscription/details/SubscriptionDetails.jsx b/src/subscription/details/SubscriptionDetails.jsx index fafca3ef7..b75d9eaa1 100644 --- a/src/subscription/details/SubscriptionDetails.jsx +++ b/src/subscription/details/SubscriptionDetails.jsx @@ -6,9 +6,8 @@ import { } from '@edx/frontend-platform/i18n'; import messages from '../../payment/cart/Cart.messages'; -import { detailsSelector, currencyDisclaimerSelector } from '../data/details/selectors'; +import { detailsSelector } from '../data/details/selectors'; -import { CurrencyDisclaimer } from '../../payment/cart/CurrencyDisclaimer'; import OrderSummary from '../../payment/cart/OrderSummary'; import ProductLineItem from '../../payment/cart/ProductLineItem'; @@ -34,7 +33,6 @@ export const SubscriptionDetails = () => { price, programType, currency, - isCurrencyConverted, totalPrice, isTrialEligible, programUuid, @@ -80,15 +78,12 @@ export const SubscriptionDetails = () => { - { - isCurrencyConverted - ? - : null - } ) : ( <> diff --git a/src/subscription/details/summary-table/SubscriptionSummaryTablePrice.jsx b/src/subscription/details/summary-table/SubscriptionSummaryTablePrice.jsx index 60fb0df1f..1eeacc411 100644 --- a/src/subscription/details/summary-table/SubscriptionSummaryTablePrice.jsx +++ b/src/subscription/details/summary-table/SubscriptionSummaryTablePrice.jsx @@ -1,10 +1,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from '@edx/frontend-platform/i18n'; +import { FormattedMessage, FormattedNumber } from '@edx/frontend-platform/i18n'; -import LocalizedPrice from '../../../payment/cart/LocalizedPrice'; +import { getPropsToRemoveFractionZeroDigits } from '../../../payment/data/utils'; -export const SubscriptionSummaryTablePrice = ({ price, isTrialEligible }) => ( +export const SubscriptionSummaryTablePrice = ({ price, isTrialEligible, currency }) => (

( />

- + { isTrialEligible ? ( ( SubscriptionSummaryTablePrice.propTypes = { price: PropTypes.number, isTrialEligible: PropTypes.bool, + currency: PropTypes.string, }; SubscriptionSummaryTablePrice.defaultProps = { price: undefined, isTrialEligible: false, + currency: 'USD', }; export default SubscriptionSummaryTablePrice; diff --git a/src/subscription/details/total-table/SubscriptionTotalTable.jsx b/src/subscription/details/total-table/SubscriptionTotalTable.jsx index 934979c65..9ff0d96da 100644 --- a/src/subscription/details/total-table/SubscriptionTotalTable.jsx +++ b/src/subscription/details/total-table/SubscriptionTotalTable.jsx @@ -1,10 +1,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { FormattedMessage } from '@edx/frontend-platform/i18n'; +import { FormattedMessage, FormattedNumber } from '@edx/frontend-platform/i18n'; -import LocalizedPrice from '../../../payment/cart/LocalizedPrice'; +import { getPropsToRemoveFractionZeroDigits } from '../../../payment/data/utils'; -export const SubscriptionTotalTable = ({ total }) => ( +export const SubscriptionTotalTable = ({ total, currency }) => (
( { text =>

{text}

}

- +

); SubscriptionTotalTable.propTypes = { total: PropTypes.number, + currency: PropTypes.string, }; SubscriptionTotalTable.defaultProps = { - total: undefined, + total: 0, + currency: 'USD', }; export default SubscriptionTotalTable;