[Domain Control] Split domain verify/verified routes for SAML and Members by jakubstec · Pull Request #91747 · Expensify/App

jakubstec · 2026-05-26T18:24:17Z

Explanation of Change

Splits routes for SAML and Members domain verification wall gates, so deeplinks work correctly. Also fixes a UI bug of invisible TXT record after refreshing the page.

Fixed Issues

$ #91081
PROPOSAL:

Tests

Go to "Workspaces"
Open any domain that is unverified
Open "Domain members" page
Click on Verify Domain
Verify, that /domain/<domainID>/members/verify and /domain/<domainID>/members/verified have (proper routing, screens etc).
Verify, that TXT record is visible correctly after a refresh.

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

MacOS: Chrome / Safari

Screen.Recording.2026-06-09.at.18.00.21.mov

Screen.Recording.2026-06-09.at.18.00.50.mov

…ndle proper deeplink behavior)

melvin-bot · 2026-05-26T18:24:22Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

…ted-domains-bug-fixes

…-wall-gate-for-unvalidated-domains-bug-fixes

…-bug-fixes' of github.com:software-mansion-labs/expensify-app-fork into jakubstec/domains/add-wall-gate-for-unvalidated-domains-bug-fixes

codecov · 2026-06-09T15:31:56Z

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/SCREENS.ts	`100.00% <ø> (ø)`
...avigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`76.92% <ø> (ø)`
src/pages/domain/DomainSamlPage.tsx	`0.00% <ø> (ø)`
src/pages/domain/Members/DomainMembersPage.tsx	`0.00% <ø> (ø)`
src/styles/index.ts	`60.41% <ø> (ø)`
src/pages/domain/BaseDomainVerifiedPage.tsx	`0.00% <0.00%> (ø)`
src/ROUTES.ts	`21.09% <0.00%> (+0.23%)`	⬆️
...gation/AppNavigator/ModalStackNavigators/index.tsx	`6.50% <0.00%> (-0.02%)`	⬇️
src/pages/domain/VerifyDomainPage.tsx	`0.00% <0.00%> (ø)`
... and 2 more
... and 20 files with indirect coverage changes

war-in

LGTM, just one small thought

war-in · 2026-06-10T08:18:43Z

+    if (domain.validated) {
+        return (
+            <NotFoundPage
+                onLinkPress={() => Navigation.dismissModal()}
+                shouldForceFullScreen
+            />
+        );
+    }


Shouldn't we redirect the user to the main domain page? Or show some screen that it was already verified? Not found page can be confusing here 🤔

Currently, on staging this flow is not handled at all, so we have to ask design team what's the best UX move here @Expensify/design

Context: accessing the verification RHP on a verified domain on staging looks like this, and this PR blocks it with a not found page.

melvin-bot · 2026-06-10T09:24:01Z

@dubielzyk-expensify @dukenv0307 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]

joekaufmanexpensify

Good for product

dubielzyk-expensify · 2026-06-11T01:12:58Z

Looks good to me. I see that this jumps from loading to when it's fully loaded. Would be nice to have a min-height to avoid that from happening:

CleanShot.2026-06-11.at.11.12.46.mp4

dukenv0307 · 2026-06-18T14:13:44Z

@jakubstec Is it ready for review?

…-wall-gate-for-unvalidated-domains-bug-fixes

jakubstec · 2026-06-19T12:21:03Z

Screen.Recording.2026-06-19.at.14.20.21.mov

added a min height of 72px. looks like that

jakubstec · 2026-06-19T12:22:14Z

@dukenv0307 should be ready now! (if none of the tests fail)

dukenv0307 · 2026-06-22T03:06:07Z

@codex review

chatgpt-codex-connector · 2026-06-22T03:11:19Z

Codex Review: Didn't find any major issues. Breezy!

Reviewed commit: 64f0885e50

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

dukenv0307 · 2026-06-22T03:40:28Z

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 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)
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)
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.
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.2026-06-22.at.10.38.29.AM.mov

Android: mWeb Chrome

Screen.Recording.2026-06-22.at.10.33.52.AM.mov

iOS: HybridApp

Screen.Recording.2026-06-22.at.10.39.59.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-06-22.at.10.28.44.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-22.at.10.18.19.AM.mov

mountiny

Thanks everyone

github-actions · 2026-06-22T12:30:23Z

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

melvin-bot · 2026-06-22T12:34:11Z

@mountiny 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.

OSBotify · 2026-06-22T12:34:16Z

✋ 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 · 2026-06-22T12:36:51Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e19e4138f1f-9980e46-d697f71b0a8447f170bab080e11b866f0b2983c6/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e19e413-9980e46-3695adeec9e32685fe53ad159c5f24d5e7d5b2cc/index.html

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

👀 View the workflow run that generated this build 👀

mountiny · 2026-06-22T13:21:15Z

This was not Emergency, the checklist is filled out and tests were passing

OSBotify · 2026-06-22T23:26:14Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.17-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-22T23:28:00Z

🤖 Help site review: no documentation changes required.

I reviewed the changes in this PR against the help articles under App/docs/articles and confirmed no updates are needed, so I did not open a draft docs PR.

Why no docs changes are needed

This PR is an internal navigation/routing refactor plus a render fix:

