[CP Staging] Feat/36985 create new rate field followups #40711

koko57 · 2024-04-22T16:21:42Z

Details

Fixed Issues

$ #36985
$ #40712
$ #40722
PROPOSAL: #36985 (comment)

Tests

Verify that changes don't break these areas:

MoneyRequestConfirmationList

Go to global create (+) > Submit expense
Change the request type to Distance
Choose and submit the start/finish points
Choose a participant and go to the Confirmation step
Verify that the distance is displayed correctly
Verify that clicking the distance field navigates to the distance editing page

Rate highlighting

Repeat steps 1-3 from above
Choose a workspace as a participant and go to the Confirmation step
Click on the Rate field
Verify that on the Rate selection page the chosen rate is also highlighted

MoneyRequestView

Go to the distance expense preview
Verify that the rate field is displayed correctly with a proper rate

-> edit distance

Click Distance.
Change the distance and save it.
Verify that until the distance is updated the field displays "Pending..." text.

Verify that no errors appear in the JS console

Offline tests

MoneyRequestConfirmationList

Go to global create (+) > Track expense
Change the request type to Distance
Choose and submit the start/finish points
Verify that the distance field displays "Pending..." text.

MoneyRequestView

Go to distance expense preview
Verify that the distance field displays "Pending..." text.

QA Steps

Verify that changes don't break these areas:

MoneyRequestConfirmationList

Go to global create (+) > Submit expense
Change the request type to Distance
Choose and submit the start/finish points
Choose a participant and go to the Confirmation step
Verify that the distance is displayed correctly
Verify that clicking the distance field navigates to the distance editing page

Rate highlighting

Repeat steps 1-3 from above
Choose a workspace as a participant and go to the Confirmation step
Click on the Rate field
Verify that on the Rate selection page the chosen rate is also highlighted

MoneyRequestView

Go to distance expense preview
Verify that the rate field is displayed correctly with a proper rate

-> edit distance

Click Distance.
Change the distance and save it.
Verify that until the distance is updated the field displays "Pending..." text.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-04-22T18:30:48Z

@shawnborton @getusha One of you needs to 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]

neil-marcellini

Looking good, a couple small things and one very important consideration. Also, I wouldn't expect editing distance on a tracked expense to work yet, since it's still in progress on the backend.

Would you please add some tests for verifying the merchant format with the regex? You can manually edit the merchant to whatever you want if you open the transaction in OldDot.

neil-marcellini · 2024-04-22T19:06:53Z

src/libs/DistanceRequestUtils.ts


 const METERS_TO_KM = 0.001; // 1 kilometer is 1000 meters
 const METERS_TO_MILES = 0.000621371; // There are approximately 0.000621371 miles in a meter
+const distanceMerchantRegex = /^[0-9.]+ \w+ @ (-|-\()?(\p{Sc}|\p{L}|\w){1,3} ?[0-9.]+\)? \/ \w+$/u;


Please add a comment explaining what this does. Something like this.

// Validates that the merchant for a distance request transaction is in the expected format. // <distance> <unit> @ <formatted rate with currency> / <unit> // Example: 1.45 miles @ $0.67 / mi

it'd be nice if we can move this to CONST.ts

@getusha no longer necessary - we decided to remove this

src/components/ReportActionItem/MoneyRequestView.tsx

shawnborton · 2024-04-22T19:17:22Z

Design-wise, this looks good to me.

getusha · 2024-04-22T19:21:47Z

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

Screen.Recording.2024-04-23.at.3.00.01.in.the.afternoon.mov

Android: mWeb Chrome

Screen.Recording.2024-04-23.at.12.23.08.at.night.mov

iOS: Native

Screen.Recording.2024-04-23.at.2.44.14.in.the.afternoon.mov

iOS: mWeb Safari

Screen.Recording.2024-04-23.at.2.49.42.in.the.afternoon.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-23.at.2.29.24.in.the.afternoon.1.mov

MacOS: Desktop

Screen.Recording.2024-04-23.at.3.12.10.in.the.afternoon.1.mov

neil-marcellini

Nice looks great, thank you. We're still working on the test steps as you said in Slack.

neil-marcellini

Nice, and it's more simple now too

neil-marcellini · 2024-04-23T15:44:03Z

@koko57 would you please fix the issue reported here where the distance field doesn't show the optimistically updated distance?

koko57 · 2024-04-23T15:51:32Z

@neil-marcellini it should be already fixed

getusha · 2024-04-23T16:01:59Z

the expense view page is flickering, @koko57 can you check the page from your side? 😄

Screen.Recording.2024-04-23.at.6.59.02.in.the.evening.mov

koko57 · 2024-04-23T16:07:38Z

@getusha it's when you're clicking on the distance field?

koko57 · 2024-04-23T16:08:47Z

@getusha I cannot recreate

…nce for tracked expense

koko57 · 2024-04-23T16:49:11Z

@getusha @neil-marcellini PR ready for (I hope) last round of review

neil-marcellini

Great thanks!

amyevans

LGTM just 1 non-blocking question/comment

src/components/ReportActionItem/MoneyRequestView.tsx

…d-followups [CP Staging] Feat/36985 create new rate field followups (cherry picked from commit 7e5b436)

…-40711-1 🍒 Cherry pick PR #40711 to staging 🍒

OSBotify · 2024-04-23T21:28:01Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 1.4.64-4 🚀

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

OSBotify · 2024-04-23T23:44:49Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.64-6 🚀

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

parasharrajat · 2024-08-15T14:31:12Z

src/components/ReportActionItem/MoneyRequestView.tsx

                <MenuItemWithTopDescription
                    description={translate('common.distance')}
