feat: policy distance rates settings by MrMuzyk · Pull Request #38060 · Expensify/App

MrMuzyk · 2024-03-11T16:19:41Z

Details

added new page to change settings for distance rates

Fixed Issues

$ #37513
PROPOSAL:

Tests

Same as QA steps

Offline tests

QA Steps

sign into account that has paid policy with distance rates available
go to distance rates screen
press on settings and change one of two pickers
Verify that no errors appear in the JS console

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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.native.mp4

Android: mWeb Chrome

android.web.mp4

iOS: Native

ios.native.mp4

iOS: mWeb Safari

ios.web.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

MrMuzyk · 2024-03-11T16:20:05Z

Once #38035 gets merged the diff will be correct

…p into feat/policy-distance-rates-settings

…icy-distance-rates-settings

src/languages/es.ts

melvin-bot · 2024-03-18T10:48:59Z

@ishpaul777 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

luacmartins

A few small comments

src/ROUTES.ts

src/languages/es.ts

src/pages/workspace/distanceRates/CategorySelector/CategorySelectorModal.tsx

ishpaul777 · 2024-03-18T15:21:19Z

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 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
- 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.js 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.
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

Record_2024-03-20-01-19-00.mp4

Android: mWeb Chrome

Record_2024-03-20-01-27-54.mp4

iOS: Native

Screen.Recording.2024-03-20.at.1.07.05.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-03-20.at.1.03.56.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-20.at.12.48.42.AM.mov

MacOS: Desktop

Screen.Recording.2024-03-20.at.1.33.14.AM.mov

…icy-distance-rates-settings

src/languages/en.ts

src/pages/workspace/distanceRates/UnitSelector/index.tsx

ishpaul777 · 2024-03-18T16:23:57Z

no offline behaviour for the selection rows and error message is not displaying when request fails

Screen.Recording.2024-03-18.at.9.52.05.PM.mov

src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx

src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx

ishpaul777 · 2024-03-18T16:55:01Z

thats it for now @MrMuzyk Feel free to ping me once you are done

MrMuzyk · 2024-03-19T15:10:27Z

Reviewing 👀, @MrMuzyk Please merge main TS checks resolved on main

ye I will. Im implementing changes to correctly handle offline mode and errors now.

src/pages/workspace/distanceRates/CategorySelector/CategorySelectorModal.tsx

…icy-distance-rates-settings

MrMuzyk · 2024-03-19T15:48:42Z

@ishpaul777 Rebased with latest main - ts errors are gone as expected. Added handling for offline mode and for errors. You can check it everything again :)

ishpaul777 · 2024-03-19T16:05:12Z

Is it expected that only enabled category shows in category selector?

Screen.Recording.2024-03-19.at.9.32.02.PM.mov

ishpaul777 · 2024-03-19T16:08:56Z

Hey @luacmartins @MrMuzyk i'll be out for 3 hours for some urgent personal work came up will complete the review as soon as i am back. Sorry for unexpected turn of events 🙇‍♂️

trjExpensify · 2024-03-19T16:30:10Z

Is it expected that only enabled category shows in category selector?

Screen.Recording.2024-03-19.at.9.32.02.PM.mov

Yep! Consistent with OldDot behaviour :)

luacmartins

Awesome! Offline behavior is working great now!

luacmartins · 2024-03-19T19:04:47Z

@ishpaul777 all yours! let's try to get this one merged today!

ishpaul777 · 2024-03-19T19:09:54Z

I am back, will finish it in few minutes

ishpaul777 · 2024-03-19T19:08:31Z

src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx

