Merge pull request #25557 from cubuspl42/nuke-unused-attachment-previ…

…ew-1 Remove unused attachment placeholder code
Expensify · Sep 29, 2023 · 5b5bdc8 · 5b5bdc8
2 parents 2f53f4f + 38ac505
commit 5b5bdc8
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 38 deletions.
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -606,12 +606,7 @@ function ReportActionItem(props) {
                             draftMessage={props.draftMessage}
                             isChronosReport={ReportUtils.chatIncludesChronos(originalReport)}
                         />
-                        <View
-                            style={StyleUtils.getReportActionItemStyle(
-                                hovered || isWhisper || isContextMenuActive || props.draftMessage,
-                                (props.network.isOffline && props.action.isLoading) || props.action.error,
-                            )}
-                        >
+                        <View style={StyleUtils.getReportActionItemStyle(hovered || isWhisper || isContextMenuActive || props.draftMessage)}>
                             <OfflineWithFeedback
                                 onClose={() => ReportActions.clearReportActionErrors(props.report.reportID, props.action)}
                                 pendingAction={props.draftMessage ? null : props.action.pendingAction}

diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
@@ -1,5 +1,4 @@
 import React, {memo} from 'react';
-import {ActivityIndicator, View} from 'react-native';
 import PropTypes from 'prop-types';
 import Str from 'expensify-common/lib/str';
 import reportActionFragmentPropTypes from './reportActionFragmentPropTypes';
@@ -27,9 +26,6 @@ const propTypes = {
     /** The message fragment needing to be displayed */
     fragment: reportActionFragmentPropTypes.isRequired,
 
-    /** Is this fragment an attachment? */
-    isAttachment: PropTypes.bool,
-
     /** If this fragment is attachment than has info? */
     attachmentInfo: PropTypes.shape({
         /** The file name of attachment */
@@ -48,9 +44,6 @@ const propTypes = {
     /** Message(text) of an IOU report action */
     iouMessage: PropTypes.string,
 
-    /** Does this fragment belong to a reportAction that has not yet loaded? */
-    loading: PropTypes.bool,
-
     /** The reportAction's source */
     source: PropTypes.oneOf(['Chronos', 'email', 'ios', 'android', 'web', 'email', '']),
 
@@ -76,15 +69,13 @@ const propTypes = {
 };
 
 const defaultProps = {
-    isAttachment: false,
     attachmentInfo: {
         name: '',
         size: 0,
         type: '',
         source: '',
     },
     iouMessage: '',
-    loading: false,
     isSingleLine: false,
     source: '',
     style: [],
@@ -96,20 +87,6 @@ const defaultProps = {
 function ReportActionItemFragment(props) {
     switch (props.fragment.type) {
         case 'COMMENT': {
-            // If this is an attachment placeholder, return the placeholder component
-            if (props.isAttachment && props.loading) {
-                return Str.isImage(props.attachmentInfo.name) ? (
-                    <RenderHTML html={`<comment><img src="${props.attachmentInfo.source}" data-expensify-preview-modal-disabled="true"/></comment>`} />
-                ) : (
-                    <View style={[styles.chatItemAttachmentPlaceholder]}>
-                        <ActivityIndicator
-                            size="large"
-                            color={themeColors.textSupporting}
-                            style={[styles.flex1]}
-                        />
-                    </View>
-                );
-            }
             const {html, text} = props.fragment;
             const isPendingDelete = props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && props.network.isOffline;
 

diff --git a/src/pages/home/report/ReportActionItemMessage.js b/src/pages/home/report/ReportActionItemMessage.js
@@ -54,14 +54,12 @@ function ReportActionItemMessage(props) {
                     <ReportActionItemFragment
                         key={`actionFragment-${props.action.reportActionID}-${index}`}
                         fragment={fragment}
-                        isAttachment={props.action.isAttachment}
                         iouMessage={iouMessage}
                         isThreadParentMessage={ReportActionsUtils.isThreadParentMessage(props.action, props.reportID)}
                         attachmentInfo={props.action.attachmentInfo}
                         pendingAction={props.action.pendingAction}
                         source={lodashGet(props.action, 'originalMessage.source')}
                         accountID={props.action.actorAccountID}
-                        loading={props.action.isLoading}
                         style={props.style}
                     />
                 ))

diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
@@ -241,8 +241,6 @@ function ReportActionItemSingle(props) {
                                     key={`person-${props.action.reportActionID}-${index}`}
                                     accountID={actorAccountID}
                                     fragment={fragment}
-                                    isAttachment={props.action.isAttachment}
-                                    isLoading={props.action.isLoading}
                                     delegateAccountID={props.action.delegateAccountID}
                                     isSingleLine
                                     actorIcon={icon}

diff --git a/src/pages/home/report/reportActionPropTypes.js b/src/pages/home/report/reportActionPropTypes.js
@@ -23,9 +23,6 @@ export default {
         IOUTransactionID: PropTypes.string,
     }),
 
-    /** Whether we have received a response back from the server */
-    isLoading: PropTypes.bool,
-
     /** Error message that's come back from the server. */
     error: PropTypes.string,
 

diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts
@@ -577,7 +577,7 @@ function getEmojiPickerStyle(isSmallScreenWidth: boolean): ViewStyle | CSSProper
 /**
  * Generate the styles for the ReportActionItem wrapper view.
  */
-function getReportActionItemStyle(isHovered = false, isLoading = false): ViewStyle | CSSProperties {
+function getReportActionItemStyle(isHovered = false): ViewStyle | CSSProperties {
     // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return {
@@ -587,7 +587,7 @@ function getReportActionItemStyle(isHovered = false, isLoading = false): ViewSty
             ? themeColors.hoverComponentBG
             : // Warning: Setting this to a non-transparent color will cause unread indicator to break on Android
               themeColors.transparent,
-        opacity: isLoading ? 0.5 : 1,
+        opacity: 1,
         ...styles.cursorInitial,
     };
 }