Compute max discount instead of using hardcoded value (#6488)

Don't show in changelog
4ian · Mar 28, 2024 · 5637642 · 5637642
1 parent 7e8b44a
commit 5637642
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 11 deletions.
diff --git a/newIDE/app/src/Profile/Subscription/SubscriptionDialog.js b/newIDE/app/src/Profile/Subscription/SubscriptionDialog.js
@@ -155,6 +155,37 @@ const getSubscriptionPricingSystemPeriod = (
   return subscriptionPricingSystem.period;
 };
 
+const getMaximumYearlyDiscountOverPlans = ({
+  subscriptionPlansWithPricingSystems,
+}: {|
+  subscriptionPlansWithPricingSystems: ?Array<SubscriptionPlanWithPricingSystems>,
+|}): number => {
+  if (!subscriptionPlansWithPricingSystems) return 0;
+  let maximumDiscount = 0;
+  subscriptionPlansWithPricingSystems.forEach(
+    subscriptionPlanWithPricingSystems => {
+      if (subscriptionPlanWithPricingSystems.isLegacy) return;
+      const { pricingSystems } = subscriptionPlanWithPricingSystems;
+      const monthlyPricingSystem = pricingSystems.find(
+        pricingSystem => pricingSystem.period === 'month'
+      );
+      const yearlyPricingSystem = pricingSystems.find(
+        pricingSystem => pricingSystem.period === 'year'
+      );
+      if (!monthlyPricingSystem || !yearlyPricingSystem) return;
+      const discount =
+        100 -
+        (yearlyPricingSystem.amountInCents /
+          (monthlyPricingSystem.amountInCents * 12)) *
+          100;
+      if (discount > maximumDiscount) {
+        maximumDiscount = discount;
+      }
+    }
+  );
+  return maximumDiscount;
+};
+
 const getPlanSpecificRequirements = (
   i18n: I18nType,
   subscriptionPlansWithPricingSystems: ?Array<SubscriptionPlanWithPricingSystems>
@@ -399,6 +430,9 @@ export default function SubscriptionDialog({
       : displayedSubscriptionPlanWithPricingSystems.length < 5
       ? 'xl'
       : false;
+  const maximumDiscount = getMaximumYearlyDiscountOverPlans({
+    subscriptionPlansWithPricingSystems,
+  });
 
   return (
     <I18n>
@@ -447,12 +481,17 @@ export default function SubscriptionDialog({
                     onChange={setPeriod}
                   />
                 </Line>
-                {period !== 'year' && (
+                {period !== 'year' && maximumDiscount > 0 && (
                   <HotMessage
-                    title={<Trans>Up to 40% discount</Trans>}
+                    title={
+                      <Trans>
+                        Up to {maximumDiscount.toFixed(0)}% discount
+                      </Trans>
+                    }
                     message={
                       <Trans>
-                        Get a yearly subscription and enjoy discounts up to 40%!
+                        Get a yearly subscription and enjoy discounts up to
+                        {maximumDiscount.toFixed(0)}%!
                       </Trans>
                     }
                     onClickRightButton={() => setPeriod('year')}
@@ -687,7 +726,10 @@ export default function SubscriptionDialog({
                 i18n,
                 displayedSubscriptionPlanWithPricingSystems
               ).map(planSpecificRequirements => (
-                <AlertMessage kind="info">
+                <AlertMessage
+                  kind="info"
+                  key={planSpecificRequirements.substring(0, 25)}
+                >
                   {planSpecificRequirements}
                 </AlertMessage>
               ))}

diff --git a/newIDE/app/src/Profile/Subscription/SubscriptionPendingDialog.js b/newIDE/app/src/Profile/Subscription/SubscriptionPendingDialog.js
@@ -27,10 +27,15 @@ export default function SubscriptionPendingDialog({
   onClose,
   authenticatedUser,
 }: Props) {
-  const hasPlan =
-    !!authenticatedUser &&
-    !!authenticatedUser.subscription &&
-    !!authenticatedUser.subscription.planId;
+  const userPlanIdAtOpening = React.useRef<?string>(
+    !!authenticatedUser.subscription
+      ? authenticatedUser.subscription.planId
+      : null
+  );
+  const userPlanId = !!authenticatedUser.subscription
+    ? authenticatedUser.subscription.planId
+    : null;
+  const hasUserPlanChanged = userPlanId !== userPlanIdAtOpening.current;
   const canUserBenefitFromDiscordRole =
     !!authenticatedUser &&
     canBenefitFromDiscordRole(authenticatedUser.subscription);
@@ -41,7 +46,7 @@ export default function SubscriptionPendingDialog({
         // Ignore any error, will be retried anyway.
       });
     },
-    hasPlan ? null : 3900
+    hasUserPlanChanged ? null : 3900
   );
   const currentDiscordUsername =
     !!authenticatedUser && !!authenticatedUser.profile
@@ -92,7 +97,7 @@ export default function SubscriptionPendingDialog({
         <Dialog
           title={<Trans>Confirming your subscription</Trans>}
           actions={[
-            hasPlan ? (
+            hasUserPlanChanged ? (
               <LeftLoader isLoading={isLoading} key="close">
                 <DialogPrimaryButton
                   label={<Trans>Done!</Trans>}
@@ -115,7 +120,7 @@ export default function SubscriptionPendingDialog({
           maxWidth="sm"
           open
         >
-          {!hasPlan ? (
+          {!hasUserPlanChanged ? (
             <Column noMargin>
               <Line expand alignItems="center" justifyContent="center">
                 <Text>