diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergePreviewTab.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergePreviewTab.tsx index c1e1860fc4e..7c9771f8f4d 100644 --- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergePreviewTab.tsx +++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergePreviewTab.tsx @@ -1,17 +1,9 @@ import { useMergePreview } from '@/object-record/record-merge/hooks/useMergePreview'; import { CardComponents } from '@/object-record/record-show/components/CardComponents'; import { SummaryCard } from '@/object-record/record-show/components/SummaryCard'; -import styled from '@emotion/styled'; import { isDefined } from 'twenty-shared/utils'; import { Section } from 'twenty-ui/layout'; -const StyledLoadingContainer = styled.div` - align-items: center; - display: flex; - height: 100px; - justify-content: center; -`; - type MergePreviewTabProps = { objectNameSingular: string; }; @@ -23,30 +15,24 @@ export const MergePreviewTab = ({ objectNameSingular, }); - if (isGeneratingPreview) { - return ( - - Generating merge preview... - - ); - } - - if (!isDefined(mergePreviewRecord)) { + if (!isDefined(mergePreviewRecord) && !isGeneratingPreview) { return null; } + const recordId = mergePreviewRecord?.id ?? 'merge-preview-loading'; + return (
{ - const labels: FixedLengthArray< - ReturnType, - typeof MUTATION_MAX_MERGE_RECORDS - > = [ - msg`First`, - msg`Second`, - msg`Third`, - msg`Fourth`, - msg`Fifth`, - msg`Sixth`, - msg`Seventh`, - msg`Eighth`, - msg`Ninth`, + const labels: FixedLengthArray = [ + t`First`, + t`Second`, + t`Third`, + t`Fourth`, + t`Fifth`, + t`Sixth`, + t`Seventh`, + t`Eighth`, + t`Ninth`, ]; - return labels[index] ? (labels[index].message as string) : ''; + return labels[index] || ''; };