fix(core): fix subscribe link for pro plan (#6627)

toeverything · Apr 19, 2024 · 4085cc6 · 4085cc6
1 parent 9d412d2
commit 4085cc6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/frontend/core/src/modules/cloud/entities/subscription.ts b/packages/frontend/core/src/modules/cloud/entities/subscription.ts
@@ -46,6 +46,11 @@ export class Subscription extends Entity {
       ? subscriptions.some(sub => sub.plan === SubscriptionPlan.Pro)
       : null
   );
+  pro$ = this.subscription$.map(subscriptions =>
+    subscriptions
+      ? subscriptions.find(sub => sub.plan === SubscriptionPlan.Pro)
+      : null
+  );
   isSelfHosted$ = this.subscription$.map(subscriptions =>
     subscriptions
       ? subscriptions.some(sub => sub.plan === SubscriptionPlan.SelfHosted)

diff --git a/packages/frontend/core/src/pages/subscribe.tsx b/packages/frontend/core/src/pages/subscribe.tsx
@@ -46,7 +46,10 @@ export const Component = () => {
           }
           setMessage('Checking subscription status...');
           await subscriptionService.subscription.waitForRevalidation(signal);
-          const subscribed = !!subscriptionService.subscription.ai$.value;
+          const subscribed =
+            plan?.toLowerCase() === 'ai'
+              ? !!subscriptionService.subscription.ai$.value
+              : !!subscriptionService.subscription.pro$.value;
           if (!subscribed) {
             setMessage('Creating checkout...');
             try {