Merge pull request #18360 from Expensify/revert-17704-fix-15194

(cherry picked from commit 40248ae)
Expensify · May 3, 2023 · 85fac10 · 85fac10
1 parent 7d78c73
commit 85fac10
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/src/styles/editedLabelStyles/index.native.js b/src/styles/editedLabelStyles/index.native.js
diff --git 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',
     },