[No QA] Bootstrap secondary actions getter by jnowakow · Pull Request #57678 · Expensify/App

jnowakow · 2025-03-03T15:00:45Z

Explanation of Change

Adds logic for determining what secondary actions should be available for report.

Fixed Issues

$ #57438
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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-03-03T15:00:51Z

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

…ied-actions-get-secondary-action

src/libs/ReportSecondaryActionUtils.ts

jnowakow · 2025-03-04T14:36:55Z

src/libs/ReportSecondaryActionUtils.ts

+    }
+
+    const isPaymentProcessing = true; // TODO
+    const hasDailyNachaCutoffPassed = false; // TODO


@luacmartins I'm not sure how to determine this value

The cutoff is 23:45 PM UTC the day the payment was made

Hmm so here I have to find payment transaction and get it's creation date and check if it's after 23:45 on that day?

Yes, you can probably use getIOUActionForReportID to get the IOU action and check if it's a pay action and then use the reportAction date

src/libs/ReportSecondaryActionUtils.ts

allgandalf · 2025-03-05T05:45:53Z

@jnowakow please also fix the failing test

allgandalf · 2025-03-05T09:04:00Z

src/libs/ReportUtils.ts

    }

-    if (isEmptyObject(report) || report.isWaitingOnBankAccount) {
+    if (isEmptyObject(report)) {


@jnowakow i don't understand the change here? why do we need to remove this change?

There is contradiction in this function. Discussion is here

src/libs/ReportSecondaryActionUtils.ts

…ied-actions-get-secondary-action

src/libs/ReportSecondaryActionUtils.ts

allgandalf · 2025-03-05T18:26:29Z

@jnowakow when do you think you can get this PR out of draft

jnowakow · 2025-03-06T07:59:37Z

@jnowakow when do you think you can get this PR out of draft

I think I will mark it as ready to review today

luacmartins · 2025-03-06T11:27:30Z

Nice! Let's push to get this one reviewed today then!

jnowakow · 2025-03-06T12:26:03Z

@luacmartins @allgandalf it's ready (I hope 🤞)

…tion

allgandalf · 2025-03-06T18:08:25Z

@jnowakow quoting from the design doc:

We can then clean up all the duplicate buttons in MoneyReportHeader.tsx

Are we not doing it in this PR?

allgandalf

@jnowakow please update the ReportSecondaryActionUtils, it doesn't follow the style we follow in our codebase, i didn't comment on some functions but the same applies to all the functions, do let reach out to me if you need any extra help here, thanks !

src/libs/ReportSecondaryActionUtils.ts

allgandalf · 2025-03-06T18:22:28Z

src/libs/ReportSecondaryActionUtils.ts

+    }
+
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+    const isReimbursed = report.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;


isReportReimbursed please

src/libs/ReportSecondaryActionUtils.ts

luacmartins · 2025-03-06T18:40:41Z

@jnowakow quoting from the design doc:

We can then clean up all the duplicate buttons in MoneyReportHeader.tsx

Are we not doing it in this PR?

@allgandalf we're gonna handle UI changes in a separate PR

allgandalf · 2025-03-06T20:40:32Z

@allgandalf we're gonna handle UI changes in a separate PR

ohh, it confused me as it was written in the design doc section of Secondary actions.

jnowakow · 2025-03-07T09:17:54Z

@allgandalf I renamed all variables according to your suggestion

luacmartins · 2025-03-07T11:48:08Z

Ready for another review from @allgandalf

allgandalf

okay, code LGTM! just one comment, but that won't block me from testing out this PR.

Completing checklist now

tests/unit/ReportSecondaryActionUtilsTest.ts

allgandalf · 2025-03-07T17:34:10Z

This PR has nothing to test in particular but i will try building each platform and verify that we are able to build successfully

allgandalf · 2025-03-07T17:38:04Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
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

allgandalf

Lets ship this and clear out the commented code in a followup 🚀

OSBotify · 2025-03-07T17:57:40Z

✋ 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-10T21:35:55Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.1.11-1 🚀

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

github-actions · 2025-03-14T01:07:14Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.12-7 🚀

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

c3024 · 2025-06-17T11:31:51Z

src/libs/ReportSecondaryActionUtils.ts

+    const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
+    const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
+
+    if (!isReportSubmitter && !isReportApprover) {


This check should include to ensure that the current user is neither the admin nor the manager before returning false to match the behaviour shown on report preview. Fixed here

#63538

ahmedGaber93 · 2025-07-11T12:33:40Z

src/libs/ReportSecondaryActionUtils.ts

+    if (hasAllPendingRTERViolations) {
+        return true;
+    }


Coming from #63137, we need to check isProcessingReport here to prevent displaying approve button if expense is not submitted and hasAllPendingRTERViolations is true.

jayeshmangwani · 2025-07-21T09:18:44Z

src/libs/ReportSecondaryActionUtils.ts

+
+    const autoReportingFrequency = getCorrectedAutoReportingFrequency(policy);
+
+    const isScheduledSubmitEnabled = policy?.harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;


Coming from this issue #62266 , here on isSubmitAction we are checking that when Scheduled Submit is enabled for the workspace, the Submit button appears as a secondary action. This behavior caused an issue if the workspace has Manual Submit enabled then Submit button does not appear for duplicate expenses. context: #62266 (comment)

suneox · 2025-12-30T17:38:54Z

src/libs/ReportSecondaryActionUtils.ts

+        const paymentDatetime = new Date(action.created);
+        const nowUTC = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds()));
+        const cutoffTimeUTC = new Date(Date.UTC(paymentDatetime.getUTCFullYear(), paymentDatetime.getUTCMonth(), paymentDatetime.getUTCDate(), 23, 45, 0));
+        return nowUTC.getTime() < cutoffTimeUTC.getTime();


