From f2598b99013bb9356e991ee458043fd20c97b0df Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Mon, 26 Feb 2024 12:47:58 +0000
Subject: [PATCH 1/4] fix: missing org settings

---
 src/routes/console/organization-[organization]/header.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index 23c2d23d8..0dca9c0e3 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -78,7 +78,7 @@
               },
               ...permanentTabSettings
           ]
-        : permanentTabs;
+        : [...permanentTabs, ...permanentTabSettings];
 </script>
 
 {#if $organization?.$id}

From fbd777d273c07155df211602fcb8ba4bb790ad58 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Mon, 26 Feb 2024 13:29:45 +0000
Subject: [PATCH 2/4] fix: queries type

---
 src/lib/sdk/billing.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index d3612312f..44227042e 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -849,7 +849,7 @@ export class Billing {
         );
     }
 
-    async listAddresses(queries: Query[] = []): Promise<AddressesList> {
+    async listAddresses(queries: string[] = []): Promise<AddressesList> {
         const path = `/account/billing-addresses`;
         const params = {
             queries

From c5b948e6dc45ce3d4e1ba5cfe32e3fb0a6c5d241 Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Mon, 26 Feb 2024 13:39:29 +0000
Subject: [PATCH 3/4] fix: invoices on selfhosted

---
 .../console/organization-[organization]/settings/+page.svelte | 4 +++-
 .../console/organization-[organization]/settings/+page.ts     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte
index 840754307..4b09765ee 100644
--- a/src/routes/console/organization-[organization]/settings/+page.svelte
+++ b/src/routes/console/organization-[organization]/settings/+page.svelte
@@ -99,4 +99,6 @@
     {/if}
 </Container>
 
-<Delete bind:showDelete invoices={data.invoices} />
+{#if isCloud && data.invoices}
+    <Delete bind:showDelete invoices={data.invoices} />
+{/if}
diff --git a/src/routes/console/organization-[organization]/settings/+page.ts b/src/routes/console/organization-[organization]/settings/+page.ts
index f4db3678f..c3d520eb2 100644
--- a/src/routes/console/organization-[organization]/settings/+page.ts
+++ b/src/routes/console/organization-[organization]/settings/+page.ts
@@ -2,12 +2,14 @@ import type { PageLoad } from './$types';
 import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
+import { isCloud } from '$lib/system';
 
 export const load: PageLoad = async ({ depends, parent }) => {
     const { organization } = await parent();
     depends(Dependencies.ORGANIZATION);
+
     return {
         projects: await sdk.forConsole.projects.list([Query.equal('teamId', organization.$id)]),
-        invoices: await sdk.forConsole.billing.listInvoices(organization.$id)
+        invoices: isCloud ? await sdk.forConsole.billing.listInvoices(organization.$id) : undefined
     };
 };

From 8391ef917780be26ccc8563024793994008e40ab Mon Sep 17 00:00:00 2001
From: loks0n <22452787+loks0n@users.noreply.github.com>
Date: Mon, 26 Feb 2024 13:42:03 +0000
Subject: [PATCH 4/4] fix: remove unused var

---
 src/lib/sdk/billing.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 44227042e..e6f91c83b 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -1,4 +1,4 @@
-import type { Client, Models, Query } from '@appwrite.io/console';
+import type { Client, Models } from '@appwrite.io/console';
 import type { Organization } from '../stores/organization';
 import type { PaymentMethod } from '@stripe/stripe-js';
 import type { Tier } from '$lib/stores/billing';