Edit merchant field of money requests #25702

mountiny · 2023-08-22T16:16:16Z

Details

In this PR we are:

Making the default transaction merchant Request
The transaction merchant field is editable

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/301363

Tests

Create a request from User B
Go to the iou report
Go to the transaction thread
verify the merchant field says Request
Edit the merchant field to say KFC
Save it
Verify the transaction data has updated and there is a report action saying changed the merchant to 'KFC' (previously 'Request')

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

25702web.mp4

Mobile Web - Chrome

Mobile Web - Safari

25702mwebiOS.mp4

Desktop

Same as web

iOS

Android

melvin-bot · 2023-08-22T16:16:23Z

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

melvin-bot · 2023-08-22T16:40:44Z

npm has a package.json file and a package-lock.json file. It seems you updated one without the other, which is usually a sign of a mistake. If you are updating a package make sure that you update the version in package.json then run npm install

melvin-bot · 2023-08-22T16:47:49Z

npm has a package.json file and a package-lock.json file. It seems you updated one without the other, which is usually a sign of a mistake. If you are updating a package make sure that you update the version in package.json then run npm install

mountiny · 2023-08-22T16:48:07Z

I am stuck with native mobile apps with cocoapos issues 😢 unable to add recordings

package-lock.json

s77rt

Code looks good

src/components/MoneyRequestConfirmationList.js

s77rt · 2023-08-22T17:37:36Z

After changing the merchant the transaction is considered as a receipt (and we get a receipt preview image). I think that's expected right?

s77rt · 2023-08-22T17:43:57Z

If you try to change the merchant on money request, the input will be empty instead of "Request"

Kooha-2023-08-22-18-43-12.mp4

s77rt · 2023-08-22T17:49:41Z

Found an unrelated bug: The App sometimes crash

Kooha-2023-08-22-18-46-09.mp4

s77rt · 2023-08-22T18:30:23Z

On Android seem to be facing multiple issues

Kooha-2023-08-22-19-28-26.mp4

Kooha-2023-08-22-19-14-54.mp4

s77rt · 2023-08-22T21:39:11Z

Most of the above bugs may not be originating from this PR but they are blocking testing for Android.

And we have some conflicts

s77rt · 2023-08-22T22:34:00Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

web.mp4

Mobile Web - Chrome

mweb-chrome.mp4

Mobile Web - Safari

mweb-safari.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mov

mountiny · 2023-08-23T14:34:57Z

After changing the merchant the transaction is considered as a receipt (and we get a receipt preview image). I think that's expected right?

This is backend bug, fixing elsewhere

mountiny · 2023-08-23T14:36:05Z

If you try to change the merchant on money request, the input will be empty instead of "Request"

So I have made this like so on purpose as the Request is a default value so I want the user to see it but on the other hand if they want to edit it, I dont want them to always have to delete the Request first in order to enter custom merchant

s77rt · 2023-08-23T16:21:46Z

The merchant does not seem to be changing now

Screen.Recording.2023-08-23.at.5.16.36.PM.mov

mountiny · 2023-08-23T16:37:36Z

@s77rt I cannot reproduce

Screen.Recording.2023-08-23.at.17.36.48.mp4

s77rt · 2023-08-23T16:51:50Z

Retested seems working now

melvin-bot · 2023-08-23T16:52:58Z

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

melvin-bot · 2023-08-23T16:53:02Z

🎯 @s77rt, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #25788.

luacmartins · 2023-08-23T18:18:18Z

src/pages/EditRequestMerchantPage.js

+        >
+            <HeaderWithBackButton
+                title={translate('common.merchant')}
+                onBackButtonPress={() => Navigation.goBack()}


NAB

Suggested change

onBackButtonPress={() => Navigation.goBack()}

onBackButtonPress={Navigation.goBack}

OSBotify · 2023-08-23T18:23:28Z

✋ 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 · 2023-08-24T03:35:13Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.57-0 🚀

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

OSBotify · 2023-08-28T18:51:53Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.58-0 🚀

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

OSBotify · 2023-08-29T00:06:54Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.57-6 🚀

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

OSBotify · 2023-08-30T01:20:56Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.58-5 🚀

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

mountiny added 4 commits August 22, 2023 17:04

Implement the edit merchant page

931524f

Remove disabled prop from the edit merchant row

880ba04

