Update marketing boosts display (#7174)

4ian · Nov 18, 2024 · c5fc7e0 · c5fc7e0
1 parent 9eada90
commit c5fc7e0
Show file tree

Hide file tree

Showing 5 changed files with 236 additions and 98 deletions.
diff --git a/newIDE/app/src/MarketingPlans/MarketingPlanFeatures.js b/newIDE/app/src/MarketingPlans/MarketingPlanFeatures.js
@@ -68,11 +68,12 @@ const MarketingPlanFeatures = ({
     canExtend,
     descriptionByLocale,
     bulletPointsByLocale,
+    ownedBulletPointsByLocale,
   } = marketingPlan;
 
-  const activeGameFeaturings: ?(GameFeaturing[]) = React.useMemo(
+  const activeGameFeaturings: GameFeaturing[] = React.useMemo(
     () => {
-      if (!gameFeaturings) return null;
+      if (!gameFeaturings) return [];
 
       return gameFeaturings.filter(
         gameFeaturing => gameFeaturing.expiresAt > Date.now() / 1000
@@ -88,6 +89,10 @@ const MarketingPlanFeatures = ({
   }
   const hasErrors = requirementsErrors.length > 0;
 
+  const bulletPointsToDisplay = isPlanActive
+    ? ownedBulletPointsByLocale
+    : bulletPointsByLocale;
+
   return (
     <I18n>
       {({ i18n }) => (
@@ -142,7 +147,7 @@ const MarketingPlanFeatures = ({
                       </Line>
                     </Column>
                   ))
-                : bulletPointsByLocale.map((bulletPointByLocale, index) => (
+                : bulletPointsToDisplay.map((bulletPointByLocale, index) => (
                     <Column key={index} expand noMargin>
                       <Line noMargin alignItems="center">
                         <CheckCircle

diff --git a/newIDE/app/src/MarketingPlans/MarketingPlanUtils.js b/newIDE/app/src/MarketingPlans/MarketingPlanUtils.js
@@ -33,10 +33,8 @@ export const getIconForMarketingPlan = (marketingPlan: MarketingPlan) => {
 
 const getActiveFeaturingsOfMarketingPlan = (
   marketingPlan: MarketingPlan,
-  activeGameFeaturings: ?(GameFeaturing[])
+  activeGameFeaturings: GameFeaturing[]
 ) => {
-  if (!activeGameFeaturings) return [];
-
   return activeGameFeaturings.filter(activeGameFeaturing =>
     marketingPlan.includedFeaturings.includes(activeGameFeaturing.featuring)
   );
@@ -104,18 +102,21 @@ export const getActiveMessage = ({
   marketingPlan: MarketingPlan,
   i18n: I18nType,
   hasErrors: boolean,
-  activeGameFeaturings: ?(GameFeaturing[]),
+  activeGameFeaturings: GameFeaturing[],
 |}) => {
   if (hasErrors) {
     return <Trans>Fix those issues to get the campaign up!</Trans>;
   }
 
   const activeFeaturingsForPlan = getActiveFeaturingsOfMarketingPlan(
-    marketingPlan
+    marketingPlan,
+    activeGameFeaturings
   );
 
-  if (activeFeaturingsForPlan.length === 0) {
-    // Should not happen.
+  if (
+    activeFeaturingsForPlan.length === 0 || // Still loading or no active featurings
+    !marketingPlan.showExpirationDate
+  ) {
     return null;
   }
 

diff --git a/newIDE/app/src/Utils/GDevelopServices/Game.js b/newIDE/app/src/Utils/GDevelopServices/Game.js
@@ -134,8 +134,7 @@ export type FeaturingType =
   | 'games-platform-home'
   | 'games-platform-game-page'
   | 'games-platform-listing'
-  | 'socials-newsletter'
-  | 'gdevelop-banner';
+  | 'games-platform-guaranteed-sessions';
 
 export type GameFeaturing = {|
   gameId: string,
@@ -164,7 +163,9 @@ export type MarketingPlan = {|
   nameByLocale: MessageByLocale,
   descriptionByLocale: MessageByLocale,
   bulletPointsByLocale: Array<MessageByLocale>,
+  ownedBulletPointsByLocale: Array<MessageByLocale>,
   additionalSuccessMessageByLocale: MessageByLocale,
+  showExpirationDate: boolean,
 |};
 
 export type GameLeaderboardEntry = {

diff --git a/newIDE/app/src/fixtures/GDevelopServicesTestData/index.js b/newIDE/app/src/fixtures/GDevelopServicesTestData/index.js
@@ -2362,10 +2362,10 @@ const prices = {
     priceInCredits: 500,
   },
   'featuring-pro': {
-    priceInCredits: 900,
+    priceInCredits: 1000,
   },
   'featuring-premium': {
-    priceInCredits: 4000,
+    priceInCredits: 3000,
   },
 };
 
@@ -2463,11 +2463,6 @@ export const limitsForSilverUser: Limits = {
       max: 1000,
       limitReached: false,
     },
-    'ask-question': {
-      current: 1,
-      max: 3,
-      limitReached: false,
-    },
     'ask-question': {
       current: 1,
       max: 10,