Merge branch 'revert-323893c3' into 'stage'

Revert "Merge branch 'correctNextPaymentDate' into 'stage'" See merge request cleeng/gummybear-2!252
Cleeng · Nov 10, 2021 · 847671b · 847671b
2 parents 323893c + 83bd0b7
commit 847671b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,4 @@ yarn-error.log*
 
 # conf files
 /config/environments/staging.js
-/config/environments/development.js
-
-.idea/
+/config/environments/development.js
diff --git a/src/components/CurrentPlan/CurrentPlan.js b/src/components/CurrentPlan/CurrentPlan.js
@@ -85,15 +85,11 @@ class CurrentPlan extends PureComponent {
         ) : (
           <>
             {subscriptions.map(subItem => {
-              const description =
+              const description = `${
                 subItem.status === 'active'
-                  ? `${t('Next payment is on')} ${dateFormat(
-                      subItem.nextPaymentAt
-                    )}`
-                  : `${t('This plan will expire on')} ${dateFormat(
-                      subItem.expiresAt
-                    )}`;
-
+                  ? t('Next payment is on')
+                  : t('This plan will expire on')
+              } ${dateFormat(subItem.expiresAt)}`;
               return (
                 <SubscriptionStyled
                   key={subItem.offerId}

diff --git a/src/components/SwitchPlanPopup/SwitchPlanPopup.js b/src/components/SwitchPlanPopup/SwitchPlanPopup.js
@@ -84,13 +84,13 @@ const SwitchPlanPopup = ({
               step={step}
               dangerouslySetInnerHTML={{
                 __html: `${t(`You are about to change your plan from <b>
-                  ${fromOffer.offerTitle}</b> to <b>
+                  ${fromOffer.offerTitle}</b> to <b> 
                   ${toOffer.title} </b>. You will be charged the new price <b>
                   ${toOffer.nextPaymentPrice}${
                   toOffer.nextPaymentPriceCurrencySymbol
-                }
+                } 
                   </b> on your next billing date <b>
-                  ${dateFormat(fromOffer.nextPaymentAt)}</b>.`)}
+                  ${dateFormat(fromOffer.expiresAt)}</b>.`)}
                   <br />
                   ${
                     toOffer.couponNotApplicable
@@ -133,7 +133,7 @@ const SwitchPlanPopup = ({
                 {toOffer.nextPaymentPriceCurrencySymbol}
               </strong>{' '}
               {t('starting from ')}
-              <strong> {dateFormat(fromOffer.nextPaymentAt)}</strong>.
+              <strong> {dateFormat(fromOffer.expiresAt)}</strong>.
             </TextStyled>
           </ContentStyled>
           <ButtonWrapperStyled>