Borys3kk 59999 follow ups #60891

borys3kk · 2025-04-25T09:56:44Z

cc: @luacmartins @jnowakow

Explanation of Change

Fixed Issues

$ #60852
$ #60911
$ #60912
$ #60913
$ #61005
$ #59999 (comment)
$ #59999 (comment)
$ #59893
PROPOSAL:

Tests

$ #60911
Approver A steps:

Log in as Approver A
Verify the workspace chat for the employee has a GBR as an action is required
Navigate to the workspace chat of the employee
Verify that you see a whisper message in the employee workspace chat notifying you that a report is awaiting your approval
Click on the header
Click on members
Verify the members listed are: employee, approver A and approver B
Navigate back to the report
Verify the next steps mention that "Waiting for [Approver A] to approve these expense(s)"
Click on the Approve button on the expense
Click on it again
Ensure that the Approve button dismisses and verifies the Next Step reads “Waiting for [Approver B] to approve expense(s)”

$ #60912
Precondition:

Workspace is connected to Sage Intacct.
Auto sync must be disabled.

Go to workspace chat.
Submit a manual expense.
Click Submit, Approve and Pay elsewhere.
Click on the export dropdown button.
Note that there are two options - Export to Sage Intacct and Mark as manually entered.
Click on the expense preview.
Click More.
Ensure that there is an option to mark as manually exported

$ #60913
Precondition:

Workspace is connected to Sage Intacct.
Auto sync must be disabled.

Go to workspace chat.
Submit a manual expense.
Click Submit, Approve and Pay elsewhere.
Click Export to Sage Intacct button.
Click Export to Sage Intacct button again.
Note that it shows a warning modal - Careful!The following reports have already been exported to Sage Intacct.
Close the modal.
Click on the expense preview.
Click Export to Sage Intacct button.
Ensure that a warning modal is displayed

$ #61005

Precondition:

Log in to account with beta access.
User A and B have no unsettled expenses.

Go to staging.new.expensify.com
[User A] Submit a manual expense with amount RM10 (any currency) to User B.
[User B] Go to chat with User A.
[User B] Submit a manual expense of the same amount (RM10) to User A.
Ensure that there is no pay button on either account.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…-59999-follow-ups

borys3kk · 2025-04-25T09:59:10Z

src/libs/ReportActionsUtils.ts

@@ -273,8 +273,7 @@ function getOriginalMessage<T extends ReportActionName>(reportAction: OnyxInputO
 }

 function isExportIntegrationAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE && !!getOriginalMessage(reportAction as ReportAction<'INTEGRATIONSMESSAGE'>)?.result?.success;
-}
+    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION;}


We have to revert to this implementation of isExportIntegrationAction because of bugs it causes for some accounting connections (eg it only works for netsuite, for other integrations you can click export button endlessly)

After discussion with @jnowakow we decided the best thing to do would be implementing checks for all accountings checking if the reports have been correctly exported, but we would need more info about what type of messages do they return etc

luacmartins · 2025-04-25T18:58:56Z

@borys3kk I wasn't able to reproduce the issue #59999 (comment) anymore. Additonally, I think #59999 (comment) is expected if the auto-sync option is enabled (the bug report didn't mention if it wasn't).

github-actions · 2025-04-29T06:55:48Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

borys3kk · 2025-04-29T07:09:22Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

Wanted to squash commits, didn't realize it commited many many files, reverted

melvin-bot · 2025-04-29T09:21:02Z

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

mananjadhav

Left a few comments. But overall looks good, I'll start testing in a few hours.

src/libs/ReportPreviewActionUtils.ts

src/libs/ReportSecondaryActionUtils.ts

tests/unit/ReportSecondaryActionUtilsTest.ts

mananjadhav · 2025-04-30T14:12:27Z

src/components/MoneyReportHeader.tsx

