From 18e6cfb1fd99225c6788e38448ef7a3c5912ed59 Mon Sep 17 00:00:00 2001
From: G30 <50341825+silentoplayz@users.noreply.github.com>
Date: Thu, 11 Dec 2025 20:34:39 -0500
Subject: [PATCH] fix: add null checks to chat iterators in ArchivedChats and
 FolderPlaceholder (#19898)

---
 .../chat/Placeholder/FolderPlaceholder.svelte    | 14 ++++++++------
 .../components/layout/ArchivedChatsModal.svelte  | 16 +++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/lib/components/chat/Placeholder/FolderPlaceholder.svelte b/src/lib/components/chat/Placeholder/FolderPlaceholder.svelte
index fb4efddab..e6916507e 100644
--- a/src/lib/components/chat/Placeholder/FolderPlaceholder.svelte
+++ b/src/lib/components/chat/Placeholder/FolderPlaceholder.svelte
@@ -1,6 +1,8 @@
-<script>
+<script lang="ts">
 	import { getContext, onMount } from 'svelte';
-	const i18n = getContext('i18n');
+	import type { Writable } from 'svelte/store';
+
+	const i18n: Writable<any> = getContext('i18n');
 
 	import { fade } from 'svelte/transition';
 
@@ -9,13 +11,13 @@
 	import Spinner from '$lib/components/common/Spinner.svelte';
 	import { getChatListByFolderId } from '$lib/apis/chats';
 
-	export let folder = null;
+	export let folder: any = null;
 
 	let selectedTab = 'chats';
 
 	let page = 1;
 
-	let chats = null;
+	let chats: any[] | null = null;
 	let chatListLoading = false;
 	let allChatsLoaded = false;
 
@@ -24,7 +26,7 @@
 
 		page += 1;
 
-		let newChatList = [];
+		let newChatList: any[] = [];
 
 		newChatList = await getChatListByFolderId(localStorage.token, folder.id, page).catch(
 			(error) => {
@@ -35,7 +37,7 @@
 
 		// once the bottom of the list has been reached (no results) there is no need to continue querying
 		allChatsLoaded = newChatList.length === 0;
-		chats = [...chats, ...newChatList];
+		chats = [...(chats || []), ...(newChatList || [])];
 
 		chatListLoading = false;
 	};
diff --git a/src/lib/components/layout/ArchivedChatsModal.svelte b/src/lib/components/layout/ArchivedChatsModal.svelte
index 0064002e0..ec6a74a04 100644
--- a/src/lib/components/layout/ArchivedChatsModal.svelte
+++ b/src/lib/components/layout/ArchivedChatsModal.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
+	// @ts-ignore
 	import fileSaver from 'file-saver';
+	import type { Writable } from 'svelte/store';
 	const { saveAs } = fileSaver;
 
 	import { toast } from 'svelte-sonner';
@@ -15,13 +17,13 @@
 	import UnarchiveAllConfirmDialog from '$lib/components/common/ConfirmDialog.svelte';
 	import Spinner from '../common/Spinner.svelte';
 
-	const i18n = getContext('i18n');
+	const i18n: Writable<any> = getContext('i18n');
 
 	export let show = false;
 	export let onUpdate = () => {};
 
 	let loading = false;
-	let chatList = null;
+	let chatList: any[] | null = null;
 	let page = 1;
 
 	let query = '';
@@ -30,13 +32,13 @@
 
 	let allChatsLoaded = false;
 	let chatListLoading = false;
-	let searchDebounceTimeout;
+	let searchDebounceTimeout: any;
 
 	let showUnarchiveAllConfirmDialog = false;
 
-	let filter = {};
+	let filter: any = {};
 	$: filter = {
-		...(query ? { query: query } : {}),
+		...(query ? { query } : {}),
 		...(orderBy ? { order_by: orderBy } : {}),
 		...(direction ? { direction } : {})
 	};
@@ -88,7 +90,7 @@
 		allChatsLoaded = newChatList.length === 0;
 
 		if (newChatList.length > 0) {
-			chatList = [...chatList, ...newChatList];
+			chatList = [...(chatList || []), ...newChatList];
 		}
 
 		chatListLoading = false;
@@ -102,7 +104,7 @@
 		saveAs(blob, `${$i18n.t('archived-chat-export')}-${Date.now()}.json`);
 	};
 
-	const unarchiveHandler = async (chatId) => {
+	const unarchiveHandler = async (chatId: string) => {
 		const res = await archiveChatById(localStorage.token, chatId).catch((error) => {
 			toast.error(`${error}`);
 		});