From b536a497bb05e9a380fe09bd5cd437b83b8027ac Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Mon, 6 Oct 2025 18:35:17 +0330
Subject: [PATCH 01/10] solved issue: error code removed and error page styled
 and close button added

---
 ftl/core/importing.ftl                      |  2 +-
 ts/lib/components/ErrorPage.svelte          | 41 +++++++++++++++++----
 ts/lib/generated/post.ts                    |  3 +-
 ts/routes/import-csv/[...path]/+page.svelte |  7 +++-
 ts/routes/import-csv/[...path]/+page.ts     | 25 ++++++++-----
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/ftl/core/importing.ftl b/ftl/core/importing.ftl
index b23d12654..891c5e05d 100644
--- a/ftl/core/importing.ftl
+++ b/ftl/core/importing.ftl
@@ -160,7 +160,7 @@ importing-cards-added =
         [one] { $count } card added.
        *[other] { $count } cards added.
     }
-importing-file-empty = The file you selected is empty.
+importing-file-empty = The selected file is empty. Please choose a valid file.
 importing-notes-added =
     { $count ->
         [one] { $count } new note imported.
diff --git a/ts/lib/components/ErrorPage.svelte b/ts/lib/components/ErrorPage.svelte
index 01bcb1224..d5ad86c4b 100644
--- a/ts/lib/components/ErrorPage.svelte
+++ b/ts/lib/components/ErrorPage.svelte
@@ -2,17 +2,42 @@
 Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
-<script lang="ts">
-    export let error: Error;
+<script context="module" lang="ts">
+    declare function pycmd(cmd: string);
 </script>
 
-<div class="message">
-    {error.message}
+<script lang="ts">
+    export let error: Error;
+
+    function closePage() {
+        try {
+            pycmd("close");
+        } catch {
+            history.back();
+        }
+    }
+</script>
+
+<div class="error-box">
+    <p class="error-text">{error.message}</p>
+    <button class="btn btn-primary" on:click={closePage}>Got it</button>
 </div>
 
 <style lang="scss">
-    .message {
-        text-align: center;
-        margin: 50px 0 0;
-    }
+    .error-box {
+    background-color: var(--window-bg);
+    border: 1px solid var(--error-fg);
+    color: var(--fg);
+    padding: 1rem;
+    border-radius: 0.5rem;
+    max-width: 400px;
+    margin: 1rem auto;
+    text-align: center;
+    box-shadow: 0 0 6px rgba(0, 0, 0, 0.15);
+  }
+  .error-text {
+    color: var(--error-fg);
+    font-weight: 600;
+    margin-bottom: 0.75rem;
+  }
 </style>
diff --git a/ts/lib/generated/post.ts b/ts/lib/generated/post.ts
index 90e372520..704d3d132 100644
--- a/ts/lib/generated/post.ts
+++ b/ts/lib/generated/post.ts
@@ -41,7 +41,8 @@ async function postProtoInner(url: string, body: Uint8Array): Promise<Uint8Array
         } catch {
             // ignore
         }
-        throw new Error(`${result.status}: ${msg}`);
+        // it is ugly to show internall server client status to user, we should just show error's to user
+        throw new Error(process.env.NODE_ENV === "production"?`${msg}`:`${result.status}: ${msg}`);
     }
     const blob = await result.blob();
     const respBuf = await new Response(blob).arrayBuffer();
diff --git a/ts/routes/import-csv/[...path]/+page.svelte b/ts/routes/import-csv/[...path]/+page.svelte
index 4553c1bfe..08bb5d2b3 100644
--- a/ts/routes/import-csv/[...path]/+page.svelte
+++ b/ts/routes/import-csv/[...path]/+page.svelte
@@ -3,10 +3,15 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
+    import ErrorPage from "$lib/components/ErrorPage.svelte";
     import ImportCsvPage from "../ImportCsvPage.svelte";
     import type { PageData } from "./$types";
 
     export let data: PageData;
 </script>
 
