From 3ad3ad088f6a0012f259345c6895e10892e6f35f Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Fri, 15 Aug 2025 20:53:34 +0200 Subject: [PATCH] ux: improve warning message in partial merge --- .../panel/project-panel/ProjectMergeForm.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/client/src/features/app-settings/panel/project-panel/ProjectMergeForm.tsx b/apps/client/src/features/app-settings/panel/project-panel/ProjectMergeForm.tsx index 3c8558150..a59274eff 100644 --- a/apps/client/src/features/app-settings/panel/project-panel/ProjectMergeForm.tsx +++ b/apps/client/src/features/app-settings/panel/project-panel/ProjectMergeForm.tsx @@ -6,6 +6,7 @@ import { PROJECT_DATA } from '../../../../common/api/constants'; import { getDb, patchData } from '../../../../common/api/db'; import { maybeAxiosError } from '../../../../common/api/utils'; import Button from '../../../../common/components/buttons/Button'; +import Info from '../../../../common/components/info/Info'; import Switch from '../../../../common/components/switch/Switch'; import { cx } from '../../../../common/utils/styleUtils'; import * as Panel from '../../panel-utils/PanelUtils'; @@ -79,7 +80,7 @@ export default function ProjectMergeForm({ onClose, fileName }: ProjectMergeFrom return ( - Merge {`"${fileName}"`} + Partial project merge