+    }, [isPaidAnimationRunning, moneyRequestReport, reportNameValuePairs, policy, transactions, violations]);
+
+    const confirmExport = useCallback(() => {
+        setExportModalStatus(null);


In ExportWithDropdownMenu we also check if isExported, do we need to do it here as well?

isExported is used in another flow in ExportWithDropdownMenu
the confirm export function is only used in warning modal for reexport
modal -> function

luacmartins · 2025-05-01T15:43:40Z

@suneox @mananjadhav let's keep momentum on this one.

suneox · 2025-05-01T16:52:04Z

@borys3kk Issue #60914 is still not fixed: the Export to Sage Intacct option is not shown after changing auto sync from enabled → disabled → enabled.

60914.mp4

luacmartins · 2025-05-01T17:07:05Z

I think it's fine if the other issues are fixed. We can just remove that one from the list of fixed issues and tackle in a separate PR. I think the priority here is to keep making progress in fixing the issues in the main tracking issue, either in batch or one at a time. So as long as we're fixing an issue and not adding unnecessary code for other issues, we should be good.

suneox · 2025-05-01T17:16:14Z

I got it. Overall, the change set LGTM I'm still working on the checklist on other platforms

luacmartins · 2025-05-01T17:18:33Z

Cool, I removed #60914 from the list of fixed issues

suneox · 2025-05-01T18:16:02Z

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

MacOS: Chrome / Safari

60911.mp4

60912.mp4

60913.mp4

61005.mp4

60914.mp4

Android: HybridApp

android-native.mp4

Android: mWeb Chrome

android-web.mp4

iOS: HybridApp

ios-01.mp4

ios-02.mp4

iOS: mWeb Safari

safari-02.mp4

safari-01.mp4

MacOS: Desktop

desktop-app.mp4

luacmartins · 2025-05-01T20:28:49Z

Thanks for the review @suneox!

melvin-bot · 2025-05-01T20:28:57Z

Congrats, that's your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It's an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

OSBotify · 2025-05-01T20:38:34Z

✋ 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-06T01:26:50Z

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

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

kavimuru · 2025-05-06T20:58:45Z

#60914 Failing on Desktop

test.4.-.fail.mp4

luacmartins · 2025-05-06T21:23:30Z

@kavimuru that one is known and we're still working on it here #60852. I removed those test steps from the OP.

github-actions · 2025-05-07T00:07:34Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.1.40-7 🚀

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

borys3kk added 5 commits April 22, 2025 14:25

fix 59999#issuecomment-2815226410

05a4fde

fix 59999#issuecomment-2815226410

20e10b7

Merge branch 'jnowakow/simplified-actions-on-header-v2' into borys3kk…

3be910b

…-59999-follow-ups

fix 59999#issuecomment-2815119394

66b7409

revert isExportIntegrationAction to previous implementation

f7d8106

borys3kk commented Apr 25, 2025

View reviewed changes

borys3kk added 7 commits April 28, 2025 14:07

fix 60913

4042c81

run prettier

f7b9fcb

fix tests

935a3a1

run prettier

5902eaa

fix lint-changed

8aef4cf

Merge branch 'main' into borys3kk-59999-follow-ups

7b20268

fix eslint, prettier, typecheck

3770393

borys3kk force-pushed the borys3kk-59999-follow-ups branch from 0fa302d to 2a5319f Compare April 29, 2025 06:55

borys3kk force-pushed the borys3kk-59999-follow-ups branch from 2a5319f to 3770393 Compare April 29, 2025 07:06

Merge branch 'main' into borys3kk-59999-follow-ups

895e441

fix 61005

928dd35

luacmartins mentioned this pull request Apr 29, 2025

Hide payment button if shouldShowPayButton is false #61010

Closed

51 tasks

borys3kk marked this pull request as ready for review April 29, 2025 09:20

borys3kk requested a review from a team as a code owner April 29, 2025 09:20

melvin-bot bot requested review from akinwale and removed request for a team April 29, 2025 09:21

luacmartins requested review from luacmartins and suneox and removed request for akinwale April 29, 2025 10:03

fix exporting not proceeding

4141be1

fix prettier, tests, lint

cc95390

mananjadhav reviewed Apr 30, 2025

View reviewed changes

borys3kk added 3 commits April 30, 2025 17:26

add new testcase

5aad592

add reuse variable currentUserID

195d68a

fix prettier

6cbe195

suneox approved these changes May 1, 2025

View reviewed changes

luacmartins approved these changes May 1, 2025

View reviewed changes

luacmartins merged commit f7c1995 into Expensify:main May 1, 2025
19 checks passed

This was referenced May 5, 2025

[Due for payment 2025-05-14] Investigate workflow job failing on main: test / Storybook tests #61403

Closed

[No QA] Remove duplicated declaration #61407

Merged

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

Deploy Checklist: New Expensify 2025-05-06 #61424

Closed

77 tasks

luacmartins mentioned this pull request May 6, 2025

[Due for payment 2025-05-14] Expense - Blank green button in expense preview and report when net amount is 0 #61005

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Borys3kk 59999 follow ups #60891

Borys3kk 59999 follow ups #60891

borys3kk commented Apr 25, 2025 •

edited by luacmartins

Loading

borys3kk Apr 25, 2025

borys3kk Apr 25, 2025

luacmartins commented Apr 25, 2025

github-actions bot commented Apr 29, 2025

borys3kk commented Apr 29, 2025

melvin-bot bot commented Apr 29, 2025

mananjadhav left a comment

mananjadhav Apr 30, 2025

borys3kk Apr 30, 2025

luacmartins commented May 1, 2025

suneox commented May 1, 2025 •

edited

Loading

luacmartins commented May 1, 2025 •

edited

Loading

suneox commented May 1, 2025

luacmartins commented May 1, 2025

suneox commented May 1, 2025

luacmartins commented May 1, 2025

melvin-bot bot commented May 1, 2025

OSBotify commented May 1, 2025

github-actions bot commented May 6, 2025

kavimuru commented May 6, 2025

luacmartins commented May 6, 2025 •

edited

Loading

github-actions bot commented May 7, 2025

Borys3kk 59999 follow ups #60891

Borys3kk 59999 follow ups #60891

Conversation

borys3kk commented Apr 25, 2025 • edited by luacmartins Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

borys3kk Apr 25, 2025

Choose a reason for hiding this comment

borys3kk Apr 25, 2025

Choose a reason for hiding this comment

luacmartins commented Apr 25, 2025

github-actions bot commented Apr 29, 2025

borys3kk commented Apr 29, 2025

melvin-bot bot commented Apr 29, 2025

mananjadhav left a comment

Choose a reason for hiding this comment

mananjadhav Apr 30, 2025

Choose a reason for hiding this comment

borys3kk Apr 30, 2025

Choose a reason for hiding this comment

luacmartins commented May 1, 2025

suneox commented May 1, 2025 • edited Loading

luacmartins commented May 1, 2025 • edited Loading

suneox commented May 1, 2025

luacmartins commented May 1, 2025

suneox commented May 1, 2025

Reviewer Checklist

Screenshots/Videos

luacmartins commented May 1, 2025

melvin-bot bot commented May 1, 2025

OSBotify commented May 1, 2025

github-actions bot commented May 6, 2025

kavimuru commented May 6, 2025

luacmartins commented May 6, 2025 • edited Loading

github-actions bot commented May 7, 2025

borys3kk commented Apr 25, 2025 •

edited by luacmartins

Loading

suneox commented May 1, 2025 •

edited

Loading

luacmartins commented May 1, 2025 •

edited

Loading

luacmartins commented May 6, 2025 •

edited

Loading