-<ImportCsvPage state={data.state} />
+{#if data.initialError}
+    <ErrorPage error={data.initialError} />
+{:else}
+    <ImportCsvPage state={data.state} />
+{/if}
diff --git a/ts/routes/import-csv/[...path]/+page.ts b/ts/routes/import-csv/[...path]/+page.ts
index cda2bace9..2f947f791 100644
--- a/ts/routes/import-csv/[...path]/+page.ts
+++ b/ts/routes/import-csv/[...path]/+page.ts
@@ -6,14 +6,19 @@ import { ImportCsvState } from "../lib";
 import type { PageLoad } from "./$types";
 
 export const load = (async ({ params }) => {
-    const [notetypes, decks, metadata] = await Promise.all([
-        getNotetypeNames({}),
-        getDeckNames({
-            skipEmptyDefault: false,
-            includeFiltered: false,
-        }),
-        getCsvMetadata({ path: params.path }, { alertOnError: false }),
-    ]);
-    const state = new ImportCsvState(params.path, notetypes, decks, metadata);
-    return { state };
+    try {
+        const [notetypes, decks, metadata] = await Promise.all([
+            getNotetypeNames({}),
+            getDeckNames({
+                skipEmptyDefault: false,
+                includeFiltered: false,
+            }),
+            getCsvMetadata({ path: params.path }, { alertOnError: false }),
+        ]);
+        const state = new ImportCsvState(params.path, notetypes, decks, metadata);
+        return { state };
+    } catch (error: any) {
+        const rawMsg = error?.message ?? String(error ?? "");
+        return { initialError: new Error(rawMsg) };
+    }
 }) satisfies PageLoad;

From bc08907f14061f043359a4cc29903782e2536642 Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Mon, 6 Oct 2025 18:58:01 +0330
Subject: [PATCH 02/10] i forgot to add my self to contributers

---
 CONTRIBUTORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a18833b04..983ffa017 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -250,6 +250,7 @@ Danilo Spillebeen <spillebeendanilo@gmail.com>
 Matbe766 <matildabergstrom01@gmail.com>
 Amanda Sternberg <mandis.sternberg@gmail.com>
 arold0 <arold0@icloud.com>
+medProgAyat <hosseinmehriyari1383@gmail.com>
 
 
 ********************

From 63803e0ff3ec7f8657ec1509011b7041a4e11d8c Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Mon, 6 Oct 2025 19:05:34 +0330
Subject: [PATCH 03/10] format using ninja format

---
 ts/lib/components/ErrorPage.svelte | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ts/lib/components/ErrorPage.svelte b/ts/lib/components/ErrorPage.svelte
index d5ad86c4b..c17f7d273 100644
--- a/ts/lib/components/ErrorPage.svelte
+++ b/ts/lib/components/ErrorPage.svelte
@@ -25,19 +25,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <style lang="scss">
     .error-box {
-    background-color: var(--window-bg);
-    border: 1px solid var(--error-fg);
-    color: var(--fg);
-    padding: 1rem;
-    border-radius: 0.5rem;
-    max-width: 400px;
-    margin: 1rem auto;
-    text-align: center;
-    box-shadow: 0 0 6px rgba(0, 0, 0, 0.15);
-  }
-  .error-text {
-    color: var(--error-fg);
-    font-weight: 600;
-    margin-bottom: 0.75rem;
-  }
+        background-color: var(--window-bg);
+        border: 1px solid var(--error-fg);
+        color: var(--fg);
+        padding: 1rem;
+        border-radius: 0.5rem;
+        max-width: 400px;
+        margin: 1rem auto;
+        text-align: center;
+        box-shadow: 0 0 6px rgba(0, 0, 0, 0.15);
+    }
+    .error-text {
+        color: var(--error-fg);
+        font-weight: 600;
+        margin-bottom: 0.75rem;
+    }
 </style>

From 021d0cd968871dfed15840758cb4700483203a96 Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Tue, 7 Oct 2025 19:47:27 +0330
Subject: [PATCH 04/10] format post.ts to meet ninja check

