-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[TS migration] Migrate withFullTransactionOrNotFound HOC #36855
Merged
tylerkaraszewski
merged 2 commits into
Expensify:main
from
ruben-rebelo:ts-migration/withFullTransactionOrNotFound-hoc
Feb 29, 2024
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
78 changes: 0 additions & 78 deletions
78
src/pages/iou/request/step/withFullTransactionOrNotFound.js
This file was deleted.
Oops, something went wrong.
62 changes: 62 additions & 0 deletions
62
src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
This file contains 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 |
---|---|---|
@@ -0,0 +1,62 @@ | ||
import {useIsFocused} from '@react-navigation/native'; | ||
import type {StackScreenProps} from '@react-navigation/stack'; | ||
import type {ComponentType, ForwardedRef, RefAttributes} from 'react'; | ||
import React, {forwardRef} from 'react'; | ||
import type {OnyxEntry} from 'react-native-onyx'; | ||
import {withOnyx} from 'react-native-onyx'; | ||
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; | ||
import getComponentDisplayName from '@libs/getComponentDisplayName'; | ||
import type {MoneyRequestNavigatorParamList} from '@libs/Navigation/types'; | ||
import CONST from '@src/CONST'; | ||
import ONYXKEYS from '@src/ONYXKEYS'; | ||
import type SCREENS from '@src/SCREENS'; | ||
import type {Transaction} from '@src/types/onyx'; | ||
|
||
type WithFullTransactionOrNotFoundOnyxProps = { | ||
/** Indicated whether the report data is loading */ | ||
transaction: OnyxEntry<Transaction>; | ||
}; | ||
|
||
type WithFullTransactionOrNotFoundProps = WithFullTransactionOrNotFoundOnyxProps & StackScreenProps<MoneyRequestNavigatorParamList, typeof SCREENS.MONEY_REQUEST.STEP_DATE>; | ||
|
||
export default function <TProps extends WithFullTransactionOrNotFoundProps, TRef>(WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>) { | ||
// eslint-disable-next-line rulesdir/no-negated-variables | ||
function WithFullTransactionOrNotFound(props: TProps, ref: ForwardedRef<TRef>) { | ||
const transactionID = props.transaction?.transactionID; | ||
|
||
const isFocused = useIsFocused(); | ||
|
||
// If the transaction does not have a transactionID, then the transaction no longer exists in Onyx as a full transaction and the not-found page should be shown. | ||
// In addition, the not-found page should be shown only if the component screen's route is active (i.e. is focused). | ||
// This is to prevent it from showing when the modal is being dismissed while navigating to a different route (e.g. on requesting money). | ||
if (!transactionID) { | ||
return <FullPageNotFoundView shouldShow={isFocused} />; | ||
} | ||
|
||
return ( | ||
<WrappedComponent | ||
// eslint-disable-next-line react/jsx-props-no-spreading | ||
{...props} | ||
ref={ref} | ||
/> | ||
); | ||
} | ||
|
||
WithFullTransactionOrNotFound.displayName = `withFullTransactionOrNotFound(${getComponentDisplayName(WrappedComponent)})`; | ||
|
||
return withOnyx<TProps & RefAttributes<TRef>, WithFullTransactionOrNotFoundOnyxProps>({ | ||
transaction: { | ||
key: ({route}) => { | ||
const transactionID = route.params.transactionID ?? 0; | ||
const userAction = route.params.action ?? CONST.IOU.ACTION.CREATE; | ||
|
||
if (userAction === CONST.IOU.ACTION.CREATE) { | ||
return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`; | ||
} | ||
return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`; | ||
}, | ||
}, | ||
})(forwardRef(WithFullTransactionOrNotFound)); | ||
} | ||
|
||
export type {WithFullTransactionOrNotFoundProps}; |
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.
Also, let's export the type (it will be used in the future)