Enable/disable per diem rates #51232

shubham1206agra · 2024-10-22T09:45:40Z

Details

Fixed Issues

$ #50862

Tests

Pre-requisite
Make sure you are on newDotPerDiem beta before testing this feature.

Go to the workspace where you want to enable per diem feature.
Go to More Features.
Toggle the Per diem under spend to enable/disable the feature.
Make sure that if you are on paid workspace, it is asking you to upgrade the workspace.
Make sure you can go to the per diem page.

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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 verified the translation was requested/reviewed 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.js 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.
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-10-31.at.8.36.18.AM.mov

iOS: Native

Screen.Recording.2024-10-31.at.10.15.02.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-10-30.at.10.01.55.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-30.at.9.29.46.PM.mov

MacOS: Desktop

Screen.Recording.2024-10-31.at.9.57.50.AM.mov

shubham1206agra · 2024-10-22T10:21:43Z

@Gonals I am almost done with this PR.

c3024 · 2024-10-24T02:45:15Z

@shubham1206agra

Can you please share the extract of the design doc?

shubham1206agra · 2024-10-24T05:45:48Z

@Gonals Can you share doc with @c3024?

Gonals · 2024-10-24T11:16:06Z

Shared

shubham1206agra · 2024-11-06T16:32:43Z

@c3024 Please proceed with the checklist.

shubham1206agra · 2024-11-07T04:29:15Z

@shawnborton @Gonals Is the learn more link correct?
https://community.expensify.com/discussion/4772/how-to-add-a-single-rate-per-diem

shawnborton · 2024-11-07T07:40:52Z

cc @bfitzexpensify - what's the correct help article URL for this?

bfitzexpensify · 2024-11-07T08:12:39Z

https://help.expensify.com/articles/expensify-classic/workspaces/Enable-per-diem-expenses

shawnborton · 2024-11-07T08:21:56Z

Do we have one ready for NewDot though? Also, where is this link shown exactly @shubham1206agra ?

bfitzexpensify · 2024-11-07T08:26:42Z

Sorry, completely missed the ND portion, need to have my coffee.

We don't have ND help docs up yet - opened https://github.com/Expensify/Expensify/issues/442420 to get them sorted, should take me a day or two.

We don't need that to be a blocker for this, I can open a PR to update the link once the help docs are ready.

c3024 · 2024-11-07T08:32:39Z

@bfitzexpensify

need to have my coffee.

This PR has other things apart from the link. I think this PR should not be closed.

shubham1206agra · 2024-11-07T08:45:51Z

Do we have one ready for NewDot though? Also, where is this link shown exactly @shubham1206agra ?

In OldDot, in PerDiem section.

shubham1206agra · 2024-11-07T08:48:41Z

@c3024 Can you finish the review now?

c3024 · 2024-11-07T08:48:05Z

src/languages/en.ts

+                title: 'Per diem',
+                description:
+                    'Per diem is a great way to keep your daily costs compliant and predictable whenever your employees travel. Enjoy features like custom rates, default categories, and more granular details like destinations and subrates.',
+                onlyAvailableOnPlan: 'Per diem are only available on the Control plan, starting at ',


Suggested change

onlyAvailableOnPlan: 'Per diem are only available on the Control plan, starting at ',

onlyAvailableOnPlan: 'Per diem is only available on the Control plan, starting at ',

NIT: Google says plural for per diem is per diems.

So, it might need to be confirmed if this should be "Per diems are" or "Per diem is" or retain as it is.

c3024

Tested the enabling/disabling and view of the per diem page. LGTM!

Gonals · 2024-11-07T10:28:50Z

Neat! Let's merge! We can update the help later. This is behind a beta, anyways. @shubham1206agra, send the PRs with the rest of the functionality (importing/exporting/setting default category) my way when they are ready. I'll test with the backend and deploy the backend PRs accordingly

OSBotify · 2024-11-07T10:41:46Z

✋ 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 · 2024-11-07T13:08:35Z

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

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

github-actions · 2024-11-11T18:14:10Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.59-3 🚀

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

ntdiary · 2024-11-20T12:53:23Z

src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx

@@ -76,9 +80,12 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
            case CONST.UPGRADE_FEATURE_INTRO_MAPPING.companyCards.id:
                Policy.enableCompanyCards(policyID, true);
                break;
+            case CONST.UPGRADE_FEATURE_INTRO_MAPPING.perDiem.id:
+                PerDiem.enablePerDiem(policyID, true, perDiemCustomUnit?.customUnitID);


Coming from #52201.
enablePerDiem needs a parameter to disable redirection, because there is a link on this page to view the subscription page, and when we tap it, this function will also be called. In such cases, we need to disable redirection. :)

shubham1206agra added 8 commits October 22, 2024 18:44

Enable/disable per diem rates

904ca23

Fix illustration file name

81b4213

Adjusting comments

eff827c

Fix illustration file name

