Add merchant and date fields to manual requests #23648

lukemorawski · 2023-07-26T14:05:20Z

Details

We want to add new fields to the money request page - merchant and date.
Those new fields need to be hidden under the “Show more” button. Button disappears when the details are shown.
Values of those fields are taken from the “iou” object created when creating a new money request.

Fixed Issues

$ #23245
PROPOSAL:
We need to add a simple bool state flag to the MoneyRequestConfirmationList.js and a small button with horizontal line that will toggle this flag. The flag will control the visibility of two new MenuItemWithTopDescription components.
New props would need to be introduced to the MoneyRequestConfirmationList component - one for passing the date and the other to pass the merchant value.
Those props are passed from the MoneyRequestConfirmPage component, and are taken from an Onyx subscription to ‘iou’ object
In order get the new default values in the ‘iou’ object we need to add them to the object merged in resetMoneyRequestInfo function from IOU.js. Default value for merchant is an empty string and date is current date.
In future PRs those values will be editable.

desktop.chrome.mov

Tests

Open app
log in
click on the FAB + button on the main screen
select Request Money
fill out details and reach the Details screen
Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

merchant and date value are taken from the "iou" key-value pair. Clearing this up with Alex.

melvin-bot · 2023-07-26T14:05:26Z

@shawnborton @0xmiroslav One of you needs to 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]

Beamanator · 2023-07-26T14:30:31Z

@lukemorawski thanks for the PR!! Looks like there's at least 1 file with a conflict :D

@0xmiroslav can you please put this relatively high on your priority list? We would love to get this in the App soon, as a few other issues are waiting for it 👍

…lds_to_manual_requests

lukemorawski · 2023-07-26T14:37:59Z

conflict resolved

shawnborton · 2023-07-26T14:51:45Z

src/components/MoneyRequestConfirmationList.js

+                        onPress={toggleShowAllFields}
+                        text={showAllFields ? translate('common.showLess') : translate('common.showMore')}
+                        shouldShowRightIcon
+                        iconRight={showAllFields ? Expensicons.UpArrow : Expensicons.DownArrow}


Can we make the icon use our standard colors.icon color?

This can be a global change for all default buttons too

shawnborton · 2023-07-26T14:53:26Z

Looks good so far, curious to see this on desktop too.

Is there ever a situation where a "Show less" button appears?

lukemorawski · 2023-07-26T14:54:38Z

@shawnborton Ah no, forgot to remove that show less thing :) Will do that in a mo.

lukemorawski · 2023-07-26T15:09:11Z

@shawnborton sorry, but I couldn't find an example in the app where an button icon is stylised with the colour you mention. Can you point to a place in the app where this colour is used?

lukemorawski · 2023-07-26T15:19:57Z

Ok, I think I got it

Beamanator · 2023-07-28T07:06:42Z

@0xmiroslav can you please test this on all platforms today? If not, can you let me know so I can find a new C+ who is available?

situchan · 2023-07-28T07:09:23Z

I am available to review right now

Beamanator · 2023-07-28T07:19:56Z

Ping'd you both in slack 👍

Beamanator · 2023-07-28T07:22:10Z

@situchan you're up! Please review! And thanks for being available quickly 🙏

situchan

Let's make this PR simple by undoing any unnecessary changes.

situchan · 2023-07-28T07:58:42Z

src/libs/actions/IOU.js

