migrate WORKSPACE_COMPANY_CARDS_ADD_NEW by huult · Pull Request #91495 · Expensify/App

huult · 2026-05-23T06:50:31Z

Explanation of Change

Fixed Issues

$ #83834
PROPOSAL:

Tests

Same QA step

Verify that no errors appear in the JS console

Offline tests

QA Steps

WORKSPACE_COMPANY_CARDS_ADD_NEW

Prerequisites:

Have a workspace with a Control plan (or be ready to upgrade)
Be an admin of the workspace

Go to a workspace that has no company card feeds connected
On the Company Cards page, tap the Add cards button
Verify you land on the Add New Card feed page (add-card-feed path) without errors
Verify the back button returns you to the Company Cards page

Test 2:

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

Screen.Recording.2026-05-27.at.14.23.21.mov

melvin-bot · 2026-05-23T06:50:37Z

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

melvin-bot · 2026-05-23T06:50:42Z

@mananjadhav @mjasikowski One of you needs to 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]

huult · 2026-05-23T06:51:37Z

@MelvinBot I migrated WORKSPACE_COMPANY_CARDS_ADD_NEW to a dynamic route. Please generate test steps to verify the WORKSPACE_COMPANY_CARDS_ADD_NEW path

MelvinBot · 2026-05-23T06:53:50Z

Here are test steps to verify the WORKSPACE_COMPANY_CARDS_ADD_NEW dynamic route migration:

Prerequisites

Have a workspace with a Control plan (or be ready to upgrade)
Be an admin of the workspace

Test 1: Navigate to Add New Card Feed from Empty State

Go to a workspace that has no company card feeds connected
On the Company Cards page, tap the Add cards button
Verify you land on the Add New Card feed page (add-card-feed path) without errors
Verify the back button returns you to the Company Cards page

Test 2: Navigate to Add New Card Feed from Feed Selector

Go to a workspace that already has a company card feed connected
Go to Company Cards > tap the feed selector dropdown
Tap Add new card feed
Verify you land on the Add New Card flow without errors
Verify the back button returns you to the Company Cards page

Test 3: Back navigation from sub-steps

Start the Add New Card flow (via either entry point above)
Select a bank (e.g., Visa) and proceed through steps
If the flow reaches Import from File step → tap the import spreadsheet option → verify back button returns to the Add New Card page
If the flow reaches Layout Name step → verify the back button and form submission both navigate back to the Add New Card page correctly

Test 4: Upgrade flow → Company Cards

Go to a workspace on the Free or Collect plan
Navigate to Settings > Workspace > Company Cards
The upgrade page should appear — tap Upgrade
After upgrading, verify you are navigated to the Add New Card flow without errors

Test 5: Verify Account flow

Start the Add New Card flow on a workspace where account verification is required
Complete the verification step
Verify you are forwarded to the Add New Card page after verification succeeds

Test 6: Deep link

Open the URL directly in a browser: [app_url]/workspaces/[policyID]/company-cards/add-card-feed
Verify it loads the Add New Card page correctly
Verify back navigation goes to the Company Cards page

Test 7: Console check

Throughout all tests above, verify no errors appear in the JS console

codecov · 2026-05-23T06:58:05Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/ROUTES.ts	`18.22% <ø> (+0.01%)`	⬆️
src/SCREENS.ts	`100.00% <ø> (ø)`
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`76.92% <ø> (ø)`
...panyCards/WorkspaceCompanyCardFeedSelectorPage.tsx	`0.00% <ø> (ø)`
...ompanyCards/WorkspaceCompanyCardPageEmptyState.tsx	`0.00% <ø> (ø)`
...s/workspace/companyCards/addNew/SelectBankStep.tsx	`0.00% <ø> (ø)`
...orkspace/companyCards/addNew/SelectCountryStep.tsx	`92.50% <ø> (+4.12%)`	⬆️
...gation/AppNavigator/ModalStackNavigators/index.tsx	`6.95% <0.00%> (ø)`
...nyCards/WorkspaceCompanyCardsVerifyAccountPage.tsx	`0.00% <0.00%> (ø)`
... and 5 more
... and 10 files with indirect coverage changes

huult · 2026-05-27T08:10:18Z

@mananjadhav This PR is ready for review.

mananjadhav · 2026-05-28T08:50:02Z

Reviewing.

mananjadhav · 2026-05-28T14:38:34Z

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
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: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

web-company-cards-add-2.mov

web-company-cards-add-1.mov

melvin-bot · 2026-05-29T07:31:08Z

@mjasikowski looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

mjasikowski · 2026-05-29T07:31:24Z

Not an emergency, all tests passed

github-actions · 2026-05-29T07:32:08Z

