Add support for REJECTED report action #48385

youssef-lr · 2024-09-01T21:08:36Z

Details

Fixed Issues

part of https://github.com/Expensify/Expensify/issues/422654

Tests

Verify that no errors appear in the JS console

Create a corporate workspace in OldDot
Submit a report to a manager
As the manager, reject the report
Copy the link of the report from OldDot and navigate to it in NewDot directly
Make sure the rejected this report report action is showing.

Offline tests

QA Steps

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-09-02T20:01:12Z

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

ishpaul777 · 2024-09-02T21:06:19Z

Typechecks failing @youssef-lr

youssef-lr · 2024-09-02T21:07:10Z

asking for help here https://expensify.slack.com/archives/C01GTK53T8Q/p1725311132883249

ishpaul777 · 2024-09-02T21:17:17Z

src/types/onyx/OriginalMessage.ts

@@ -595,6 +596,8 @@ type OriginalMessageMap = {
    /** */
    [CONST.REPORT.ACTIONS.TYPE.RENAMED]: OriginalMessageRenamed;
    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REJECTED]: never;
+    /** */


Do you know why do we have empty comments, feels weird

Oh, eslint complains if you remove them

ok nice hack whoever did it 👍

I think I'll just disable the rule for the rest of that file

ishpaul777 · 2024-09-02T21:42:53Z

Make sure the rejected this report report action is showing.

it shows for second only then it goes away

My policy setup and steps

Create Control policy and invite a employe. Policy has advanced approval and employe submits to owner/manager.
Employe submit expense,manager rejected it.
As a employee i see this

Untitled.mov

@youssef-lr

ishpaul777 · 2024-09-02T22:00:37Z

it still exists in onyx db but just not showing

youssef-lr · 2024-09-02T22:08:27Z

Oh sorry. We need to be testing when the report is rejected back to the last approver and not to the submitter. The one showing there is a different action (REJECTTOSUBMITTER). Please create the following config in a Control workspace in OldDot:

Then:

Submit a report as the submitter
As the first approver (approver@), approve and forward it to accounting@
as accounting@, reject it back to the last approver.
Open the report directly in NewDot and verify the action is showing there.

ishpaul777 · 2024-09-02T22:08:48Z

src/CONST.ts