-                ...(isNewChatReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
+                ...(isNewChatReport
+                    ? {
+                          pendingFields: {
+                              createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                          },
+                      }
+                    : {}),


Please revert any unnecessary changes like this as long as they don't break lint.

situchan · 2023-07-28T07:59:00Z

src/libs/actions/IOU.js

+                ...(isNewIOUReport
+                    ? {
+                          pendingFields: {
+                              createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                          },
+                      }
+                    : {}),


situchan · 2023-07-28T07:59:09Z

src/libs/actions/IOU.js

@@ -336,7 +361,6 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part
    if (iouReport) {
        if (isPolicyExpenseChat) {
            iouReport = {...iouReport};
-


this is not undo'ed yet

situchan · 2023-07-28T07:59:25Z

src/libs/actions/IOU.js

-                ...(existingGroupChatReport ? {} : {[groupCreatedReportAction.reportActionID]: groupCreatedReportAction}),
+                ...(existingGroupChatReport
+                    ? {}
+                    : {
+                          [groupCreatedReportAction.reportActionID]: groupCreatedReportAction,
+                      }),


situchan · 2023-07-28T07:59:43Z

src/libs/actions/IOU.js

+                    ? {}
+                    : {
+                          [groupCreatedReportAction.reportActionID]: {pendingAction: null},
+                      }),


situchan · 2023-07-28T08:00:46Z

src/libs/actions/IOU.js

+    API.write('SendMoneyWithWallet', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });


situchan · 2023-07-28T08:00:56Z

src/libs/actions/IOU.js

+    API.write('SendMoneyViaPaypal', params, {
+        optimisticData,
+        successData,
+        failureData,
+    });


this is not undo'ed yet

situchan · 2023-07-28T08:01:03Z

src/libs/actions/IOU.js

+    Onyx.merge(ONYXKEYS.IOU, {
+        participants,
+    });


situchan · 2023-07-28T08:01:56Z

src/libs/actions/IOU.js

-    splitBill,
-    splitBillAndOpenReport,
+    payMoneyRequest,
    requestMoney,
+    resetMoneyRequestInfo,
    sendMoneyElsewhere,
    sendMoneyViaPaypal,
-    payMoneyRequest,
    sendMoneyWithWallet,
-    startMoneyRequest,
-    resetMoneyRequestInfo,
-    setMoneyRequestId,
    setMoneyRequestAmount,
    setMoneyRequestCurrency,
    setMoneyRequestDescription,
+    setMoneyRequestId,
    setMoneyRequestParticipants,
+    splitBill,
+    splitBillAndOpenReport,
+    startMoneyRequest,


please keep original orders so I can see clearly what are removed and what are newly added

situchan · 2023-07-28T08:02:03Z

src/pages/iou/steps/MoneyRequestConfirmPage.js

@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useRef, useMemo} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef} from 'react';


situchan · 2023-08-01T20:35:37Z

@lukemorawski please re-request review from me when ready. Thanks

Beamanator · 2023-08-02T07:27:23Z

Code is looking great!! I still see a few places changes that weren't necessary (reordering the withCurrentPersonalDetails prop types & default prop types, but for the sake of urgency @situchan please review as is 🙏 we really need to get this merged soon 🙏

Also FYI @lukemorawski I'm going to remove Lukemorawski 23245 from the PR title if you don't mind 😅

lukemorawski · 2023-08-02T08:20:05Z

@Beamanator hey, yeah no worries, remove the name 😃

Beamanator · 2023-08-02T08:30:41Z

Done! 😅 👍

situchan

Looks good, minor feedback

situchan · 2023-08-02T10:45:33Z

src/components/MoneyRequestConfirmationList.js