Update tests

1afa768

Swap the created and merchant order for the modified expense messahe

4fd293e

mountiny self-assigned this Aug 22, 2023

mountiny requested a review from a team as a code owner August 22, 2023 16:16

melvin-bot bot requested review from s77rt and removed request for a team August 22, 2023 16:16

mountiny changed the title ~~Edit merchnat on request~~ Edit merchant field of money requests Aug 22, 2023

Polish

8d17b2c

mountiny commented Aug 22, 2023

View reviewed changes

package-lock.json Outdated Show resolved Hide resolved

s77rt reviewed Aug 22, 2023

View reviewed changes

src/components/MoneyRequestConfirmationList.js Show resolved Hide resolved

mountiny requested a review from Gonals August 22, 2023 17:28

Merge main

26c1c76

mountiny requested a review from s77rt August 23, 2023 15:09

s77rt approved these changes Aug 23, 2023

View reviewed changes

melvin-bot bot requested a review from hayata-suenaga August 23, 2023 16:52

melvin-bot bot mentioned this pull request Aug 23, 2023

Payment issue for E/App PR#25702 #25788

Closed

luacmartins self-requested a review August 23, 2023 18:14

luacmartins approved these changes Aug 23, 2023

View reviewed changes

luacmartins merged commit 59b396c into main Aug 23, 2023

luacmartins deleted the vit-editMerchant branch August 23, 2023 18:18

mountiny mentioned this pull request Aug 23, 2023

Make the merchant field be populated #25794

Merged

59 tasks

This was referenced Aug 23, 2023

[$1000] IOU - IOU is displayed as Merchant in IOU details page when IOU is created without a Merchant #25694

Closed

Deploy Checklist: New Expensify 2023-08-21 #25625

Closed

OSBotify mentioned this pull request Aug 24, 2023

Deploy Checklist: New Expensify 2023-08-24 #25813

Closed

73 tasks

lanitochka17 mentioned this pull request Aug 24, 2023

Request money - Visual issue appear when change Merchant name #25870

Closed

6 tasks

OSBotify mentioned this pull request Aug 28, 2023

Deploy Checklist: New Expensify 2023-08-28 #26113

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Edit merchant field of money requests #25702

Edit merchant field of money requests #25702

mountiny commented Aug 22, 2023 •

edited

Loading

melvin-bot bot commented Aug 22, 2023

melvin-bot bot commented Aug 22, 2023

melvin-bot bot commented Aug 22, 2023

mountiny commented Aug 22, 2023

s77rt left a comment

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023 •

edited

Loading

mountiny commented Aug 23, 2023

mountiny commented Aug 23, 2023

s77rt commented Aug 23, 2023

mountiny commented Aug 23, 2023

s77rt commented Aug 23, 2023

melvin-bot bot commented Aug 23, 2023

melvin-bot bot commented Aug 23, 2023

luacmartins Aug 23, 2023

OSBotify commented Aug 23, 2023

OSBotify commented Aug 24, 2023

OSBotify commented Aug 28, 2023

OSBotify commented Aug 29, 2023

OSBotify commented Aug 30, 2023

	onBackButtonPress={() => Navigation.goBack()}
	onBackButtonPress={Navigation.goBack}

Edit merchant field of money requests #25702

Edit merchant field of money requests #25702

Conversation

mountiny commented Aug 22, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 22, 2023

melvin-bot bot commented Aug 22, 2023

melvin-bot bot commented Aug 22, 2023

mountiny commented Aug 22, 2023

s77rt left a comment

Choose a reason for hiding this comment

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023

s77rt commented Aug 22, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mountiny commented Aug 23, 2023

mountiny commented Aug 23, 2023

s77rt commented Aug 23, 2023

mountiny commented Aug 23, 2023

s77rt commented Aug 23, 2023

melvin-bot bot commented Aug 23, 2023

melvin-bot bot commented Aug 23, 2023

luacmartins Aug 23, 2023

Choose a reason for hiding this comment

OSBotify commented Aug 23, 2023

OSBotify commented Aug 24, 2023

OSBotify commented Aug 28, 2023

OSBotify commented Aug 29, 2023

OSBotify commented Aug 30, 2023

mountiny commented Aug 22, 2023 •

edited

Loading

s77rt commented Aug 22, 2023 •

edited

Loading