Sort Distance Rates on IOURequestsStepDistanceRate.tsx #50721

ChavdaSachin · 2024-10-14T11:59:50Z

Details

Fixed Issues

$ #50304
PROPOSAL: #50304 (comment)

Tests

Same as QA tests

Verify that no errors appear in the JS console

Offline tests

Same as QA tests.

QA Steps

Note: This is a beta feature, so enable canUseP2PDistanceRequests beta before proceeding.

Go to workspace settings > Distance rates
Add a few distance rates
Go to workspace chat.
Click + > Submit expense > Distance.
Enter waypoints > Next.
Click Rate on confirmation page.
Notice Distance rates are sorted based on rate values.
Go to Troubleshoot > Clear cache and restart
Select Reset and refresh
Repeat steps 3-6.
Notice Distance rates are sorted based on rate values.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-10-14.at.6.31.16.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-10-14.at.6.34.09.PM.mov

iOS: Native

Screen.Recording.2024-10-14.at.6.31.16.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-10-14.at.6.34.09.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-14.at.6.27.29.PM.mov

MacOS: Desktop

Screen.Recording.2024-10-14.at.6.36.32.PM.mov

ChavdaSachin · 2024-10-14T12:32:02Z

We have an additional concern here,

Names produced for Distance rates are not up to the mark,

Add few distance rates.
delete one of the distance rate from the list.
Add a new distance rate.
Go to IOURequest Distance Rate step. notice Names produces for the rates lacks consistent naming logic.

From birds eye view - this function here needs improvement.

App/src/libs/PolicyDistanceRatesUtils.ts

Lines 42 to 45 in 1535588

    
           function getOptimisticRateName(rates: Record<string, Rate>): string { 
        
               const existingRatesWithSameName = Object.values(rates ?? {}).filter((rate) => (rate.name ?? '').startsWith(CONST.CUSTOM_UNITS.DEFAULT_RATE)); 
        
               return existingRatesWithSameName.length ? `${CONST.CUSTOM_UNITS.DEFAULT_RATE} ${existingRatesWithSameName.length}` : CONST.CUSTOM_UNITS.DEFAULT_RATE; 
        
           }

Which causes visual inconsistency, see

What should be our next step here?
Should we take care of naming as part of this PR?

cc. @paultsimura @madmax330

ps. Will complete my checklist after processing the decision we take here.

…tes-IOUStepDistanceRates#50304

paultsimura · 2024-10-14T12:37:17Z

@ChavdaSachin no, this is unrelated - the distance rates naming is planned to be user-customizable.

ChavdaSachin · 2024-10-14T12:39:26Z

Alright I will proceed with the checklist then...

ChavdaSachin · 2024-10-14T12:40:30Z

And about useOnyx migration?
check is failing here https://github.com/Expensify/App/actions/runs/11327065310/job/31497336590?pr=50721

ChavdaSachin · 2024-10-14T12:42:19Z

IMO we should have a separate PR for migration.
Today I merged a PR where we decided to handle ONYX migration as separate PR.

paultsimura · 2024-10-14T14:05:08Z

@ChavdaSachin this is a policy that we should make the migrations within the same PR.
Luckily, we have such a migration ready to be merged – you can copy it from here: https://github.com/Expensify/App/pull/50142/files#diff-7b1d9dac2fdc5c08e5f62ae430056029ab25f103fa19bd77688286f188ec3507

melvin-bot · 2024-10-14T15:01:48Z

@paultsimura 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]

ChavdaSachin · 2024-10-14T15:01:48Z

https://github.com/Expensify/App/pull/50142/files#diff-7b1d9dac2fdc5c08e5f62ae430056029ab25f103fa19bd77688286f188ec3507
This PR looks almost finished, so rather then copying let's wait for the pr to merge with main. shouldn't take long...

paultsimura · 2024-10-14T15:19:32Z

That PR is under my review, and it might take quite long to get merged. Go on and copy the migration, please – there shouldn't be any conflicts.

