fix: Split - App does not throw an error when saving the empty merchant field. #45371

Krishna2323 · 2024-07-13T10:28:38Z

Details

Fixed Issues

$ #45180
PROPOSAL: #45180 (comment)

Tests

Go to workspace chat.
Go to + > Split expense > Scan.
Upload a receipt and submit it.
Click on the split preview.
Click Merchant.
Click Save without entering the merchant.
Verify This field is required. error appears below merchant input and RHP is not closed.

Verify that no errors appear in the JS console

Offline tests

Go to workspace chat.
Go to + > Split expense > Scan.
Upload a receipt and submit it.
Click on the split preview.
Click Merchant.
Click Save without entering the merchant.
Verify This field is required. error appears below merchant input and RHP is not closed.

QA Steps

Go to workspace chat.
Go to + > Split expense > Scan.
Upload a receipt and submit it.
Click on the split preview.
Click Merchant.
Click Save without entering the merchant.
Verify This field is required. error appears below merchant input and RHP is not closed.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

…nt field. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2024-07-13T10:28:43Z

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

Krishna2323 · 2024-07-13T10:29:38Z

@c3024, do we also need to remove || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);? I'm not sure about it 😅

c3024 · 2024-07-15T06:52:46Z

src/pages/iou/request/step/IOURequestStepMerchant.tsx

