fix

Author: HarshMN2345

src/lib/stores/billing.ts

@@ -78,40 +78,60 @@ export const showBudgetAlert = derived(
 );
 
 function getPlansInfoStore(): BillingPlansMap | null {
-    return get(plansInfo) ?? get(page).data?.plansInfo ?? null;
+    return get(plansInfo) ?? get(page).data?.plansInfo ?? new Map();
 }
 
-function makeBillingPlan(billingPlanOrId: string | Models.BillingPlan): Models.BillingPlan {
+function makeBillingPlan(
+    billingPlanOrId: string | Models.BillingPlan | null | undefined
+): Models.BillingPlan | null {
+    if (!billingPlanOrId) {
+        return null;
+    }
+
     return typeof billingPlanOrId === 'string' ? billingIdToPlan(billingPlanOrId) : billingPlanOrId;
 }
 
 export function getRoleLabel(role: string) {
     return roles.find((r) => r.value === role)?.label ?? role;
 }
 
-export function isStarterPlan(billingPlanOrId: string | Models.BillingPlan): boolean {
+export function isStarterPlan(
+    billingPlanOrId: string | Models.BillingPlan | null | undefined
+): boolean {
     const billingPlan = makeBillingPlan(billingPlanOrId);
     return planHasGroup(billingPlan, BillingPlanGroup.Starter);
 }
 
-export function canUpgrade(billingPlanOrId: string | Models.BillingPlan): boolean {
+export function canUpgrade(
+    billingPlanOrId: string | Models.BillingPlan | null | undefined
+): boolean {
     const billingPlan = makeBillingPlan(billingPlanOrId);
+    if (!billingPlan?.$id) {
+        return false;
+    }
+
     const nextTier = getNextTierBillingPlan(billingPlan.$id);
 
     // defaults back to PRO, so adjust the check!
     return billingPlan.$id !== nextTier.$id;
 }
 
-export function canDowngrade(billingPlanOrId: string | Models.BillingPlan): boolean {
+export function canDowngrade(
+    billingPlanOrId: string | Models.BillingPlan | null | undefined
+): boolean {
     const billingPlan = makeBillingPlan(billingPlanOrId);
+    if (!billingPlan?.$id) {
+        return false;
+    }
+
     const nextTier = getPreviousTierBillingPlan(billingPlan.$id);
 
     // defaults back to Starter, so adjust the check!
     return billingPlan.$id !== nextTier.$id;
 }
 
 export function planHasGroup(
-    billingPlanOrId: string | Models.BillingPlan,
+    billingPlanOrId: string | Models.BillingPlan | null | undefined,
     group: BillingPlanGroup
 ): boolean {
     const billingPlan = makeBillingPlan(billingPlanOrId);
@@ -567,6 +587,9 @@ export function checkForMarkedForDeletion(org: Models.Organization) {
 
 export async function checkForMissingPaymentMethod() {
     const starterPlan = getBasePlanFromGroup(BillingPlanGroup.Starter);
+    if (!starterPlan?.$id) {
+        return;
+    }
 
     const orgs = await sdk.forConsole.organizations.list({
         queries: [

src/routes/+layout.ts

@@ -39,8 +39,8 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     if (account) {
         // `/v1/teams` (and org list on cloud) returns 401 until the console account is verified;
         // do not call that API on this route while still unverified.
-        if (url.pathname === verifyEmailPath && !account.emailVerification) {
-            const plansInfo = await getPlatformPlans();
+        if (url.pathname === verifyEmailPath) {
+            const plansInfo = await getPlatformPlans().catch(() => null);
             plansInfoStore.set(plansInfo);
             return {
                 plansInfo,
@@ -69,7 +69,7 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
                 }
 
                 // Already on verify-email: do not rethrow; the teams API is blocked until verified.
-                const plansInfo = await getPlatformPlans();
+                const plansInfo = await getPlatformPlans().catch(() => null);
                 plansInfoStore.set(plansInfo);
                 return {
                     plansInfo,