From d9a84726517612f66c2b51733846888b73448150 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Wed, 18 Dec 2024 11:11:13 +0100
Subject: [PATCH 1/3] Inform the user to first add a billing address to their
 account

---
 .../billing/replaceAddress.svelte                   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 0eb06bbef7..2df6d1bc2c 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
-    import { Modal, RadioBoxes } from '$lib/components';
+    import { Alert, Modal, RadioBoxes } from '$lib/components';
     import { Button, FormItem, FormList, InputSelect, InputText } from '$lib/elements/forms';
     import { sdk } from '$lib/stores/sdk';
     import { organization } from '$lib/stores/organization';
@@ -10,6 +10,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Pill } from '$lib/elements';
+    import { base } from '$app/paths';
 
     export let show = false;
     let addresses: AddressesList;
@@ -185,10 +186,18 @@
                 </FormList>
             </RadioBoxes>
         </FormList>
+    {:else}
+        <Alert
+            >There are no billing addresses linked to your account, please <a
+                href={`${base}/account/payments`}
+                class="link">add one</a> first</Alert>
     {/if}
     <svelte:fragment slot="footer">
         <Button text on:click={() => (show = false)}>Cancel</Button>
-        <Button secondary submit disabled={selectedAddress === $organization.billingAddressId}>
+        <Button
+            secondary
+            submit
+            disabled={selectedAddress === $organization.billingAddressId || !addresses?.total}>
             Save
         </Button>
     </svelte:fragment>

From 65d477f65940b0a8708f3f0b04879416a02a37a0 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 10:39:28 +0100
Subject: [PATCH 2/3] Use button instead of link

---
 .../billing/replaceAddress.svelte                     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 2df6d1bc2c..e322dfe0f9 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -11,6 +11,8 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Pill } from '$lib/elements';
     import { base } from '$app/paths';
+    import { wizard } from '$lib/stores/wizard';
+    import { redirect } from '@sveltejs/kit';
 
     export let show = false;
     let addresses: AddressesList;
@@ -188,9 +190,12 @@
         </FormList>
     {:else}
         <Alert
-            >There are no billing addresses linked to your account, please <a
-                href={`${base}/account/payments`}
-                class="link">add one</a> first</Alert>
+            buttons={[
+                {
+                    slot: 'Add address',
+                    href: `${base}/account/payments`
+                }
+            ]}>There are no billing addresses linked to your account.</Alert>
     {/if}
     <svelte:fragment slot="footer">
         <Button text on:click={() => (show = false)}>Cancel</Button>

From f7d40f764d1a9ba5e6e868bf4f5a4b7da783325f Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 19 Dec 2024 10:41:40 +0100
Subject: [PATCH 3/3] Remove unused imports

---
 .../organization-[organization]/billing/replaceAddress.svelte   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index e322dfe0f9..a57cecf48b 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -11,8 +11,6 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Pill } from '$lib/elements';
     import { base } from '$app/paths';
-    import { wizard } from '$lib/stores/wizard';
-    import { redirect } from '@sveltejs/kit';
 
     export let show = false;
     let addresses: AddressesList;