-                    title={distanceToDisplay}
+                    title={getPendingFieldAction('waypoints') ? translate('iou.fieldPending') : distanceToDisplay}


We don't need this now. #43569

koko57 added 2 commits April 22, 2024 16:09

fix: NAB comments from pull 38543

5111487

fix: NAB comments + change requested from pull 38543

69f54e2

koko57 mentioned this pull request Apr 22, 2024

[HOLD for payment 2024-05-02] CRITICAL: [P2P Distance] [$500] Create a new Rate field #36985

Closed

koko57 added 2 commits April 22, 2024 20:08

Merge branch 'main' into feat/36985-create-new-rate-field-followups

f34e527

fix: typecheck error

a49422d

koko57 mentioned this pull request Apr 22, 2024

[HOLD for payment 2024-05-02] Distance - Distance row shows "0.00 miles" instead of "Pending" after changing distance #40712

Closed

6 tasks

fix: show pending field when route is 0

7851a8b

koko57 marked this pull request as ready for review April 22, 2024 18:30

koko57 requested a review from a team as a code owner April 22, 2024 18:30

melvin-bot bot requested review from getusha and shawnborton and removed request for a team April 22, 2024 18:30

mountiny changed the title ~~Feat/36985 create new rate field followups~~ [CP Staging] Feat/36985 create new rate field followups Apr 22, 2024

mountiny assigned koko57 Apr 22, 2024

mountiny requested a review from amyevans April 22, 2024 18:31

neil-marcellini self-requested a review April 22, 2024 19:01

neil-marcellini mentioned this pull request Apr 22, 2024

Feat/36985 create new rate field #38543

Merged

61 tasks

neil-marcellini requested changes Apr 22, 2024

View reviewed changes

fix: apply requested changes

535cc20

neil-marcellini previously approved these changes Apr 22, 2024

View reviewed changes

fix: get the distance from comment quantity

eefa152

koko57 dismissed neil-marcellini’s stale review via eefa152 April 22, 2024 19:57

koko57 requested a review from neil-marcellini April 22, 2024 19:58

neil-marcellini previously approved these changes Apr 22, 2024

View reviewed changes

fix: fix initially focused option

5355cca

koko57 dismissed neil-marcellini’s stale review via 5355cca April 22, 2024 20:17

koko57 requested a review from neil-marcellini April 22, 2024 20:21

fix: display pending while changing the distance, block editing dista…

f88f23d

…nce for tracked expense

koko57 requested review from amyevans and neil-marcellini April 23, 2024 16:49

getusha approved these changes Apr 23, 2024

View reviewed changes

melvin-bot bot requested a review from yuwenmemon April 23, 2024 18:28

neil-marcellini previously approved these changes Apr 23, 2024

View reviewed changes

amyevans previously approved these changes Apr 23, 2024

View reviewed changes

src/components/ReportActionItem/MoneyRequestView.tsx Outdated Show resolved Hide resolved

fix: minor fix

e75d8f5

koko57 dismissed stale reviews from amyevans and neil-marcellini via e75d8f5 April 23, 2024 18:56

koko57 requested review from amyevans and neil-marcellini April 23, 2024 18:57

amyevans approved these changes Apr 23, 2024

View reviewed changes

neil-marcellini merged commit 7e5b436 into Expensify:main Apr 23, 2024

OSBotify pushed a commit that referenced this pull request Apr 23, 2024

Merge pull request #40711 from koko57/feat/36985-create-new-rate-fiel…

fa748ea

…d-followups [CP Staging] Feat/36985 create new rate field followups (cherry picked from commit 7e5b436)

os-botify bot mentioned this pull request Apr 23, 2024

🍒 Cherry pick PR #40711 to staging 🍒 #40821

Merged

48 tasks

neil-marcellini added a commit that referenced this pull request Apr 23, 2024

Merge pull request #40821 from Expensify/mountiny-cherry-pick-staging…

50e6769

…-40711-1 🍒 Cherry pick PR #40711 to staging 🍒

github-actions bot mentioned this pull request Apr 23, 2024

Deploy Checklist: New Expensify 2024-04-22 #40702

Closed

95 tasks

melvin-bot bot mentioned this pull request Apr 25, 2024

[HOLD for payment 2024-05-02] Distance - Selected distance rate is not highlighted in rate list #40722

Closed

6 tasks

bernhardoj mentioned this pull request Jun 12, 2024

[HOLD for payment 2024-08-14] [$250] Distance - Distance still shows Pending when preview and report header already show distance #43569

Closed

6 tasks

dominictb mentioned this pull request Jun 14, 2024

[HOLD for payment 2024-07-24] [$250] Track distance - Incorrect distance is displayed on confirmation page when submitting to WS #42959

Closed

6 tasks

parasharrajat reviewed Aug 15, 2024

View reviewed changes

[CP Staging] Feat/36985 create new rate field followups #40711

[CP Staging] Feat/36985 create new rate field followups #40711

Uh oh!

Conversation

koko57 commented Apr 22, 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!

melvin-bot bot commented Apr 22, 2024

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

getusha Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

koko57 Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shawnborton commented Apr 22, 2024

Uh oh!

getusha commented Apr 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini commented Apr 23, 2024

Uh oh!

koko57 commented Apr 23, 2024

Uh oh!

getusha commented Apr 23, 2024

Uh oh!

koko57 commented Apr 23, 2024

Uh oh!

koko57 commented Apr 23, 2024

Uh oh!

koko57 commented Apr 23, 2024

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 23, 2024

Uh oh!

OSBotify commented Apr 23, 2024

Uh oh!

parasharrajat Aug 15, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

koko57 commented Apr 22, 2024 •

edited

Loading

getusha commented Apr 22, 2024 •

edited

Loading