diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx index fc5fb8c7f..c58b40962 100644 --- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx +++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceSwitcherMenu.tsx @@ -45,9 +45,7 @@ const WorkspaceSwitcherMenu: FunctionComponent = ({ const signoutAll = useCallback(async () => { const confirmed = await viewControllerManager.application.alertService.confirm( - `Are you sure you want to sign out of all workspaces on this device?${ - viewControllerManager.application.isNativeMobileWeb() && ' Your app will quit after sign out completes.' - }`, + 'Are you sure you want to sign out of all workspaces on this device?', undefined, 'Sign out all', ButtonType.Danger, @@ -64,44 +62,14 @@ const WorkspaceSwitcherMenu: FunctionComponent = ({ const activateWorkspace = useCallback( async (descriptor: ApplicationDescriptor) => { - if (viewControllerManager.application.isNativeMobileWeb()) { - const confirmed = await viewControllerManager.application.alertService.confirm( - 'The app needs to be restarted to activate the workspace', - undefined, - 'Quit app and activate workspace', - ButtonType.Danger, - ) - - if (confirmed) { - void mainApplicationGroup.unloadCurrentAndActivateDescriptor(descriptor) - } - - return - } - void mainApplicationGroup.unloadCurrentAndActivateDescriptor(descriptor) }, - [mainApplicationGroup, viewControllerManager.application], + [mainApplicationGroup], ) const addAnotherWorkspace = useCallback(async () => { - if (viewControllerManager.application.isNativeMobileWeb()) { - const confirmed = await viewControllerManager.application.alertService.confirm( - 'The app needs to be restarted to add another workspace', - undefined, - 'Quit app and add new workspace', - ButtonType.Danger, - ) - - if (confirmed) { - void mainApplicationGroup.unloadCurrentAndCreateNewDescriptor() - } - - return - } - void mainApplicationGroup.unloadCurrentAndCreateNewDescriptor() - }, [mainApplicationGroup, viewControllerManager.application]) + }, [mainApplicationGroup]) return ( diff --git a/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx b/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx index 22eb0ff69..9ba529753 100644 --- a/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx +++ b/packages/web/src/javascripts/Components/ConfirmSignoutModal/ConfirmSignoutModal.tsx @@ -41,15 +41,7 @@ const ConfirmSignoutModal: FunctionComponent = ({ application, viewContro Sign out workspace?
-

- {STRING_SIGN_OUT_CONFIRMATION} - {application.isNativeMobileWeb() && ( -

-
- Your app will quit after sign out completes. -
- )} -

+

{STRING_SIGN_OUT_CONFIRMATION}

{showWorkspaceWarning && ( <>