Skip to content

feat(appLock): add logout flow to app lock modal [WPB-23186] #20391

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.

Sign up for GitHub

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
V-Gira wants to merge 20 commits into
base: dev
Choose a base branch
from
+192 −196
Open

feat(appLock): add logout flow to app lock modal [WPB-23186] #20391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8d3639f
feat(appLock): add logout flow to app lock modal [WPB-23186]
V-Gira Feb 9, 2026
9f9844d
use ui kit for input
V-Gira Feb 9, 2026
220986d
use ui kit for button
V-Gira Feb 9, 2026
28cce93
use ui kit for link
V-Gira Feb 9, 2026
c7c47df
use ui kit for input
V-Gira Feb 9, 2026
c9d6c29
remove wipe database steps from app lock modal
V-Gira Feb 11, 2026
446e77e
remove passphrase on logout
V-Gira Feb 11, 2026
3da6451
implement checkbox to clear data on logout
V-Gira Feb 12, 2026
0168054
remove unused setter
V-Gira Feb 12, 2026
d59c99c
implement changed localization strings
V-Gira Feb 12, 2026
89cda02
remove unused localizaltion strings
V-Gira Feb 12, 2026
0d15b19
add changed localization strings
V-Gira Feb 12, 2026
d484558
add correct localization key
V-Gira Feb 12, 2026
dfbf956
copy less styles into object css
V-Gira Feb 13, 2026
81f7a21
apply styling changes
V-Gira Feb 13, 2026
6e0cbee
apply styling changes
V-Gira Feb 13, 2026
1966f68
add localization strings
V-Gira Feb 13, 2026
d7d8075
add removed strings types
V-Gira Feb 13, 2026
cd4bdf4
render component using theme util in tests
V-Gira Feb 13, 2026
80e3bbc
remove missing label step from e2e test
V-Gira Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions apps/webapp/src/i18n/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@
"modalAccountLeaveGuestRoomAction": "Leave",
"modalAccountLeaveGuestRoomHeadline": "Leave the guest room?",
"modalAccountLeaveGuestRoomMessage": "Conversation history will be deleted. To keep it, create an account next time.",
"modalAccountLogoutAction": "Log out",
"modalAccountLogoutAction": "Log Out",
"modalAccountLogoutHeadline": "Clear Data?",
"modalAccountLogoutOption": "Delete all your personal information and conversations on this device.",
"modalAccountNewDevicesFrom": "From:",
Expand All @@ -1259,16 +1259,18 @@
"modalAccountRemoveDevicePlaceholder": "Password",
"modalAcknowledgeAction": "Ok",
"modalAcknowledgeHeadline": "Something went wrong",
"modalAppLockForgotGoBackButton": "Go back",
"modalAppLockForgotMessage": "The data stored on this device can only be accessed with your app lock passcode. If you have forgotten your passcode, you can reset this client.",
"modalAppLockForgotTitle": "Forgot your app lock passcode?",
"modalAppLockForgotWipeCTA": "Reset this client",
"modalAppLockForgotGoBackButton": "Back",
"modalAppLockForgotMessage": "The data stored on this device can only be accessed with your app lock passcode.",
"modalAppLockForgotSecondMessage":"If you have forgotten your passcode, you can log out of this account and set a new passcode the next time you log in.",
Copy link

Copilot AI Feb 15, 2026

Choose a reason for hiding this comment

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

Missing space after the colon in the JSON property. Should be "modalAppLockForgotSecondMessage": "If you have forgotten..." (note the space after the colon).

Suggested change
"modalAppLockForgotSecondMessage":"If you have forgotten your passcode, you can log out of this account and set a new passcode the next time you log in.",
"modalAppLockForgotSecondMessage": "If you have forgotten your passcode, you can log out of this account and set a new passcode the next time you log in.",

