From f2d8534e3dc67fdcea99c2a524f2c2df05de5ef7 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Wed, 28 Aug 2024 11:22:05 +0300
Subject: [PATCH] Web: Files: ConflictResolve: fix styles

---
 .../components/dialogs/ConflictResolveDialog/index.tsx |  3 ++-
 .../dialogs/conflict-resolve/ConflictResolve.styled.ts | 10 ++++++++++
 .../dialogs/conflict-resolve/ConflictResolve.tsx       |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
index 2014f089d1..100b58461e 100644
--- a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
+++ b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
@@ -37,6 +37,7 @@ import {
   ConflictResolveDialogProps,
   TActiveItem,
 } from "./ConflictResolveDialog.types";
+import { Text } from "@docspace/shared/components/text";
 
 const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
   const {
@@ -217,7 +218,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
         ns="Common"
         i18nKey="FileActionRequired"
         values={{ fileName: items[0].title }}
-        components={{ 1: <span className="bold" /> }}
+        components={{ 1: <span className="bold truncate" /> }}
       />
     );
 
diff --git a/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts b/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts
index 91500886ac..85ac10f832 100644
--- a/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts
+++ b/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts
@@ -39,6 +39,12 @@ const StyledModalDialog = styled(ModalDialog)`
     .bold {
       font-weight: 600;
     }
+
+    .truncate {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
   }
 
   .select-action {
@@ -76,6 +82,10 @@ const StyledModalDialog = styled(ModalDialog)`
       color: #a3a9ae;
     }
   }
+
+  .conflict-resolve_file-name {
+    display: flex;
+  }
 `;
 
 export default StyledModalDialog;
diff --git a/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx b/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx
index 36fbffe044..6eec9233fb 100644
--- a/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx
+++ b/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx
@@ -115,7 +115,7 @@ const ConflictResolve = (props: ConflictResolveProps) => {
     >
       <ModalDialog.Header>{headerLabel}</ModalDialog.Header>
       <ModalDialog.Body>
-        <Text truncate className="message">
+        <Text truncate className="message conflict-resolve_file-name ">
           {messageText}
         </Text>
         <Text className="select-action">{selectActionText}</Text>