[NO QA] [Distance Tracking] - Add routes for the distance request #65527
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
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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import type SCREENS from '@src/SCREENS'; | ||
| import type {SelectedTabRequest} from '@src/types/onyx'; | ||
| import type {WithWritableReportOrNotFoundProps} from './step/withWritableReportOrNotFound'; | ||
|
|
||
| type DistanceRequestStartPageProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.DISTANCE_CREATE> & { | ||
| // eslint-disable-next-line react/no-unused-prop-types | ||
| defaultSelectedTab: SelectedTabRequest; | ||
| }; | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| function DistanceRequestStartPage(props: DistanceRequestStartPageProps) { | ||
| return null; | ||
| } | ||
|
|
||
| DistanceRequestStartPage.displayName = 'DistanceRequestStartPage'; | ||
|
|
||
| export default DistanceRequestStartPage; |
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 |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ import React, {useEffect} from 'react'; | |
| import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; | ||
| import ScreenWrapper from '@components/ScreenWrapper'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import {generateReportID} from '@libs/ReportUtils'; | ||
| import CONST from '@src/CONST'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import type SCREENS from '@src/SCREENS'; | ||
|
|
@@ -27,13 +27,17 @@ function IOURequestRedirectToStartPage({ | |
| Navigation.dismissModal(); | ||
|
|
||
| // Redirect the person to the right start page using a random reportID | ||
| const optimisticReportID = generateReportID(); | ||
| if (iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE) { | ||
| Navigation.navigate(ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, iouType, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, optimisticReportID)); | ||
| } else if (iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL) { | ||
| Navigation.navigate(ROUTES.MONEY_REQUEST_CREATE_TAB_MANUAL.getRoute(CONST.IOU.ACTION.CREATE, iouType, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, optimisticReportID)); | ||
| } else if (iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN) { | ||
| Navigation.navigate(ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, optimisticReportID)); | ||
| } else if (iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MAP) { | ||
| Navigation.navigate(ROUTES.DISTANCE_REQUEST_CREATE_TAB_MAP.getRoute(CONST.IOU.ACTION.CREATE, iouType, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, optimisticReportID)); | ||
| } else if (iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL) { | ||
| Navigation.navigate(ROUTES.DISTANCE_REQUEST_CREATE_TAB_MANUAL.getRoute(CONST.IOU.ACTION.CREATE, iouType, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, optimisticReportID)); | ||
|
Comment on lines
+37
to
+40
Contributor
There was a problem hiding this comment. @allroundexperts Why did you use Redirect logic here? I can see in docs you created a different component for the same.
Contributor
Author
There was a problem hiding this comment. I created a new component first, but it was a lot of duplicated code. In the end, I decided that adding it in the already existing component would be a better approach.
Contributor
There was a problem hiding this comment. @allroundexperts This approach will cause a problem if I use
Contributor
Author
There was a problem hiding this comment. Not really. It will redirect you to the new page.
Contributor
Author
There was a problem hiding this comment. Unless I am mistaken. But let me know. |
||
| } | ||
|
|
||
| // This useEffect should only run on mount which is why there are no dependencies being passed in the second parameter | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* eslint-disable @typescript-eslint/no-unused-vars */ | ||
| import type {OnyxEntry} from 'react-native-onyx'; | ||
| import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails'; | ||
| import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails'; | ||
| import type SCREENS from '@src/SCREENS'; | ||
| import type Transaction from '@src/types/onyx/Transaction'; | ||
| import withFullTransactionOrNotFound from './withFullTransactionOrNotFound'; | ||
| import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound'; | ||
| import withWritableReportOrNotFound from './withWritableReportOrNotFound'; | ||
|
|
||
| type IOURequestStepDistanceManualProps = WithCurrentUserPersonalDetailsProps & | ||
| WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_DISTANCE_MANUAL | typeof SCREENS.MONEY_REQUEST.DISTANCE_CREATE> & { | ||
| /** The transaction object being modified in Onyx */ | ||
| transaction: OnyxEntry<Transaction>; | ||
| }; | ||
|
|
||
| function IOURequestStepDistanceManual({ | ||
| report, | ||
| route: { | ||
| params: {action, iouType, reportID, transactionID, backTo, backToReport}, | ||
| }, | ||
| transaction, | ||
| currentUserPersonalDetails, | ||
| }: IOURequestStepDistanceManualProps) { | ||
| return null; | ||
| } | ||
|
|
||
| IOURequestStepDistanceManual.displayName = 'IOURequestStepDistanceManual'; | ||
|
|
||
| const IOURequestStepDistanceManualWithOnyx = IOURequestStepDistanceManual; | ||
|
|
||
| const IOURequestStepDistanceManualWithCurrentUserPersonalDetails = withCurrentUserPersonalDetails(IOURequestStepDistanceManualWithOnyx); | ||
| // eslint-disable-next-line rulesdir/no-negated-variables | ||
| const IOURequestStepDistanceManualWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDistanceManualWithCurrentUserPersonalDetails, true); | ||
| // eslint-disable-next-line rulesdir/no-negated-variables | ||
| const IOURequestStepDistanceManualWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDistanceManualWithWritableReportOrNotFound); | ||
|
|
||
| export default IOURequestStepDistanceManualWithFullTransactionOrNotFound; |
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.
Why do we have 3 distance request types now? Can we just have distance and distance-manual please? 'distance' can imply map, for the sake of simplicity and backwards compatibility.
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.
We need a different name here because we want to treat this differently then the already existing flow. As an example, check this. If we use the same name, we'd be redirecting the user to the old flow.
I also think that since we'll be removing the old flow, this naming convention makes more sense. We are prefixing our current flows with
MONEY_REQUEST_. Since the distance flow has two sub flows, prefixing those withDISTANCE_would be better.