---
 ts/lib/generated/post.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ts/lib/generated/post.ts b/ts/lib/generated/post.ts
index 704d3d132..e6f77cdf9 100644
--- a/ts/lib/generated/post.ts
+++ b/ts/lib/generated/post.ts
@@ -19,7 +19,10 @@ export async function postProto<T>(
         return outputType.fromBinary(outputBytes);
     } catch (err) {
         const { alertOnError = true } = options;
-        if (alertOnError && !(err instanceof Error && err.message === "500: Interrupted")) {
+        if (
+            alertOnError &&
+            !(err instanceof Error && err.message === "500: Interrupted")
+        ) {
             alert(err);
         }
         throw err;
@@ -42,7 +45,11 @@ async function postProtoInner(url: string, body: Uint8Array): Promise<Uint8Array
             // ignore
         }
         // it is ugly to show internall server client status to user, we should just show error's to user
-        throw new Error(process.env.NODE_ENV === "production"?`${msg}`:`${result.status}: ${msg}`);
+        throw new Error(
+            process.env.NODE_ENV === "production"
+                ? `${msg}`
+                : `${result.status}: ${msg}`,
+        );
     }
     const blob = await result.blob();
     const respBuf = await new Response(blob).arrayBuffer();

From 654537c6694fa8afd53c4a256aacd7b35729f983 Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Tue, 7 Oct 2025 19:51:37 +0330
Subject: [PATCH 05/10] fix style again because the last one was using pretier
 not dprint

---
 ts/lib/generated/post.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ts/lib/generated/post.ts b/ts/lib/generated/post.ts
index e6f77cdf9..35310007a 100644
--- a/ts/lib/generated/post.ts
+++ b/ts/lib/generated/post.ts
@@ -19,10 +19,7 @@ export async function postProto<T>(
         return outputType.fromBinary(outputBytes);
     } catch (err) {
         const { alertOnError = true } = options;
-        if (
-            alertOnError &&
-            !(err instanceof Error && err.message === "500: Interrupted")
-        ) {
+        if (alertOnError && !(err instanceof Error && err.message === "500: Interrupted")) {
             alert(err);
         }
         throw err;
@@ -46,9 +43,7 @@ async function postProtoInner(url: string, body: Uint8Array): Promise<Uint8Array
         }
         // it is ugly to show internall server client status to user, we should just show error's to user
         throw new Error(
-            process.env.NODE_ENV === "production"
-                ? `${msg}`
-                : `${result.status}: ${msg}`,
+            process.env.NODE_ENV === "production" ? `${msg}` : `${result.status}: ${msg}`
         );
     }
     const blob = await result.blob();

From 4e8997d497e64b4334d09ac5478c9ab9b1ab3286 Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Tue, 7 Oct 2025 19:56:22 +0330
Subject: [PATCH 06/10] format using dprint

---
 ts/lib/generated/post.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ts/lib/generated/post.ts b/ts/lib/generated/post.ts
index 35310007a..dab9c1b9c 100644
--- a/ts/lib/generated/post.ts
+++ b/ts/lib/generated/post.ts
@@ -19,7 +19,9 @@ export async function postProto<T>(
         return outputType.fromBinary(outputBytes);
     } catch (err) {
         const { alertOnError = true } = options;
-        if (alertOnError && !(err instanceof Error && err.message === "500: Interrupted")) {
+        if (
+            alertOnError && !(err instanceof Error && err.message === "500: Interrupted")
+        ) {
             alert(err);
         }
         throw err;
@@ -43,7 +45,9 @@ async function postProtoInner(url: string, body: Uint8Array): Promise<Uint8Array
         }
         // it is ugly to show internall server client status to user, we should just show error's to user
         throw new Error(
-            process.env.NODE_ENV === "production" ? `${msg}` : `${result.status}: ${msg}`
+            process.env.NODE_ENV === "production"
+                ? `${msg}`
+                : `${result.status}: ${msg}`,
         );
     }
     const blob = await result.blob();