ChavdaSachin · 2024-10-14T16:18:44Z

Done

paultsimura · 2024-10-14T18:52:30Z

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

![Screenshot_1728932439](https://github.com/user-attachments/assets/2afe6772-c95f-4a3a-88e8-813e7a930853)

Android: mWeb Chrome

![Screenshot_1728932211](https://github.com/user-attachments/assets/8a3ef7ae-cc6d-46eb-9823-8e0e30997437)

iOS: Native

![Simulator Screenshot - iPhone 15 Pro - 2024-10-14 at 20 58 08](https://github.com/user-attachments/assets/56528d45-b90e-419f-b6b0-847ad5b10260)

iOS: mWeb Safari

![Simulator Screenshot - iPhone 15 Pro - 2024-10-14 at 20 49 14](https://github.com/user-attachments/assets/ae71130a-b82c-40ca-a20f-a9681d6d64b2)

MacOS: Chrome / Safari

MacOS: Desktop

paultsimura

LGTM ✔️

OSBotify · 2024-10-15T11:45: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-10-17T02:00:14Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.0.50-0 🚀

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

github-actions · 2024-10-18T18:49:04Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.50-8 🚀

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

Sort Disstance Rates on IOURequestsStepDistanceRate.tsx

b3d60f1

Merge remote-tracking branch 'upstream/main' into fix/Sort-DIstanceRa…

e379e9c

…tes-IOUStepDistanceRates#50304

ChavdaSachin marked this pull request as ready for review October 14, 2024 15:01

ChavdaSachin requested a review from a team as a code owner October 14, 2024 15:01

melvin-bot bot requested review from paultsimura and removed request for a team October 14, 2024 15:01

useOnyx migration

c3249f1

paultsimura approved these changes Oct 14, 2024

View reviewed changes

melvin-bot bot requested a review from madmax330 October 14, 2024 19:06

madmax330 approved these changes Oct 15, 2024

View reviewed changes

madmax330 merged commit e9de4f2 into Expensify:main Oct 15, 2024
17 checks passed

CortneyOfstad mentioned this pull request Oct 15, 2024

[PAID] [$250] Distance rates - Distance rate order in Rate page is random after clear cache and restart app #50304

Closed

6 tasks

github-actions bot mentioned this pull request Oct 17, 2024

Deploy Checklist: New Expensify 2024-10-17 #50969

Closed

90 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sort Distance Rates on IOURequestsStepDistanceRate.tsx #50721

Sort Distance Rates on IOURequestsStepDistanceRate.tsx #50721

ChavdaSachin commented Oct 14, 2024 •

edited

Loading

ChavdaSachin commented Oct 14, 2024 •

edited

Loading

paultsimura commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

paultsimura commented Oct 14, 2024

melvin-bot bot commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

paultsimura commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

paultsimura commented Oct 14, 2024 •

edited

Loading

paultsimura left a comment

OSBotify commented Oct 15, 2024

github-actions bot commented Oct 17, 2024

github-actions bot commented Oct 18, 2024

Sort Distance Rates on IOURequestsStepDistanceRate.tsx #50721

Sort Distance Rates on IOURequestsStepDistanceRate.tsx #50721

Conversation

ChavdaSachin commented Oct 14, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

ChavdaSachin commented Oct 14, 2024 • edited Loading

paultsimura commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

paultsimura commented Oct 14, 2024

melvin-bot bot commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

paultsimura commented Oct 14, 2024

ChavdaSachin commented Oct 14, 2024

paultsimura commented Oct 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

paultsimura left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 15, 2024

github-actions bot commented Oct 17, 2024

github-actions bot commented Oct 18, 2024

ChavdaSachin commented Oct 14, 2024 •

edited

Loading

ChavdaSachin commented Oct 14, 2024 •

edited

Loading

paultsimura commented Oct 14, 2024 •

edited

Loading