Merge pull request #3132 from Expensify/main

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001005206
-        versionName "1.0.52-6"
+        versionCode 1001005300
+        versionName "1.0.53-0"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.52</string>
+	<string>1.0.53</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.52.6</string>
+	<string>1.0.53.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.52</string>
+	<string>1.0.53</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.52.6</string>
+	<string>1.0.53.0</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.52-6",
+  "version": "1.0.53-0",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/pages/iou/IOUDetailsModal.js

@@ -14,7 +14,6 @@ import ScreenWrapper from '../../components/ScreenWrapper';
 import {payIOUReport} from '../../libs/actions/IOU';
 import {fetchIOUReportByID} from '../../libs/actions/Report';
 import ReportActionItemIOUPreview from '../../components/ReportActionItemIOUPreview';
-import iouTransactionPropTypes from './iouTransactionPropTypes';
 import IOUTransactions from './IOUTransactions';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
@@ -53,9 +52,6 @@ const propTypes = {
         /** Owner is the person who is owed money */
         ownerEmail: PropTypes.string,
 
-        /** The IOU transactions */
-        transactions: PropTypes.arrayOf(PropTypes.shape(iouTransactionPropTypes)),
-
         /** Does the report have an outstanding IOU that needs to be paid? */
         hasOutstandingIOU: PropTypes.bool,
     }).isRequired,
@@ -116,7 +112,6 @@ class IOUDetailsModal extends Component {
                             <IOUTransactions
                                 chatReportID={Number(this.props.route.params.chatReportID)}
                                 iouReportID={Number(this.props.route.params.iouReportID)}
-                                transactions={this.props.iouReport.transactions}
                                 hasOutstandingIOU={this.props.iouReport.hasOutstandingIOU}
                             />
                         </ScrollView>

src/pages/iou/IOUTransactions.js

@@ -1,12 +1,11 @@
-import React, {Component} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import styles from '../../styles/styles';
 import ONYXKEYS from '../../ONYXKEYS';
 import ReportActionPropTypes from '../home/report/ReportActionPropTypes';
-import iouTransactionPropTypes from './iouTransactionPropTypes';
 import ReportTransaction from '../../components/ReportTransaction';
 
 const propTypes = {
@@ -18,65 +17,33 @@ const propTypes = {
 
     /** ReportID for the associated IOU report */
     iouReportID: PropTypes.number.isRequired,
-
-    /** Transactions for this IOU report */
-    transactions: PropTypes.arrayOf(PropTypes.shape(iouTransactionPropTypes)),
 };
 
 const defaultProps = {
     reportActions: {},
-    transactions: [],
 };
 
-class IOUTransactions extends Component {
-    constructor(props) {
-        super(props);
-
-        this.getActionForTransaction = this.getActionForTransaction.bind(this);
-    }
-
-    /**
-     * Given a transaction from an IOU Report, returns the chatReport action with a matching transactionID. Unless
-     * something has gone wrong with our storing logic, there should always exist an action for each transaction.
-     *
-     * @param {Object} transaction
-     * @returns {Object} action
-     */
-    getActionForTransaction(transaction) {
-        const matchedAction = _.find(this.props.reportActions, (action) => {
-            // iouReport.transaction.transactionID is returned as a String, but the originalMessage value is Number
-            if (action && action.originalMessage && action.originalMessage.IOUTransactionID
-                && action.originalMessage.IOUTransactionID.toString() === transaction.transactionID) {
-                return action;
+const IOUTransactions = ({
+    reportActions,
+    chatReportID,
+    iouReportID,
+}) => (
+    <View style={[styles.mt3]}>
+        {_.map(reportActions, (reportAction) => {
+            if (reportAction.actionName === 'IOU'
+                && reportAction.originalMessage.IOUReportID === iouReportID) {
+                return (
+                    <ReportTransaction
+                        chatReportID={chatReportID}
+                        iouReportID={iouReportID}
+                        action={reportAction}
+                        key={reportAction.sequenceNumber}
+                    />
+                );
             }
-            return false;
-        });
-        if (!matchedAction) {
-            throw new Error(`Unable to locate a matching report action for transaction ${transaction.transactionID}!`);
-        }
-
-        return matchedAction;
-    }
-
-    render() {
-        return (
-            <View style={[styles.mt3]}>
-                {/* For each IOU transaction, get the matching report action */}
-                {_.map(this.props.transactions, (transaction) => {
-                    const action = this.getActionForTransaction(transaction);
-                    return (
-                        <ReportTransaction
-                            chatReportID={this.props.chatReportID}
-                            iouReportID={this.props.iouReportID}
-                            action={action}
-                            key={action.originalMessage.IOUTransactionID}
-                        />
-                    );
-                })}
-            </View>
-        );
-    }
-}
+        })}
+    </View>
+);
 
 IOUTransactions.defaultProps = defaultProps;
 IOUTransactions.propTypes = propTypes;