Copilot uses AI. Check for mistakes.
"modalAppLockForgotTitle": "Forgot passcode?",
"modalAppLockLockedError": "Wrong passcode",
"modalAppLockLockedForgotCTA": "Access as new device",
"modalAppLockLockedForgotCTA": "Forgot passcode?",
"modalAppLockLogoutCancelButton": "Cancel",
"modalAppLockInputPlaceholder": "Enter passcode",
"modalAppLockLockedTitle": "Enter passcode to unlock {brandName}",
"modalAppLockLockedUnlockButton": "Unlock",
"modalAppLockPasscode": "Passcode",
"modalAppLockSetupAcceptButton": "Set passcode",
"modalAppLockSetupAcceptButton": "Create Passcode",
"modalAppLockSetupChangeMessage": "Your organization needs to lock your app when {brandName} is not in use to keep the team safe.[br]Create a passlock to unlock {brandName}. Please, remember it, as it can not be recovered.",
"modalAppLockSetupChangeTitle": "There was a change at {brandName}",
"modalAppLockSetupCloseBtn": "Close window, Set app lock passcode?",
Expand All @@ -1278,17 +1280,8 @@
"modalAppLockSetupMessage": "The app will lock itself after a certain time of inactivity.[br]To unlock the app you need to enter this passcode.[br]Make sure to remember this passcode as there is no way to recover it.",
"modalAppLockSetupSecondPlaceholder": "Repeat passcode",
"modalAppLockSetupSpecial": "A special character",
"modalAppLockSetupTitle": "Set app lock passcode",
"modalAppLockSetupTitle": "Create passcode",
"modalAppLockSetupUppercase": "An uppercase letter",
"modalAppLockWipeConfirmConfirmButton": "Reset this client",
"modalAppLockWipeConfirmGoBackButton": "Go back",
"modalAppLockWipeConfirmMessage": "All your conversation history will be permanently deleted from this client. You may then log in again.",
"modalAppLockWipeConfirmTitle": "Do you really want to reset this client?",
"modalAppLockWipePasswordConfirmButton": "Reset this client",
"modalAppLockWipePasswordError": "Wrong password",
"modalAppLockWipePasswordGoBackButton": "Go back",
"modalAppLockWipePasswordPlaceholder": "Password",
"modalAppLockWipePasswordTitle": "Enter your {brandName} account password to reset this client",
"modalAssetFileTypeRestrictionHeadline": "Restricted filetype",
"modalAssetFileTypeRestrictionMessage": "The filetype of \"{fileName}\" is not allowed.",
"modalAssetParallelUploadsHeadline": "Too many files at once",
Expand Down
11 changes: 6 additions & 5 deletions apps/webapp/src/script/page/AppLock/AppLock.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {UserState} from 'Repositories/user/UserState';
import {createUuid} from 'Util/uuid';

import {AppLock, APPLOCK_STATE} from './AppLock';
import {withTheme} from 'src/script/auth/util/test/TestUtil';

// https://github.com/jedisct1/libsodium.js/issues/235
jest.mock('libsodium-wrappers', () => ({
Expand Down Expand Up @@ -91,7 +92,7 @@ describe('AppLock', () => {
clientRepository,
};

const {queryByTestId} = render(<AppLock {...props} />);
const {queryByTestId} = render(withTheme(<AppLock {...props} />));

const appLockModal = queryByTestId('applock-modal');
expect(appLockModal).toBe(null);
Expand All @@ -112,7 +113,7 @@ describe('AppLock', () => {
clientRepository,
};

const {getByTestId} = render(<AppLock {...props} />);
const {getByTestId} = render(withTheme(<AppLock {...props} />));

const appLockModalBody = getByTestId('applock-modal-body');
expect(appLockModalBody.getAttribute('data-uie-value')).toEqual(APPLOCK_STATE.LOCKED);
Expand All @@ -131,7 +132,7 @@ describe('AppLock', () => {
clientRepository,
};

const {getByTestId} = render(<AppLock {...props} />);
const {getByTestId} = render(withTheme(<AppLock {...props} />));

act(() => {
amplify.publish(WebAppEvents.PREFERENCES.CHANGE_APP_LOCK_PASSPHRASE);
Expand All @@ -153,7 +154,7 @@ describe('AppLock', () => {
clientRepository,
};

const {getByTestId} = render(<AppLock {...props} />);
const {getByTestId} = render(withTheme(<AppLock {...props} />));

act(() => {
amplify.publish(WebAppEvents.PREFERENCES.CHANGE_APP_LOCK_PASSPHRASE);
Expand All @@ -177,7 +178,7 @@ describe('AppLock', () => {
clientRepository,
};

const {getByTestId} = render(<AppLock {...props} />);
const {getByTestId} = render(withTheme(<AppLock {...props} />));

const appLockModal = getByTestId('applock-modal');
expect(window.getComputedStyle(appLockModal).getPropertyValue('display')).toBe('flex');
Expand Down
Loading
Loading