Fix export condition #61260

luacmartins · 2025-05-01T17:53:03Z

Explanation of Change

Updates the logic to show the Export primary action based on if the auto export has failed or if the user has manually marked the report as exported

Fixed Issues

$ #61092
$ #60914

Tests

Pre-requisite: a workspace connected to an accounting system AND auto sync is enabled

Create an expense and pay it
Verify that you don't see the Export primary action because the report is queued to auto-export
When the export fails, verify that the Export primary button is shown
Tap More and manually export the expense
Verify that the Export button is not shown

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Successful export

Screen.Recording.2025-05-07.at.12.52.27.AM.mov

Failed export

Screen.Recording.2025-05-07.at.12.54.31.AM.mov

Auto sync on. For this one, the report preview button is grey (instead of green). I'll fix that tomorrow since it's already quite late for me.

Screen.Recording.2025-05-07.at.12.55.39.AM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-05-01T20:56:22Z

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

luacmartins · 2025-05-01T20:56:47Z

@suneox let's prioritize review on this one! Hopefully we can get through these small bugs fast.

borys3kk

It does work, but I think that this solution also works (i had a sudden realization a moment ago 💀 ), without changing anything in reportUtils.ts file:

from line 173

const connectedIntegration = getConnectedIntegration(policy);
    const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
    const reportActions = getAllReportActions(report.reportID);
    const isExported = isExportedUtil(reportActions);

    if (syncEnabled && !isExported) {
        return false;
    }

I think this solution is a bit more elegant as we don't operate on actions directly and instead we use function intended for this that does this job for us :)

borys3kk · 2025-05-01T21:48:31Z

we still need to get reportActions but instead of checking all actions by hand we can just check whether the report was not exported

borys3kk · 2025-05-01T21:50:29Z

Screen.Recording.2025-05-01.at.23.49.36.mov

video showing it works with that implementation :)

luacmartins · 2025-05-01T22:04:35Z

Hmm but in that case we still show the Export button when the user has marked the report as manually exported. We want to hide it in that case too. I think we might have to update the logic in isExported then

luacmartins · 2025-05-01T22:15:49Z

I updated the PR with your suggestion, but I think there's some missing cases since I'm seeing some odd behavior now. I'll get back to this on Monday

suneox · 2025-05-02T09:46:55Z

@suneox let's prioritize review on this one! Hopefully we can get through these small bugs fast.

I will start checking now

src/libs/ReportPrimaryActionUtils.ts

luacmartins · 2025-05-05T19:02:55Z

Ok @borys3kk @suneox, I updated the PR to account for export errors. I confirmed with our team and the following is true:

EXPORTINTEGRATION -> successful export
INTEGRATIONSMESSAGE -> failed export

So I believe the logic is correct now.

src/libs/ReportPrimaryActionUtils.ts

luacmartins · 2025-05-06T23:06:31Z

@suneox ok, I think I figured out the logic for exported reports. I updated the PR accordingly. Here's the result:

Successful export

Screen.Recording.2025-05-07.at.12.52.27.AM.mov

Failed export

Screen.Recording.2025-05-07.at.12.54.31.AM.mov

Auto sync on. For this one, the report preview button is grey (instead of green). I'll fix that tomorrow since it's already quite late for me.

Screen.Recording.2025-05-07.at.12.55.39.AM.mov

luacmartins · 2025-05-07T08:49:43Z

This PR also fixed #60914.

luacmartins · 2025-05-07T08:58:17Z

@suneox @borys3kk this is ready for review again. FYI I'm adding a hardcoded value of success to the export button since from now on it's always green as a primary action. This will introduce a temporary regression to the current behavior where sometimes the button is grey, but I think that's acceptable for a short period of time until we remove the beta.

suneox · 2025-05-07T12:54:32Z

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: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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: HybridApp

Screen.Recording.2025-05-07.at.20.03.48.mp4

Android: mWeb Chrome

Screen.Recording.2025-05-07.at.19.47.19.mp4

iOS: HybridApp

Screen.Recording.2025-05-07.at.19.40.44.mp4

iOS: mWeb Safari

Screen.Recording.2025-05-07.at.19.44.26.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-05-07.at.19.28.00.mp4

MacOS: Desktop

Screen.Recording.2025-05-07.at.19.28.00.mp4

suneox

LGTM

melvin-bot · 2025-05-07T12:59:32Z

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

MarioExpensify

LGTM!!

OSBotify · 2025-05-07T13:36:01Z

✋ 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-05-08T00:16:46Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.1.42-0 🚀

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

github-actions · 2025-05-09T09:27:14Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.1.43-5 🚀

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

github-actions · 2025-05-13T17:52:57Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.44-8 🚀

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

fix export condition

a03fdc0

luacmartins self-assigned this May 1, 2025