+                    </OfflineWithFeedback>
+                    {policy?.areCategoriesEnabled && (
+                        <OfflineWithFeedback
+                            errors={errorFields?.defaultCategory}


i think we need to show the latest message only, not all error message

ishpaul777 · 2024-03-19T19:13:56Z

src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx

+                >
+                    <HeaderWithBackButton title={translate('workspace.common.settings')} />
+                    <OfflineWithFeedback
+                        errors={errorFields?.attributes}


i think we need to show the latest message only, not all error message

ishpaul777 · 2024-03-19T19:14:44Z

we can handle above as follow up if @MrMuzyk is not around

ishpaul777 · 2024-03-19T19:39:35Z

offline indicator showing right below the selector, it should show at botton of screen. (can be a follow up as well)

luacmartins · 2024-03-19T19:59:58Z

Yea, I agree we can address those as a follow up

luacmartins

LGTM! Let's address the comments from @ishpaul777 in a follow up.

OSBotify · 2024-03-19T23:50:52Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.55-0 🚀

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

OSBotify · 2024-03-20T00:51:27Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.55-0 🚀

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

parasharrajat · 2024-03-20T11:15:04Z

There seems to be a regression from this PR #38662 which can be handled in follow-up PR.

OSBotify · 2024-03-22T16:10:13Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.55-3 🚀

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

feat: policy distance rates settings

b694545

MrMuzyk added 4 commits March 12, 2024 09:19

Merge branch 'feat/policy-add-distance-rate' of github.com:MrMuzyk/Ap…

be8aa05

…p into feat/policy-distance-rates-settings

Merge branch 'feat/policy-add-distance-rate' of github.com:MrMuzyk/Ap…

949824e

…p into feat/policy-distance-rates-settings

fix: after conflicts resolve

8a489d3

fix: update error message

3cf6a2a

MrMuzyk mentioned this pull request Mar 13, 2024

feat: policy distance rates edit #38237

Merged

50 tasks

MrMuzyk added 4 commits March 14, 2024 11:03

Merge branch 'feat/policy-add-distance-rate' of github.com:MrMuzyk/Ap…

dc23541

…p into feat/policy-distance-rates-settings

fix: remove redundant error clearing

de14e66

Merge branch 'feat/policy-add-distance-rate' of github.com:MrMuzyk/Ap…

00bb556

…p into feat/policy-distance-rates-settings

Merge branch 'main' of https://github.com/Expensify/App into feat/pol…

9ab4bba

…icy-distance-rates-settings

MrMuzyk commented Mar 18, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

fix: remove redundant prop

b088355

MrMuzyk marked this pull request as ready for review March 18, 2024 10:48

MrMuzyk requested a review from a team as a code owner March 18, 2024 10:48

melvin-bot bot requested review from ishpaul777 and removed request for a team March 18, 2024 10:48

fix: access wrapper

6a666d3

luacmartins requested changes Mar 18, 2024

View reviewed changes

fix: cr fixes

7e175f6

luacmartins previously approved these changes Mar 18, 2024

View reviewed changes

Merge branch 'main' of https://github.com/Expensify/App into feat/pol…

c935449

…icy-distance-rates-settings

MrMuzyk dismissed luacmartins’s stale review via c935449 March 18, 2024 16:02

ishpaul777 reviewed Mar 18, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

src/pages/workspace/distanceRates/UnitSelector/index.tsx Show resolved Hide resolved

ishpaul777 reviewed Mar 18, 2024

View reviewed changes

src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx Outdated Show resolved Hide resolved

ishpaul777 reviewed Mar 18, 2024

View reviewed changes

src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx Outdated Show resolved Hide resolved

ishpaul777 reviewed Mar 19, 2024

View reviewed changes

src/pages/workspace/distanceRates/CategorySelector/CategorySelectorModal.tsx Show resolved Hide resolved

MrMuzyk added 2 commits March 19, 2024 16:39

fix: offline and error handling

68dc3a4

Merge branch 'main' of https://github.com/Expensify/App into feat/pol…

9b40772

…icy-distance-rates-settings

MrMuzyk requested review from ishpaul777 and luacmartins March 19, 2024 15:49

luacmartins approved these changes Mar 19, 2024

View reviewed changes

ishpaul777 reviewed Mar 19, 2024

View reviewed changes

ishpaul777 approved these changes Mar 19, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins March 19, 2024 20:06

luacmartins approved these changes Mar 19, 2024

View reviewed changes

luacmartins merged commit ca0cf24 into Expensify:main Mar 19, 2024

github-actions bot mentioned this pull request Mar 19, 2024

Deploy Checklist: New Expensify 2024-03-19 #38651

Closed

66 tasks

izarutskaya mentioned this pull request Mar 20, 2024

[Simplified Collect][Distance rates] Subcategory is displayed as indented instead of Parent: Child format #38662

Closed

6 tasks

lanitochka17 mentioned this pull request Mar 20, 2024

[Distance rates] Category - Cannot cancel the category selection in distance rates settings #38673

Closed

6 tasks

melvin-bot bot mentioned this pull request Mar 22, 2024

[HOLD for payment 2024-03-29] [$500] [Simplified Collect][Distance Rates] Implement PolicyDistanceRateSettingsPage #37513

Closed

ZhenjaHorbach mentioned this pull request Apr 18, 2024

[$250] WS - App crashes when changing workspace ID to invalid ID while distance rate RHP is open #40481

Closed

6 tasks

Conversation

MrMuzyk commented Mar 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MrMuzyk commented Mar 11, 2024

Uh oh!

Uh oh!

melvin-bot bot commented Mar 18, 2024

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ishpaul777 commented Mar 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

ishpaul777 commented Mar 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ishpaul777 commented Mar 18, 2024

Uh oh!

MrMuzyk commented Mar 19, 2024

Uh oh!

Uh oh!

MrMuzyk commented Mar 19, 2024

Uh oh!

ishpaul777 commented Mar 19, 2024

Uh oh!

ishpaul777 commented Mar 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Mar 19, 2024

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins commented Mar 19, 2024

Uh oh!

ishpaul777 commented Mar 19, 2024

Uh oh!

ishpaul777 Mar 19, 2024

Choose a reason for hiding this comment

Uh oh!

ishpaul777 Mar 19, 2024

Choose a reason for hiding this comment

Uh oh!

ishpaul777 Mar 19, 2024

Choose a reason for hiding this comment

Uh oh!

ishpaul777 commented Mar 19, 2024

Uh oh!

ishpaul777 commented Mar 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins commented Mar 19, 2024

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Mar 19, 2024

Uh oh!

OSBotify commented Mar 20, 2024

Uh oh!

MrMuzyk commented Mar 11, 2024 •

edited

Loading

ishpaul777 commented Mar 18, 2024 •

edited

Loading

ishpaul777 commented Mar 18, 2024 •

edited

Loading

ishpaul777 commented Mar 19, 2024 •

edited

Loading

ishpaul777 commented Mar 19, 2024 •

edited

Loading