Repository navigation
fix(mobile): rebuild the sign-in screen when the app language changes #8704
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
Open
iscekic
wants to merge
7
commits into
main
Choose a base branch
from
drain/login-language-refresh
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
735fdb3
fix(mobile): rebuild the sign-in screen when the app language changes
iscekic 3bb3fdc
fix(mobile): keep the sign-in drafts across a screen remount
iscekic c7d7acf
test(mobile): cover the draft a language change keeps on the sign-in …
iscekic 8adc421
test(mobile): cover a corrupt stored login draft
iscekic 9830700
fix(mobile): clear the sign-in form drafts on every successful sign-in
iscekic 9820d69
Merge origin/main into drain/login-language-refresh
iscekic 452f610
test(mobile): pin the sign-in draft clear to signIn
iscekic 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { LoginScreen } from '@/components/login-screen'; | ||
|
|
||
| export default function LoginRoute() { | ||
| return <LoginScreen />; | ||
| const { i18n } = useTranslation(); | ||
| return <LoginScreen key={i18n.language} />; | ||
| } | ||
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
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
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 { beforeEach, describe, expect, it, vi } from 'vitest'; | ||
|
|
||
| import { | ||
| clearLoginDrafts, | ||
| restoreLoginDrafts, | ||
| setLoginEmailDraft, | ||
| setSsoRecoveryDraft, | ||
| } from './login-draft'; | ||
|
|
||
| const stored = vi.hoisted(() => ({ | ||
| email: null as string | null, | ||
| sso: null as string | null, | ||
| })); | ||
|
|
||
| vi.mock('@/lib/auth/secure-store', () => ({ | ||
| getItemAsync: vi.fn((key: string) => | ||
| Promise.resolve(key.includes('sso') ? stored.sso : stored.email) | ||
| ), | ||
| setItemAsync: vi.fn(() => Promise.resolve()), | ||
| deleteItemAsync: vi.fn(() => Promise.resolve()), | ||
| })); | ||
|
|
||
| describe('login drafts across a remount', () => { | ||
| beforeEach(() => { | ||
| stored.email = null; | ||
| stored.sso = null; | ||
| clearLoginDrafts(); | ||
| }); | ||
|
|
||
| it('keeps the drafts the form is holding in memory', async () => { | ||
| setLoginEmailDraft('typed@example.com'); | ||
| setSsoRecoveryDraft({ email: 'typed@example.com', ssoOrganizationId: 'org-1' }); | ||
| stored.email = 'older@example.com'; | ||
|
|
||
| await expect(restoreLoginDrafts()).resolves.toEqual({ | ||
| email: 'typed@example.com', | ||
| ssoRecovery: { email: 'typed@example.com', ssoOrganizationId: 'org-1' }, | ||
| }); | ||
| }); | ||
|
|
||
| it('falls back to the stored drafts when the form holds none', async () => { | ||
| stored.email = 'stored@example.com'; | ||
| stored.sso = JSON.stringify({ email: 'stored@example.com', ssoOrganizationId: 'org-2' }); | ||
|
|
||
| await expect(restoreLoginDrafts()).resolves.toEqual({ | ||
| email: 'stored@example.com', | ||
| ssoRecovery: { email: 'stored@example.com', ssoOrganizationId: 'org-2' }, | ||
| }); | ||
| }); | ||
|
|
||
| it('ignores a corrupt stored draft instead of failing the mount', async () => { | ||
| stored.sso = '{not json'; | ||
|
|
||
| await expect(restoreLoginDrafts()).resolves.toEqual({ email: '', ssoRecovery: null }); | ||
| }); | ||
| }); |
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
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.
Uh oh!
There was an error while loading. Please reload this page.