[CP Staging] Fix missing settlement button #23129

mountiny · 2023-07-18T20:31:26Z

Details

This is a regression which is a combination of two PRs #22484 and #21852 where in the changes to the Header component and its refactor they have missed to pass the children to the header

Fixed Issues

$ #23083

Tests

Request money between 2 accounts
Go to the payer account and ensure you can see the payment button in the top right corner on web
Or in the middle for narrow view

Verify that no errors appear in the JS console

Offline tests

N/A

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

Same as web

iOS

Android

melvin-bot · 2023-07-18T20:31:33Z

@mollfpr 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-07-18T20:36:27Z

@Nikhil-Vats Can you leave a review on this one and fill out the checklist?

mountiny · 2023-07-18T20:38:06Z

Assigning @Nikhil-Vats as padawan C+ here

Nikhil-Vats · 2023-07-18T20:38:25Z

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

23129_web.mov

Mobile Web - Chrome

23129_mweb_chrome.mov

Mobile Web - Safari

Desktop

23129_desktop.mov

iOS

Android

23129_android.mov

luacmartins · 2023-07-18T20:48:05Z

src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js

    personalDetails: PropTypes.objectOf(participantPropTypes),
+
+    /** Children to wrap in Header */
+    children: PropTypes.node,


I wonder if defining children in the propTypes here will conflict with this declaration

Also, children is not required but we're not setting a default value for it

Making it required has been complaining in the logs as some usecases were not passing children I think

Nikhil-Vats · 2023-07-18T21:19:07Z

src/components/HeaderWithBackButton/index.js

        horizontal: 0,
    },
    threeDotsMenuItems = [],
+    children,


We should change this to children = null.

mountiny · 2023-07-18T21:26:25Z

@Nikhil-Vats @luacmartins Updated!

Nikhil-Vats · 2023-07-18T21:38:30Z

LGTM. 🚀

All yours @luacmartins.

OSBotify · 2023-07-18T21:58:50Z

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

[CP Staging] Fix missing settlement button (cherry picked from commit 34cfd33)

OSBotify · 2023-07-18T23:15:11Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.42-24 🚀

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

OSBotify · 2023-07-19T17:58:05Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.42-26 🚀

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

OSBotify · 2023-07-21T18:52:39Z

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

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

OSBotify · 2023-07-25T01:26:36Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.44-2 🚀

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

mountiny added 2 commits July 18, 2023 21:07

Add children to the header props

aef0717

Make the button non-required

8fe414a

mountiny requested a review from a team as a code owner July 18, 2023 20:31

mountiny self-assigned this Jul 18, 2023

melvin-bot bot requested review from mollfpr and removed request for a team July 18, 2023 20:31

mountiny mentioned this pull request Jul 18, 2023

New preferences page layout #21852

Merged

57 tasks

mountiny removed the request for review from mollfpr July 18, 2023 20:37

mountiny requested a review from luacmartins July 18, 2023 20:43

luacmartins reviewed Jul 18, 2023

View reviewed changes

Nikhil-Vats reviewed Jul 18, 2023

View reviewed changes

Pass default as null to the children argument

d7c1fcd

mountiny requested review from Nikhil-Vats and luacmartins July 18, 2023 21:26

Nikhil-Vats approved these changes Jul 18, 2023

View reviewed changes

luacmartins approved these changes Jul 18, 2023

View reviewed changes

luacmartins merged commit 34cfd33 into main Jul 18, 2023

luacmartins deleted the vit-fixMissingSettlementButton branch July 18, 2023 21:54

OSBotify pushed a commit that referenced this pull request Jul 18, 2023

Merge pull request #23129 from Expensify/vit-fixMissingSettlementButton

71787d0

[CP Staging] Fix missing settlement button (cherry picked from commit 34cfd33)

jasperhuangg mentioned this pull request Jul 19, 2023

[HOLD for payment 2023-07-28] [HOLD for payment 2023-07-26] [$1000] IOU - No settlement button in the IOU report header #23083

Closed

6 tasks

OSBotify mentioned this pull request Jul 21, 2023

Deploy Checklist: New Expensify 2023-07-21 #23362

Closed

[CP Staging] Fix missing settlement button #23129

[CP Staging] Fix missing settlement button #23129

Uh oh!

Conversation

mountiny commented Jul 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jul 18, 2023

Uh oh!

mountiny commented Jul 18, 2023

Uh oh!

mountiny commented Jul 18, 2023

Uh oh!

Nikhil-Vats commented Jul 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

luacmartins Jul 18, 2023

Choose a reason for hiding this comment

Uh oh!

luacmartins Jul 18, 2023

Choose a reason for hiding this comment

Uh oh!

mountiny Jul 18, 2023

Choose a reason for hiding this comment

Uh oh!

Nikhil-Vats Jul 18, 2023

Choose a reason for hiding this comment

Uh oh!

mountiny Jul 18, 2023

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jul 18, 2023

Uh oh!

Nikhil-Vats commented Jul 18, 2023

Uh oh!

OSBotify commented Jul 18, 2023

Uh oh!

OSBotify commented Jul 18, 2023

Uh oh!

OSBotify commented Jul 19, 2023

Uh oh!

OSBotify commented Jul 21, 2023

Uh oh!

OSBotify commented Jul 25, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mountiny commented Jul 18, 2023 •

edited

Loading

Nikhil-Vats commented Jul 18, 2023 •

edited

Loading