[No QA] Create Money Request Header component #18148

yuwenmemon · 2023-04-28T16:49:45Z

Right now to get this to show I do a couple of things

Web

Find an IOU report, since this has the same structure as the type of report we'll be showing here
Get the reportID for it
Apply this diff:

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index df5ba50e62..83aed35fed 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -39,6 +39,7 @@ import personalDetailsPropType from '../personalDetailsPropType';
 import getIsReportFullyVisible from '../../libs/getIsReportFullyVisible';
 import EmojiPicker from '../../components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from '../../libs/actions/EmojiPickerAction';
+import MoneyRequestHeader from '../../components/MoneyRequestHeader';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -241,6 +242,16 @@ class ReportScreen extends React.Component {
         // (which is shown, until all the actual views of the ReportScreen have been rendered)
         const shouldAnimate = !shouldFreeze;
 
+        const moneyRequestHeader = this.props.report.type === 'iou' && this.props.report.reportID === '5571340985182399'
+            ? <MoneyRequestHeader report={this.props.report} policies={this.props.policies} personalDetails={this.props.personalDetails} />
+            : (<HeaderView
+                reportID={reportID}
+                onNavigationMenuButtonClicked={() => Navigation.navigate(ROUTES.HOME)}
+                personalDetails={this.props.personalDetails}
+                report={this.props.report}
+                policies={this.props.policies}
+            />);
+
         return (
             <ScreenWrapper
                 style={screenWrapperStyle}
@@ -273,13 +284,7 @@ class ReportScreen extends React.Component {
                                     errors={addWorkspaceRoomOrChatErrors}
                                     shouldShowErrorMessages={false}
                                 >
-                                    <HeaderView
-                                        reportID={reportID}
-                                        onNavigationMenuButtonClicked={() => Navigation.navigate(ROUTES.HOME)}
-                                        personalDetails={this.props.personalDetails}
-                                        report={this.props.report}
-                                        policies={this.props.policies}
-                                    />
+                                    {moneyRequestHeader}
                                 </OfflineWithFeedback>
                                 {Boolean(this.props.accountManagerReportID) && ReportUtils.isConciergeChatReport(this.props.report) && this.state.isBannerVisible && (
                                     <Banner

Replace 5571340985182399 with the reportID of your IOU
Navigate to that report in your browser URL, i.e. http://localhost:8080/r/5571340985182399
If you want to test the Expense Report Only Features you can apply this diff

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 7aae22feee..0f03fc99d1 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -105,7 +105,7 @@ function getReportParticipantsTitle(logins) {
  * @returns {Boolean}
  */
 function isExpenseReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.EXPENSE;
+    return true;
 }

Mobile

In addition to the diff above add the following so that every time you click and IOU you load the MoneyRequestHeader instead:

diff --git a/src/components/ReportActionItem/IOUAction.js b/src/components/ReportActionItem/IOUAction.js
index a7fe3f1710..6835776a87 100644
--- a/src/components/ReportActionItem/IOUAction.js
+++ b/src/components/ReportActionItem/IOUAction.js
@@ -67,7 +67,7 @@ const defaultProps = {
 
 const IOUAction = (props) => {
     const launchDetailsModal = () => {
-        Navigation.navigate(ROUTES.getIouDetailsRoute(props.chatReportID, props.action.originalMessage.IOUReportID));
+        Navigation.navigate(ROUTES.getReportRoute(props.action.originalMessage.IOUReportID));
     };
 
     const shouldShowIOUPreview = (

To view the Header, click "Pay" on the IOU preview:

Details

Adds the Money Request Header component into the code so that it can be used in Money Request Flows.

Fixed Issues

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

Tests

Use the instructions above to apply a diff and load an IOU report to display in the header.
Load the header
Click the three dot menu item makes sure it load the menu in the correct spot
On Mobile or any other small screen, make sure that a back button is rendered and that takes you back to the Chat List Menu. On large screens (web and desktop) make sure there is no back button present.

Offline tests

QA Steps

No QA - this cannot be as there's no currently logic that loads this component

PR Author Checklist

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

Note: The Header gap here is a different color. This is because the ScreenWrapper component in ReportScreen does not have a background color set and we'll most likely need to pass it in as a prop. However, because we're not showing the component yet I'm not sure this is the time to take care of this - since this exists outside of the component.

iOS

Android

…better

…tyling Styling Help for MoneyRequestHeader

MelvinBot · 2023-05-01T22:30:51Z

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

luacmartins

Looking good. Left a few comments.

src/styles/styles.js

src/libs/ReportUtils.js

src/components/AvatarWithDisplayName.js

src/components/HeaderWithCloseButton.js

src/components/MoneyRequestHeader.js

src/components/HeaderWithCloseButton.js

src/components/MoneyRequestHeader.js

src/libs/ReportUtils.js

yuwenmemon · 2023-05-04T18:25:50Z

@parasharrajat apologies but what error are you getting?

parasharrajat · 2023-05-04T18:33:49Z

It was login.toLowerCase related from hashLogin function in ReportUtils.js

yuwenmemon · 2023-05-04T18:45:21Z

Okay - @parasharrajat do you want me to do something about it? What are you getting at exactly? I tested and I did see a different JS error which I fixed - but I'm not seeing what you're reporting.

JmillsExpensify · 2023-05-04T19:41:39Z

Can we pull out whatever remaining issues we're seeing, get a checklist in this PR, and then merge? Unfortunately this PR holds up a cascading series of downstream PRs for our upcoming conference. I'd love to get this merged and still keep working on whatever issues we're finding separately.

JmillsExpensify · 2023-05-04T19:42:07Z

Also for what it's worth, we are going to purposefully break IOUs in the coming week.

yuwenmemon · 2023-05-04T19:52:37Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

bondydaa

👍 my one comment is def NAB and is maybe something we consider as we keep iterating on this.

bondydaa · 2023-05-04T21:25:40Z

src/components/HeaderWithCloseButton.js

+    report: iouReportPropTypes,
+
+    /** Policies, if we're showing the details for a report and need info about it for AvatarWithDisplay */
+    policies: PropTypes.shape({
+        /** Name of the policy */
+        name: PropTypes.string,
+    }),
+
+    /** Policies, if we're showing the details for a report and need participant details for AvatarWithDisplay */
+    personalDetails: PropTypes.objectOf(participantPropTypes),
+
+    /** Additional styles to render on the container of this component */
+    // eslint-disable-next-line react/forbid-prop-types
+    containerStyles: PropTypes.arrayOf(PropTypes.object),


NAB but if these are only used when shouldShowAvatarWithDisplay is true then maybe that's a case for having a completely separate component HeaderWithCloseButtonAndAvavtar or something like that 🤷.

bondydaa · 2023-05-04T21:31:49Z

Okay I'm merging this, for the other reviews on here if you have outstanding concerns please spin up new issue(s) for them and we can get them addressed then.

OSBotify · 2023-05-04T21:38:29Z

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

parasharrajat · 2023-05-05T03:36:20Z

Thanks for merging this. Meanwhile, there is a critical bug #18148 (comment) which should have been solved on this. Should I create a new slack report for it or someone will create a follow up?

hungvu193 · 2023-05-05T03:41:54Z

I was going to report the issue but then slack conversation leaded me here.
I think this line broke the header.

App/src/components/HeaderWithCloseButton.js

Line 168 in 5f649d5

parasharrajat · 2023-05-05T04:24:54Z

Yes, I also tried to point out above but it got merged while I was sleeping... 😄

yuwenmemon · 2023-05-05T04:27:20Z

Ah, my b. Will look at this.

luacmartins · 2023-05-05T04:28:22Z

@yuwenmemon feel free to assign me for review

JmillsExpensify · 2023-05-05T04:34:38Z

Yep, our bad.

OSBotify · 2023-05-05T20:02:29Z

🚀 Deployed to staging by https://github.com/bondydaa in version: 1.3.11-0 🚀

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

OSBotify · 2023-05-09T04:05:04Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.12-0 🚀

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

Santhosh-Sellavel · 2023-06-03T18:48:35Z

We missed a case here, which led to this issue. More details on the issue

yuwenmemon added 4 commits April 26, 2023 18:29

Add MoneyRequestHeader and AvatarWithDisplayName components

9a02fcc

Get the avatar with display name rendering

6832775

Get some rudimentary style in there, get workspace logo part working …

2d52d92

…better

Add some more styles

48e99fd

yuwenmemon self-assigned this Apr 28, 2023

yuwenmemon and others added 6 commits April 28, 2023 16:57

Update Avatar logic for IOU vs. Expense Report

8873246

Initial styling pass

b31c2d1

Align the bottom half

f6d9b4b

Merge pull request #18247 from Expensify/georgia-moneyRequestHeader-s…

e7ff900

…tyling Styling Help for MoneyRequestHeader

Revert ReportScreen.js back to normal

1867b7e

Hide close button

c59467c

yuwenmemon changed the title ~~Create Money Request Header component~~ [No QA] Create Money Request Header component May 1, 2023

yuwenmemon marked this pull request as ready for review May 1, 2023 22:30

yuwenmemon requested a review from a team as a code owner May 1, 2023 22:30

yuwenmemon requested review from mountiny and luacmartins May 1, 2023 22:30

melvin-bot bot requested review from bondydaa and parasharrajat and removed request for a team May 1, 2023 22:30

yuwenmemon added 3 commits May 1, 2023 15:32

Fix some header alignment and get formatting looking better

9caca42

Style

04e5b45

Back button functionality

854de26

luacmartins reviewed May 2, 2023

View reviewed changes

parasharrajat reviewed May 2, 2023

View reviewed changes

src/components/HeaderWithCloseButton.js Outdated Show resolved Hide resolved

parasharrajat reviewed May 2, 2023

View reviewed changes

src/components/MoneyRequestHeader.js Outdated Show resolved Hide resolved

mountiny reviewed May 2, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

PR comments

a4a9226

yuwenmemon force-pushed the yuwen-moneyRequestHeader branch from b54c13b to a4a9226 Compare May 2, 2023 18:11

Fix conflicts

240871a

Fix JS error

eadd538

yuwenmemon dismissed stale reviews from grgia, Julesssss, and luacmartins via eadd538 May 4, 2023 18:44

bondydaa approved these changes May 4, 2023

View reviewed changes

bondydaa merged commit 5f649d5 into main May 4, 2023

bondydaa deleted the yuwen-moneyRequestHeader branch May 4, 2023 21:31

yuwenmemon mentioned this pull request May 5, 2023

Fix header with close button styles #18465

Merged

56 tasks

OSBotify mentioned this pull request May 5, 2023

Deploy Checklist: New Expensify 2023-05-05 #18498

Closed

31 tasks

parasharrajat mentioned this pull request May 8, 2023

Fix styles for MoneyRequestHeader #18467

Merged

54 tasks

luacmartins mentioned this pull request May 8, 2023

Payment issue for E/App PR#18467 and 18148 #18572

Closed

Santhosh-Sellavel mentioned this pull request Jun 3, 2023

[HOLD for payment 2023-06-02] [$1000] The transaction thread shows option to delete even for the payer #19340

Closed

6 tasks

sobitneupane mentioned this pull request Jun 7, 2023

fix: use tooltip on money request header avatar #19947

Closed

56 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[No QA] Create Money Request Header component #18148

[No QA] Create Money Request Header component #18148

yuwenmemon commented Apr 28, 2023 •

edited

Loading

MelvinBot commented May 1, 2023

luacmartins left a comment

yuwenmemon commented May 4, 2023

parasharrajat commented May 4, 2023

yuwenmemon commented May 4, 2023

JmillsExpensify commented May 4, 2023

JmillsExpensify commented May 4, 2023

yuwenmemon commented May 4, 2023 •

edited

Loading

bondydaa left a comment

bondydaa May 4, 2023

bondydaa commented May 4, 2023

OSBotify commented May 4, 2023

parasharrajat commented May 5, 2023 •

edited

Loading

hungvu193 commented May 5, 2023 •

edited

Loading

parasharrajat commented May 5, 2023

yuwenmemon commented May 5, 2023

luacmartins commented May 5, 2023

JmillsExpensify commented May 5, 2023

OSBotify commented May 5, 2023

OSBotify commented May 9, 2023

Santhosh-Sellavel commented Jun 3, 2023 •

edited

Loading

[No QA] Create Money Request Header component #18148

[No QA] Create Money Request Header component #18148

Conversation

yuwenmemon commented Apr 28, 2023 • edited Loading

Web

Mobile

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented May 1, 2023

luacmartins left a comment

Choose a reason for hiding this comment

yuwenmemon commented May 4, 2023

parasharrajat commented May 4, 2023

yuwenmemon commented May 4, 2023

JmillsExpensify commented May 4, 2023

JmillsExpensify commented May 4, 2023

yuwenmemon commented May 4, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

bondydaa left a comment

Choose a reason for hiding this comment

bondydaa May 4, 2023

Choose a reason for hiding this comment

bondydaa commented May 4, 2023

OSBotify commented May 4, 2023

parasharrajat commented May 5, 2023 • edited Loading

hungvu193 commented May 5, 2023 • edited Loading

parasharrajat commented May 5, 2023

yuwenmemon commented May 5, 2023

luacmartins commented May 5, 2023

JmillsExpensify commented May 5, 2023

OSBotify commented May 5, 2023

OSBotify commented May 9, 2023

Santhosh-Sellavel commented Jun 3, 2023 • edited Loading

yuwenmemon commented Apr 28, 2023 •

edited

Loading

yuwenmemon commented May 4, 2023 •

edited

Loading

parasharrajat commented May 5, 2023 •

edited

Loading

hungvu193 commented May 5, 2023 •

edited

Loading

Santhosh-Sellavel commented Jun 3, 2023 •

edited

Loading