[NoQA] feat: show submit button in MoneyReportHeader when report is in draft #28998

BeeMargarida · 2023-10-06T11:25:26Z

Details

Adds submit button in MoneyReportHeader for a money request report that is in the open/draft state.

Fixed Issues

$ #28765

Tests

To test this currently, it requires some setup. Check the dropdown below.

Required setup

Open a money request report and take note of its ID, which is present in the URL
Go to ReportScreen.js and copy paste the code below inside the useEffect with empty dependency array, after fetchReportIfNeeded. Use the report ID of the previous post. This will make the report have the status of open/draft.
Set the app to offline (so that the report info is not updated)

Onyx.merge('report_<REPORT_ID>', {
    statusNum: 0,
    stateNum: 0,
});

Open a money request report that is currently in draft state
Check that the header contains a button with "Submit" or the Spanish translation

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

N/A

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

…/open state

src/components/MoneyReportHeader.js

rezkiy37

Left a comment, besides LGTM.

src/libs/actions/IOU.js

melvin-bot · 2023-10-06T11:43:29Z

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

src/components/MoneyReportHeader.js

BeeMargarida · 2023-10-06T13:27:26Z

@mountiny Updated!

src/libs/ReportUtils.js

src/components/MoneyReportHeader.js

BeeMargarida · 2023-10-06T15:19:09Z

@mountiny Updated!

mountiny · 2023-10-06T17:53:09Z

Can you please merge main to resolve conflicts from #28918 thank you!

BeeMargarida · 2023-10-09T07:53:00Z

@mountiny Updated!

cubuspl42 · 2023-10-09T09:00:04Z

@BeeMargarida Why is this unusual "Required setup" necessary?

BeeMargarida · 2023-10-09T09:07:29Z

@BeeMargarida Why is this unusual "Required setup" necessary?

There's no support for reports in draft/open state in NewDot, so this "required setup" forces one of them to this state so that we can test that the submit button is working.

mountiny · 2023-10-09T09:13:40Z

@cubuspl42 no need for c+ review here, will take care of this, thanks!

mountiny · 2023-10-09T16:12:59Z

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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

Feature which is not accessible by the users yet

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

mountiny · 2023-10-09T16:15:21Z

src/components/MoneyReportHeader.js

+                        success={chatReport.isOwnPolicyExpenseChat}
+                        text={translate('common.submit')}
+                        style={[styles.w100, styles.pr0]}
+                        onPress={() => IOU.submitReport(moneyRequestReport)}


This is not exported right now I believe, wont we get complains about it?

It's being exported from lib/actions/IOU

Ah I must have seen some commit diff then, sorry.

OSBotify · 2023-10-10T12:45:48Z

✋ 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-10-11T05:09:17Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.81-0 🚀

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

OSBotify · 2023-10-12T04:50:47Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.83-0 🚀

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

alitoshmatov · 2024-06-23T19:52:51Z

src/components/MoneyReportHeader.js

-    }, [policyType, isManager, isApproved, isSettled]);
+        return isManager && !isDraft && !isApproved && !isSettled;
+    }, [policyType, isManager, isDraft, isApproved, isSettled]);
+    const shouldShowSubmitButton = isDraft;


Admin can submit and approve it is own report when Prevent self approval is enabled. So we should have prevented submitting it, ref: #36425

BeeMargarida added 2 commits October 6, 2023 11:25

feat: show submit button in MoneyReportHeader when report is in draft…

45f9fd6

…/open state

fix: small fix on showing border

2eca6a1

rezkiy37 reviewed Oct 6, 2023

View reviewed changes

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

rezkiy37 reviewed Oct 6, 2023

View reviewed changes

refactor: remove brackets

687ab6d

MrMuzyk reviewed Oct 6, 2023

View reviewed changes

src/libs/actions/IOU.js Outdated Show resolved Hide resolved

BeeMargarida marked this pull request as ready for review October 6, 2023 11:43

BeeMargarida requested a review from a team as a code owner October 6, 2023 11:43

melvin-bot bot requested review from cubuspl42 and removed request for a team October 6, 2023 11:43

mountiny assigned BeeMargarida Oct 6, 2023

