Hide proactive app review modal during Supportal and copilot sessions - #96231
Conversation
Support tokens cannot call RespondToProactiveAppReview, so dismissing the modal fails with 411 and leaves it stuck open alongside the Supportal permission modal. Co-authored-by: Cursor <cursoragent@cursor.com>
Backend copilot tokens are TYPE_DELEGATE ("delegate"). Guard via
isActingAsDelegate and the new AUTH_TOKEN_TYPES.DELEGATE, and persist
authTokenType on connect so SESSION matches the Auth token type.
Co-authored-by: Cursor <cursoragent@cursor.com>
roryabraham
changed the title
Compiler already memoizes; capture mount time for purity and simplify supportal/copilot/trigger guards. Co-authored-by: Cursor <cursoragent@cursor.com>
97f4865 to
6c14052
Compare
Copilot gating uses account.delegatedAccess.delegate; no need to mirror Auth TYPE_DELEGATE onto SESSION. Co-authored-by: Cursor <cursoragent@cursor.com>
|
@mkhutornyi 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] |
|
skipping C+ review b/c we can't repro locally anyways |
robertjchen
left a comment
robertjchen
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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 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 usingAvatarhave 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
- 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
- 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 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
Avataris modified, I verified thatAvataris 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
Designlabel and/or tagged@Expensify/designso 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
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - 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
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 37690e4410
ℹ️ 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".
| } else if (proactiveAppReview?.lastPrompt) { | ||
| // Don't show again within 30 days of the last prompt | ||
| const lastPromptTime = new Date(proactiveAppReview.lastPrompt).getTime(); | ||
| const msSinceLastPrompt = timeAtMount - lastPromptTime; |
There was a problem hiding this comment.
If the app is opened before the 30-day cooldown expires and the user keeps the web tab/native app alive until after it expires, a later NVP_APP_REVIEW update that sets a new trigger is still compared against the stale timeAtMount. In that scenario msSinceLastPrompt remains below 30 days, so the proactive review modal is suppressed until a full remount or another app-review update, whereas the previous code recomputed Date.now() when proactiveAppReview changed and would show the now-eligible prompt.
Useful? React with 👍 / 👎.
|
🚧 roryabraham has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
…upportal Hide proactive app review modal during Supportal and copilot sessions (cherry picked from commit d388fdd) (cherry-picked to staging by roryabraham)
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
|
🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.4.34-14 🚀
|
|
🤖 I reviewed the changes in this PR against Expensify's help site files under No help site changes are required. This PR is a purely internal visibility gate in I searched @roryabraham, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR |
|
🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀
|
|
🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.4.34-14 🚀
|
|
🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀
Bundle Size Analysis (Sentry): |
|
🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.4.35-1 🚀
|
|
🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.4.35-6 🚀
|
Extend the app-review supportal/copilot gate from Expensify#96231 into a single shared guard (shouldSuppressPromotionalUI) and reuse it across all promo, training, and onboarding entry points so this UI is hidden for supportal and copilot sessions. Co-authored-by: Cursor <cursoragent@cursor.com>
4 participants
Explanation of Change
This PR suppresses the proactive app review modal for supportal and copilot.
Neither should leave reviews on behalf of another user, and neither has permission to call
RespondToProactiveAppReview(not on the Auth whitelist for those token types).The modal is also impossible to dismiss when supportaled in: when they call
RespondToProactiveAppReview, they get a 411, and the optimisticskipoutcome to hide to modal is rolled by via OnyxfailureData, and the modal reappears in a loop.Fixed Issues
$ #96204
Tests
I don't have a local reproduction for the issue.
Offline tests
N/A — this only gates modal visibility based on session/delegate state; no network-dependent behavior is changed for normal users.
QA Steps
Retest the linked issue
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
N/A — visibility gate only; covered by unit tests + Supportal/copilot staging QA.
Android: mWeb Chrome
N/A
iOS: Native
N/A
iOS: mWeb Safari
N/A
MacOS: Chrome / Safari
N/A