Skip to content

Refactor ImportSpreadsheetConfirmModal flow#90611

Closed
KJ21-ENG wants to merge 3 commits into
Expensify:mainfrom
KJ21-ENG:codex/89302-import-spreadsheet-modal-refactor
Closed

Refactor ImportSpreadsheetConfirmModal flow#90611
KJ21-ENG wants to merge 3 commits into
Expensify:mainfrom
KJ21-ENG:codex/89302-import-spreadsheet-modal-refactor

Conversation

@KJ21-ENG
Copy link
Copy Markdown
Contributor

@KJ21-ENG KJ21-ENG commented May 14, 2026

Explanation of Change

Refactors the import-spreadsheet confirmation flow so the result modal is shown from the import button flow instead of through the deleted ImportSpreadsheetConfirmModal null-rendering effect component.

The import actions now return an ImportFinalModal result and use API.makeRequestWithSideEffects for import commands that need the server response before showing the modal. The transient modal fields were removed from ONYXKEYS.IMPORTED_SPREADSHEET, while the durable spreadsheet state remains on Onyx.

This updates the current import consumers for categories, members, member role confirmation, tags, multi-level tags, per diem, company cards, and wallet transactions. Company-card imports preserve the existing pending-message copy by returning pendingMessageKey with the modal data.

Fixed Issues

$ #89302
PROPOSAL: #89302 (comment)

Tests

Manual flow checks to run before final review:

  1. Import workspace categories from a valid CSV, map the required columns, press Import, verify the success modal appears, confirm it, and verify the page returns to Categories.
  2. Import workspace members with roles present, press Import, verify the success modal appears, confirm it, and verify the page returns to Members.
  3. Import workspace members with missing roles, choose a role on the confirmation page, press Import, verify the success modal appears, confirm it, and verify the page returns to Members.
  4. Import single-level workspace tags, verify the success modal appears, and verify confirming it returns to Tags.
  5. Import multi-level tags through both paths: direct import from settings and independent mapping import. Verify each path shows the success modal and returns to Tags.
  6. Import per diem rates, verify the success modal appears, and verify confirming it returns to Per Diem.
  7. Import company-card transactions, verify the success modal includes the pending-message suffix, and verify confirming it returns to Company Cards.
  8. Import wallet transactions, verify the success modal appears, and verify confirming it dismisses the import modal.
  9. On one import mapping page, leave a required column unmapped, press Import, and verify the validation error appears and no confirmation modal opens.
  10. Start one import, immediately navigate back before the request resolves, and verify no stale result modal appears and no unrelated screen is popped.
  11. Verify that no errors appear in the JS console.

Regression checks already run locally:

  1. git diff --check
  2. npm run lint -- <changed files>
  3. npm run react-compiler-compliance-check check-changed -- --remote upstream
  4. npm test -- --runTestsByPath tests/actions/PolicyCategoryTest.ts tests/actions/PolicyMemberTest.ts tests/actions/PolicyTagTest.ts tests/unit/ImportTransactions.test.ts tests/unit/CompanyCardsRBRTest.ts tests/actions/IOU/PerDiemTest.ts

npm run typecheck-tsgo was also run and currently fails only in unrelated baseline files: src/components/MapView/utils.ts and src/libs/migrations/ConvertGpsPointsTo2DArray.ts.

  • Verify that no errors appear in the JS console

Offline tests

Manual offline check to run before final review:

  1. Navigate to an import mapping page.
  2. Turn the network connection off.
  3. Verify the Import button is disabled or the offline blocking UI prevents import.
  4. Turn the network connection back on.
  5. Press Import and verify the result modal appears after the import completes.

QA Steps

Same as Tests.

  • 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
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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

N/A - refactor only, no intended visual/copy/layout changes. A representative import modal recording can be added if requested during review.

Android: Native

N/A - refactor only, no intended visual/copy/layout changes.

Android: mWeb Chrome

N/A - refactor only, no intended visual/copy/layout changes.

iOS: Native

N/A - refactor only, no intended visual/copy/layout changes.

iOS: mWeb Safari

N/A - refactor only, no intended visual/copy/layout changes.

MacOS: Chrome / Safari

N/A - refactor only, no intended visual/copy/layout changes.

@codecov
Copy link
Copy Markdown

codecov Bot commented May 14, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/libs/API/types.ts 100.00% <ø> (ø)
src/libs/actions/ImportSpreadsheet.ts 43.47% <ø> (ø)
src/components/ImportSpreadsheetColumns.tsx 0.00% <0.00%> (ø)
src/libs/actions/Policy/Category.ts 52.90% <90.00%> (+0.27%) ⬆️
src/libs/actions/Policy/Member.ts 74.11% <63.63%> (-0.51%) ⬇️
...pages/settings/Wallet/TransactionsImportedPage.tsx 0.00% <0.00%> (ø)
...e/companyCards/addNew/CompanyCardsImportedPage.tsx 0.00% <0.00%> (ø)
...rc/pages/workspace/perDiem/ImportedPerDiemPage.tsx 0.00% <0.00%> (ø)
...ages/workspace/tags/ImportedMultiLevelTagsPage.tsx 0.00% <0.00%> (ø)
src/libs/actions/CompanyCards.ts 0.00% <0.00%> (ø)
... and 9 more
... and 42 files with indirect coverage changes

@KJ21-ENG KJ21-ENG closed this May 14, 2026
@KJ21-ENG KJ21-ENG deleted the codex/89302-import-spreadsheet-modal-refactor branch May 14, 2026 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant