From 4085cc67283e9c2efa210b838f16a39854d6383e Mon Sep 17 00:00:00 2001 From: EYHN Date: Fri, 19 Apr 2024 06:36:38 +0000 Subject: [PATCH] fix(core): fix subscribe link for pro plan (#6627) --- .../frontend/core/src/modules/cloud/entities/subscription.ts | 5 +++++ packages/frontend/core/src/pages/subscribe.tsx | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/frontend/core/src/modules/cloud/entities/subscription.ts b/packages/frontend/core/src/modules/cloud/entities/subscription.ts index 71393ece22e6..e76bd5f42a08 100644 --- 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 index 162f0651cc9e..fa5895b9d82a 100644 --- 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 {