fix: allow user to instantly edit created distance rate by MrMuzyk · Pull Request #38799 · Expensify/App

MrMuzyk · 2024-03-22T12:01:38Z

Details

Fixing the issue that prevented users from instantly editing freshly created distance rate.

Fixed Issues

$ #38798
$ #38815
PROPOSAL:

Tests

Same as QA steps

Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition:
Have a paid policy that you're admin of
Enable distance rates

Go to workspace settings > Distance Rates
Create new rate
Create another rate with same value
Disable last created rate
Verify that it is saved and is working as expected.

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

create-edge-case-fix.mp4

MacOS: Desktop

MrMuzyk · 2024-03-22T12:10:13Z


    const toggleAllRates = () => {
-        if (selectedDistanceRates.length === Object.values(customUnitRates).length) {
+        const allSelectableRates = Object.values(customUnitRates).filter((rate) => rate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);


minor fix to toggleAllRates functionality. It wasn't working properly in offline mode

melvin-bot · 2024-03-22T12:10:27Z

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

c3024 · 2024-03-22T13:44:21Z

If we don't provide shouldEnableMaxHeight here to the ScreenWrapper

App/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx

Line 73 in 67acd7b

>

the Save button goes behind the on screen keyboard like here #37969 (comment). We might fix this in this PR.

c3024 · 2024-03-22T13:23:47Z

+ * @param rates
+ */
+function getOptimisticRateName(rates: Record<string, Rate>): string {
+    const existingRatesWithSameName = Object.values(rates).filter((rate) => (rate.name ?? '').startsWith(CONST.CUSTOM_UNITS.DEFAULT_RATE));


Suggested change

const existingRatesWithSameName = Object.values(rates).filter((rate) => (rate.name ?? '').startsWith(CONST.CUSTOM_UNITS.DEFAULT_RATE));

const existingRatesWithSameName = Object.values(rates ?? {}).filter((rate) => (rate.name ?? '').startsWith(CONST.CUSTOM_UNITS.DEFAULT_RATE));

Same reason as other comment

c3024 · 2024-03-22T13:51:25Z

Pressing Enter does not submit the form in CreateDistanceRatePage. I think we should add
disablePressOnEnter={false}
here

App/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx

Line 75 in 67acd7b

<FormProvider

as we do in RatePage and ValuePage

c3024 · 2024-03-22T14:41:44Z

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

instantEditAndroid.mp4

Android: mWeb Chrome

instantEditAndroidChrome.mp4

iOS: Native

instantEditiOS.mp4

iOS: mWeb Safari

instantEditiOSSafari.mp4

MacOS: Chrome / Safari

instantEditChrome.mp4

MacOS: Desktop

instantEditDesktop.mp4

c3024 · 2024-03-22T16:18:35Z

We might still end up giving same optimistic name for two rates.

Say we made 25 rates. The last one will have name as Default Rate 25. Now we delete Default Rate 5. Now the count is 24, so the new rate will have name as Default Rate 25 again making a duplicate.

I think backend is not adding increasing count of Default Value but just increasing the last digit count if the same name already exists.

I think theses being rare cases we can just go ahead and merge. Or if we like to fix we can give unique keys for each rate name.

cc: @luacmartins

c3024

LGTM

OSBotify · 2024-03-22T18:02:23Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

fix: instantly edit created distance rate

29cd7ba

MrMuzyk commented Mar 22, 2024

View reviewed changes

MrMuzyk marked this pull request as ready for review March 22, 2024 12:10

MrMuzyk requested a review from a team as a code owner March 22, 2024 12:10

melvin-bot Bot requested review from c3024 and removed request for a team March 22, 2024 12:10

c3024 reviewed Mar 22, 2024

View reviewed changes

Comment thread src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx Outdated

fix: cr fix

1fa4dc1

c3024 reviewed Mar 22, 2024

View reviewed changes

fix: more fixes

29a2fd1

c3024 approved these changes Mar 22, 2024

View reviewed changes

melvin-bot Bot requested a review from luacmartins March 22, 2024 16:18

luacmartins approved these changes Mar 22, 2024

View reviewed changes

luacmartins merged commit a8382aa into Expensify:main Mar 22, 2024

This was referenced Mar 22, 2024

[No QA] Fix off by one error in optimistic distance rate name #38823

Merged

[HOLD for payment 2024-04-05] [Simplified Collect][Distance rates] - Error shows up when disabling and renaming distance rate #38815

Closed

github-actions Bot mentioned this pull request Mar 27, 2024

Deploy Checklist: New Expensify 2024-03-27 #39033

Closed

kbecciv mentioned this pull request Mar 27, 2024

Distance rates - Empty space between distance rates after deleting and adding distance rate #39083

Closed

6 tasks

lanitochka17 mentioned this pull request Mar 27, 2024

[HOLD for payment 2024-04-09] Distance rates - App shows the same icon for Enable rate and Disable rate #39085

Closed

6 tasks

melvin-bot Bot mentioned this pull request Mar 29, 2024

[HOLD for payment 2024-04-05] [Distance rates] Immediate editing of freshly created rate fails - rates are not being created with correct optimistic name #38798

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: allow user to instantly edit created distance rate#38799

fix: allow user to instantly edit created distance rate#38799
luacmartins merged 3 commits into
Expensify:mainfrom
MrMuzyk:fix/editing-fresh-distance-rate

MrMuzyk commented Mar 22, 2024 •

edited by luacmartins

Loading

Uh oh!

MrMuzyk Mar 22, 2024

Uh oh!

melvin-bot Bot commented Mar 22, 2024

Uh oh!

Uh oh!

c3024 commented Mar 22, 2024

Uh oh!

c3024 Mar 22, 2024

Uh oh!

c3024 commented Mar 22, 2024

Uh oh!

c3024 commented Mar 22, 2024 •

edited

Loading

Uh oh!

c3024 commented Mar 22, 2024 •

edited

Loading

Uh oh!

c3024 left a comment

Uh oh!

OSBotify commented Mar 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	const existingRatesWithSameName = Object.values(rates).filter((rate) => (rate.name ?? '').startsWith(CONST.CUSTOM_UNITS.DEFAULT_RATE));
	const existingRatesWithSameName = Object.values(rates ?? {}).filter((rate) => (rate.name ?? '').startsWith(CONST.CUSTOM_UNITS.DEFAULT_RATE));

Uh oh!

Conversation

MrMuzyk commented Mar 22, 2024 • edited by luacmartins 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 Mar 22, 2024

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Mar 22, 2024

Uh oh!

Uh oh!

c3024 commented Mar 22, 2024

Uh oh!

c3024 Mar 22, 2024

Choose a reason for hiding this comment

Uh oh!

c3024 commented Mar 22, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

c3024 left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Mar 22, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

MrMuzyk commented Mar 22, 2024 •

edited by luacmartins

Loading

c3024 commented Mar 22, 2024 •

edited

Loading

c3024 commented Mar 22, 2024 •

edited

Loading