Merge pull request #3674 from Expensify/jules-refactorIOUReportAction…

…Components Refactor IOU Components to /ReportActionItem folder & rename
Expensify · Jun 18, 2021 · 7931eea · 7931eea
2 parents 54c082c + fd8edfb
commit 7931eea
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git a/src/components/ReportActionItemIOUAction.js → src/components/ReportActionItem/IOUAction.js b/src/components/ReportActionItemIOUAction.js → src/components/ReportActionItem/IOUAction.js
@@ -1,12 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import ONYXKEYS from '../ONYXKEYS';
-import ReportActionItemIOUQuote from './ReportActionItemIOUQuote';
-import ReportActionPropTypes from '../pages/home/report/ReportActionPropTypes';
-import ReportActionItemIOUPreview from './ReportActionItemIOUPreview';
-import Navigation from '../libs/Navigation/Navigation';
-import ROUTES from '../ROUTES';
+import ONYXKEYS from '../../ONYXKEYS';
+import IOUQuote from './IOUQuote';
+import ReportActionPropTypes from '../../pages/home/report/ReportActionPropTypes';
+import IOUPreview from './IOUPreview';
+import Navigation from '../../libs/Navigation/Navigation';
+import ROUTES from '../../ROUTES';
 
 const propTypes = {
     /** All the data of the action */
@@ -32,7 +32,7 @@ const defaultProps = {
     },
 };
 
