-
Notifications
You must be signed in to change notification settings - Fork 4k
Hide proactive app review modal during Supportal and copilot sessions #96231
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+86
−28
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
da1f3a7
Hide proactive app review modal during Supportal sessions
roryabraham de68730
Hide proactive app review modal for copilots too
roryabraham 6c14052
refactor: drop useMemo from proactive app review
roryabraham dde2e20
Remove unused DELEGATE authTokenType
roryabraham 37690e4
Hyphenate cool-down to make spellcheck happy
roryabraham File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| import {renderHook, waitFor} from '@testing-library/react-native'; | ||
|
|
||
| import CONST from '@src/CONST'; | ||
| import useProactiveAppReview from '@src/hooks/useProactiveAppReview'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
|
|
||
| import Onyx from 'react-native-onyx'; | ||
|
|
||
| import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; | ||
|
|
||
| describe('useProactiveAppReview', () => { | ||
| beforeAll(() => { | ||
| Onyx.init({keys: ONYXKEYS}); | ||
| return waitForBatchedUpdates(); | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| Onyx.clear(); | ||
| return waitForBatchedUpdates(); | ||
| }); | ||
|
|
||
| it('returns shouldShowModal true when a trigger is set for a normal session', async () => { | ||
| await Onyx.merge(ONYXKEYS.NVP_APP_REVIEW, {trigger: 'submit'}); | ||
| await waitForBatchedUpdates(); | ||
|
|
||
| const {result} = renderHook(() => useProactiveAppReview()); | ||
|
|
||
| await waitFor(() => { | ||
| expect(result.current.shouldShowModal).toBe(true); | ||
| }); | ||
| }); | ||
|
|
||
| it('returns shouldShowModal false during a supportal session even when a trigger is set', async () => { | ||
| await Onyx.merge(ONYXKEYS.SESSION, {authTokenType: CONST.AUTH_TOKEN_TYPES.SUPPORT}); | ||
| await Onyx.merge(ONYXKEYS.NVP_APP_REVIEW, {trigger: 'submit'}); | ||
| await waitForBatchedUpdates(); | ||
|
|
||
| const {result} = renderHook(() => useProactiveAppReview()); | ||
|
|
||
| await waitFor(() => { | ||
| expect(result.current.shouldShowModal).toBe(false); | ||
| }); | ||
| }); | ||
|
|
||
| it('returns shouldShowModal false when acting as a copilot even when a trigger is set', async () => { | ||
| await Onyx.merge(ONYXKEYS.ACCOUNT, {delegatedAccess: {delegate: 'copilot@expensify.com'}}); | ||
| await Onyx.merge(ONYXKEYS.NVP_APP_REVIEW, {trigger: 'submit'}); | ||
| await waitForBatchedUpdates(); | ||
|
|
||
| const {result} = renderHook(() => useProactiveAppReview()); | ||
|
|
||
| await waitFor(() => { | ||
| expect(result.current.shouldShowModal).toBe(false); | ||
| }); | ||
| }); | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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_REVIEWupdate that sets a new trigger is still compared against the staletimeAtMount. In that scenariomsSinceLastPromptremains below 30 days, so the proactive review modal is suppressed until a full remount or another app-review update, whereas the previous code recomputedDate.now()whenproactiveAppReviewchanged and would show the now-eligible prompt.Useful? React with 👍 / 👎.