fix: resolve conflicts

Expensify · Oct 19, 2023 · 17cae03 · 17cae03
1 parent 0e91db8
commit 17cae03
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 32 deletions.
diff --git a/src/components/ReportActionItem/MoneyReportView.js b/src/components/ReportActionItem/MoneyReportView.js
@@ -44,34 +44,32 @@ function MoneyReportView(props) {
         <View style={[StyleUtils.getReportWelcomeContainerStyle(props.isSmallScreenWidth), StyleUtils.getMinimumHeight(CONST.EMPTY_STATE_BACKGROUND.MONEY_REPORT.MIN_HEIGHT)]}>
             <AnimatedEmptyStateBackground />
             <View style={[StyleUtils.getReportWelcomeTopMarginStyle(props.isSmallScreenWidth)]}>
-                <View style={[styles.flex1, styles.justifyContentCenter]}>
-                    <Text
-                        style={[styles.textLabelSupporting]}
-                        numberOfLines={1}
-                    >
-                        {translate('common.total')}
-                    </Text>
-                </View>
-                <View style={[styles.flexRow, styles.justifyContentCenter]}>
-                    {isSettled && (
-                        <View style={[styles.defaultCheckmarkWrapper, styles.mh2]}>
-                            <Icon
-                                src={Expensicons.Checkmark}
-                                fill={themeColors.success}
-                            />
-                        </View>
-                    )}
-                    <Text
-                        numberOfLines={1}
-                        style={[styles.taskTitleMenuItem, styles.alignSelfCenter]}
-                    >
-                        {formattedTotalAmount}
-                    </Text>
+                <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv2]}>
+                    <View style={[styles.flex1, styles.justifyContentCenter]}>
+                        <Text
+                            style={[styles.textLabelSupporting]}
+                            numberOfLines={1}
+                        >
+                            {translate('common.total')}
+                        </Text>
+                    </View>
+                    <View style={[styles.flexRow, styles.justifyContentCenter]}>
+                        {isSettled && (
+                            <View style={[styles.defaultCheckmarkWrapper, styles.mh2]}>
+                                <Icon
+                                    src={Expensicons.Checkmark}
+                                    fill={themeColors.success}
+                                />
+                            </View>
+                        )}
+                        <Text
+                            numberOfLines={1}
+                            style={[styles.taskTitleMenuItem, styles.alignSelfCenter]}
+                        >
+                            {formattedTotalAmount}
+                        </Text>
+                    </View>
                 </View>
-                <SpacerView
-                    shouldShow={props.shouldShowHorizontalRule}
-                    style={[props.shouldShowHorizontalRule ? styles.reportHorizontalRule : {}]}
-                />
             </View>
             {shouldShowBreakdown ? (
                 <>

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
@@ -159,7 +159,7 @@ function MoneyRequestView({report, betas, parentReport, policyCategories, should
     const getPendingFieldAction = (fieldPath) => lodashGet(transaction, fieldPath) || pendingAction;
 
     return (
-        <View style={StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)}>
+        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)]}>
             <AnimatedEmptyStateBackground />
             <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
                 {hasReceipt && (
@@ -168,6 +168,7 @@ function MoneyRequestView({report, betas, parentReport, policyCategories, should
                             <ReportActionItemImage
                                 thumbnail={receiptURIs.thumbnail}
                                 image={receiptURIs.image}
+                                transaction={transaction}
                                 enablePreviewModal
                             />
                         </View>
@@ -281,11 +282,11 @@ function MoneyRequestView({report, betas, parentReport, policyCategories, should
                         />
                     </View>
                 )}
-                <SpacerView
-                    shouldShow={shouldShowHorizontalRule}
-                    style={[shouldShowHorizontalRule ? styles.reportHorizontalRule : {}]}
-                />
             </View>
+            <SpacerView
+                shouldShow={shouldShowHorizontalRule}
+                style={[shouldShowHorizontalRule ? styles.reportHorizontalRule : {}]}
+            />
         </View>
     );
 }