-const ReportActionItemIOUAction = ({
+const IOUAction = ({
     action,
     chatReportID,
     isMostRecentIOUReportAction,
@@ -42,13 +42,13 @@ const ReportActionItemIOUAction = ({
     };
     return (
         <>
-            <ReportActionItemIOUQuote
+            <IOUQuote
                 action={action}
                 shouldShowViewDetailsLink={Boolean(action.originalMessage.IOUReportID)}
                 onViewDetailsPressed={launchDetailsModal}
             />
             {isMostRecentIOUReportAction && Boolean(action.originalMessage.IOUReportID) && (
-                <ReportActionItemIOUPreview
+                <IOUPreview
                     iouReportID={action.originalMessage.IOUReportID}
                     chatReportID={chatReportID}
                     onPayButtonPressed={launchDetailsModal}
@@ -59,12 +59,12 @@ const ReportActionItemIOUAction = ({
     );
 };
 
-ReportActionItemIOUAction.propTypes = propTypes;
-ReportActionItemIOUAction.defaultProps = defaultProps;
-ReportActionItemIOUAction.displayName = 'ReportActionItemIOUAction';
+IOUAction.propTypes = propTypes;
+IOUAction.defaultProps = defaultProps;
+IOUAction.displayName = 'IOUAction';
 
 export default withOnyx({
     chatReport: {
         key: ({chatReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`,
     },
-})(ReportActionItemIOUAction);
+})(IOUAction);
diff --git a/src/components/ReportActionItemIOUPreview.js → ...components/ReportActionItem/IOUPreview.js b/src/components/ReportActionItemIOUPreview.js → ...components/ReportActionItem/IOUPreview.js
@@ -11,16 +11,16 @@ import Str from 'expensify-common/lib/str';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
-import compose from '../libs/compose';
-import styles from '../styles/styles';
-import ONYXKEYS from '../ONYXKEYS';
-import MultipleAvatars from './MultipleAvatars';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
-import {fetchIOUReportByID} from '../libs/actions/Report';
-import themeColors from '../styles/themes/default';
-import Icon from './Icon';
-import CONST from '../CONST';
-import {Checkmark} from './Icon/Expensicons';
+import compose from '../../libs/compose';
+import styles from '../../styles/styles';
+import ONYXKEYS from '../../ONYXKEYS';
+import MultipleAvatars from '../MultipleAvatars';
+import withLocalize, {withLocalizePropTypes} from '../withLocalize';
+import {fetchIOUReportByID} from '../../libs/actions/Report';
+import themeColors from '../../styles/themes/default';
+import Icon from '../Icon';
+import CONST from '../../CONST';
+import {Checkmark} from '../Icon/Expensicons';
 
 const propTypes = {
     /** Additional logic for displaying the pay button */
@@ -74,7 +74,7 @@ const defaultProps = {
     onPayButtonPressed: null,
 };
 
-const ReportActionItemIOUPreview = ({
+const IOUPreview = ({
     iouReportID,
     chatReportID,
     iouReport,
@@ -167,9 +167,9 @@ const ReportActionItemIOUPreview = ({
     );
 };
 
-ReportActionItemIOUPreview.propTypes = propTypes;
-ReportActionItemIOUPreview.defaultProps = defaultProps;
-ReportActionItemIOUPreview.displayName = 'ReportActionItemIOUPreview';
+IOUPreview.propTypes = propTypes;
+IOUPreview.defaultProps = defaultProps;
+IOUPreview.displayName = 'IOUPreview';
 
 export default compose(
     withLocalize,
@@ -184,4 +184,4 @@ export default compose(
             key: ONYXKEYS.SESSION,
         },
     }),
-)(ReportActionItemIOUPreview);
+)(IOUPreview);
diff --git a/src/components/ReportActionItemIOUQuote.js → src/components/ReportActionItem/IOUQuote.js b/src/components/ReportActionItemIOUQuote.js → src/components/ReportActionItem/IOUQuote.js
@@ -2,9 +2,9 @@ import React from 'react';
 import {View, Text} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
-import styles from '../styles/styles';
-import ReportActionPropTypes from '../pages/home/report/ReportActionPropTypes';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import styles from '../../styles/styles';
+import ReportActionPropTypes from '../../pages/home/report/ReportActionPropTypes';
+import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 
 const propTypes = {
     /** All the data of the action */
@@ -24,7 +24,7 @@ const defaultProps = {
     onViewDetailsPressed: () => {},
 };
 
-const ReportActionItemIOUQuote = ({
+const IOUQuote = ({
     action,
     shouldShowViewDetailsLink,
     onViewDetailsPressed,
@@ -51,8 +51,8 @@ const ReportActionItemIOUQuote = ({
     </View>
 );
 
-ReportActionItemIOUQuote.propTypes = propTypes;
-ReportActionItemIOUQuote.defaultProps = defaultProps;
-ReportActionItemIOUQuote.displayName = 'ReportActionItemIOUQuote';
+IOUQuote.propTypes = propTypes;
+IOUQuote.defaultProps = defaultProps;
+IOUQuote.displayName = 'IOUQuote';
 
-export default withLocalize(ReportActionItemIOUQuote);
+export default withLocalize(IOUQuote);
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -16,7 +16,7 @@ import PopoverWithMeasuredContent from '../../../components/PopoverWithMeasuredC
 import ReportActionItemSingle from './ReportActionItemSingle';
 import ReportActionItemGrouped from './ReportActionItemGrouped';
 import ReportActionContextMenu from './ReportActionContextMenu';
-import ReportActionItemIOUAction from '../../../components/ReportActionItemIOUAction';
+import IOUAction from '../../../components/ReportActionItem/IOUAction';
 import ReportActionItemMessage from './ReportActionItemMessage';
 import UnreadActionIndicator from '../../../components/UnreadActionIndicator';
 import ReportActionItemMessageEdit from './ReportActionItemMessageEdit';
@@ -205,7 +205,7 @@ class ReportActionItem extends Component {
         let children;
         if (this.props.action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {
             children = (
-                <ReportActionItemIOUAction
+                <IOUAction
                     chatReportID={this.props.reportID}
                     action={this.props.action}
                     isMostRecentIOUReportAction={this.props.isMostRecentIOUReportAction}

diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js
@@ -13,7 +13,7 @@ import ButtonWithDropdown from '../../components/ButtonWithDropdown';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import {payIOUReport} from '../../libs/actions/IOU';
 import {fetchIOUReportByID} from '../../libs/actions/Report';
-import ReportActionItemIOUPreview from '../../components/ReportActionItemIOUPreview';
+import IOUPreview from '../../components/ReportActionItem/IOUPreview';
 import IOUTransactions from './IOUTransactions';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
@@ -214,7 +214,7 @@ class IOUDetailsModal extends Component {
                 {reportIsLoading ? <ActivityIndicator color={themeColors.text} /> : (
                     <View style={[styles.flex1, styles.justifyContentBetween]}>
                         <ScrollView contentContainerStyle={styles.iouDetailsContainer}>
-                            <ReportActionItemIOUPreview
+                            <IOUPreview
                                 iou={this.props.iouReport}
                                 chatReportID={Number(this.props.route.params.chatReportID)}
                                 iouReportID={Number(this.props.route.params.iouReportID)}