fix: post release modal

src/lib/stores/billing.ts

@@ -291,7 +291,8 @@ export async function checkForFreeOrgOverflow(orgs: Models.TeamList<Record<strin
     }
 }
 
-export function checkForPostReleaseProModal() {
+export async function checkForPostReleaseProModal(orgs: Models.TeamList<Record<string, unknown>>) {
+    if (!orgs?.teams?.length) return;
     const modalTime = localStorage.getItem('postReleaseProModal');
     const now = Date.now();
     // show the modal if it was never shown

src/routes/console/(billing-modal)/postReleaseModal.svelte

@@ -3,17 +3,45 @@
     import SideLight from './side-light.png';
     import SideDark from './side-dark.png';
     import { app } from '$lib/stores/app';
-    import { Button } from '$lib/elements/forms';
+    import { Button, FormList } from '$lib/elements/forms';
     import { trackEvent } from '$lib/actions/analytics';
     import { wizard } from '$lib/stores/wizard';
     import ChangeOrganizationTierCloud from '../changeOrganizationTierCloud.svelte';
     import { user } from '$lib/stores/user';
+    import { onMount } from 'svelte';
+    import { sdk } from '$lib/stores/sdk';
+    import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
+    import type { Organization } from '$lib/stores/organization';
+    import InputSelect from '$lib/elements/forms/inputSelect.svelte';
 
     export let show = false;
+    let orgs: { teams: Organization[]; total: number };
+    let selectedOrg: string;
 
-    $: isNewUser = new Date($user.$createdAt) > new Date(2023, 11, 12);
-    //user creation date after the 12th of December 2023
+    onMount(async () => {
+        orgs = (await sdk.forConsole.teams.list()) as { teams: Organization[]; total: number };
+    });
+
+    async function handleUpgrade() {
+        if (selectedOrg) {
+            await goto(`${base}/console/organization/${selectedOrg}/billing`);
+        } else {
+            const freeOrg = orgs.teams.find((o) => o.billingPlan === 'tier-0');
+            await goto(`${base}/console/organization/${freeOrg.$id}/billing`);
+        }
+        show = false;
+        wizard.start(ChangeOrganizationTierCloud);
+        trackEvent('click_organization_upgrade', {
+            source: event
+        });
+    }
+
+    $: isNewUser = new Date($user.$createdAt) > new Date(2023, 11, 18);
+    //user creation date after the 18th of December 2023
     $: event = isNewUser ? 'billing_new_user_modal' : 'billing_release_modal';
+    $: freeOrgs = orgs?.teams.filter((o) => o.billingPlan === 'tier-0');
+    $: options = freeOrgs.map((o) => ({ label: o.name, value: o.$id }));
 </script>
 
 <ModalSideCol bind:show title="Claim your Pro credit today" style="max-width: min(53rem,95%)">
@@ -38,7 +66,7 @@
     <div class="u-flex u-flex-vertical u-gap-16">
         <p class="text">
             Upgrade now and use the code <span class="inline-tag"
-                >{isNewUser ? 'WELCOME15' : 'THANKYOU30'}</span>
+                >{isNewUser ? 'PRO15' : 'THANKYOU30'}</span>
             to claim ${isNewUser ? '15' : '30'} in credits for a Pro plan. Credits will expire on 31
             January 2024.
         </p>
@@ -58,41 +86,44 @@
                 }}>Learn more on our pricing page.</Button>
         </p>
 
-        <ul class="list u-flex-vertical u-gap-8 u-margin-block-start-24">
-            <li class="u-flex u-gap-8 u-cross-center">
-                <span class="icon-check-circle" aria-hidden="true" />
-                <span class="text">Unlimited org. members</span>
-            </li>
-            <li class="u-flex u-gap-8 u-cross-center">
-                <span class="icon-check-circle" aria-hidden="true" />
-                <span class="text">300GB bandwidth</span>
-            </li>
-            <li class="u-flex u-gap-8 u-cross-center">
-                <span class="icon-check-circle" aria-hidden="true" />
-                <span class="text">200,000 monthly active users</span>
-            </li>
-            <li class="u-flex u-gap-8 u-cross-center">
-                <span class="icon-check-circle" aria-hidden="true" />
-                <span class="text">150GB free strorage</span>
-            </li>
-            <li class="u-flex u-gap-8 u-cross-center">
-                <span class="icon-check-circle" aria-hidden="true" />
-                <span class="text">7 days rolling logs</span>
-            </li>
-            <li class="u-flex u-gap-8 u-cross-center">
-                <span class="icon-check-circle" aria-hidden="true" />
-                <span class="text">Email support</span>
-            </li>
-        </ul>
-        <Button
-            fullWidth
-            class="u-margin-block-start-24"
-            on:click={() => wizard.start(ChangeOrganizationTierCloud)}
-            on:click={() => (show = false)}
-            on:click={() =>
-                trackEvent('click_organization_upgrade', {
-                    source: event
-                })}>
+        {#if freeOrgs.length > 1 && options.length}
+            <FormList class="u-margin-block-start-24">
+                <InputSelect
+                    label="Organization to upgrade"
+                    placeholder="Select organization"
+                    id="orgs"
+                    bind:value={selectedOrg}
+                    {options} />
+            </FormList>
+        {:else}
+            <ul class="list u-flex-vertical u-gap-8 u-margin-block-start-24">
+                <li class="u-flex u-gap-8 u-cross-center">
+                    <span class="icon-check-circle" aria-hidden="true" />
+                    <span class="text">Unlimited org. members</span>
+                </li>
+                <li class="u-flex u-gap-8 u-cross-center">
+                    <span class="icon-check-circle" aria-hidden="true" />
+                    <span class="text">300GB bandwidth</span>
+                </li>
+                <li class="u-flex u-gap-8 u-cross-center">
+                    <span class="icon-check-circle" aria-hidden="true" />
+                    <span class="text">200,000 monthly active users</span>
+                </li>
+                <li class="u-flex u-gap-8 u-cross-center">
+                    <span class="icon-check-circle" aria-hidden="true" />
+                    <span class="text">150GB free strorage</span>
+                </li>
+                <li class="u-flex u-gap-8 u-cross-center">
+                    <span class="icon-check-circle" aria-hidden="true" />
+                    <span class="text">7 days rolling logs</span>
+                </li>
+                <li class="u-flex u-gap-8 u-cross-center">
+                    <span class="icon-check-circle" aria-hidden="true" />
+                    <span class="text">Email support</span>
+                </li>
+            </ul>
+        {/if}
+        <Button fullWidth class="u-margin-block-start-24" on:click={handleUpgrade}>
             Start your 14 day free trial
         </Button>
     </Box>

src/routes/console/+layout.svelte

@@ -248,12 +248,13 @@
 
         if (isCloud) {
             if (!$page.url.pathname.includes('/console/onboarding')) {
-                checkForPostReleaseProModal();
             }
             try {
                 const orgs = await sdk.forConsole.teams.list([
                     Query.equal('billingPlan', 'tier-0')
                 ]);
+
+                checkForPostReleaseProModal(orgs);
                 checkForFreeOrgOverflow(orgs);
             } catch (error) {
                 console.log(error);