fix: prevent editing money request in case create failure #46376

dominictb · 2024-07-28T05:01:32Z

Details

Fixed Issues

Tests

Disable internet connection
Go to FAB > Submit expense
Select the Distance option
Enter an invalid start location
Enter an invalid finish location
Submit the expense to a workspace
Enable the internet connection
Wait for the error on the request to appear
Click on X icon to clear the error

Verify that: After step 8, the user couldn't edit the money request. After step 9, the errored money request is cleaned up properly and the user is navigated back to the relevant report screen

Verify that no errors appear in the JS console

Offline tests

QA Steps

Disable internet connection
Go to FAB > Submit expense
Select the Distance option
Enter an invalid start location
Enter an invalid finish location
Submit the expense to a workspace
Enable the internet connection
Wait for the error on the request to appear
Click on X icon to clear the error

Verify that: After step 8, the user couldn't edit the money request. After step 9, the errored money request is cleaned up properly and the user is navigated back to the relevant report screen

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

compressed_android.mov.mp4

Android: mWeb Chrome

compressed_android.mov.mp4

iOS: Native

compressed_ios.mov.mp4

iOS: mWeb Safari

compressed_ios.mov.mp4

MacOS: Chrome / Safari

compressed_web.mov.mp4

MacOS: Desktop

compressed_web.mov.mp4

melvin-bot · 2024-07-28T05:01:37Z

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

Ollyws · 2024-07-29T14:07:42Z

Little bit confused about the last three testing steps:

Click on the request

Click on the address input field and type valid waypoints on the start and finish locations respectively.

Save the new addresses

As we're disabling editing the request until the error (and request) are dismissed.

dominictb · 2024-07-29T16:51:16Z

Sorry @Ollyws. I updated the test steps.

Ollyws · 2024-07-30T09:59:33Z

@dominictb It seems that editing is disabled on all requests:

Screen.Recording.2024-07-30.at.11.56.41.mov

dominictb · 2024-07-30T10:16:42Z

@Ollyws this doesn't look right. Lemme check and get back to you later.

dominictb · 2024-07-30T18:02:11Z

@Ollyws sorry, I might mistakenly put an extra '!'. Remove it now and everything should work fine.

Ollyws · 2024-07-31T13:34:43Z

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

01_Android_Native.mp4

Android: mWeb Chrome

02_Android_Chrome.mp4

iOS: Native

03_iOS_Native.mp4

iOS: mWeb Safari

04_iOS_Safari.mp4

MacOS: Chrome / Safari

05_MacOS_Chrome.mp4

MacOS: Desktop

06_MacOS_Desktop.mp4

Ollyws

LGTM.

neil-marcellini

Thank for the fix, I think it all looks pretty good. I added some non blocking suggestions, which you could address in a follow up if you like. If so please DM me on Slack so I can review.

neil-marcellini · 2024-07-31T19:04:21Z

src/libs/ReportUtils.ts

@@ -2733,6 +2733,11 @@ function canEditMoneyRequest(reportAction: OnyxInputOrEntry<ReportAction<typeof
        return false;
    }

+    const transaction = linkedTransaction ?? getLinkedTransaction(reportAction ?? undefined);
+    if (!transaction?.transactionID || (transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(transaction.errors))) {


NAB: It would capture the intent better and be easier to read if we extract the if statement condition into a variable called transactionFailedToCreate. Alternatively we could explain with a comment.

neil-marcellini · 2024-07-31T19:06:01Z

src/components/ReportActionItem/MoneyRequestView.tsx

+        const originalMessage = parentReportAction && ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction) : undefined;
+        return originalMessage?.IOUTransactionID ?? '-1';
+    }, [parentReportAction]);
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${linkedTransactionID}`);


NAB: To match the previous behavior using withOnyx should we render null if the transaction status is loading from Onyx?

OSBotify · 2024-07-31T19:32:30Z

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

OSBotify · 2024-07-31T20:33:20Z

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

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

OSBotify · 2024-08-02T02:20:49Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.15-9 🚀

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

fix: prevent editing money request in case create failure

91de470

dominictb requested a review from a team as a code owner July 28, 2024 05:01

melvin-bot bot requested review from Ollyws and removed request for a team July 28, 2024 05:01

fix: update boolean logic

f34d68a

Ollyws approved these changes Jul 31, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini July 31, 2024 13:35

neil-marcellini approved these changes Jul 31, 2024

View reviewed changes

neil-marcellini merged commit 65bdedc into Expensify:main Jul 31, 2024
16 checks passed

github-actions bot mentioned this pull request Jul 31, 2024

Deploy Checklist: New Expensify 2024-07-31 #46607

Closed

melvin-bot bot mentioned this pull request Aug 2, 2024

[HOLD for payment 2024-08-09] [$250] Distance - Error is not dismissed after entering valid waypoints #44459

Closed

6 tasks

dominictb deleted the fix/44459-err-dismiss branch August 21, 2024 02:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: prevent editing money request in case create failure #46376

fix: prevent editing money request in case create failure #46376

dominictb commented Jul 28, 2024 •

edited

Loading

melvin-bot bot commented Jul 28, 2024

Ollyws commented Jul 29, 2024 •

edited

Loading

dominictb commented Jul 29, 2024

Ollyws commented Jul 30, 2024

dominictb commented Jul 30, 2024

dominictb commented Jul 30, 2024

Ollyws commented Jul 31, 2024

Ollyws left a comment

neil-marcellini left a comment

neil-marcellini Jul 31, 2024

neil-marcellini Jul 31, 2024

OSBotify commented Jul 31, 2024

OSBotify commented Jul 31, 2024

OSBotify commented Aug 2, 2024

fix: prevent editing money request in case create failure #46376

fix: prevent editing money request in case create failure #46376

Conversation

dominictb commented Jul 28, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 28, 2024

Ollyws commented Jul 29, 2024 • edited Loading

dominictb commented Jul 29, 2024

Ollyws commented Jul 30, 2024

dominictb commented Jul 30, 2024

dominictb commented Jul 30, 2024

Ollyws commented Jul 31, 2024

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment

Choose a reason for hiding this comment

neil-marcellini left a comment

Choose a reason for hiding this comment

neil-marcellini Jul 31, 2024

Choose a reason for hiding this comment

neil-marcellini Jul 31, 2024

Choose a reason for hiding this comment

OSBotify commented Jul 31, 2024

OSBotify commented Jul 31, 2024

OSBotify commented Aug 2, 2024

dominictb commented Jul 28, 2024 •

edited

Loading

Ollyws commented Jul 29, 2024 •

edited

Loading