Enable setting created and merchant fields for new requests #25449

mountiny · 2023-08-17T23:45:05Z

Details

In this PR we are enabling setting merchant and created when new requests are made

Fixed Issues

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

Tests

From Global create, select request money
Choose amount and participant
On the request confirmation page, show the hidden field
verify both Date and Merchant are clickable
Verify the Date is showing the current date
Choose different date
Write in some Merchant info
Create the request
Go to the iou report
Go to the transaction details
Verify the request has been created with correct Date
Verify the merchant is shown correctly and you cannot edit it for now

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

I am having a nightmare with the builds on native or android chrome, skipping it hoping C+ will test it

Web

web25449.mp4

Mobile Web - Chrome

Android emulator is acting up on me

Mobile Web - Safari

iosWeb25449.mp4

Desktop

Same as web

iOS

Android

Android emulator is acting up on me

melvin-bot · 2023-08-18T15:59:18Z

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

mountiny · 2023-08-18T16:04:43Z

@rushatgabhane Ah actually noting that the changes with created and merchant in API are not deployed yet so you should be able to test it offline only.

I believe we dont have to hold on the API since this is just adding two new params and if the client doe not send them, its not a problem.

rushatgabhane · 2023-08-18T16:59:59Z

src/pages/iou/MoneyRequestMerchantPage.js