🚧 @mjasikowski has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-05-29T07:37:24Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #91495.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-0aa2ac327e9-a82d62a-2370edf82225ab6911e96902043a1808897d9b69/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-0aa2ac3-a82d62a-6628fe7a7d6d8e69eae4c01430b3e024c567bc4a/index.html

Web 🕸️
https://91495.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-29T07:39:46Z

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

OSBotify · 2026-06-01T10:21:12Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.90-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-01T10:23:10Z

Help site review — no changes required

I reviewed the changes in this PR and no updates to the help site (App/docs/articles) are required.

This is a purely internal navigation refactor and does not change any user-facing behavior, feature names, labels, buttons, or workflows:

Migrates WORKSPACE_COMPANY_CARDS_ADD_NEW from the legacy backTo-param pattern to the createDynamicRoute() / DYNAMIC_ROUTES pattern (per the migration task in Expensify/App#83834).
Renames the screen constant COMPANY_CARDS_ADD_NEW → DYNAMIC_WORKSPACE_COMPANY_CARDS_ADD_NEW and the page component AddNewCardPage → DynamicAddNewCardPage.
Removes the now-unused backTo param and its handling in SelectBankStep/SelectCountryStep.

The user-visible flow is unchanged: the Add cards button still opens the add-card-feed page at the same URL path (workspaces/:policyID/company-cards/add-card-feed), and back navigation behaves the same way. The help articles document the conceptual flow for adding company cards, not internal route names, screen constants, or the backTo mechanism — none of which surface to end users.

I also confirmed the help site contains no references to any of the changed identifiers (add-card-feed route definition, backTo, WORKSPACE_COMPANY_CARDS_ADD_NEW).

Because no documentation changes are needed, I did not create a draft help site PR.

@huult — no help site PR was created since this refactor has no user-facing impact. If you believe a user-facing behavior did change here that I missed, let me know and I'll re-review.

OSBotify · 2026-06-02T06:03:47Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.90-3 🚀

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

migrate WORKSPACE_COMPANY_CARDS_ADD_NEW

65862eb

huult requested review from a team as code owners May 23, 2026 06:50

melvin-bot Bot assigned huult May 23, 2026

melvin-bot Bot requested review from JmillsExpensify and mananjadhav and removed request for mananjadhav May 23, 2026 06:50

melvin-bot Bot requested review from a team, mananjadhav and mjasikowski and removed request for a team May 23, 2026 06:50

huult added 3 commits May 25, 2026 08:01

Merge remote-tracking branch 'upstream/main' into 83834-migrate-perdiem

ddef6a0

Merge remote-tracking branch 'upstream/main' into 83834-migrate-perdiem

d5512d0

update add new card page

ba5dd93

Merge remote-tracking branch 'upstream/main' into 83834-migrate-perdiem

60ddf53

mananjadhav approved these changes May 28, 2026

View reviewed changes

mjasikowski approved these changes May 29, 2026

View reviewed changes

mjasikowski merged commit 0aa2ac3 into Expensify:main May 29, 2026
40 checks passed

melvin-bot Bot added the Emergency label May 29, 2026

mjasikowski removed the Emergency label May 29, 2026

OSBotify mentioned this pull request Jun 1, 2026

Deploy Checklist: New Expensify 2026-06-01 #92180

Closed

69 tasks

melvin-bot Bot mentioned this pull request Jun 2, 2026

[BT-106] Migrate Workspace - Tags Settings + Per Diem #83834

Closed

5 tasks

Uh oh!

Conversation

huult commented May 23, 2026 • 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 May 23, 2026

Uh oh!

melvin-bot Bot commented May 23, 2026

Uh oh!

huult commented May 23, 2026

Uh oh!

MelvinBot commented May 23, 2026

Prerequisites

Test 1: Navigate to Add New Card Feed from Empty State

Test 2: Navigate to Add New Card Feed from Feed Selector

Test 3: Back navigation from sub-steps

Test 4: Upgrade flow → Company Cards

Test 5: Verify Account flow

Test 6: Deep link

Test 7: Console check

Uh oh!

codecov Bot commented May 23, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

huult commented May 27, 2026

Uh oh!

mananjadhav commented May 28, 2026

Uh oh!

mananjadhav commented May 28, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

melvin-bot Bot commented May 29, 2026

Uh oh!

mjasikowski commented May 29, 2026

Uh oh!

github-actions Bot commented May 29, 2026

Uh oh!

github-actions Bot commented May 29, 2026

Uh oh!

OSBotify commented May 29, 2026

Uh oh!

OSBotify commented Jun 1, 2026

Uh oh!

MelvinBot commented Jun 1, 2026

Help site review — no changes required

Uh oh!

OSBotify commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

huult commented May 23, 2026 •

edited

Loading

codecov Bot commented May 23, 2026 •

edited by github-actions Bot

Loading