0d0ffa1

Fix getPerDiemCustomUnit

cc201f0

Fix access

84afa28

Fix button color

feb8e97

Making feature control only

4b6ccc7

shubham1206agra added 4 commits October 23, 2024 17:26

Fixing text:

95e7819

Fixing command EnablePolicyPerDiem

c6ade13

Fixing ts

c70846d

Fixing command name

bc92c1a

shubham1206agra mentioned this pull request Oct 25, 2024

[$250] [HOLD for payment 2024-11-18] [Per Diem] Frontend - Enabling/Disabling Per Diem in Newdot #50862

Closed

shubham1206agra and others added 8 commits October 28, 2024 13:52

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

078e6b0

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

fd961f6

Merge branch 'main' into per-diem-1

c6c7c42

Fixing wrong navigation

d5e9497

Merge branch 'main' into per-diem-1

0736acc

Hiding option behind beta

5db6a7f

Fixing some more functions

58d9ff8

Fixing translations

9d6cf46

shubham1206agra marked this pull request as ready for review October 31, 2024 04:47

shubham1206agra requested review from a team as code owners October 31, 2024 04:47

melvin-bot bot requested review from jjcoffee and removed request for a team October 31, 2024 04:47

Apply suggestions from code review

5fd7a43

shubham1206agra added 2 commits November 6, 2024 22:22

Fix page alignment

5be926c

Added per diem learn more link

42a19ae

bfitzexpensify closed this Nov 7, 2024

bfitzexpensify reopened this Nov 7, 2024

c3024 suggested changes Nov 7, 2024

View reviewed changes

c3024 approved these changes Nov 7, 2024

View reviewed changes

melvin-bot bot requested a review from Gonals November 7, 2024 08:52

Gonals approved these changes Nov 7, 2024

View reviewed changes

Gonals merged commit e000d80 into Expensify:main Nov 7, 2024
21 checks passed

github-actions bot mentioned this pull request Nov 7, 2024

Deploy Checklist: New Expensify 2024-11-07 #52178

Closed

60 tasks

Gonals assigned Gonals and shubham1206agra and unassigned Gonals Nov 7, 2024

NikkiWines mentioned this pull request Nov 8, 2024

Per diem - Unable to edit category when Per diem is enabled #52257

Closed

8 tasks

ntdiary reviewed Nov 20, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable/disable per diem rates #51232

Enable/disable per diem rates #51232

shubham1206agra commented Oct 22, 2024 •

edited

Loading

shubham1206agra commented Oct 22, 2024

c3024 commented Oct 24, 2024

shubham1206agra commented Oct 24, 2024

Gonals commented Oct 24, 2024

shubham1206agra commented Nov 6, 2024

shubham1206agra commented Nov 7, 2024

shawnborton commented Nov 7, 2024

bfitzexpensify commented Nov 7, 2024

shawnborton commented Nov 7, 2024

bfitzexpensify commented Nov 7, 2024

c3024 commented Nov 7, 2024

shubham1206agra commented Nov 7, 2024

shubham1206agra commented Nov 7, 2024

c3024 Nov 7, 2024 •

edited

Loading

c3024 left a comment

Gonals commented Nov 7, 2024 •

edited

Loading

OSBotify commented Nov 7, 2024

github-actions bot commented Nov 7, 2024

github-actions bot commented Nov 11, 2024

ntdiary Nov 20, 2024

	onlyAvailableOnPlan: 'Per diem are only available on the Control plan, starting at ',
	onlyAvailableOnPlan: 'Per diem is only available on the Control plan, starting at ',

Enable/disable per diem rates #51232

Enable/disable per diem rates #51232

Conversation

shubham1206agra commented Oct 22, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

shubham1206agra commented Oct 22, 2024

c3024 commented Oct 24, 2024

shubham1206agra commented Oct 24, 2024

Gonals commented Oct 24, 2024

shubham1206agra commented Nov 6, 2024

shubham1206agra commented Nov 7, 2024

shawnborton commented Nov 7, 2024

bfitzexpensify commented Nov 7, 2024

shawnborton commented Nov 7, 2024

bfitzexpensify commented Nov 7, 2024

c3024 commented Nov 7, 2024

shubham1206agra commented Nov 7, 2024

shubham1206agra commented Nov 7, 2024

c3024 Nov 7, 2024 • edited Loading

Choose a reason for hiding this comment

c3024 left a comment

Choose a reason for hiding this comment

Gonals commented Nov 7, 2024 • edited Loading

OSBotify commented Nov 7, 2024

github-actions bot commented Nov 7, 2024

github-actions bot commented Nov 11, 2024

ntdiary Nov 20, 2024

Choose a reason for hiding this comment

shubham1206agra commented Oct 22, 2024 •

edited

Loading

c3024 Nov 7, 2024 •

edited

Loading

Gonals commented Nov 7, 2024 •

edited

Loading