Skip to content

Concierge AI Feature Promo Modal v2#94012

Draft
gijoe0295 wants to merge 7 commits into
Expensify:mainfrom
gijoe0295:fix/ai-feature-promo-modal-v2
Draft

Concierge AI Feature Promo Modal v2#94012
gijoe0295 wants to merge 7 commits into
Expensify:mainfrom
gijoe0295:fix/ai-feature-promo-modal-v2

Conversation

@gijoe0295

@gijoe0295 gijoe0295 commented Jun 19, 2026 •
edited
Loading

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. Verify Let's go/x/tapping outside dismisses the modal
  8. Verify the modal is shown only once
  • 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-06-15.at.12.43.07.mov
Android: mWeb Chrome
Screen.Recording.2026-06-15.at.12.44.06.mov
iOS: Native
Screen.Recording.2026-06-15.at.12.46.58.mov
iOS: mWeb Safari
Screen.Recording.2026-06-15.at.12.53.25.mov
MacOS: Chrome / Safari

Light mode

Screen.Recording.2026-06-08.at.16.16.11.mov

Dark mode

Screen.Recording.2026-06-08.at.17.21.25.mov

Don't intervene onboarding modal

Screen.Recording.2026-06-08.at.17.21.09.mov

gijoe0295 and others added 7 commits June 19, 2026 11:41
@gijoe0295
Reapply "Merge pull request Expensify#92007 from gijoe0295/feat/ai-fe…
e05a88c 
…ature-promo-modal"

This reverts commit 9586f96.
@gijoe0295 @claude
Fix search router opens/closes when AI promo modal is up
6b39918 
`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>
@gijoe0295 @claude
Fix AI promo modal clipping action buttons in landscape
db3dc2a 
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>
@gijoe0295 @claude
Fix AI promo carousel rendering blank on mWeb
0d5e20c 
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>
@gijoe0295 @claude
Fix AI promo carousel skipping middle page on fast swipe
4e05ef2 
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>
@gijoe0295 @claude
Suppress AI promo modal while acting as a delegate
e0d7fd3 
`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>
@gijoe0295 @claude
Allow external intents to navigate past the AI promo modal
f29182e 
`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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@gijoe0295 gijoe0295

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@gijoe0295