Coming from #66225 BugZero checklist:

the implementation of the hasDailyNachaCutoffPassed condition is described in #57678 (comment) check if it's after 23:45 on that day so that mean the current time must be > cut off time

Bootstrap secondary actions getter

ad51938

jnowakow requested a review from a team as a code owner March 3, 2025 15:00

melvin-bot bot requested a review from allgandalf March 3, 2025 15:00

jnowakow marked this pull request as draft March 3, 2025 15:00

melvin-bot bot removed the request for review from a team March 3, 2025 15:00

luacmartins self-requested a review March 3, 2025 20:39

jnowakow added 3 commits March 4, 2025 12:40

Merge branch 'main' of github.com:Expensify/App into jnowakow/simplif…

4dfd0ce

…ied-actions-get-secondary-action

Implement secondary actions

8c98298

Remove contradiction from isSettled

265eeb3

jnowakow commented Mar 4, 2025

View reviewed changes

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

jnowakow commented Mar 4, 2025

View reviewed changes

allgandalf reviewed Mar 5, 2025

View reviewed changes

src/libs/ReportSecondaryActionUtils.ts Show resolved Hide resolved

jnowakow added 3 commits March 5, 2025 13:56

Merge branch 'main' of github.com:Expensify/App into jnowakow/simplif…

60532af

…ied-actions-get-secondary-action

Apply responses for reviews

1f7eb7b

Add tests

e45b471

jnowakow commented Mar 5, 2025

View reviewed changes

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

Add nacha cutoff condition

19e344a

jnowakow marked this pull request as ready for review March 6, 2025 11:33

luacmartins requested a review from allgandalf March 6, 2025 12:31

Merge branch 'main' into jnowakow/simplified-actions-get-secondary-ac…

3108f37

…tion

allgandalf suggested changes Mar 6, 2025

View reviewed changes

Rename variables

cd79a0f

luacmartins requested a review from allgandalf March 7, 2025 11:47

luacmartins assigned jnowakow Mar 7, 2025

allgandalf reviewed Mar 7, 2025

View reviewed changes

tests/unit/ReportSecondaryActionUtilsTest.ts Show resolved Hide resolved

allgandalf approved these changes Mar 7, 2025

View reviewed changes

luacmartins approved these changes Mar 7, 2025

View reviewed changes

luacmartins merged commit 800a538 into Expensify:main Mar 7, 2025
17 of 20 checks passed

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

Deploy Checklist: New Expensify 2025-03-10 #58124

Closed

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

[Due for payment 2025-03-21] [Simplified Actions] Implement getSecondaryActions with tests #57438

Closed

c3024 reviewed Jun 17, 2025

View reviewed changes

c3024 mentioned this pull request Jun 30, 2025

[Due for payment 2025-07-18] [Due for payment 2025-07-15] [$250] Export to Xero-"Export to Xero" option is not displayed in the menu after paying the expense #64766

Closed

16 tasks

ahmedGaber93 reviewed Jul 11, 2025

View reviewed changes

jayeshmangwani reviewed Jul 21, 2025

View reviewed changes

jayeshmangwani mentioned this pull request Jul 21, 2025

[Due for payment 2025-07-17] [$250] Report - No Submit option for a duplicate expenses #62266

Closed

8 tasks

suneox mentioned this pull request Aug 26, 2025

[Due for payment 2025-12-31] [$500] Pay with Expensify-"Cancel payment" option is not displayed for the paid expense #66225

Closed

8 tasks

suneox reviewed Dec 30, 2025

View reviewed changes


		const autoReportingFrequency = getCorrectedAutoReportingFrequency(policy);

		const isScheduledSubmitEnabled = policy?.harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;

Conversation

jnowakow commented Mar 3, 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 Mar 3, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luacmartins Mar 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

allgandalf commented Mar 5, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

allgandalf commented Mar 5, 2025

Uh oh!

jnowakow commented Mar 6, 2025

Uh oh!

luacmartins commented Mar 6, 2025

Uh oh!

jnowakow commented Mar 6, 2025

Uh oh!

allgandalf commented Mar 6, 2025

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

luacmartins commented Mar 6, 2025

Uh oh!

allgandalf commented Mar 6, 2025

Uh oh!

jnowakow commented Mar 7, 2025

Uh oh!

luacmartins commented Mar 7, 2025

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

allgandalf commented Mar 7, 2025

Uh oh!

allgandalf commented Mar 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

jnowakow commented Mar 3, 2025 •

edited

Loading

luacmartins Mar 4, 2025 •

edited

Loading

allgandalf commented Mar 7, 2025 •

edited

Loading

allgandalf left a comment •

edited

Loading