Skip to content

Commit 8d62d1b

Browse files
authored
Merge pull request #2908 from appwrite/fix-another-logic-error
Fix another logic error
2 parents 0b36348 + 2059a46 commit 8d62d1b

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/lib/components/billing/planSelection.svelte

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
2727
function shouldShowTooltip(plan: Models.BillingPlan) {
2828
if (plan.group !== BillingPlanGroup.Starter) return true;
29-
else return !anyOrgFree;
29+
if (!anyOrgFree) return true;
30+
// Hide only when upgrading from Free (current org on Free, user selected Pro)
31+
if ($organization?.billingPlanId === plan.$id && selectedPlan !== plan.$id) return true;
32+
return false;
3033
}
3134
3235
function shouldDisable(plan: Models.BillingPlan) {
@@ -45,7 +48,6 @@
4548
name="plan"
4649
bind:group={selectedPlan}
4750
disabled={!selfService || shouldDisable(plan)}
48-
tooltipShow={shouldDisable(plan)}
4951
value={plan.$id}
5052
title={plan.name}>
5153
<svelte:fragment slot="action">

src/routes/(console)/organization-[organization]/change-plan/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@
486486
bind:couponData={selectedCoupon}
487487
bind:billingBudget
488488
organizationId={data.organization.$id} />
489-
{:else if !data.organization.billingPlanDetails.selfService}
489+
{:else if isSelfService}
490490
<PlanComparisonBox downgrade={data.hasFreeOrgs ? false : isDowngrade} />
491491
{/if}
492492
</svelte:fragment>

0 commit comments

Comments
 (0)