Skip to content

Commit 643a313

Browse files
tgolentgolen
authored
Merge pull request #78004 from shubham1206agra/refactor-iou-currency
Refactored IOU currency to use modal structure (attempt 2)
2 parents 99bf5f4 + 9be0224 commit 643a313

File tree

12 files changed

+154
-228
lines changed

12 files changed

+154
-228
lines changed

‎src/ROUTES.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,12 +1132,6 @@ const ROUTES = {
11321132
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
11331133
getUrlWithBackToParam(`settings/${policyID}/category/${encodeURIComponent(categoryName)}/gl-code` as const, backTo),
11341134
},
1135-
MONEY_REQUEST_STEP_CURRENCY: {
1136-
route: ':action/:iouType/currency/:transactionID/:reportID/:pageIndex?',
1137-
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, pageIndex = '', currency = '', backTo = '') =>
1138-
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
1139-
getUrlWithBackToParam(`${action as string}/${iouType as string}/currency/${transactionID}/${reportID}/${pageIndex}?currency=${currency}`, backTo),
1140-
},
11411135
MONEY_REQUEST_STEP_DATE: {
11421136
route: ':action/:iouType/date/:transactionID/:reportID/:reportActionID?',
11431137
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '', reportActionID?: string) => {

‎src/SCREENS.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ const SCREENS = {
291291
STEP_UPGRADE: 'Money_Request_Step_Upgrade',
292292
STEP_AMOUNT: 'Money_Request_Step_Amount',
293293
STEP_CATEGORY: 'Money_Request_Step_Category',
294-
STEP_CURRENCY: 'Money_Request_Step_Currency',
295294
STEP_DATE: 'Money_Request_Step_Date',
296295
STEP_DESCRIPTION: 'Money_Request_Step_Description',
297296
STEP_DISTANCE: 'Money_Request_Step_Distance',

‎src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator<MoneyRequestNa
144144
[SCREENS.MONEY_REQUEST.STEP_TAX_AMOUNT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepTaxAmountPage').default,
145145
[SCREENS.MONEY_REQUEST.STEP_TAX_RATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepTaxRatePage').default,
146146
[SCREENS.MONEY_REQUEST.STEP_CATEGORY]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepCategory').default,
147-
[SCREENS.MONEY_REQUEST.STEP_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepCurrency').default,
148147
[SCREENS.MONEY_REQUEST.STEP_DATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepDate').default,
149148
[SCREENS.MONEY_REQUEST.STEP_DESCRIPTION]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepDescription').default,
150149
[SCREENS.MONEY_REQUEST.STEP_DISTANCE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepDistance').default,

‎src/libs/Navigation/linkingConfig/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,6 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
14611461
[SCREENS.MONEY_REQUEST.STEP_CATEGORY]: ROUTES.MONEY_REQUEST_STEP_CATEGORY.route,
14621462
[SCREENS.MONEY_REQUEST.STEP_CONFIRMATION]: ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.route,
14631463
[SCREENS.MONEY_REQUEST.STEP_CONFIRMATION_VERIFY_ACCOUNT]: ROUTES.MONEY_REQUEST_STEP_CONFIRMATION_VERIFY_ACCOUNT.route,
1464-
[SCREENS.MONEY_REQUEST.STEP_CURRENCY]: ROUTES.MONEY_REQUEST_STEP_CURRENCY.route,
14651464
[SCREENS.MONEY_REQUEST.STEP_DATE]: ROUTES.MONEY_REQUEST_STEP_DATE.route,
14661465
[SCREENS.MONEY_REQUEST.STEP_DESCRIPTION]: ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.route,
14671466
[SCREENS.MONEY_REQUEST.STEP_DISTANCE]: ROUTES.MONEY_REQUEST_STEP_DISTANCE.route,

‎src/libs/Navigation/types.ts‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,6 @@ type MoneyRequestNavigatorParamList = {
16411641
reportID: string;
16421642
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
16431643
backTo: Routes;
1644-
currency?: string;
16451644
};
16461645
[SCREENS.MONEY_REQUEST.STEP_TAG]: {
16471646
action: IOUAction;
@@ -1731,7 +1730,6 @@ type MoneyRequestNavigatorParamList = {
17311730
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
17321731
backTo: never;
17331732
action: never;
1734-
currency: never;
17351733
pageIndex?: string;
17361734
backToReport?: string;
17371735
reportActionID?: string;
@@ -1750,7 +1748,6 @@ type MoneyRequestNavigatorParamList = {
17501748
backTo: Routes;
17511749
action: IOUAction;
17521750
pageIndex?: string;
1753-
currency?: string;
17541751
backToReport?: string;
17551752
reportActionID?: string;
17561753
};
@@ -1795,16 +1792,6 @@ type MoneyRequestNavigatorParamList = {
17951792
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
17961793
backTo: Routes;
17971794
};
1798-
[SCREENS.MONEY_REQUEST.STEP_CURRENCY]: {
1799-
action: IOUAction;
1800-
iouType: IOUType;
1801-
transactionID: string;
1802-
reportID: string;
1803-
pageIndex?: string;
1804-
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
1805-
backTo?: Routes;
1806-
currency?: string;
1807-
};
18081795
[SCREENS.MONEY_REQUEST.HOLD]: {
18091796
/** ID of the transaction the page was opened for */
18101797
transactionID: string;
@@ -1916,7 +1903,6 @@ type MoneyRequestNavigatorParamList = {
19161903
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
19171904
backTo: never;
19181905
action: never;
1919-
currency: never;
19201906
pageIndex?: string;
19211907
backToReport?: string;
19221908
reportActionID?: string;

‎src/pages/iou/request/DistanceRequestStartPage.tsx‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,27 +98,6 @@ function DistanceRequestStartPage({
9898
Navigation.closeRHPFlow();
9999
};
100100

101-
// This useEffect is used to initialize the money request, so that currency will be reset to default currency on page reload.
102-
useEffect(() => {
103-
if (transaction?.amount !== 0) {
104-
return;
105-
}
106-
initMoneyRequest({
107-
reportID,
108-
policy,
109-
isFromGlobalCreate,
110-
currentIouRequestType: transaction?.iouRequestType,
111-
newIouRequestType: transaction?.iouRequestType,
112-
report,
113-
parentReport,
114-
currentDate,
115-
lastSelectedDistanceRates,
116-
currentUserPersonalDetails,
117-
hasOnlyPersonalPolicies,
118-
});
119-
// eslint-disable-next-line
120-
}, []);
121-
122101
const resetIOUTypeIfChanged = useCallback(
123102
(newIOUType: IOURequestType) => {
124103
Keyboard.dismiss();

‎src/pages/iou/request/IOURequestStartPage.tsx‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -137,27 +137,6 @@ function IOURequestStartPage({
137137
Navigation.closeRHPFlow();
138138
};
139139

140-
// This useEffect is used to initialize the money request, so that currency will be reset to default currency on page reload.
141-
useEffect(() => {
142-
if (transaction?.amount !== 0) {
143-
return;
144-
}
145-
initMoneyRequest({
146-
reportID,
147-
policy,
148-
isFromGlobalCreate,
149-
currentIouRequestType: transaction?.iouRequestType,
150-
newIouRequestType: transaction?.iouRequestType,
151-
report,
152-
parentReport,
153-
currentDate,
154-
lastSelectedDistanceRates,
155-
currentUserPersonalDetails,
156-
hasOnlyPersonalPolicies,
157-
});
158-
// eslint-disable-next-line
159-
}, []);
160-
161140
const resetIOUTypeIfChanged = useCallback(
162141
(newIOUType: IOURequestType) => {
163142
Keyboard.dismiss();

0 commit comments

Comments
 (0)