Skip to content

Concierge AI Feature Promo Modal v2#94012

Merged
tgolen merged 43 commits into
Expensify:mainfrom
gijoe0295:fix/ai-feature-promo-modal-v2
Jul 10, 2026
Merged

Concierge AI Feature Promo Modal v2#94012
tgolen merged 43 commits into
Expensify:mainfrom
gijoe0295:fix/ai-feature-promo-modal-v2

Conversation

@gijoe0295

@gijoe0295 gijoe0295 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Second attempt to add promo modal for new AI features:

image image image

Fixed Issues

$ #90820
$ #93964
$ #93968
$ #93969
$ #93970
$ #93973
$ #93976
$ #93985
PROPOSAL:

Tests

  1. Open App
  2. Verify AI features promo modal appears
  3. Verify there are 3 steps in the modal
  4. Verify Back and Next buttons navigate through the pages
  5. Verify horizontal swipes navigate through the pages
  6. Verify the pagination dots change on page change
  7. On mWeb, verify the promo modal shows on top of Home page

  1. Press CMD + K
  2. Verify search router opens

  1. On mobile, rotate the device
  2. Verify modal are scrollable and automatically scrolls to bottom so buttons are visible

  1. Verify Let's go/x/tapping outside dismisses the modal
  2. Verify the modal is shown only once

  1. Sign up a new account
  2. Complete onboarding
  3. Verify the promo modal won't show until refresh page or kill & reopen app

  1. Copilot into an Agent account
  2. Verify the modal does not appear

Native only:
19. Sign in another account that has not seen the modal
20. While the modal is showing, background the app
21. Open device gallery and share a photo to Expensify app
22. Verify promo modal is dismissed and share page appears

  • Verify that no errors appear in the JS console

Offline tests

NA

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
    • 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

Android: Native
Screen.Recording.2026-07-02.at.22.37.22.mov
Android: mWeb Chrome
iOS: Native
Screen.Recording.2026-06-26.at.06.19.19.mov
iOS: mWeb Safari
Screen.Recording.2026-06-26.at.06.21.26.mov
MacOS: Chrome / Safari
Screen.Recording.2026-06-26.at.06.18.07.mov

gijoe0295 and others added 7 commits June 19, 2026 11:41
`openSearchRouter` was pushing the `{isSearchModalOpen: true}` history entry
synchronously, before `close()` finished dismissing any pre-existing modals.
When the AI promo modal closed it ran `Navigation.goBack()` (default
behavior of `FeatureTrainingModal` via `shouldGoBack=true`), which popped
the just-pushed history entry. The resulting `popstate` event fired before
the close callback finished, immediately marking the router as closed.

Move the `pushState` inside the `close()` callback so the history entry is
added only after pre-existing modals' close paths (including any history-
mutating `goBack`) have settled.

Fixes Expensify#93964

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The carousel path bypassed the ScrollView Wrapper that the single-page
path of FeatureTrainingModal uses, so in landscape (where the modal is
hard-capped at 75% of window height via MODAL_MAX_HEIGHT_TO_WINDOW_HEIGHT_RATIO_LANDSCAPE_MODE)
there was no scroller to make the buttons reachable when the illustration
consumed most of the cap.

Lift the Wrapper (ScrollView when shouldUseScrollView, else View) out so
both branches share it, and remove the now-redundant landscape maxHeight
and wrapperStyles from FeatureTrainingModalCarouselBody. Also drop
`isCarousel` from the keyboard scroll-to-end early-return so the carousel
benefits from the same keyboard behavior.

Fixes Expensify#93968

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
On narrow viewports (mWeb BOTTOM_DOCKED) the carousel's outer View had
no intrinsic content (everything inside is gated on `carouselViewportWidth > 0`)
and no width style, so inside the modal sheet's `fit-content` container
it collapsed to 0×0. `onLayout` never fired with a positive width, the
carousel never rendered, and the user saw the modal backdrop only.

Add `styles.w100` to the outer View on narrow screens so it stretches
to the sheet's full width and `onLayout` resolves immediately. The
explicit `getWidthStyle(width)` continues to apply on medium+ screens.

Fixes Expensify#93969

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
react-native-web translates FlatList's `pagingEnabled` to CSS scroll-snap,
but it only applies `scroll-snap-align: start` to the scroller's direct
children. Our per-page <View> rendered inside `renderItem` is not a direct
child of the FlatList's internal scroll container, so the carousel ended
up with a single snap point. A fast fling on mWeb/desktop Chrome could
coast past page 2 of 3 onto the last page.

Add `scrollSnapAlign: 'start'` to each page wrapper via a web-gated style
so every page becomes a snap point. Add `disableIntervalMomentum`,
`snapToInterval`, and `decelerationRate="fast"` to the FlatList as defense
in depth on native — no-ops on web, but they arrest momentum precisely at
each page boundary on iOS/Android.

Fixes Expensify#93970

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
`AIFeaturesPromoGuard` had no copilot/delegate awareness. When the host
user switched into another account via Copilot,
`clearOnyxForDelegateTransition` wiped Onyx using
`KEYS_TO_PRESERVE_DELEGATE_ACCESS` — which does NOT preserve
`NVP_DISMISSED_PRODUCT_TRAINING`. The guard then saw the dismissed NVP
as empty and re-prompted the host user's one-time AI promo for every
copilot transition.

Subscribe to `ONYXKEYS.ACCOUNT`, track `isActingAsDelegate` via
`isActingAsDelegateSelector`, and gate `isEligibleToShowAIFeaturesPromoModal`
on `!isActingAsDelegate`. Mirrors the same short-circuit in
`ProductTrainingContext`.

