Remove type

4ian · Jan 16, 2025 · d51bd15 · d51bd15
1 parent 18a2e8b
commit d51bd15
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 28 deletions.
diff --git a/newIDE/app/src/Profile/Subscription/PromotionSubscriptionDialog/index.js b/newIDE/app/src/Profile/Subscription/PromotionSubscriptionDialog/index.js
@@ -11,7 +11,6 @@ import {
   type SubscriptionPlanPricingSystem,
 } from '../../../Utils/GDevelopServices/Usage';
 import { sendChoosePlanClicked } from '../../../Utils/Analytics/EventSender';
-import { type PurchasablePlanId } from '../SubscriptionSuggestionContext';
 import Window from '../../../Utils/Window';
 import Text from '../../../UI/Text';
 import { ColumnStackLayout, LineStackLayout } from '../../../UI/Layout';
@@ -26,7 +25,7 @@ import AlertMessage from '../../../UI/AlertMessage';
 type Props = {|
   onClose: Function,
   subscriptionPlansWithPricingSystems: ?(SubscriptionPlanWithPricingSystems[]),
-  recommendedPlanId: PurchasablePlanId,
+  recommendedPlanId: string,
   onOpenPendingDialog: (open: boolean) => void,
 |};
 

diff --git a/newIDE/app/src/Profile/Subscription/SubscriptionSuggestionContext.js b/newIDE/app/src/Profile/Subscription/SubscriptionSuggestionContext.js
@@ -18,17 +18,13 @@ import useSubscriptionPlans, {
 } from '../../Utils/UseSubscriptionPlans';
 import PromotionSubscriptionDialog from './PromotionSubscriptionDialog';
 import SubscriptionPendingDialog from './SubscriptionPendingDialog';
+import LoaderModal from '../../UI/LoaderModal';
 
 export type SubscriptionType = 'individual' | 'team' | 'education';
-export type PurchasablePlanId =
-  | 'gdevelop_silver'
-  | 'gdevelop_gold'
-  | 'gdevelop_startup'
-  | 'gdevelop_education';
 
 export type SubscriptionAnalyticsMetadata = {|
   reason: SubscriptionDialogDisplayReason,
-  recommendedPlanId?: PurchasablePlanId,
+  recommendedPlanId?: string,
   preStep?: 'subscriptionChecker',
 |};
 
@@ -171,8 +167,10 @@ export const SubscriptionSuggestionProvider = ({
         />
       )}
       {analyticsMetadata ? (
-        !hasValidSubscriptionPlan(authenticatedUser.subscription) &&
-        analyticsMetadata.recommendedPlanId ? (
+        authenticatedUser.loginState === 'loggingIn' ? (
+          <LoaderModal show />
+        ) : !hasValidSubscriptionPlan(authenticatedUser.subscription) &&
+          analyticsMetadata.recommendedPlanId ? (
           <PromotionSubscriptionDialog
             subscriptionPlansWithPricingSystems={
               availableSubscriptionPlansWithPrices

diff --git a/newIDE/app/src/Utils/UseOpenInitialDialog.js b/newIDE/app/src/Utils/UseOpenInitialDialog.js
@@ -1,10 +1,7 @@
 // @flow
 import * as React from 'react';
 import RouterContext from '../MainFrame/RouterContext';
-import {
-  SubscriptionSuggestionContext,
-  type PurchasablePlanId,
-} from '../Profile/Subscription/SubscriptionSuggestionContext';
+import { SubscriptionSuggestionContext } from '../Profile/Subscription/SubscriptionSuggestionContext';
 import { FLING_GAME_IN_APP_TUTORIAL_ID } from './GDevelopServices/InAppTutorial';
 import AuthenticatedUserContext from '../Profile/AuthenticatedUserContext';
 
@@ -37,24 +34,13 @@ const useOpenInitialDialog = ({
     () => {
       switch (routeArguments['initial-dialog']) {
         case 'subscription':
-          let recommendedPlanId = routeArguments['recommended-plan-id'];
-          if (
-            ![
-              'gdevelop_silver',
-              'gdevelop_gold',
-              'gdevelop_education',
-              'gdevelop_startup',
-            ].includes(recommendedPlanId)
-          ) {
-            recommendedPlanId = 'gdevelop_silver';
-          }
-          // $FlowFixMe - we know that recommendedPlanId is a valid PurchasablePlanId
-          const verifiedPlanId: PurchasablePlanId = recommendedPlanId;
+          let recommendedPlanId =
+            routeArguments['recommended-plan-id'] || 'gdevelop_silver';
 
           openSubscriptionDialog({
             analyticsMetadata: {
               reason: 'Landing dialog at opening',
-              recommendedPlanId: verifiedPlanId,
+              recommendedPlanId,
             },
           });
           removeRouteArguments(['initial-dialog', 'recommended-plan-id']);