From ec1846c2568cd745facfbbb103c9f402443c83c1 Mon Sep 17 00:00:00 2001 From: dragnoir Date: Thu, 23 May 2024 12:35:47 +0100 Subject: [PATCH 1/4] Fix; add spacing between comment and Uploading attachment... --- .../HTMLEngineProvider/BaseHTMLEngineProvider.tsx | 7 ++++++- src/libs/ReportUtils.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx index 51f9981f1524..406e5e1cbc8b 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx @@ -77,8 +77,13 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim mixedUAStyles: {...styles.textSupporting, ...styles.textLineThrough}, contentModel: HTMLContentModel.textual, }), + 'uploading-attachment': HTMLElementModel.fromCustomModel({ + tagName: 'uploading-attachment', + mixedUAStyles: {...styles.mt3}, + contentModel: HTMLContentModel.block, + }), }), - [styles.formError, styles.mb0, styles.colorMuted, styles.textLabelSupporting, styles.lh16, styles.textSupporting, styles.textLineThrough], + [styles.formError, styles.mb0, styles.colorMuted, styles.textLabelSupporting, styles.lh16, styles.textSupporting, styles.textLineThrough, styles.mt3], ); /* eslint-enable @typescript-eslint/naming-convention */ diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index b8e4c448fdc2..ecd0a94230c0 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -3450,7 +3450,7 @@ function buildOptimisticAddCommentReportAction( htmlForNewComment = commentText; textForNewComment = parser.htmlToText(htmlForNewComment); } else { - htmlForNewComment = `${commentText}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`; + htmlForNewComment = `${commentText}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`; textForNewComment = `${parser.htmlToText(commentText)}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`; } From 9b11960277eab0303f2f49295f8997ddbc9dc095 Mon Sep 17 00:00:00 2001 From: dragnoir Date: Sat, 25 May 2024 10:15:01 +0100 Subject: [PATCH 2/4] fix spacing.. --- src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx index 406e5e1cbc8b..6d2cbcc08862 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx @@ -79,7 +79,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim }), 'uploading-attachment': HTMLElementModel.fromCustomModel({ tagName: 'uploading-attachment', - mixedUAStyles: {...styles.mt3}, + mixedUAStyles: {...styles.mt4}, contentModel: HTMLContentModel.block, }), }), From 5d34b6c8df372f9d2ffe85ad53c34d2d25362f55 Mon Sep 17 00:00:00 2001 From: dragnoir Date: Sat, 25 May 2024 13:41:52 +0100 Subject: [PATCH 3/4] fix lint --- src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx index 6d2cbcc08862..d95fc9e11a31 100755 --- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx +++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx @@ -83,7 +83,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim contentModel: HTMLContentModel.block, }), }), - [styles.formError, styles.mb0, styles.colorMuted, styles.textLabelSupporting, styles.lh16, styles.textSupporting, styles.textLineThrough, styles.mt3], + [styles.formError, styles.mb0, styles.colorMuted, styles.textLabelSupporting, styles.lh16, styles.textSupporting, styles.textLineThrough, styles.mt4], ); /* eslint-enable @typescript-eslint/naming-convention */ From 86f62402413be0a60596344f4e18bc611c4a0a2a Mon Sep 17 00:00:00 2001 From: dragnoir Date: Wed, 29 May 2024 20:08:34 +0100 Subject: [PATCH 4/4] fix spacing on native --- src/libs/ReportUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 66ae45ebc7fb..5d65d0207b55 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -3485,7 +3485,7 @@ function buildOptimisticAddCommentReportAction( htmlForNewComment = commentText; textForNewComment = parser.htmlToText(htmlForNewComment); } else { - htmlForNewComment = `${commentText}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`; + htmlForNewComment = `${commentText}${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`; textForNewComment = `${parser.htmlToText(commentText)}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`; }