forked from Expensify/App
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Expensify#37572 from Expensify/revert-36855-ts-mig…
…ration/withFullTransactionOrNotFound-hoc
- Loading branch information
Showing
2 changed files
with
78 additions
and
62 deletions.
There are no files selected for viewing
78 changes: 78 additions & 0 deletions
78
src/pages/iou/request/step/withFullTransactionOrNotFound.js
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,78 @@ | ||
import {useIsFocused} from '@react-navigation/native'; | ||
import lodashGet from 'lodash/get'; | ||
import PropTypes from 'prop-types'; | ||
import React from 'react'; | ||
import {withOnyx} from 'react-native-onyx'; | ||
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; | ||
import transactionPropTypes from '@components/transactionPropTypes'; | ||
import getComponentDisplayName from '@libs/getComponentDisplayName'; | ||
import CONST from '@src/CONST'; | ||
import ONYXKEYS from '@src/ONYXKEYS'; | ||
import IOURequestStepRoutePropTypes from './IOURequestStepRoutePropTypes'; | ||
|
||
const propTypes = { | ||
/** The HOC takes an optional ref as a prop and passes it as a ref to the wrapped component. | ||
* That way, if a ref is passed to a component wrapped in the HOC, the ref is a reference to the wrapped component, not the HOC. */ | ||
forwardedRef: PropTypes.func, | ||
|
||
/** The report corresponding to the reportID in the route params */ | ||
transaction: transactionPropTypes, | ||
|
||
route: IOURequestStepRoutePropTypes.isRequired, | ||
}; | ||
|
||
const defaultProps = { | ||
forwardedRef: () => {}, | ||
transaction: {}, | ||
}; | ||
|
||
export default function (WrappedComponent) { | ||
// eslint-disable-next-line rulesdir/no-negated-variables | ||
function WithFullTransactionOrNotFound({forwardedRef, ...props}) { | ||
const { | ||
transaction: {transactionID}, | ||
} = props; | ||
|
||
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={forwardedRef} | ||
/> | ||
); | ||
} | ||
|
||
WithFullTransactionOrNotFound.propTypes = propTypes; | ||
WithFullTransactionOrNotFound.defaultProps = defaultProps; | ||
WithFullTransactionOrNotFound.displayName = `withFullTransactionOrNotFound(${getComponentDisplayName(WrappedComponent)})`; | ||
|
||
// eslint-disable-next-line rulesdir/no-negated-variables | ||
const WithFullTransactionOrNotFoundWithRef = React.forwardRef((props, ref) => ( | ||
<WithFullTransactionOrNotFound | ||
// eslint-disable-next-line react/jsx-props-no-spreading | ||
{...props} | ||
forwardedRef={ref} | ||
/> | ||
)); | ||
|
||
WithFullTransactionOrNotFoundWithRef.displayName = 'WithFullTransactionOrNotFoundWithRef'; | ||
|
||
return withOnyx({ | ||
transaction: { | ||
key: ({route}) => { | ||
const transactionID = lodashGet(route, 'params.transactionID', 0); | ||
const userAction = lodashGet(route, 'params.action', CONST.IOU.ACTION.CREATE); | ||
return `${userAction === CONST.IOU.ACTION.CREATE ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`; | ||
}, | ||
}, | ||
})(WithFullTransactionOrNotFoundWithRef); | ||
} |
62 changes: 0 additions & 62 deletions
62
src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
This file was deleted.
Oops, something went wrong.