From 49924c4e8fa6c96dccc177f72d176cd8f0404a49 Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Thu, 9 Oct 2025 17:42:23 +0330
Subject: [PATCH 07/10] fix: use bridgeCommand instead pycmd for now "till add
 rpc in future"

---
 ts/lib/components/ErrorPage.svelte | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ts/lib/components/ErrorPage.svelte b/ts/lib/components/ErrorPage.svelte
index c17f7d273..d4ea80054 100644
--- a/ts/lib/components/ErrorPage.svelte
+++ b/ts/lib/components/ErrorPage.svelte
@@ -2,16 +2,14 @@
 Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
-<script context="module" lang="ts">
-    declare function pycmd(cmd: string);
-</script>
 
 <script lang="ts">
+    import { bridgeCommand } from "@tslib/bridgecommand";
     export let error: Error;
 
     function closePage() {
         try {
-            pycmd("close");
+            bridgeCommand("close");
         } catch {
             history.back();
         }

From c73f9f5706dfe9f569e902d10bff07d5ab0d3710 Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Thu, 9 Oct 2025 17:54:35 +0330
Subject: [PATCH 08/10] fix: make error page got it button using translation

---
 ts/lib/components/ErrorPage.svelte | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ts/lib/components/ErrorPage.svelte b/ts/lib/components/ErrorPage.svelte
index d4ea80054..e69e8ad49 100644
--- a/ts/lib/components/ErrorPage.svelte
+++ b/ts/lib/components/ErrorPage.svelte
@@ -5,6 +5,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <script lang="ts">
     import { bridgeCommand } from "@tslib/bridgecommand";
+    import * as tr from "@generated/ftl";
+
     export let error: Error;
 
     function closePage() {
@@ -18,7 +20,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <div class="error-box">
     <p class="error-text">{error.message}</p>
-    <button class="btn btn-primary" on:click={closePage}>Got it</button>
+    <button class="btn btn-primary" on:click={closePage}>
+        {tr.actionsClose() || "Got it"}
+    </button>
 </div>
 
 <style lang="scss">
@@ -33,6 +37,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         text-align: center;
         box-shadow: 0 0 6px rgba(0, 0, 0, 0.15);
     }
+
     .error-text {
         color: var(--error-fg);
         font-weight: 600;

From d9190f9abd0cddbd0b604c98b2cc88d9268eb2d0 Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Mon, 13 Oct 2025 13:42:15 +0330
Subject: [PATCH 09/10] fix: unneccessary null check for actionclose() removed

---
 ts/lib/components/ErrorPage.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/lib/components/ErrorPage.svelte b/ts/lib/components/ErrorPage.svelte
index e69e8ad49..eaacb359e 100644
--- a/ts/lib/components/ErrorPage.svelte
+++ b/ts/lib/components/ErrorPage.svelte
@@ -21,7 +21,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <div class="error-box">
     <p class="error-text">{error.message}</p>
     <button class="btn btn-primary" on:click={closePage}>
-        {tr.actionsClose() || "Got it"}
+        {tr.actionsClose()}
     </button>
 </div>
 

From 3e63ff34b0121662bc0963d74077aa7c7c5b00ab Mon Sep 17 00:00:00 2001
From: medProgAyat <hosseinmehriyari1383@gmail.com>
Date: Sat, 1 Nov 2025 22:12:52 +0330
Subject: [PATCH 10/10] Update ts/lib/generated/post.ts

Co-authored-by: Damien Elmes <dae@users.noreply.github.com>
---
 ts/lib/generated/post.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/lib/generated/post.ts b/ts/lib/generated/post.ts
index dab9c1b9c..0ed02549c 100644
--- a/ts/lib/generated/post.ts
+++ b/ts/lib/generated/post.ts
@@ -43,7 +43,7 @@ async function postProtoInner(url: string, body: Uint8Array): Promise<Uint8Array
         } catch {
             // ignore
         }
-        // it is ugly to show internall server client status to user, we should just show error's to user
+        // hide HTTP status in production builds
         throw new Error(
             process.env.NODE_ENV === "production"
                 ? `${msg}`