Skip to content
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.

Sign up for GitHub

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 to TypeScript #39582

Merged
merged 8 commits into from
Apr 8, 2024
Merged

[TS migration] Migrate withFullTransactionOrNotFound HOC to TypeScript #39582

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a9a0966
Revert "Revert "[TS migration] Migrate withFullTransactionOrNotFound …
ruben-rebelo Apr 4, 2024
f545592
[TS migration][withFullTransactionOrNotFound] Fixed route type
ruben-rebelo Apr 4, 2024
4073384
Merge branch 'main' into ts-migration/withFullTransactionOrNotFound-hoc
ruben-rebelo Apr 5, 2024
9573099
Merge branch 'main' into ts-migration/withFullTransactionOrNotFound-hoc
ruben-rebelo Apr 8, 2024
03adbba
[TS migration] Fixes new screen type
ruben-rebelo Apr 8, 2024
0dbb59c
[TS migration] Added Tax rate type on withFullTransactionOrNotFound HOC
ruben-rebelo Apr 8, 2024
3e8d6c2
Merge branch 'main' into ts-migration/withFullTransactionOrNotFound-hoc
ruben-rebelo Apr 8, 2024
828413f
Merge branch 'main' into ts-migration/withFullTransactionOrNotFound-hoc
ruben-rebelo Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ type WithFullTransactionOrNotFoundOnyxProps = {
transaction: OnyxEntry<Transaction>;
};

type Route = RouteProp<MoneyRequestNavigatorParamList, typeof SCREENS.MONEY_REQUEST.STEP_WAYPOINT>;
type MoneyRequestRouteName = typeof SCREENS.MONEY_REQUEST.STEP_WAYPOINT | typeof SCREENS.MONEY_REQUEST.STEP_DESCRIPTION;

type WithFullTransactionOrNotFoundProps = WithFullTransactionOrNotFoundOnyxProps & {route: Route};
type Route<T extends MoneyRequestRouteName> = RouteProp<MoneyRequestNavigatorParamList, T>;

export default function <TProps extends WithFullTransactionOrNotFoundProps, TRef>(WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>) {
type WithFullTransactionOrNotFoundProps<T extends MoneyRequestRouteName> = WithFullTransactionOrNotFoundOnyxProps & {route: Route<T>};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any benefits of using generics here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added this generic based on withWritableReportOrNotFound HOC, both of this HOC uses generic Route props based on MoneyRequestParamList, depending on the Screen where this is called the Route prop changes.


export default function <TProps extends WithFullTransactionOrNotFoundProps<MoneyRequestRouteName>, 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;
Expand Down
Loading