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.

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

Implemented BE part of Per Diem Request #54760

Merged
merged 32 commits into from
Jan 17, 2025
Merged

Conversation

shubham1206agra
Copy link
Contributor

@shubham1206agra shubham1206agra commented Jan 2, 2025

HELD on https://github.com/Expensify/Auth/pull/13763/files

Explanation of Change

Fixed Issues

$ #50868
$ #54892
$ #54905
$ #54884
$ #54834

Tests

  1. Click into the Submit Expense flow
  2. 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)
  3. Click Per diem and confirm you are presented with a list of Destinations to choose from
  4. Select a Destination and confirm you are taken to a screen to select the Start date, Start time, End date, End time
  5. Confirm that each of these options works as expected (calendar choice for date, time choice for time)
  6. Click Next and confirm you are taken to the page to select the Subrate
  7. Click into the Subrate selection and confirm it matches the expected list of subrates for that destination
  8. Return to the Subrate page and enter a quantity
  9. 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
  1. Confirm you are able to submit the expense
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Screen.Recording.2025-01-12.at.9.16.45.PM.mov
Android: mWeb Chrome
Screen.Recording.2025-01-12.at.7.59.13.PM.mov
iOS: Native
Screen.Recording.2025-01-12.at.9.10.15.PM.mov
iOS: mWeb Safari
Screen.Recording.2025-01-12.at.7.51.14.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-01-12.at.7.36.28.PM.mov
MacOS: Desktop
Screen.Recording.2025-01-12.at.8.07.24.PM.mov

@c3024
Copy link
Contributor

c3024 commented Jan 7, 2025

Per diem receipt shows an error saying incomplete scan.
Screenshot 2025-01-07 at 8 52 26 PM

Screenshot 2025-01-07 at 8 52 41 PM

@shubham1206agra
Copy link
Contributor Author

Per diem receipt shows an error saying incomplete scan. Screenshot 2025-01-07 at 8 52 26 PM

Screenshot 2025-01-07 at 8 52 41 PM

This is BE issue. It will be fixed shortly.

@shubham1206agra
Copy link
Contributor Author

@c3024 Can you start the review of this PR?

@c3024
Copy link
Contributor

c3024 commented Jan 11, 2025

Validation of the quantity happens even when clicking on the subrate before focusing the quantity input.

Screen.Recording.2025-01-11.at.12.52.22.PM.mov

Following two are related to backend.

Date is cutoff in the receipt

w_38b1f0fa96bf7938fd1b1c96fd4cc2835b444a92-2025-01-11 07_20_41.357.pdf

When there are not several subrates there seems to be a lot of unnecessary white space in the receipt.

@c3024
Copy link
Contributor

c3024 commented Jan 11, 2025

@Gonals

OpenReport returns all per diem rates available in the workspace in its response. That seems to be a lot of not useful data.

Screen.Recording.2025-01-11.at.12.58.24.PM.mov

I think backend should not send a receipt scan error for per diem expenses.

Screenshot 2025-01-11 at 1 01 44 PM

@c3024
Copy link
Contributor

c3024 commented Jan 11, 2025

Backend does not allow a future date. Should we prohibit future date on frontend too and add the system message of updating the date only if it is a valid non-future date?

Screen.Recording.2025-01-11.at.1.04.38.PM.mov

@c3024
Copy link
Contributor

c3024 commented Jan 11, 2025

Frontend receipt is as per design doc.
Screenshot 2025-01-11 at 6 46 48 PM

Backend receipt design is different.
w_9e49cbb8b19cdf634931e6962988349ab39b2c58-2025-01-11 08_05_37.431.pdf

src/libs/Navigation/OnyxTabNavigator.tsx Show resolved Hide resolved
src/libs/PerDiemRequestUtils.ts Outdated Show resolved Hide resolved
src/libs/actions/Policy/PerDiem.ts Outdated Show resolved Hide resolved
@shubham1206agra
Copy link
Contributor Author

@shubham1206agra

Should this be fixed?

Backend does not allow a future date. Should we prohibit future date on frontend too and add the system message of updating the date only if it is a valid non-future date?

@c3024 I don't think so since this page is not touched by me and it should be allowed as it is allowed for other types of request.

@c3024
Copy link
Contributor

c3024 commented Jan 13, 2025

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
perDiemBEAndroid.mov
Android: mWeb Chrome
perDiemAndroidmWeb.mp4
iOS: Native
perDiemBEiOS.mov
iOS: mWeb Safari
perDiemiOSmWeb.mov
MacOS: Chrome / Safari
perDiemBEChrome.mp4
MacOS: Desktop
perDiemBEDesktop.mov

Copy link
Contributor

@c3024 c3024 left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from Gonals January 13, 2025 12:51
@Gonals Gonals changed the title Implemented BE part of Per Diem Request [HOLD] Implemented BE part of Per Diem Request Jan 13, 2025
@Gonals Gonals changed the title [HOLD] Implemented BE part of Per Diem Request Implemented BE part of Per Diem Request Jan 16, 2025
Gonals
Gonals previously approved these changes Jan 16, 2025
@Gonals
Copy link
Contributor

Gonals commented Jan 16, 2025

@shubham1206agra, seems like we have some conflicts

@Gonals Gonals merged commit 2fb2789 into Expensify:main Jan 17, 2025
17 checks passed
@OSBotify
Copy link
Contributor

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

Copy link
Contributor

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

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

Copy link
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.87-3 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants