[No QA] Implement report primary action getter by jnowakow · Pull Request #57475 · Expensify/App

jnowakow · 2025-02-26T13:03:38Z

@luacmartins

Explanation of Change

This PR implements logic responsible for getting primary action button that will be used in MoneyReportHeader

Fixed Issues

$ #57436
PROPOSAL: N/A

Tests

Verify that npm run test passes

Verify that no errors appear in the JS console

Offline tests

N/A

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: 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
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

No UI changes

Android: mWeb Chrome

No UI changes

iOS: Native

No UI changes

iOS: mWeb Safari

No UI changes

MacOS: Chrome / Safari

No UI changes

MacOS: Desktop

No UI changes

melvin-bot · 2025-02-26T13:03:44Z

@brunovjk 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/libs/PolicyUtils.ts

src/libs/ReportPrimaryActionUtils.ts

luacmartins · 2025-03-03T12:45:17Z

@ikevin127 let's prioritize reviewing this PR!

luacmartins

Looking good. Left a few comments.

src/libs/ReportUtils.ts

tests/actions/ReportPrimaryActionUtilsTest.ts

src/libs/ReportPrimaryActionUtils.ts

ikevin127 · 2025-03-03T16:13:08Z

src/libs/ReportPrimaryActionUtils.ts

+    policy: Policy,
+    reportTransactions: Transaction[],
+    violations: OnyxCollection<TransactionViolation[]>,
+): ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | undefined {


From the design doc, looks like the return type of this function should be:

ValueOf(typeof CONST.REPORT.PRIMARY_ACTIONS) | ''

which means that if there's no match, we should return empty string (from design doc):

// If there is no Primary action to return for this report, just return an empty string default return '';```

If there's an already agreed-upon reason for which we want undefined instead of empty string then this comment can be ignored.

Ah yea, nice catch. We can update it to return an empty string

ikevin127 · 2025-03-03T16:14:14Z

Looks like we're missing this part from the doc:

In MoneyReportHeader.tsx, create an actionToOption map

and this part:

Add a success button here and set it up with the results of getPrimaryAction and actionToOption

If there is no primary action for this report, we will not render the button and using the css flex styles the Secondary button will take a full width of screen.

If this is expected for this PR, then we're good to move forward 👍

luacmartins · 2025-03-03T16:25:40Z

@ikevin127 this parts you mentioned above will be done as a separate PR once the logic for secondary/preview actions are ready as well.

ikevin127

@ikevin127 this parts you #57475 (comment) will be done as a separate PR once the logic for secondary/preview actions are ready as well.

Based on this, the changes LGTM 🚀

ikevin127 · 2025-03-03T16:28: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: 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

luacmartins

I left some comments that I think need to be addressed

jnowakow · 2025-03-04T09:45:56Z

@luacmartins I applied suggestions 🫡

luacmartins

LGTM

OSBotify · 2025-03-04T11:30:53Z

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

github-actions · 2025-03-04T22:09:37Z

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

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2025-03-04T22:52:44Z

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

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

github-actions · 2025-03-06T22:56:03Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.9-8 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

s77rt · 2025-06-15T10:40:45Z

src/libs/ReportPrimaryActionUtils.ts

+function isApproveAction(report: Report, policy: Policy, reportTransactions: Transaction[]) {
+    const isExpense = isExpenseReport(report);
+    const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
+    const isApprovalEnabled = policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+
+    if (!isExpense || !isApprover || !isApprovalEnabled) {
+        return false;
+    }


You don't need to be the current approver to approve a report.

If you are an approver and got a report to approve, and then you are no longer the workspace approver, then you'd still have access to the previous submitted report and you can still approve it.

Coming from #61389

Pujan92 · 2025-07-31T13:16:45Z

src/libs/ReportPrimaryActionUtils.ts

+    const isProcessing = isProcessingReport(report);
+    const isOneExpenseReportOnHold = isOneExpenseReport && isOnHold;
+
+    if (isProcessing || isOneExpenseReportOnHold) {


This(isOneExpenseReportOnHold) seems to be an incorrect condition to derive an approve action which caused an issue #65873

Krishna2323 · 2025-12-05T18:35:56Z

src/libs/ReportPrimaryActionUtils.ts

+    }
+
+    const isExporter = isPrefferedExporter(policy);
+    if (!isExporter) {


We should have also checked whether the current user is an admin or not. Only checking for Preferred Exporter caused this issue. The export option wasn’t shown to the admin because we were only checking for !isExporter.

Implement report primary action getter

c4d35a4

jnowakow requested a review from a team as a code owner February 26, 2025 13:03

melvin-bot bot requested review from brunovjk and removed request for a team February 26, 2025 13:03

jnowakow marked this pull request as draft February 26, 2025 13:03

luacmartins requested review from ikevin127 and luacmartins and removed request for brunovjk February 26, 2025 13:07

jnowakow commented Feb 26, 2025

View reviewed changes

src/libs/PolicyUtils.ts Show resolved Hide resolved

jnowakow commented Feb 26, 2025

View reviewed changes

src/libs/ReportPrimaryActionUtils.ts Outdated Show resolved Hide resolved

jnowakow commented Feb 26, 2025

View reviewed changes

src/libs/ReportPrimaryActionUtils.ts Outdated Show resolved Hide resolved

jnowakow commented Feb 26, 2025

View reviewed changes

src/libs/ReportPrimaryActionUtils.ts Outdated Show resolved Hide resolved

jnowakow commented Feb 26, 2025

View reviewed changes

src/libs/ReportPrimaryActionUtils.ts Outdated Show resolved Hide resolved

jnowakow added 11 commits February 26, 2025 16:06

Add first test

5b89d15

Add missing variables

6063886

Add tests

7ffb8d1

Adjust to design doc change

bd1229e

Update markAsCash condition

caea02f

Add actionToOption map

8a83f5e

Undo UI changes

f77db51

Add more tests

8bd61df

fix prettier

0655bfe

Fix typescript

83a068f

fix typescript and tests

a5ccca5

jnowakow marked this pull request as ready for review March 3, 2025 11:18

jnowakow changed the title ~~Implement report primary action getter~~ [No QA] Implement report primary action getter Mar 3, 2025

jnowakow added 2 commits March 3, 2025 12:47

Refactor

f84a80e

Merge branch 'main' into jnowakow/simplified-actions-get-primary-action

f29c220

jnowakow marked this pull request as draft March 3, 2025 12:04

fix typescript and tests

12af8b4

jnowakow marked this pull request as ready for review March 3, 2025 12:24

luacmartins requested changes Mar 3, 2025

View reviewed changes

ikevin127 reviewed Mar 3, 2025

View reviewed changes

ikevin127 approved these changes Mar 3, 2025

View reviewed changes

melvin-bot bot requested a review from luacmartins March 3, 2025 16:27

luacmartins requested changes Mar 3, 2025

View reviewed changes

Apply review suggestions

e9d65e1

luacmartins approved these changes Mar 4, 2025

View reviewed changes

luacmartins merged commit 23fa95c into Expensify:main Mar 4, 2025
16 checks passed

github-actions bot mentioned this pull request Mar 4, 2025

Deploy Checklist: New Expensify 2025-03-04 #57792

Closed

77 tasks

jnowakow mentioned this pull request Mar 5, 2025

[No QA] Bootstrap secondary actions getter #57678

Merged

50 tasks

melvin-bot bot mentioned this pull request Mar 6, 2025

[Due for payment 2025-03-13] [Simplified Actions] Implement getPrimaryAction with tests #57436

Closed

s77rt reviewed Jun 15, 2025

View reviewed changes

s77rt mentioned this pull request Jun 15, 2025

[Due for payment 2025-06-18] [$250] Approve Button Still Visible After Approval Workflow Changed #61389

Closed

16 tasks

Pujan92 reviewed Jul 31, 2025

View reviewed changes

Krishna2323 reviewed Dec 5, 2025

View reviewed changes

Krishna2323 mentioned this pull request Dec 5, 2025

[$375] Export option not showing for admins on workspaces who turn off payments #72517

Closed

16 tasks

Conversation

jnowakow commented Feb 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 26, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

luacmartins commented Mar 3, 2025

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ikevin127 Mar 3, 2025

Choose a reason for hiding this comment

Uh oh!

luacmartins Mar 3, 2025

Choose a reason for hiding this comment

Uh oh!

ikevin127 commented Mar 3, 2025

Uh oh!

luacmartins commented Mar 3, 2025

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

Uh oh!

ikevin127 commented Mar 3, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

jnowakow commented Mar 4, 2025

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 4, 2025

Uh oh!

github-actions bot commented Mar 4, 2025

Uh oh!

github-actions bot commented Mar 4, 2025

Uh oh!

github-actions bot commented Mar 6, 2025

Uh oh!

s77rt Jun 15, 2025

Choose a reason for hiding this comment

Uh oh!

Pujan92 Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Dec 5, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

jnowakow commented Feb 26, 2025 •

edited

Loading