+    },
+};
+
+class MoneyRequestMerchantPage extends Component {


@mountiny could you please convert this to a functional component? It should be straighforward.
Or if it's really urgent, we can merge this as-is and I can create a follow up PR to convert to functional component on a probono basis.

rushatgabhane · 2023-08-18T17:00:18Z

src/pages/iou/MoneyRequestCreatedPage.js

+    },
+};
+
+class MoneyRequestCreatedPage extends Component {


same for this

rushatgabhane · 2023-08-18T17:01:27Z

src/pages/iou/MoneyRequestCreatedPage.js

+                        inputID="moneyRequestCreated"
+                        label={this.props.translate('common.date')}
+                        defaultValue={this.props.iou.created}
+                        maxDate={new Date()}


Should we save drafts?

What happens when we there is a server error? Are we following Red Brick Road pattern here?

No when you close the modal, it should reset that is intentional. RBR is handled separately

rushatgabhane · 2023-08-18T17:07:27Z

src/libs/TransactionUtils.js

-        merchant,
-        created: DateUtils.getDBTime(),
+        merchant: merchant || CONST.REPORT.TYPE.IOU,
+        created: created || DateUtils.getDBTime(),


created: DateUtils.getDBTime()

getDBTime() returns time in milisecs. And created is of format YYYY-MM-DD.
This won't work, right?

I think the server is expecting time in one format. i.e. YYYY-MM-DD

The server does not mind, it can be both, now its passing DateUtils.getDBTime() and it should work fine

rushatgabhane · 2023-08-18T17:14:57Z

This tests well, just some comments above for you @mountiny

rushatgabhane · 2023-08-18T19:41:56Z

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

Screen.Recording.2023-08-18.at.22.25.08.mov

Split bill page

Mobile Web - Chrome

WhatsApp.Video.2023-08-19.at.03.05.29.mp4

Mobile Web - Safari

Desktop

Screen.Recording.2023-08-19.at.03.08.17.mov

iOS

Screen.Recording.2023-08-19.at.01.22.27.mov

Android

Screen.Recording.2023-08-19.at.03.00.45.mov

melvin-bot · 2023-08-18T21:37:58Z

@amyevans 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-18T21:38:03Z

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

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

rushatgabhane

@mountiny when splitting a bill, the merchant and created isn't set in split details page.
Steps:

Go offline
Create a split
Set merchant and change the date
Click the split request to open details page

Observe that the merchant and created isn't set

Screen.Recording.2023-08-19.at.03.08.17.mov

mountiny · 2023-08-18T23:46:32Z

@rushatgabhane I will disable this for the split bill case, its more complicated and the backend is not ready for it. thanks for highlighting

mountiny · 2023-08-19T00:13:37Z

Updated.

melvin-bot · 2023-08-19T03:41:07Z

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

Gonals

Tests great!

Gonals · 2023-08-21T09:05:00Z

I would leave that as a follow up

Do we have an issue for this?

mountiny · 2023-08-21T09:21:56Z

#25561

mountiny · 2023-08-21T16:33:22Z

@luacmartins resolved the merge conflicts.

luacmartins

LGTM!

luacmartins · 2023-08-21T16:40:10Z

We already had approvals from @rushatgabhane @Gonals and myself. Gonna go ahead and merge this since it solves a critical wave 4 issue.

OSBotify · 2023-08-21T16:48:05Z

✋ 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-21T22:23:19Z

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

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

OSBotify · 2023-08-24T03:06:20Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

mountiny added 3 commits August 18, 2023 00:32

Add getMerchant method

92ecc77

Set up money request merchant routes

4fc0e51

Add the MoneyRequestMerchantPage pagge

86c2be1

mountiny self-assigned this Aug 17, 2023

mountiny added 13 commits August 18, 2023 00:53

Enable the merchant field

ce56753

Create MoneyRequestCreatedPage and relevant routes

2c5f13e

Implementing the ability to set date for new request

b76949a

Make sure the created is also reset

c61a43f

Merge branch 'main' into vit-addMerchantToRequestMoney

3912e51

Remove unused prop

0bb81e1

Add mechant and created to the build optimistic transaction call

74bbf44

Pass the merchant and created to the api

6ed654c

Merge branch 'main' into vit-addMerchantToRequestMoney

8f7b3a3

Update tests

f8d6cab

Fix the lint

3105cf5

Add the merchant to transaction header

ae5ab8d

Merge branch 'main' into vit-addMerchantToRequestMoney

44b2dc6

mountiny marked this pull request as ready for review August 18, 2023 15:58

mountiny requested a review from a team as a code owner August 18, 2023 15:58

mountiny requested a review from Gonals August 18, 2023 15:58

melvin-bot bot requested review from AndrewGable and removed request for a team August 18, 2023 15:59

mountiny requested a review from rushatgabhane August 18, 2023 16:03

rushatgabhane suggested changes Aug 18, 2023

View reviewed changes

luacmartins self-requested a review August 18, 2023 17:18

Merge branch 'main' into vit-addMerchantToRequestMoney

3661a9c

This comment was marked as outdated.

Sign in to view

melvin-bot bot requested a review from amyevans August 18, 2023 21:37

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

[HOLD for payment 2023-08-30] Payment issue for E/App PR#25449 #25515

Closed

rushatgabhane suggested changes Aug 18, 2023

View reviewed changes

mountiny added 2 commits August 19, 2023 00:47

Merge branch 'main' into vit-addMerchantToRequestMoney

e5755b4

Disable changing date and merchant when creating split bills

8ad0fc4

rushatgabhane approved these changes Aug 19, 2023

View reviewed changes

melvin-bot bot requested a review from jasperhuangg August 19, 2023 03:41

Gonals previously approved these changes Aug 21, 2023

View reviewed changes

mountiny mentioned this pull request Aug 21, 2023

[HOLD for payment 2023-09-04] [mWeb Safari] Date is trimmed on small devices when creating manual requetst #25561

Closed

6 tasks

BeeMargarida mentioned this pull request Aug 21, 2023

#25561: apply flex1 to MenuItems titleStyle in MoneyRequestConfirmationList #25593

Merged

59 tasks

Merge main to resolve merge conflicts

6b13565

mountiny dismissed Gonals’s stale review via 6b13565 August 21, 2023 16:04

luacmartins approved these changes Aug 21, 2023

View reviewed changes

luacmartins merged commit 977f1fd into main Aug 21, 2023
12 checks passed

luacmartins deleted the vit-addMerchantToRequestMoney branch August 21, 2023 16:40

OSBotify mentioned this pull request Aug 21, 2023

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

Closed

jjcoffee mentioned this pull request Aug 22, 2023

[HOLD for payment 2023-09-04] [$1000] Split Bill - All user names are showing in IOU #25640

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable setting created and merchant fields for new requests #25449

Enable setting created and merchant fields for new requests #25449

mountiny commented Aug 17, 2023 •

edited

Loading

melvin-bot bot commented Aug 18, 2023

mountiny commented Aug 18, 2023

rushatgabhane Aug 18, 2023

rushatgabhane Aug 18, 2023

rushatgabhane Aug 18, 2023

mountiny Aug 18, 2023

rushatgabhane Aug 18, 2023 •

edited

Loading

mountiny Aug 18, 2023

rushatgabhane commented Aug 18, 2023 •

edited

Loading

rushatgabhane commented Aug 18, 2023 •

edited

Loading

This comment was marked as outdated.

melvin-bot bot commented Aug 18, 2023

melvin-bot bot commented Aug 18, 2023

rushatgabhane left a comment •

edited

Loading

mountiny commented Aug 18, 2023

mountiny commented Aug 19, 2023

melvin-bot bot commented Aug 19, 2023

Gonals left a comment

Gonals commented Aug 21, 2023

mountiny commented Aug 21, 2023

mountiny commented Aug 21, 2023

luacmartins left a comment

luacmartins commented Aug 21, 2023

OSBotify commented Aug 21, 2023

OSBotify commented Aug 21, 2023

OSBotify commented Aug 24, 2023

Enable setting created and merchant fields for new requests #25449

Enable setting created and merchant fields for new requests #25449

Conversation

mountiny commented Aug 17, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 18, 2023

mountiny commented Aug 18, 2023

rushatgabhane Aug 18, 2023

Choose a reason for hiding this comment

rushatgabhane Aug 18, 2023

Choose a reason for hiding this comment

rushatgabhane Aug 18, 2023

Choose a reason for hiding this comment

mountiny Aug 18, 2023

Choose a reason for hiding this comment

rushatgabhane Aug 18, 2023 • edited Loading

Choose a reason for hiding this comment

mountiny Aug 18, 2023

Choose a reason for hiding this comment

rushatgabhane commented Aug 18, 2023 • edited Loading

rushatgabhane commented Aug 18, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

This comment was marked as outdated.

melvin-bot bot commented Aug 18, 2023

melvin-bot bot commented Aug 18, 2023

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

mountiny commented Aug 18, 2023

mountiny commented Aug 19, 2023

melvin-bot bot commented Aug 19, 2023

Gonals left a comment

Choose a reason for hiding this comment

Gonals commented Aug 21, 2023

mountiny commented Aug 21, 2023

mountiny commented Aug 21, 2023

luacmartins left a comment

Choose a reason for hiding this comment

luacmartins commented Aug 21, 2023

OSBotify commented Aug 21, 2023

OSBotify commented Aug 21, 2023

OSBotify commented Aug 24, 2023

mountiny commented Aug 17, 2023 •

edited

Loading

rushatgabhane Aug 18, 2023 •

edited

Loading

rushatgabhane commented Aug 18, 2023 •

edited

Loading

rushatgabhane commented Aug 18, 2023 •

edited

Loading

rushatgabhane left a comment •

edited

Loading