mountiny reviewed Oct 6, 2023

View reviewed changes

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

src/components/MoneyReportHeader.js Show resolved Hide resolved

fix: button color for submit

4775ea7

mountiny requested changes Oct 6, 2023

View reviewed changes

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

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

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

fix: add check for expense report in isDraft and use chat report

09c620c

Merge branch 'main' into feat/28765-submit_draft_money_request_header

7bb0e0b

mountiny changed the title ~~feat: show submit button in MoneyReportHeader when report is in draft~~ [] feat: show submit button in MoneyReportHeader when report is in draft Oct 9, 2023

mountiny changed the title ~~[] feat: show submit button in MoneyReportHeader when report is in draft~~ [NoQA] feat: show submit button in MoneyReportHeader when report is in draft Oct 9, 2023

mountiny approved these changes Oct 9, 2023

View reviewed changes

mountiny merged commit 8c00c5e into Expensify:main Oct 10, 2023
19 checks passed

OSBotify mentioned this pull request Oct 11, 2023

Deploy Checklist: New Expensify 2023-10-11 #29252

Closed

OSBotify mentioned this pull request Oct 12, 2023

Deploy Checklist: New Expensify 2023-10-12 #29417

Closed

97 tasks

melvin-bot bot mentioned this pull request Oct 13, 2023

[HOLD for payment 2023-10-23] [HOLD for payment 2023-10-23] [HOLD for payment 2023-10-20] [HOLD for payment 2023-10-20] [Wave 6: Drafts] Add the submit button to the MoneyRequestHeader #28765

Closed

alitoshmatov reviewed Jun 23, 2024

View reviewed changes

alitoshmatov mentioned this pull request Jun 23, 2024

[$500] Web - Admin can submit and approve their own report when "Prevent Self-Approval" is on #36425

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NoQA] feat: show submit button in MoneyReportHeader when report is in draft #28998

[NoQA] feat: show submit button in MoneyReportHeader when report is in draft #28998

BeeMargarida commented Oct 6, 2023 •

edited by mountiny

Loading

rezkiy37 left a comment •

edited

Loading

melvin-bot bot commented Oct 6, 2023

BeeMargarida commented Oct 6, 2023

BeeMargarida commented Oct 6, 2023

mountiny commented Oct 6, 2023

BeeMargarida commented Oct 9, 2023

cubuspl42 commented Oct 9, 2023

BeeMargarida commented Oct 9, 2023

mountiny commented Oct 9, 2023

mountiny commented Oct 9, 2023 •

edited

Loading

mountiny Oct 9, 2023

BeeMargarida Oct 10, 2023

mountiny Oct 10, 2023

OSBotify commented Oct 10, 2023

OSBotify commented Oct 11, 2023

OSBotify commented Oct 12, 2023

alitoshmatov Jun 23, 2024

[NoQA] feat: show submit button in MoneyReportHeader when report is in draft #28998

[NoQA] feat: show submit button in MoneyReportHeader when report is in draft #28998

Conversation

BeeMargarida commented Oct 6, 2023 • edited by mountiny Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

rezkiy37 left a comment • edited Loading

Choose a reason for hiding this comment

melvin-bot bot commented Oct 6, 2023

BeeMargarida commented Oct 6, 2023

BeeMargarida commented Oct 6, 2023

mountiny commented Oct 6, 2023

BeeMargarida commented Oct 9, 2023

cubuspl42 commented Oct 9, 2023

BeeMargarida commented Oct 9, 2023

mountiny commented Oct 9, 2023

mountiny commented Oct 9, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mountiny Oct 9, 2023

Choose a reason for hiding this comment

BeeMargarida Oct 10, 2023

Choose a reason for hiding this comment

mountiny Oct 10, 2023

Choose a reason for hiding this comment

OSBotify commented Oct 10, 2023

OSBotify commented Oct 11, 2023

OSBotify commented Oct 12, 2023

alitoshmatov Jun 23, 2024

Choose a reason for hiding this comment

BeeMargarida commented Oct 6, 2023 •

edited by mountiny

Loading

rezkiy37 left a comment •

edited

Loading

mountiny commented Oct 9, 2023 •

edited

Loading