From 907c3433eecbea75663694f7249bcdab7d220dd2 Mon Sep 17 00:00:00 2001
From: sw3205933776 <3205933776@qq.com>
Date: Mon, 29 Sep 2025 17:53:00 +0800
Subject: [PATCH 1/2] Fix incorrect button position in model validation modal

---
 src/pages/Setting/Models.tsx | 63 +++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/src/pages/Setting/Models.tsx b/src/pages/Setting/Models.tsx
index 2ad909abe..4ed47086e 100644
--- a/src/pages/Setting/Models.tsx
+++ b/src/pages/Setting/Models.tsx
@@ -213,37 +213,23 @@ export default function SettingModels() {
 			if (res.is_tool_calls && res.is_valid) {
 				console.log("success");
 				toast(t("setting.validate-success"), {
-					description:
-						t("setting.the-model-has-been-verified-to-support-function-calling-which-is-required-to-use-eigent"),
+					description: t(
+						"setting.the-model-has-been-verified-to-support-function-calling-which-is-required-to-use-eigent"
+					),
 					closeButton: true,
 				});
 			} else {
 				console.log("failed", res.message);
 				toast(t("setting.validate-failed"), {
-					description: (
-						<div
-							style={{
-								maxHeight: "120px",
-								overflowY: "auto",
-							}}
-						>
-							<div>{res.message}</div>
-							<div className="flex justify-end">
-								<Button
-									size="xs"
-									variant="primary"
-									onClick={() => {
-										navigator.clipboard.writeText(res.message);
-										toast.success(t("setting.copied-to-clipboard"));
-									}}
-								>
-									{t("setting.copy")}
-								</Button>
-							</div>
-						</div>
-					),
-					closeButton: true,
-				});
+          description: res.message,
+          action: {
+            label: t("setting.copy"),
+            onClick: () => () => {
+							navigator.clipboard.writeText(res.message);
+							toast.success(t("setting.copied-to-clipboard"));
+						},
+          },
+        })
 
 				return;
 			}
@@ -370,8 +356,9 @@ export default function SettingModels() {
 				if (res.is_tool_calls && res.is_valid) {
 					console.log("success");
 					toast(t("setting.validate-success"), {
-						description:
-							t("setting.the-model-has-been-verified-to-support-function-calling-which-is-required-to-use-eigent"),
+						description: t(
+							"setting.the-model-has-been-verified-to-support-function-calling-which-is-required-to-use-eigent"
+						),
 						closeButton: true,
 					});
 				} else {
@@ -474,7 +461,9 @@ export default function SettingModels() {
 		if (!hasSearchKey) {
 			// Show warning toast instead of blocking
 			toast(t("setting.warning-google-search-not-configured"), {
-				description: t("setting.search-functionality-may-be-limited-without-google-api"),
+				description: t(
+					"setting.search-functionality-may-be-limited-without-google-api"
+				),
 				closeButton: true,
 			});
 		}
@@ -501,7 +490,9 @@ export default function SettingModels() {
 		if (!hasSearchKey) {
 			// Show warning toast instead of blocking
 			toast(t("setting.warning-google-search-not-configured"), {
-				description: t("setting.search-functionality-may-be-limited-without-google-api"),
+				description: t(
+					"setting.search-functionality-may-be-limited-without-google-api"
+				),
 				closeButton: true,
 			});
 		}
@@ -760,7 +751,9 @@ export default function SettingModels() {
 											<Input
 												id={`apiKey-${item.id}`}
 												type={showApiKey[idx] ? "text" : "password"}
-												placeholder={` ${t("setting.enter-your-api-key")} ${item.name} ${t("setting.key")}`}
+												placeholder={` ${t("setting.enter-your-api-key")} ${
+													item.name
+												} ${t("setting.key")}`}
 												className="w-full pr-10"
 												value={form[idx].apiKey}
 												onChange={(e) => {
@@ -805,7 +798,9 @@ export default function SettingModels() {
 									<div>
 										<Input
 											id={`apiHost-${item.id}`}
-											placeholder={`${t("setting.enter-your-api-host")} ${item.name} ${t("setting.url")}`}
+											placeholder={`${t("setting.enter-your-api-host")} ${
+												item.name
+											} ${t("setting.url")}`}
 											className="w-full"
 											value={form[idx].apiHost}
 											onChange={(e) => {
@@ -833,7 +828,9 @@ export default function SettingModels() {
 									<div>
 										<Input
 											id={`modelType-${item.id}`}
-											placeholder={`${t("setting.enter-your-model-type")} ${item.name} ${t("setting.model-type")}`}
+											placeholder={`${t("setting.enter-your-model-type")} ${
+												item.name
+											} ${t("setting.model-type")}`}
 											className="w-full"
 											value={form[idx].model_type}
 											onChange={(e) => {

From 01a6a2ce01f5c01d94db5a80fa4171cc0466fbda Mon Sep 17 00:00:00 2001
From: Wendong-Fan <w3ndong.fan@gmail.com>
Date: Tue, 30 Sep 2025 23:24:36 +0800
Subject: [PATCH 2/2] enhance: Fix incorrect button position in model
 validation modal PR414

---
 src/pages/Setting/Models.tsx | 41 +++++++++++-------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/pages/Setting/Models.tsx b/src/pages/Setting/Models.tsx
index 7bb33bc91..837fd934b 100644
--- a/src/pages/Setting/Models.tsx
+++ b/src/pages/Setting/Models.tsx
@@ -220,13 +220,12 @@ export default function SettingModels() {
 				});
 			} else {
 				console.log("failed", res.message);
-				toast(t("setting.validate-failed"), {
+				const toastId = toast(t("setting.validate-failed"), {
           description: res.message,
           action: {
-            label: t("setting.copy"),
-            onClick: () => () => {
-							navigator.clipboard.writeText(res.message);
-							toast.success(t("setting.copied-to-clipboard"));
+            label: t("setting.close"),
+            onClick: () => {
+							toast.dismiss(toastId);
 						},
           },
         })
@@ -363,30 +362,14 @@ export default function SettingModels() {
 					});
 				} else {
 					console.log("failed", res.message);
-					toast(t("setting.validate-failed"), {
-						description: (
-							<div
-								style={{
-									maxHeight: "120px",
-									overflowY: "auto",
-								}}
-							>
-								<div>{res.message}</div>
-								<div className="flex justify-end">
-									<Button
-										size="xs"
-										variant="primary"
-										onClick={() => {
-											navigator.clipboard.writeText(res.message);
-											toast.success(t("setting.copied-to-clipboard"));
-										}}
-									>
-										{t("setting.copy")}
-									</Button>
-								</div>
-							</div>
-						),
-						closeButton: true,
+					const toastId = toast(t("setting.validate-failed"), {
+						description: res.message,
+						action: {
+							label: t("setting.close"),
+							onClick: () => {
+								toast.dismiss(toastId);
+							},
+						},
 					});
 
 					return;