Implemented per diem request flow by shubham1206agra · Pull Request #54252 · Expensify/App

shubham1206agra · 2024-12-17T15:47:33Z

Explanation of Change

Fixed Issues

$ #50868

Tests

Click into the Submit Expense flow
Confirm that the segmented control shows 4 options (with an icon for the 3 that are not selected, and an icon + text for the option selected)
Click Per diem and confirm you are presented with a list of Destinations to choose from
Select a Destination and confirm you are taken to a screen to select the Start date, Start time, End date, End time
Confirm that each of these options works as expected (calendar choice for date, time choice for time)
Click Next and confirm you are taken to the page to select the Subrate
Click into the Subrate selection and confirm it matches the expected list of subrates for that destination
Return to the Subrate page and enter a quantity
Click Next and confirm you are presented with a summary page listing:

To - who the expense will be submitted to
Destination
Time - a concatenation of start time + date, and end time + date
Subrate - a concatenation of the selected subrate, and a Qty: X for the quantity selected
Description - free text field to add a description to the expense
Category
Tag
Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests but you can't submit the expense just yet.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2024-12-30.at.3.38.04.PM.mov

iOS: Native

Screen.Recording.2024-12-30.at.4.04.29.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-12-30.at.3.30.39.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-12-30.at.3.16.02.PM.mov

MacOS: Desktop

Screen.Recording.2024-12-30.at.3.50.22.PM.mov

melvin-bot · 2024-12-17T15:47:38Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

…uest is not supported just yet

shubham1206agra · 2024-12-18T16:24:55Z

@Expensify/design QQ, What should I call this button? It will send me to per diem page of the workspace.

shubham1206agra · 2024-12-18T16:28:41Z

@Expensify/design Please let me know any improvement.

c3024 · 2024-12-30T17:37:43Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

submitPerDiemAndroid.mov

Android: mWeb Chrome

Screenrecorder-2024-12-30-23-06-05-145.mp4

iOS: Native

submitPerDiemiOS.mov

iOS: mWeb Safari

ScreenRecording_12-30-2024.23-01-44_1.MP4

MacOS: Chrome / Safari

submitPerDiemChrome.mov

MacOS: Desktop

submitPerDiemDesktop.mov

c3024

LGTM!

OSBotify · 2025-01-02T09:25:26Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-01-06T18:33:31Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.81-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

IuliiaHerets · 2025-01-06T21:42:23Z

This PR is failing for mWeb because of issue #54845

c3024 · 2025-01-07T05:37:03Z

src/pages/iou/request/step/IOURequestStepSubrate.tsx

