Skip to content

Implemented per diem request flow#54252

Merged
Gonals merged 46 commits into
Expensify:mainfrom
shubham1206agra:per-diem-5
Jan 2, 2025
Merged

Implemented per diem request flow#54252
Gonals merged 46 commits into
Expensify:mainfrom
shubham1206agra:per-diem-5

Conversation

@shubham1206agra

@shubham1206agra shubham1206agra commented Dec 17, 2024

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #50868

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

  • 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

  • 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
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

melvin-bot Bot commented Dec 17, 2024

Copy link
Copy Markdown

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

@shubham1206agra

Copy link
Copy Markdown
Contributor Author
Screenshot 2024-12-18 at 9 53 56 PM

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

@shubham1206agra

Copy link
Copy Markdown
Contributor Author
Screenshot 2024-12-18 at 9 55 22 PM Screenshot 2024-12-18 at 9 55 51 PM Screenshot 2024-12-18 at 9 56 29 PM Screenshot 2024-12-18 at 9 56 39 PM Screenshot 2024-12-18 at 9 56 52 PM Screenshot 2024-12-18 at 9 57 22 PM Screenshot 2024-12-18 at 9 57 32 PM Screenshot 2024-12-18 at 9 57 49 PM

@Expensify/design Please let me know any improvement.

@c3024 c3024 left a comment

Copy link
Copy Markdown
Contributor

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 December 30, 2024 17:41
@Gonals Gonals merged commit c7d01db into Expensify:main Jan 2, 2025
@OSBotify

OSBotify commented Jan 2, 2025

Copy link
Copy Markdown
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.

@github-actions

github-actions Bot commented Jan 6, 2025

Copy link
Copy Markdown
Contributor

🚀 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

Copy link
Copy Markdown

This PR is failing for mWeb because of issue #54845

}));
}

function IOURequestStepWaypoint({

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

-IOURequestStepWaypoint
+IOURequestStepSubRate

@izarutskaya

izarutskaya commented Jan 7, 2025

Copy link
Copy Markdown

@github-actions

github-actions Bot commented Jan 8, 2025

Copy link
Copy Markdown
Contributor

🚀 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 ✅

Comment on lines +33 to +35

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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@shubham1206agra shubham1206agra deleted the per-diem-5 branch February 3, 2025 17:50
label: string;
};

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Missing forwardRef here, which caused #61595

Comment thread 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;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

Comment on lines +198 to +217
{!!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>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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:

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.

Comment on lines +64 to +65
const isLoading = !isOffline && isLoadingOnyxValue(policyMetadata);
const shouldShowEmptyState = isEmptyObject(customUnit?.rates);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

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);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

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.