Fixes Expensify#93973

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
`shouldBlockWhileModalActive` previously blocked every navigation action
except DISMISS_MODAL and GO_BACK while the AI promo modal was on top.
External top-level intents — native share targeting SHARE_MODAL_NAVIGATOR,
report deep-links arriving as RESET via getAdaptedStateFromPath — were
silently dropped, stranding the user on the modal until they manually
closed it.

The block's intent is only to prevent an in-app tab swipe from racing
the modal overlay. Switch the logic accordingly:

- Always allow DISMISS_MODAL / GO_BACK.
- Always allow RESET (deep links / share intents).
- For NAVIGATE / PUSH / REPLACE, only block when `payload.name` targets
  the AI promo navigator itself; targets pointing at any sibling
  navigator/screen proceed and the new screen overlays or replaces the
  modal naturally.

Fixes Expensify#93976

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@melvin-bot

melvin-bot Bot commented Jun 19, 2026

Copy link
Copy Markdown

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:

  1. Look at the code and make sure there are no malicious changes.
  2. 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

@codecov

codecov Bot commented Jun 25, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 94.81% <ø> (ø)
src/ROUTES.ts 20.78% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
...tureTrainingContent/FeatureTrainingContentBody.tsx 100.00% <100.00%> (ø)
...TrainingContent/FeatureTrainingContentBodyText.tsx 100.00% <100.00%> (ø)
src/components/Lottie/index.tsx 81.35% <100.00%> (+0.65%) ⬆️
src/components/LottieAnimations/index.tsx 100.00% <ø> (ø)
src/components/Section/index.tsx 100.00% <ø> (ø)
src/libs/Navigation/AppNavigator/AuthScreens.tsx 82.79% <100.00%> (+0.18%) ⬆️
...Navigation/AppNavigator/AuthScreensInitHandler.tsx 88.15% <100.00%> (+0.15%) ⬆️
... and 11 more
... and 17 files with indirect coverage changes

@gijoe0295 gijoe0295 marked this pull request as ready for review June 25, 2026 23:21
@gijoe0295 gijoe0295 requested review from a team as code owners June 25, 2026 23:21
@melvin-bot melvin-bot Bot requested review from flaviadefaria and situchan and removed request for a team June 25, 2026 23:22
@melvin-bot

melvin-bot Bot commented Jun 25, 2026

Copy link
Copy Markdown

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

tgolen
tgolen previously approved these changes Jul 9, 2026

@tgolen tgolen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thank you!

@tgolen tgolen merged commit 884bbe4 into Expensify:main Jul 10, 2026
36 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/tgolen in version: 9.4.33-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no changes required.

This PR (#94012) adds a frontend-only "Concierge AI Feature Promo Modal" that promotes three existing AI features and links each to a help site article via CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS. It introduces no new user-facing behavior that needs documenting — it points to articles that already exist and accurately describe the promoted features. So I did not open a docs PR.

Verification of each linked article
Modal page Learn more URL Article file Covers the behavior?
Interactive spend analysis .../concierge-ai/How-Concierge-Analyzes-Spend How-Concierge-Analyzes-Spend.md ✅ Documents proactive monthly spend insights and drilling into details
Meet your new expense assistant .../concierge-ai/Expense-Assistant Expense-Assistant.md ✅ Documents creating/updating expenses via chat, email (concierge@expensify.com), and text
Build your own agents (beta) .../ai-agents/Create-Agent-Rules Create-Agent-Rules.md ✅ Documents custom AI rules that review, approve, and route reports

Each URL slug maps 1:1 to an existing markdown file under docs/articles/, so none of the "Learn more" links are broken, and each article's content matches the copy shown in the modal.

If you believe any of these articles needs updating to reflect changes shipped alongside this modal (e.g. new copy, renamed features, or behavior differences), reply with the specifics and I'll open a draft docs PR.

@gijoe0295, please confirm you agree no help site changes are needed here. If you'd like a docs PR for any of the linked articles, let me know what to update.

@danielrvidal

Copy link
Copy Markdown
Contributor

@MelvinBot in as brief as a summary as you can, can you outline the logic for which users will see this and when once it goes to production.

@MelvinBot

Copy link
Copy Markdown
Contributor

The modal auto-opens once per user, right after the app finishes loading, for essentially all signed-in NewDot users — except delegates and users who are mid-migration/onboarding. It's gated by an NVP, not a beta, so once dismissed it never shows again (synced across devices).

A user sees it when ALL of these hold (logic in useAIFeaturesPromoModal.ts):

  • Signed in and the app has finished loading (authToken present, !isLoadingApp).
  • Not acting as a delegate/copilot (L79).
  • Has not previously dismissed it — tracked via the dismissedProductTraining NVP, so it's genuinely one-time and cross-device (L81).
  • No migrated-user welcome modal is pending, and none was shown this session (L82-L83).
  • No active onboarding was seen this session — so brand-new users who just onboarded won't get it until they refresh/reopen the app (L84).

When / where it fires: it waits for in-flight navigation transitions to settle and for protected routes to be ready, then navigates from whatever screen you're on — and it skips firing if you're currently on the Share modal or a Not-found page (L86-L109).

No beta gate on seeing it. The only beta involvement is content: the 3rd "Build your own agents" page renders only for users with the CUSTOM_AGENT beta (AIFeaturesPromoModal.tsx); everyone else sees the 2 non-beta pages.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #95853 was identified to be related to this PR.

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker ##95856 was identified to be related to this PR

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #95869 was identified to be related to this PR.

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.