+        }));
+}
+
+function IOURequestStepWaypoint({


-IOURequestStepWaypoint +IOURequestStepSubRate

izarutskaya · 2025-01-07T09:50:46Z

@shubham1206agra found issues when validation this PR - issues #54831, #54833, #54845, #54889

https://platform.applause.com/services/links/v1/external/b00e3061203c6449d2d2426ed73f47af66da6deb42d3ef34e57216ee33090d66

https://platform.applause.com/services/links/v1/external/de924be17c74e919b3b736c50bae52c427d9a3eabf15597f0d978467af1e2ca2

github-actions · 2025-01-08T02:44:22Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.81-6 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

ahmedGaber93 · 2025-01-27T18:25:26Z

src/components/TabSelector/TabSelectorItem.tsx

+
+    /** Whether to show the label when the tab is inactive */
+    shouldShowLabelWhenInactive?: boolean;


Coming from here #55032, we decide to add a tooltip on web when shouldShowLabelWhenInactive is false

shubham1206agra · 2025-06-15T12:20:33Z

src/components/TimeModalPicker.tsx

+    label: string;
+};
+
+function TimeModalPicker({value, errorText, label, onInputChange = () => {}}: TimeModalPickerProps) {


Missing forwardRef here, which caused #61595

dukenv0307 · 2025-07-08T10:44:13Z

src/libs/PolicyUtils.ts

+/** Whether the user can submit per diem expense from the workspace */
+function canSubmitPerDiemExpenseFromWorkspace(policy: OnyxEntry<Policy>): boolean {
+    const perDiemCustomUnit = getPerDiemCustomUnit(policy);
+    return !isEmptyObject(perDiemCustomUnit) && !!perDiemCustomUnit?.enabled;


Comming from: #64913, the user can't submit the per diem expense from WS if policy?.isPolicyExpenseChatEnabled is false

ikevin127 · 2025-08-11T18:12:01Z

src/pages/iou/request/IOURequestStartPage.tsx

+                                {!!shouldShowPerDiemOption && (
+                                    <TopTab.Screen name={CONST.TAB_REQUEST.PER_DIEM}>
+                                        {() => (
+                                            <TabScreenWithFocusTrapWrapper>
+                                                {moreThanOnePerDiemExist && !doesCurrentPolicyPerDiemExist ? (
+                                                    <IOURequestStepPerDiemWorkspace
+                                                        route={route}
+                                                        navigation={navigation}
+                                                    />
+                                                ) : (
+                                                    <IOURequestStepDestination
+                                                        openedFromStartPage
+                                                        explicitPolicyID={moreThanOnePerDiemExist ? undefined : perDiemCustomUnits.at(0)?.policyID}
+                                                        route={route}
+                                                        navigation={navigation}
+                                                    />
+                                                )}
+                                            </TabScreenWithFocusTrapWrapper>
+                                        )}
+                                    </TopTab.Screen>


The addition of the new tab screen here led to the following issue on native due to conflicting horizontal vs vertical scroll list coming from the tab navigator and per diem page scroll list:

[Due for payment 2025-08-11] [$250] Android - Expense - Trying to scroll Per diem search result on create expense flow directs to distance tab #65746

we addressed this with a mixed approach between native and web based platforms by dismissing the keyboard when any direction swipe starts on native and disabling tab navigator swipe on mweb while on the Per Diem tab only.

ahmedGaber93 · 2025-12-04T10:06:09Z

src/pages/iou/request/step/IOURequestStepDestination.tsx

+    const isLoading = !isOffline && isLoadingOnyxValue(policyMetadata);
+    const shouldShowEmptyState = isEmptyObject(customUnit?.rates);


Coming from #74272, when have an edge case, after clearing cache, it shows empty state page briefly instead of loading.

rojiphil · 2026-02-03T17:44:55Z

src/pages/iou/request/step/IOURequestStepTime.tsx

+    const currentStartDate = currentDateAttributes?.start ? DateUtils.extractDate(currentDateAttributes.start) : undefined;
+    const currentEndDate = currentDateAttributes?.end ? DateUtils.extractDate(currentDateAttributes.end) : undefined;
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFound = !IOUUtils.isValidMoneyRequestType(iouType) || isEmptyObject(transaction?.comment?.customUnit) || isEmptyObject(policy);


NAB but a brief display of Not here page is displayed because of empty transaction during creation of per diem expense. We handled this in #78920

Implemented per diem request flow

83128dd

shubham1206agra and others added 26 commits December 17, 2024 21:23

Fix ts lint

4309d58

Fix crash

f52e55e

Fix errors

ee04b68

Fix component

02f5b0a

Fix wrong navigation

411754d

Fix subrate page layout

0cd1397

Fix unused keys

705413a

Fix small bug

e7cf663

Fix small bug

9e45c3b

Fix prettier

5fe7c8e

Add menuitems to confirmation page

03f8148

Fixed wrong policyID

8ea64b5

Fix wrong subrate filter logic

70fb5ba

Trying to fix navigation by declaring redundant routes

f0205ee

Fix condition shouldShowPerDiemOption

a3fbb08

Add validation to time page

dd12886

Fix confirmation page

71c6bcf

Fix confirmation page

68eceec

Test something on confirmation page

57bc75b

Fix style

40d2ea4

Added text to translation

9230ffa

Fix button text

ccc2d26

Fix go back from confirmation page

ad5fe97

Fix per diem display condition

dd17663

Temp: return early when starting createTransaction since per diem req…

ab477da

…uest is not supported just yet

Merge branch 'Expensify:main' into per-diem-5

fb2fb95

c3024 approved these changes Dec 30, 2024

View reviewed changes

melvin-bot bot requested a review from Gonals December 30, 2024 17:41

Merge branch 'main' into per-diem-5

dc599ba

Gonals approved these changes Jan 2, 2025

View reviewed changes

Gonals assigned shubham1206agra Jan 2, 2025

Gonals merged commit c7d01db into Expensify:main Jan 2, 2025

github-actions bot mentioned this pull request Jan 6, 2025

Deploy Checklist: New Expensify 2025-01-06 #54825

Closed

74 tasks

francoisl mentioned this pull request Jan 6, 2025

Per diem - Confirmation page shows per diem confirm page when it is a manual expense #54830

Closed

8 tasks

lanitochka17 mentioned this pull request Jan 6, 2025

[HOLD for payment 2025-01-28] Per diem - Subrate quantity field has no limitation #54834

Closed

8 tasks

IuliiaHerets mentioned this pull request Jan 6, 2025

mWeb - Per diem-Unable to submit a Per diem expense #54845

Closed

8 tasks

c3024 reviewed Jan 7, 2025

View reviewed changes

IuliiaHerets mentioned this pull request Jan 7, 2025

[$250] Per diem -"It's not here" page flickers after choosing the destination #54875

Closed

8 tasks

lanitochka17 mentioned this pull request Jan 7, 2025

Per diem - The Quantity field allows float number #54889

Closed

8 tasks

marcochavezf mentioned this pull request Jan 7, 2025

Per diem - Per diem page does not open in RHP when it is opened from create expense RHP #54887

Closed

8 tasks

vincdargento mentioned this pull request Jan 7, 2025

Per diem - The string "Qty" in the Confirm details page is not translated into Spanish #54902

Closed

8 tasks

lanitochka17 mentioned this pull request Jan 7, 2025

[HOLD for payment 2025-01-28] [$250] Per diem - Labels show quantities only in the plural #54905

Closed

8 tasks

melvin-bot bot mentioned this pull request Jan 8, 2025

[HOLD for payment 2025-01-28] [Hold 54760] [HOLD for payment 2025-01-15] [$250] [Per Diem] Frontend - Creating Per Diem expenses in Newdot[ #50868

Closed

ahmedGaber93 reviewed Jan 27, 2025

View reviewed changes

shubham1206agra deleted the per-diem-5 branch February 3, 2025 17:50

shubham1206agra commented Jun 15, 2025

View reviewed changes

dukenv0307 reviewed Jul 8, 2025

View reviewed changes

ikevin127 reviewed Aug 11, 2025

View reviewed changes

ahmedGaber93 reviewed Dec 4, 2025

View reviewed changes

rojiphil reviewed Feb 3, 2026

View reviewed changes


		/** Whether to show the label when the tab is inactive */
		shouldShowLabelWhenInactive?: boolean;

		const isLoading = !isOffline && isLoadingOnyxValue(policyMetadata);
		const shouldShowEmptyState = isEmptyObject(customUnit?.rates);

Conversation

shubham1206agra commented Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Dec 17, 2024

Uh oh!

shubham1206agra commented Dec 18, 2024

Uh oh!

shubham1206agra commented Dec 18, 2024

Uh oh!

c3024 commented Dec 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

c3024 left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jan 2, 2025

Uh oh!

github-actions bot commented Jan 6, 2025

Uh oh!

IuliiaHerets commented Jan 6, 2025

Uh oh!

c3024 Jan 7, 2025

Choose a reason for hiding this comment

Uh oh!

izarutskaya commented Jan 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 8, 2025

Uh oh!

ahmedGaber93 Jan 27, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Jun 15, 2025

Choose a reason for hiding this comment

Uh oh!

dukenv0307 Jul 8, 2025

Choose a reason for hiding this comment

Uh oh!

ikevin127 Aug 11, 2025

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

rojiphil Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

shubham1206agra commented Dec 17, 2024 •

edited

Loading

c3024 commented Dec 30, 2024 •

edited

Loading

izarutskaya commented Jan 7, 2025 •

edited

Loading