From 00e57187e8112cc30dd752d3883268449ca0c965 Mon Sep 17 00:00:00 2001
From: Marc Glasser <marc.aaron.glasser@gmail.com>
Date: Wed, 3 May 2023 08:59:43 -1000
Subject: [PATCH] =?UTF-8?q?Revert=20"Fix=20for:=20Web=20-=20Triple=20click?=
 =?UTF-8?q?ing=20an=20edited=20message=20select=E2=80=99s=20the=20(edited)?=
 =?UTF-8?q?=20label=20along=20with=20the=20actual=20message"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HTMLRenderers/EditedRenderer.js           |  4 +--
 src/pages/home/report/ReportActionItem.js     | 25 ++++++++++---------
 .../home/report/ReportActionItemFragment.js   |  5 +---
 src/styles/editedLabelStyles/index.js         |  3 ---
 src/styles/editedLabelStyles/index.native.js  |  1 -
 src/styles/utilities/display.js               |  5 ----
 6 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 src/styles/editedLabelStyles/index.js
 delete mode 100644 src/styles/editedLabelStyles/index.native.js

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
index 1295fc0946b0..0b04c3a885be 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
@@ -6,7 +6,6 @@ import Text from '../../Text';
 import variables from '../../../styles/variables';
 import themeColors from '../../../styles/themes/default';
 import styles from '../../../styles/styles';
-import editedLabelStyles from '../../../styles/editedLabelStyles';
 
 const propTypes = {
     ...htmlRendererPropTypes,
@@ -21,10 +20,9 @@ const EditedRenderer = (props) => {
             {...defaultRendererProps}
             fontSize={variables.fontSizeSmall}
             color={themeColors.textSupporting}
-            style={[styles.alignItemsBaseline, editedLabelStyles]}
         >
             {/* Native devices do not support margin between nested text */}
-            <Text style={[styles.w1, styles.userSelectNone]}>{' '}</Text>
+            <Text style={styles.w1}>{' '}</Text>
             {props.translate('reportActionCompose.edited')}
         </Text>
     );
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index c43da3092177..c93753efe902 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -279,18 +279,6 @@ class ReportActionItem extends Component {
                 <Hoverable>
                     {hovered => (
                         <View accessibilityLabel={this.props.translate('accessibilityHints.chatMessage')}>
-                            <MiniReportActionContextMenu
-                                reportID={this.props.report.reportID}
-                                reportAction={this.props.action}
-                                isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
-                                displayAsGroup={this.props.displayAsGroup}
-                                isVisible={
-                                    hovered
-                                    && !this.props.draftMessage
-                                }
-                                draftMessage={this.props.draftMessage}
-                                isChronosReport={ReportUtils.chatIncludesChronos(this.props.report)}
-                            />
                             {this.props.shouldDisplayNewMarker && (
                                 <UnreadActionIndicator reportActionID={this.props.action.reportActionID} />
                             )}
@@ -354,6 +342,19 @@ class ReportActionItem extends Component {
                                         )}
                                 </OfflineWithFeedback>
                             </View>
+                            <MiniReportActionContextMenu
+                                reportID={this.props.report.reportID}
+                                reportAction={this.props.action}
+                                isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
+                                displayAsGroup={this.props.displayAsGroup}
+                                isVisible={
+                                    hovered
+                                    && !this.props.draftMessage
+                                    && !hasErrors
+                                }
+                                draftMessage={this.props.draftMessage}
+                                isChronosReport={ReportUtils.chatIncludesChronos(this.props.report)}
+                            />
                         </View>
                     )}
                 </Hoverable>
diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
index 9eb6b0900f34..29b6907b9d95 100644
--- a/src/pages/home/report/ReportActionItemFragment.js
+++ b/src/pages/home/report/ReportActionItemFragment.js
@@ -18,7 +18,6 @@ import * as StyleUtils from '../../../styles/StyleUtils';
 import {withNetwork} from '../../../components/OnyxProvider';
 import CONST from '../../../CONST';
 import applyStrikethrough from '../../../components/HTMLEngineProvider/applyStrikethrough';
-import editedLabelStyles from '../../../styles/editedLabelStyles';
 
 const propTypes = {
     /** The message fragment needing to be displayed */
@@ -134,10 +133,8 @@ const ReportActionItemFragment = (props) => {
                     <Text
                         fontSize={variables.fontSizeSmall}
                         color={themeColors.textSupporting}
-                        style={[styles.alignItemsBaseline, editedLabelStyles]}
                     >
-                        <Text style={[styles.w1, styles.userSelectNone]}>{' '}</Text>
-                        {props.translate('reportActionCompose.edited')}
+                        {` ${props.translate('reportActionCompose.edited')}`}
                     </Text>
                     )}
                 </Text>
diff --git a/src/styles/editedLabelStyles/index.js b/src/styles/editedLabelStyles/index.js
deleted file mode 100644
index 172dcc152b74..000000000000
--- a/src/styles/editedLabelStyles/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import display from '../utilities/display';
-
-export default {...display.dInlineFlex};
diff --git a/src/styles/editedLabelStyles/index.native.js b/src/styles/editedLabelStyles/index.native.js
deleted file mode 100644
index ff8b4c56321a..000000000000
--- a/src/styles/editedLabelStyles/index.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.js
index bcef1c6b565f..9e7e4107a937 100644
--- a/src/styles/utilities/display.js
+++ b/src/styles/utilities/display.js
@@ -20,11 +20,6 @@ export default {
     dInline: {
         display: 'inline',
     },
-
-    dInlineFlex: {
-        display: 'inline-flex',
-    },
-
     dBlock: {
         display: 'block',
     },