From 3bb23ba11d05eff2ee015483309c59f80243ef34 Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Sun, 31 Aug 2025 23:23:52 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20feat:=20Enhance=20Import=20Conve?=
 =?UTF-8?q?rsations=20UI=20with=20loading=20state=20and=20new=20localizati?=
 =?UTF-8?q?on=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Nav/SettingsTabs/Data/ImportConversations.tsx     | 11 ++++++++---
 client/src/locales/en/translation.json                |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
index 2d06b74392..090bc693da 100644
--- a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
@@ -119,11 +119,16 @@ function ImportConversations() {
         aria-labelledby="import-conversation-label"
       >
         {isUploading ? (
-          <Spinner className="mr-1 w-4" />
+          <>
+            <Spinner className="mr-1 w-4" />
+            <span>{localize('com_ui_importing')}</span>
+          </>
         ) : (
-          <Import className="mr-1 flex h-4 w-4 items-center stroke-1" />
+          <>
+            <Import className="mr-1 flex h-4 w-4 items-center stroke-1" />
+            <span>{localize('com_ui_import')}</span>
+          </>
         )}
-        <span>{localize('com_ui_import')}</span>
       </Button>
       <input
         ref={fileInputRef}
diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
index b686580376..9d06aa81fa 100644
--- a/client/src/locales/en/translation.json
+++ b/client/src/locales/en/translation.json
@@ -954,6 +954,7 @@
   "com_ui_image_edited": "Image edited",
   "com_ui_image_gen": "Image Gen",
   "com_ui_import": "Import",
+  "com_ui_importing": "Importing",
   "com_ui_import_conversation_error": "There was an error importing your conversations",
   "com_ui_import_conversation_file_type_error": "Unsupported import type",
   "com_ui_import_conversation_info": "Import conversations from a JSON file",