@@ -103,6 +113,9 @@ function MoneyRequestConfirmationList(props) {
    // Prop functions pass props itself as a "this" value to the function which means they change every time props change.
    const {translate, onSendMoney, onConfirm, onSelectParticipant} = props;

+    // A flag and a toggler for showing the rest of the form fields
+    const [showAllFields, toggleShowAllFields] = useReducer((state) => !state, false);


Why not useState here?

I like this approach as it exposes a bool flag and a toggle function in one line. With useState you have declare a separate function to toggle the flag. Nice and clean.

situchan · 2023-08-02T10:46:29Z

src/languages/es.js

@@ -148,6 +148,8 @@ export default {
        someone: 'Alguien',
        total: 'Total',
        edit: 'Editar',
+        showMore: 'Mostrar más',
+        merchant: 'comerciante',


Is this correct? Just asking because first letter is not capitalized like English

Yep, should be capitalized.

situchan · 2023-08-02T12:22: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 / 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 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.mov

Mobile Web - Chrome

mchrome.mov

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

Beamanator · 2023-08-03T08:14:28Z

Oof, @lukemorawski can you please fix the conflicts & respond to @situchan 's comments?

Then @situchan can you please do a re-review after conflicts are fixed to make sure nothing's broken?

Anything keeping us from getting this merged today, y'all??

…lds_to_manual_requests

situchan

Re-tested latest code. Confirmed nothing broken

Beamanator

Thanks so much gents, let's merge!

OSBotify · 2023-08-03T10:35: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-03T17:41:07Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 1.3.50-0 🚀

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

mvtglobally · 2023-08-03T18:13:42Z

@lukemorawski @shawnborton @Beamanator
Can you please confirm for QA what do we need to verify on the Details screen after reaching it?

Beamanator · 2023-08-04T15:22:03Z

Yes @mvtglobally - sorry we missed that, but I tested in staging and it's working well! 👍

dylanexpensify · 2023-08-04T15:25:41Z

@Beamanator just to confirm, did this get deployed/we can close #295259 now?

Beamanator · 2023-08-04T15:31:16Z

@dylanexpensify technically we can probably close the internal issue, BUT we won't close the App one yet since we have to pay out the C+ here once it's on prod for 7 days

And also, this PR is only on staging for today, we're currently not planning to deploy today so won't get to prod till next week

dylanexpensify · 2023-08-04T15:32:39Z

Ahh nice nice, ok let's leave open until at prod! TY! <3

OSBotify · 2023-08-07T18:29:27Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.50-3 🚀

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

OSBotify · 2023-08-07T18:56:40Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 1.3.51-0 🚀

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

OSBotify · 2023-08-09T08:45:48Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.51-2 🚀

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

lukemorawski added 6 commits July 21, 2023 18:58

ui and first data flow attemps

53bc97e

merchant and date value are taken from the "iou" key-value pair. Clearing this up with Alex.

added date and fixed layout

dfeadb9

linting

79612cf

remove jsconfig

79b2b56

fixed missing iou date on native

6d55c8a

show more button hidden when details showed

12cb636

lukemorawski requested a review from a team as a code owner July 26, 2023 14:05

melvin-bot bot requested review from 0xmiros and shawnborton and removed request for a team July 26, 2023 14:05

Merge branch 'main' into lukemorawski-23245-add_merchant_and_date_fie…

4cbf319

…lds_to_manual_requests

Beamanator self-requested a review July 26, 2023 14:38

Beamanator assigned lukemorawski Jul 26, 2023

shawnborton reviewed Jul 26, 2023

View reviewed changes

removed button show less state

e35f9c8

show more button icon fill change

696e881

Beamanator requested review from situchan and removed request for 0xmiros July 28, 2023 07:21

situchan suggested changes Jul 28, 2023

View reviewed changes

lukemorawski requested a review from situchan August 2, 2023 07:14

Beamanator changed the title ~~Lukemorawski 23245 add merchant and date fields to manual requests~~ Add merchant and date fields to manual requests Aug 2, 2023

situchan reviewed Aug 2, 2023

View reviewed changes

capitalized merchant in Spanish

7f8a634

lukemorawski requested a review from situchan August 3, 2023 08:29

Merge branch 'main' into lukemorawski-23245-add_merchant_and_date_fie…

b97423b

…lds_to_manual_requests

situchan approved these changes Aug 3, 2023

View reviewed changes

Beamanator approved these changes Aug 3, 2023

View reviewed changes

Beamanator merged commit e26d900 into Expensify:main Aug 3, 2023

OSBotify mentioned this pull request Aug 3, 2023

Deploy Checklist: New Expensify 2023-08-03 #24121

Closed

86 tasks

OSBotify mentioned this pull request Aug 7, 2023

Deploy Checklist: New Expensify 2023-08-07 #24230

Closed

98 tasks

ShogunFire mentioned this pull request Aug 17, 2023

Split bill - Split bill details page shows inactive fields #25420

Closed

6 tasks

Beamanator mentioned this pull request Aug 21, 2023

[Feature] Add merchant and date fields to manual requests #23245

Closed

Ollyws mentioned this pull request Sep 11, 2023

[HOLD for payment 2023-09-06] [$1000] Web - Split bill - Show more button in split bill has no padding below #25562

Closed

6 tasks

		@@ -1,4 +1,4 @@
		import React, {useCallback, useEffect, useRef, useMemo} from 'react';
		import React, {useCallback, useEffect, useMemo, useRef} from 'react';

Add merchant and date fields to manual requests #23648

Add merchant and date fields to manual requests #23648

Conversation

lukemorawski commented Jul 26, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 26, 2023

Beamanator commented Jul 26, 2023

lukemorawski commented Jul 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shawnborton commented Jul 26, 2023

lukemorawski commented Jul 26, 2023

lukemorawski commented Jul 26, 2023

lukemorawski commented Jul 26, 2023

Beamanator commented Jul 28, 2023

situchan commented Jul 28, 2023

Beamanator commented Jul 28, 2023

Beamanator commented Jul 28, 2023

situchan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

situchan commented Aug 1, 2023

Beamanator commented Aug 2, 2023

lukemorawski commented Aug 2, 2023

Beamanator commented Aug 2, 2023

situchan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

situchan commented Aug 2, 2023

Reviewer Checklist

Screenshots/Videos

Beamanator commented Aug 3, 2023

situchan left a comment

Choose a reason for hiding this comment

Beamanator left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 3, 2023

OSBotify commented Aug 3, 2023

mvtglobally commented Aug 3, 2023

Beamanator commented Aug 4, 2023

dylanexpensify commented Aug 4, 2023

Beamanator commented Aug 4, 2023

dylanexpensify commented Aug 4, 2023

OSBotify commented Aug 7, 2023

OSBotify commented Aug 7, 2023

OSBotify commented Aug 9, 2023

lukemorawski commented Jul 26, 2023 •

edited

Loading