@@ -63,7 +63,7 @@ function IOURequestStepMerchant({
    const merchant = ReportUtils.getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant;
    const isEmptyMerchant = merchant === '' || merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;

-    const isMerchantRequired = ReportUtils.isExpenseRequest(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);
+    const isMerchantRequired = ReportUtils.isPolicyExpenseChat(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);


Is isExpenseRequest always true (false) when isPolicyExpenseChat is true (false)? It is not obvious for me from the function definitions.

Is isExpenseRequest always true (false) when isPolicyExpenseChat is true (false)? It is not obvious for me from the function definitions.

Could you pls explain, what do you mean by this?
isPolicyExpenseChat is only true for Policy Expenses and isExpenseRequest is true for all expenses IG.

I was asking if we are sure of removing it safely without a regression. Looks like we gotta retain the isExpenseRequest condition as well.

Here is a regression I found if we remove it.

Submit two expenses in a workspace chat

Click on the Report Preview

Click on one of the expenses

Click on merchant

Remove the text in the merchant field and save

It is saved and modal dismissed (this is a regression)

merchantPossibleRegression.mp4

c3024 · 2024-07-15T07:53:45Z

@c3024, do we also need to remove || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);? I'm not sure about it 😅

@Krishna2323

We cannot remove it. This might not be required for split expense but it is required in other cases. This is one of the cases where I found this is required.

Prerequisite: User has no workspaces

Track an expense
Click on Categorize it on the whisper created
Select a category
Click on Merchant
Click Save on merchant page
Merchant can be saved with empty string (this will be a regression)

Krishna2323 · 2024-07-15T07:57:22Z

We cannot remove it. This might not be required for split expense but it is required in other cases. This is one of the cases where I found this is required.

Yes, thats what I was thinking. I was confused due to slack convo .

c3024 · 2024-07-15T08:20:41Z

src/pages/iou/request/step/IOURequestStepMerchant.tsx

@@ -63,7 +63,7 @@ function IOURequestStepMerchant({
    const merchant = ReportUtils.getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant;
    const isEmptyMerchant = merchant === '' || merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;

-    const isMerchantRequired = ReportUtils.isExpenseRequest(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);
+    const isMerchantRequired = ReportUtils.isPolicyExpenseChat(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);


I was asking if we are sure of removing it safely without a regression. Looks like we gotta retain the isExpenseRequest condition as well.

Here is a regression I found if we remove it.

Submit two expenses in a workspace chat

Click on the Report Preview

Click on one of the expenses

Click on merchant

Remove the text in the merchant field and save

It is saved and modal dismissed (this is a regression)

merchantPossibleRegression.mp4

c3024 · 2024-07-15T13:14:38Z

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

merchantAndroid.mp4

Android: mWeb Chrome

merchantAndroidmWeb.mp4

iOS: Native

merchantiOS.mp4

iOS: mWeb Safari

merchantiOSmWeb.mp4

MacOS: Chrome / Safari

merchantChrome.mp4

MacOS: Desktop

merchantDesktop.mp4

c3024 · 2024-07-15T13:21:25Z

Upload a receipt and submit it.
Click on the split preview.

Should there be a specific step that the request fails here in between these steps?

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2024-07-15T13:45:39Z

Should there be a specific step that the request fails here in between these steps?

Nope, it can be tested without failure. Recording videos, will be added in few minutes.

Krishna2323 · 2024-07-15T14:02:41Z

@c3024, recordings added.

c3024

LGTM!

OSBotify · 2024-07-15T15:57:42Z

✋ 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-15T21:09:11Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.0.7-3 🚀

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

OSBotify · 2024-07-15T22:17:49Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-17T00:26:22Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

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

OSBotify · 2024-07-18T13:55:08Z

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

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

fix: Split - App does not throw an error when saving the empty mercha…

2b9b1a1

…nt field. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 requested a review from a team as a code owner July 13, 2024 10:28

melvin-bot bot requested review from c3024 and removed request for a team July 13, 2024 10:28

c3024 reviewed Jul 15, 2024

View reviewed changes

c3024 suggested changes Jul 15, 2024

View reviewed changes

add ReportUtils.isExpenseRequest(report) check back.

07def0a

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

c3024 approved these changes Jul 15, 2024

View reviewed changes

melvin-bot bot requested a review from Julesssss July 15, 2024 15:04

Julesssss approved these changes Jul 15, 2024

View reviewed changes

Julesssss merged commit 167aea2 into Expensify:main Jul 15, 2024
15 of 16 checks passed

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

Deploy Checklist: New Expensify 2024-07-15 #45421

Closed

melvin-bot bot mentioned this pull request Jul 17, 2024

[HOLD for payment 2024-07-24] [$250] Split - App does not throw an error when saving the empty merchant field #45180

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Split - App does not throw an error when saving the empty merchant field. #45371

fix: Split - App does not throw an error when saving the empty merchant field. #45371

Krishna2323 commented Jul 13, 2024 •

edited

Loading

melvin-bot bot commented Jul 13, 2024

Krishna2323 commented Jul 13, 2024

c3024 Jul 15, 2024

Krishna2323 Jul 15, 2024

c3024 Jul 15, 2024

c3024 commented Jul 15, 2024

Krishna2323 commented Jul 15, 2024

c3024 Jul 15, 2024

c3024 commented Jul 15, 2024 •

edited

Loading

c3024 commented Jul 15, 2024 •

edited

Loading

Krishna2323 commented Jul 15, 2024

Krishna2323 commented Jul 15, 2024

c3024 left a comment

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

fix: Split - App does not throw an error when saving the empty merchant field. #45371

fix: Split - App does not throw an error when saving the empty merchant field. #45371

Conversation

Krishna2323 commented Jul 13, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 13, 2024

Krishna2323 commented Jul 13, 2024

c3024 Jul 15, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 15, 2024

Choose a reason for hiding this comment

c3024 Jul 15, 2024

Choose a reason for hiding this comment

c3024 commented Jul 15, 2024

Krishna2323 commented Jul 15, 2024

c3024 Jul 15, 2024

Choose a reason for hiding this comment

c3024 commented Jul 15, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

c3024 commented Jul 15, 2024 • edited Loading

Krishna2323 commented Jul 15, 2024

Krishna2323 commented Jul 15, 2024

c3024 left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

Krishna2323 commented Jul 13, 2024 •

edited

Loading

c3024 commented Jul 15, 2024 •

edited

Loading

c3024 commented Jul 15, 2024 •

edited

Loading