@@ -741,6 +741,7 @@ const CONST = {
                REIMBURSEMENT_REQUESTED: 'REIMBURSEMENTREQUESTED', // Deprecated OldDot Action
                REIMBURSEMENT_SETUP: 'REIMBURSEMENTSETUP', // Deprecated OldDot Action
                REIMBURSEMENT_SETUP_REQUESTED: 'REIMBURSEMENTSETUPREQUESTED', // Deprecated OldDot Action
+                REJECTED: 'REJECTED',


action type is REJECTEDTOSUBMITTER

see my comment above.

ishpaul777 · 2024-09-02T22:40:10Z

was able to figure this out

ishpaul777 · 2024-09-02T22:42:52Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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

Android: Native

Sorry android build is failing consistently , i gave up :

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

N

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-09-02T23:11:11Z

@carlosmiceli 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 · 2024-09-02T23:11:14Z

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

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

carlosmiceli · 2024-09-03T01:30: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: 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

OSBotify · 2024-09-03T01:49:49Z

✋ 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 · 2024-09-03T23:43:42Z

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.0.29-0 🚀

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

OSBotify · 2024-09-05T19:17:47Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.29-12 🚀

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

youssef-lr added 3 commits September 1, 2024 22:07

Fix FORWARDED report action amount being always empty

ea0f382

Add support for REJECTED report action

2d5a575

Add support for REJECTED report message text everywhere

bd1a3f1

youssef-lr self-assigned this Sep 2, 2024

youssef-lr marked this pull request as ready for review September 2, 2024 20:00

youssef-lr requested a review from a team as a code owner September 2, 2024 20:00

melvin-bot bot requested a review from marcochavezf September 2, 2024 20:01

melvin-bot bot removed the request for review from a team September 2, 2024 20:01

youssef-lr added 2 commits September 2, 2024 21:12

Merge branch 'main' into youssef_reject_report_changes

2f9f72e

Add translation

d5d2e9e

youssef-lr changed the title ~~Youssef reject report changes~~ Add support for REJECTED report action Sep 2, 2024

marcochavezf requested a review from ishpaul777 September 2, 2024 20:58

youssef-lr added 2 commits September 2, 2024 22:13

Add mapping for new action

15f3793

Cleanup

eedd172

ishpaul777 reviewed Sep 2, 2024

View reviewed changes

Disable rule in the end of the file

b49d66f

ishpaul777 reviewed Sep 2, 2024

View reviewed changes

ishpaul777 approved these changes Sep 2, 2024

View reviewed changes

melvin-bot bot requested a review from carlosmiceli September 2, 2024 23:11

melvin-bot bot mentioned this pull request Sep 2, 2024

Payment issue for E/App PR#48385 #48439

Closed

carlosmiceli approved these changes Sep 3, 2024

View reviewed changes

carlosmiceli merged commit 2c04129 into main Sep 3, 2024
16 of 19 checks passed

carlosmiceli deleted the youssef_reject_report_changes branch September 3, 2024 01:32

github-actions bot mentioned this pull request Sep 3, 2024

Deploy Checklist: New Expensify 2024-09-03 #48515

Closed

68 tasks

izarutskaya mentioned this pull request Sep 4, 2024

Report - Rejected reports in OldDot don't show rejection action in NewDot. #48555

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for REJECTED report action #48385

Add support for REJECTED report action #48385

youssef-lr commented Sep 1, 2024 •

edited

Loading

melvin-bot bot commented Sep 2, 2024

ishpaul777 commented Sep 2, 2024 •

edited

Loading

youssef-lr commented Sep 2, 2024

ishpaul777 Sep 2, 2024 •

edited

Loading

youssef-lr Sep 2, 2024

youssef-lr Sep 2, 2024

ishpaul777 Sep 2, 2024

youssef-lr Sep 2, 2024

ishpaul777 commented Sep 2, 2024 •

edited

Loading

ishpaul777 commented Sep 2, 2024

youssef-lr commented Sep 2, 2024

ishpaul777 Sep 2, 2024

youssef-lr Sep 2, 2024

ishpaul777 commented Sep 2, 2024

ishpaul777 commented Sep 2, 2024 •

edited

Loading

melvin-bot bot commented Sep 2, 2024

melvin-bot bot commented Sep 2, 2024

carlosmiceli commented Sep 3, 2024 •

edited

Loading

OSBotify commented Sep 3, 2024

OSBotify commented Sep 3, 2024

OSBotify commented Sep 5, 2024

Add support for REJECTED report action #48385

Add support for REJECTED report action #48385

Conversation

youssef-lr commented Sep 1, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 2, 2024

ishpaul777 commented Sep 2, 2024 • edited Loading

youssef-lr commented Sep 2, 2024

ishpaul777 Sep 2, 2024 • edited Loading

Choose a reason for hiding this comment

youssef-lr Sep 2, 2024

Choose a reason for hiding this comment

youssef-lr Sep 2, 2024

Choose a reason for hiding this comment

ishpaul777 Sep 2, 2024

Choose a reason for hiding this comment

youssef-lr Sep 2, 2024

Choose a reason for hiding this comment

ishpaul777 commented Sep 2, 2024 • edited Loading

ishpaul777 commented Sep 2, 2024

youssef-lr commented Sep 2, 2024

ishpaul777 Sep 2, 2024

Choose a reason for hiding this comment

youssef-lr Sep 2, 2024

Choose a reason for hiding this comment

ishpaul777 commented Sep 2, 2024

ishpaul777 commented Sep 2, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Sep 2, 2024

melvin-bot bot commented Sep 2, 2024

carlosmiceli commented Sep 3, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

OSBotify commented Sep 3, 2024

OSBotify commented Sep 3, 2024

OSBotify commented Sep 5, 2024

youssef-lr commented Sep 1, 2024 •

edited

Loading

ishpaul777 commented Sep 2, 2024 •

edited

Loading

ishpaul777 Sep 2, 2024 •

edited

Loading

ishpaul777 commented Sep 2, 2024 •

edited

Loading

ishpaul777 commented Sep 2, 2024 •

edited

Loading

carlosmiceli commented Sep 3, 2024 •

edited

Loading