luacmartins added 2 commits May 1, 2025 20:05

handle null action

9857b6e

update conditions

3732d25

luacmartins marked this pull request as ready for review May 1, 2025 20:56

luacmartins requested a review from a team as a code owner May 1, 2025 20:56

melvin-bot bot requested review from suneox and removed request for a team May 1, 2025 20:56

luacmartins mentioned this pull request May 1, 2025

[PAID] Report - No Export to [Accounting system] primary option on paid report #61092

Closed

16 tasks

borys3kk reviewed May 1, 2025

View reviewed changes

luacmartins added 2 commits May 2, 2025 00:12

update conditions

138a2ef

resolve conflicts

db4fe5e

suneox reviewed May 2, 2025

View reviewed changes

src/libs/ReportPrimaryActionUtils.ts Show resolved Hide resolved

luacmartins added 2 commits May 5, 2025 20:46

Merge branch 'main' into cmartins-fixExportCondition

4dfccd0

add export error condition

77bb681

luacmartins requested review from suneox and borys3kk May 5, 2025 19:01

suneox reviewed May 6, 2025

View reviewed changes

src/libs/ReportPrimaryActionUtils.ts Show resolved Hide resolved

luacmartins mentioned this pull request May 6, 2025

[Due for payment 2025-05-20] Intacct - Missing "Export to Sage Intacct" in More options after changing auto sync settings #60914

Open

6 tasks

luacmartins added 2 commits May 6, 2025 23:30

Merge branch 'main' into cmartins-fixExportCondition

c6b36c0

update isExported logic, get reportActions from Onyx in the view

29591fb

luacmartins requested a review from suneox May 6, 2025 23:03

luacmartins added 2 commits May 7, 2025 01:07

fix lint

f68589f

always display button in success style

2ba5f23

luacmartins added 2 commits May 7, 2025 10:58

rm policy prop

3f39dd6

fix eslint

acaba3b

suneox approved these changes May 7, 2025

View reviewed changes

melvin-bot bot requested a review from MarioExpensify May 7, 2025 12:59

MarioExpensify approved these changes May 7, 2025

View reviewed changes

MarioExpensify merged commit 7451d9b into main May 7, 2025
22 checks passed

MarioExpensify deleted the cmartins-fixExportCondition branch May 7, 2025 13:27

github-actions bot mentioned this pull request May 7, 2025

Deploy Checklist: New Expensify 2025-05-07 #61626

Closed

90 tasks

jponikarchuk mentioned this pull request May 8, 2025

[Due for payment 2025-05-22] [Due for payment 2025-05-20] Export primary button is not hidden when manually exporting the expense for first time #61643

Open

8 tasks

IuliiaHerets mentioned this pull request May 12, 2025

Accounting - No failed report from accounting system #61836

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix export condition #61260

Fix export condition #61260

luacmartins commented May 1, 2025 •

edited

Loading

melvin-bot bot commented May 1, 2025

luacmartins commented May 1, 2025

borys3kk left a comment •

edited

Loading

borys3kk commented May 1, 2025

borys3kk commented May 1, 2025

luacmartins commented May 1, 2025

luacmartins commented May 1, 2025

suneox commented May 2, 2025

luacmartins commented May 5, 2025

luacmartins commented May 6, 2025 •

edited

Loading

luacmartins commented May 7, 2025

luacmartins commented May 7, 2025

suneox commented May 7, 2025 •

edited

Loading

suneox left a comment

melvin-bot bot commented May 7, 2025

MarioExpensify left a comment

OSBotify commented May 7, 2025

github-actions bot commented May 8, 2025

github-actions bot commented May 9, 2025

github-actions bot commented May 13, 2025

Fix export condition #61260

Fix export condition #61260

Conversation

luacmartins commented May 1, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 1, 2025

luacmartins commented May 1, 2025

borys3kk left a comment • edited Loading

Choose a reason for hiding this comment

borys3kk commented May 1, 2025

borys3kk commented May 1, 2025

luacmartins commented May 1, 2025

luacmartins commented May 1, 2025

suneox commented May 2, 2025

luacmartins commented May 5, 2025

luacmartins commented May 6, 2025 • edited Loading

luacmartins commented May 7, 2025

luacmartins commented May 7, 2025

suneox commented May 7, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

suneox left a comment

Choose a reason for hiding this comment

melvin-bot bot commented May 7, 2025

MarioExpensify left a comment

Choose a reason for hiding this comment

OSBotify commented May 7, 2025

github-actions bot commented May 8, 2025

github-actions bot commented May 9, 2025

github-actions bot commented May 13, 2025

luacmartins commented May 1, 2025 •

edited

Loading

borys3kk left a comment •

edited

Loading

luacmartins commented May 6, 2025 •

edited

Loading

suneox commented May 7, 2025 •

edited

Loading