feat: removed the Localized Currency for subscription (#758)

openedx · Jun 7, 2023 · 75104bc · 75104bc
1 parent 737e3e2
commit 75104bc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 18 deletions.
diff --git 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
@@ -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 = () => {
             <SubscriptionSummaryTablePrice
               price={price}
               isTrialEligible={isTrialEligible}
+              currency={currency}
             />
             <SubscriptionTotalTable
               total={totalPrice}
+              currency={currency}
             />
-            {
-            isCurrencyConverted
-              ? <CurrencyDisclaimer currencyDisclaimerSelector={currencyDisclaimerSelector} />
-              : null
-            }
           </OrderSummary>
         ) : (
           <>

diff --git 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 }) => (
   <div className="summary-row d-flex">
     <h4 className="flex-grow-1">
       <FormattedMessage
@@ -14,7 +14,15 @@ export const SubscriptionSummaryTablePrice = ({ price, isTrialEligible }) => (
       />
     </h4>
     <h4 className="summary-price">
-      <LocalizedPrice amount={price} shouldRemoveFractionZeroDigits />
+      <FormattedNumber
+        value={price}
+        style="currency" // eslint-disable-line react/style-prop-object
+        currency={currency}
+        {...getPropsToRemoveFractionZeroDigits({
+          price,
+          shouldRemoveFractionZeroDigits: true,
+        })}
+      />
       { isTrialEligible
         ? (
           <FormattedMessage
@@ -37,10 +45,12 @@ export const SubscriptionSummaryTablePrice = ({ price, 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
@@ -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 }) => (
   <div className="summary-row font-weight-bold d-flex">
     <FormattedMessage
       id="subscription.summary.table.label.total.to.pay"
@@ -14,16 +14,26 @@ export const SubscriptionTotalTable = ({ total }) => (
       { text => <h4 className="flex-grow-1">{text}</h4>}
     </FormattedMessage>
     <h4 className="text-right">
-      <LocalizedPrice amount={total} shouldRemoveFractionZeroDigits />
+      <FormattedNumber
+        value={total}
+        style="currency" // eslint-disable-line react/style-prop-object
+        currency={currency}
+        {...getPropsToRemoveFractionZeroDigits({
+          price: total,
+          shouldRemoveFractionZeroDigits: true,
+        })}
+      />
     </h4>
   </div>
 );
 
 SubscriptionTotalTable.propTypes = {
   total: PropTypes.number,
+  currency: PropTypes.string,
 };
 SubscriptionTotalTable.defaultProps = {
-  total: undefined,
+  total: 0,
+  currency: 'USD',
 };
 
 export default SubscriptionTotalTable;