Create super wide RHP modal to display expense reports when accessed via Reports page or report previews #73731
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,23 @@ | ||
| import {PortalHost} from '@gorhom/portal'; | ||
| import React, {useCallback, useMemo} from 'react'; | ||
| // We use Animated for all functionality related to wide RHP to make it easier | ||
| // to interact with react-navigation components (e.g., CardContainer, interpolator), which also use Animated. | ||
| // eslint-disable-next-line no-restricted-imports | ||
| import {Animated, InteractionManager, ScrollView, View} from 'react-native'; | ||
| import type {OnyxEntry} from 'react-native-onyx'; | ||
| import HeaderGap from '@components/HeaderGap'; | ||
| import MoneyReportHeader from '@components/MoneyReportHeader'; | ||
| import MoneyRequestHeader from '@components/MoneyRequestHeader'; | ||
| import OfflineWithFeedback from '@components/OfflineWithFeedback'; | ||
| import MoneyRequestReceiptView from '@components/ReportActionItem/MoneyRequestReceiptView'; | ||
| import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView'; | ||
| import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView'; | ||
| import useNetwork from '@hooks/useNetwork'; | ||
| import useNewTransactions from '@hooks/useNewTransactions'; | ||
| import useOnyx from '@hooks/useOnyx'; | ||
| import usePaginatedReportActions from '@hooks/usePaginatedReportActions'; | ||
| import useParentReportAction from '@hooks/useParentReportAction'; | ||
| import useResponsiveLayout from '@hooks/useResponsiveLayout'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport'; | ||
| import {removeFailedReport} from '@libs/actions/Report'; | ||
|
|
@@ -56,6 +61,16 @@ function goBackFromSearchMoneyRequest() { | |
| const rootState = navigationRef.getRootState(); | ||
| const lastRoute = rootState.routes.at(-1); | ||
|
|
||
| if (!lastRoute) { | ||
| Log.hmmm('[goBackFromSearchMoneyRequest()] No last route found in root state.'); | ||
| return; | ||
| } | ||
|
|
||
| if (lastRoute?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) { | ||
| Navigation.goBack(); | ||
| return; | ||
| } | ||
|
|
||
| if (lastRoute?.name !== NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR) { | ||
| Log.hmmm('[goBackFromSearchMoneyRequest()] goBackFromSearchMoneyRequest was called from a different navigator than SearchFullscreenNavigator.'); | ||
| return; | ||
|
|
@@ -84,6 +99,10 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe | |
| const styles = useThemeStyles(); | ||
| const {isOffline} = useNetwork(); | ||
|
|
||
| // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth | ||
| const {isSmallScreenWidth} = useResponsiveLayout(); | ||
|
|
||
| const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: false}); | ||
| const reportID = report?.reportID; | ||
| const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true}); | ||
| const [isComposerFullSize = false] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${reportID}`, {canBeMissing: true}); | ||
|
|
@@ -129,6 +148,9 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe | |
| const isEmptyTransactionReport = visibleTransactions && visibleTransactions.length === 0 && transactionThreadReportID === undefined; | ||
| const shouldDisplayMoneyRequestActionsList = !!isEmptyTransactionReport || shouldDisplayReportTableView(report, visibleTransactions ?? []); | ||
|
|
||
| const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`, {canBeMissing: true}); | ||
| const shouldShowWideRHPReceipt = visibleTransactions.length === 1 && !isSmallScreenWidth && !!transactionThreadReport; | ||
|
|
||
| const reportHeaderView = useMemo( | ||
| () => | ||
| isTransactionThreadView ? ( | ||
|
|
@@ -211,47 +233,61 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe | |
| > | ||
| <HeaderGap /> | ||
| {reportHeaderView} | ||
| <View style={[styles.flex1, styles.flexRow]}> | ||
| {shouldShowWideRHPReceipt && ( | ||
| <Animated.View style={styles.wideRHPMoneyRequestReceiptViewContainer}> | ||
| <ScrollView contentContainerStyle={styles.wideRHPMoneyRequestReceiptViewScrollViewContainer}> | ||
| <MoneyRequestReceiptView | ||
| allReports={allReports} | ||
|
Contributor
There was a problem hiding this comment. Unrelated, but I dont understand why this component should be getting full reports collection
Contributor
There was a problem hiding this comment. the components needs parent and chat report so we could have just passed the two, I believe @adamgrzybowski is in blame so ideally SWM can take a look at this |
||
| report={transactionThreadReport} | ||
| fillSpace | ||
| isDisplayedInWideRHP | ||
| /> | ||
| </ScrollView> | ||
| </Animated.View> | ||
| )} | ||
| <View style={[[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]]}> | ||
| {shouldDisplayMoneyRequestActionsList ? ( | ||
| <MoneyRequestReportActionsList | ||
| report={report} | ||
| policy={policy} | ||
| transactions={visibleTransactions} | ||
| hasPendingDeletionTransaction={hasPendingDeletionTransaction} | ||
| newTransactions={newTransactions} | ||
| reportActions={reportActions} | ||
| violations={allReportViolations} | ||
| hasOlderActions={hasOlderActions} | ||
| hasNewerActions={hasNewerActions} | ||
| showReportActionsLoadingState={isLoadingInitialReportActions && !reportMetadata?.hasOnceLoadedReportActions} | ||
| /> | ||
| ) : ( | ||
| <ReportActionsView | ||
| report={report} | ||
| reportActions={reportActions} | ||
| isLoadingInitialReportActions={reportMetadata?.isLoadingInitialReportActions} | ||
| hasNewerActions={hasNewerActions} | ||
| hasOlderActions={hasOlderActions} | ||
| parentReportAction={parentReportAction} | ||
| transactionThreadReportID={transactionThreadReportID} | ||
| /> | ||
| )} | ||
| {shouldDisplayReportFooter ? ( | ||
| <> | ||
| <ReportFooter | ||
| report={report} | ||
| reportMetadata={reportMetadata} | ||
| policy={policy} | ||
| pendingAction={reportPendingAction} | ||
| isComposerFullSize={!!isComposerFullSize} | ||
| lastReportAction={lastReportAction} | ||
| reportTransactions={transactions} | ||
| // If the report is from the 'Send Money' flow, we add the comment to the `iou` report because for these we don't combine reportActions even if there is a single transaction (they always have a single transaction) | ||
| transactionThreadReportID={isSentMoneyReport ? undefined : transactionThreadReportID} | ||
| /> | ||
| <PortalHost name="suggestions" /> | ||
| </> | ||
| ) : null} | ||
| </View> | ||
| </View> | ||
| </OfflineWithFeedback> | ||
| </View> | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I feel like this should be abstracted out