Route split — domain/:id/verify and domain/:id/verified are split into separate SAML and Members paths (domain/:id/saml/verify[ed] and domain/:id/members/verify[ed]) so deeplinks resolve to the correct gate. These are internal deeplink/route paths, not URLs that users are instructed to navigate to in the help site.
TXT record render fix — addresses the TXT record field being invisible after a page refresh.

The only domain-verification help article, Claim-and-Verify-a-Domain.md, documents the user-facing flow (Workspaces → Domains tab → ⋮ → Verify domain → add the TXT record at your DNS provider). None of those UI labels, steps, or screens changed — the verification experience the user sees is unchanged. There are no user-facing route URLs or feature/label names documented in the help site that this PR alters.

Since no help site changes are required, there is no linked docs PR to review.

@jakubstec, if you believe a user-facing behavior did change and should be documented, let me know and I'll open the draft PR.

OSBotify · 2026-06-23T21:58:28Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.17-3 🚀

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

OSBotify · 2026-06-23T23:36:58Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.17-3 🚀

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

feat: seperate subpages for domain verification (members, saml) to ha…

02a5abd

…ndle proper deeplink behavior)

melvin-bot Bot assigned jakubstec May 26, 2026

jakubstec changed the title ~~Jakubstec/domains/add wall gate for unvalidated domains bug fixes~~ [HOLD] [Domain Control] Split domain verify/verified routes for SAML and Members May 26, 2026

jakubstec mentioned this pull request May 26, 2026

[Domain Control] Add wall gate for unvalidated domains in domain members #91170

Merged

52 tasks

jakubstec changed the title ~~[HOLD] [Domain Control] Split domain verify/verified routes for SAML and Members~~ [Domain Control] Split domain verify/verified routes for SAML and Members May 29, 2026

jakubstec mentioned this pull request May 29, 2026

[Due for payment 2026-06-30] [Design + Copy + Implementation] Domain Members page — wall gate for unvalidated domains #91081

Closed

war-in and others added 4 commits June 1, 2026 10:59

Merge branch 'main' into jakubstec/domains/add-wall-gate-for-unvalida…

e2b525a

…ted-domains-bug-fixes

Merge remote-tracking branch 'origin/main' into jakubstec/domains/add…

9037f1a

…-wall-gate-for-unvalidated-domains-bug-fixes

fix: eslint

ab4f0f0

Merge branch 'jakubstec/domains/add-wall-gate-for-unvalidated-domains…

273ecd6

…-bug-fixes' of github.com:software-mansion-labs/expensify-app-fork into jakubstec/domains/add-wall-gate-for-unvalidated-domains-bug-fixes

jakubstec added 3 commits June 9, 2026 17:47

fix: ui bug causing txt record disappearing after page refresh

c1588a4

fix: revert minor changes

938499c

fix: revert minor changes

d75cf83

war-in approved these changes Jun 10, 2026

View reviewed changes

jakubstec marked this pull request as ready for review June 10, 2026 09:23

jakubstec requested review from a team as code owners June 10, 2026 09:23

melvin-bot Bot requested review from dubielzyk-expensify, dukenv0307 and joekaufmanexpensify and removed request for a team June 10, 2026 09:23

joekaufmanexpensify previously approved these changes Jun 10, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into jakubstec/domains/add…

764d00f

…-wall-gate-for-unvalidated-domains-bug-fixes

fix: add a min height for txt record code to remove flickering

64f0885

jakubstec dismissed joekaufmanexpensify’s stale review via 64f0885 June 19, 2026 12:21

jakubstec requested a review from a team as a code owner June 19, 2026 12:21

dukenv0307 approved these changes Jun 22, 2026

View reviewed changes

mountiny approved these changes Jun 22, 2026

View reviewed changes

mountiny merged commit e19e413 into Expensify:main Jun 22, 2026
47 of 64 checks passed

melvin-bot Bot added the Emergency label Jun 22, 2026

mountiny removed the Emergency label Jun 22, 2026

OSBotify mentioned this pull request Jun 22, 2026

Deploy Checklist: New Expensify 2026-06-22 #94222

Closed

Uh oh!

Conversation

jakubstec commented May 26, 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 26, 2026

Uh oh!

codecov Bot commented Jun 9, 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!

war-in left a comment

Choose a reason for hiding this comment

Uh oh!

war-in Jun 10, 2026

Choose a reason for hiding this comment

Uh oh!

jakubstec Jun 10, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Jun 10, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

dubielzyk-expensify commented Jun 11, 2026

Uh oh!

dukenv0307 commented Jun 18, 2026

Uh oh!

jakubstec commented Jun 19, 2026

Uh oh!

jakubstec commented Jun 19, 2026

Uh oh!

dukenv0307 commented Jun 22, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 22, 2026

Uh oh!

dukenv0307 commented Jun 22, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Jun 22, 2026

Uh oh!

melvin-bot Bot commented Jun 22, 2026

Uh oh!

OSBotify commented Jun 22, 2026

Uh oh!

github-actions Bot commented Jun 22, 2026

Uh oh!

mountiny commented Jun 22, 2026

Uh oh!

OSBotify commented Jun 22, 2026

Uh oh!

MelvinBot commented Jun 22, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

jakubstec commented May 26, 2026 •

edited

Loading

codecov Bot commented Jun 9, 2026 •

edited by github-actions Bot

Loading