Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update browser extension settings UI (#2204)

Leendert de Borst60ba5f38b396
diff --git a/apps/browser-extension/src/entrypoints/popup/App.tsx b/apps/browser-extension/src/entrypoints/popup/App.tsx
index 3c0a2053e..f9649e788 100644
--- a/apps/browser-extension/src/entrypoints/popup/App.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/App.tsx
@@ -26,6 +26,7 @@ import RecentlyDeleted from '@/entrypoints/popup/pages/items/RecentlyDeleted';
import PasskeyAuthenticate from '@/entrypoints/popup/pages/passkeys/PasskeyAuthenticate';
import PasskeyCreate from '@/entrypoints/popup/pages/passkeys/PasskeyCreate';
import Reinitialize from '@/entrypoints/popup/pages/Reinitialize';
+import AppearanceSettings from '@/entrypoints/popup/pages/settings/AppearanceSettings';
import AutofillSettings from '@/entrypoints/popup/pages/settings/AutofillSettings';
import AutoLockSettings from '@/entrypoints/popup/pages/settings/AutoLockSettings';
import ClipboardSettings from '@/entrypoints/popup/pages/settings/ClipboardSettings';
@@ -206,6 +207,7 @@ const App: React.FC = () => {
{ path: '/settings/auto-lock', element: <AutoLockSettings />, showBackButton: true, title: t('common.settings') },
{ path: '/settings/passkeys', element: <PasskeySettings />, showBackButton: true, title: t('common.settings') },
{ path: '/settings/identity-generator', element: <IdentityGeneratorSettings />, showBackButton: true, title: t('common.settings') },
+ { path: '/settings/appearance', element: <AppearanceSettings />, showBackButton: true, title: t('common.settings') },
], [t]);
useEffect(() => {
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/AppearanceSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/AppearanceSettings.tsx
new file mode 100644
index 000000000..257aaa187
--- /dev/null
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/AppearanceSettings.tsx
@@ -0,0 +1,72 @@
+import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import PageTitle from '@/entrypoints/popup/components/PageTitle';
+import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
+import { useTheme } from '@/entrypoints/popup/context/ThemeContext';
+
+/**
+ * Appearance settings page component.
+ */
+const AppearanceSettings: React.FC = () => {
+ const { t } = useTranslation();
+ const { theme, setTheme } = useTheme();
+ const { setIsInitialLoading } = useLoading();
+
+ useEffect(() => {
+ // Mark initial loading as complete
+ setIsInitialLoading(false);
+ }, [setIsInitialLoading]);
+
+ return (
+ <div className="space-y-6">
+ <PageTitle>{t('settings.appearance')}</PageTitle>
+ <section>
+ <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
+ <div className="p-4">
+ <div>
+ <p className="font-medium text-gray-900 dark:text-white mb-2">{t('settings.theme')}</p>
+ <div className="flex flex-col space-y-2">
+ <label className="flex items-center">
+ <input
+ type="radio"
+ name="theme"
+ value="system"
+ checked={theme === 'system'}
+ onChange={() => setTheme('system')}
+ className="mr-2"
+ />
+ <span className="text-sm text-gray-700 dark:text-gray-300">{t('settings.useDefault')}</span>
+ </label>
+ <label className="flex items-center">
+ <input
+ type="radio"
+ name="theme"
+ value="light"
+ checked={theme === 'light'}
+ onChange={() => setTheme('light')}
+ className="mr-2"
+ />
+ <span className="text-sm text-gray-700 dark:text-gray-300">{t('settings.light')}</span>
+ </label>
+ <label className="flex items-center">
+ <input
+ type="radio"
+ name="theme"
+ value="dark"
+ checked={theme === 'dark'}
+ onChange={() => setTheme('dark')}
+ className="mr-2"
+ />
+ <span className="text-sm text-gray-700 dark:text-gray-300">{t('settings.dark')}</span>
+ </label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </section>
+ </div>
+ );
+};
+
+export default AppearanceSettings;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
index d9f5174dc..195e7fc8a 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
@@ -10,7 +10,6 @@ import { useApp } from '@/entrypoints/popup/context/AppContext';
import { useAuth } from '@/entrypoints/popup/context/AuthContext';
import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
-import { useTheme } from '@/entrypoints/popup/context/ThemeContext';
import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { useApiUrl } from '@/entrypoints/popup/utils/ApiUrlUtility';
import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';
@@ -25,7 +24,6 @@ import { browser, storage } from "#imports";
*/
const Settings: React.FC = () => {
const { t } = useTranslation();
- const { theme, setTheme } = useTheme();
const app = useApp();
const auth = useAuth();
const webApi = useWebApi();
@@ -86,14 +84,6 @@ const Settings: React.FC = () => {
loadSettings();
}, [loadSettings]);
- /**
- * Set theme preference.
- */
- const setThemePreference = async (newTheme: 'system' | 'light' | 'dark') : Promise<void> => {
- // Use the ThemeContext to apply the theme
- setTheme(newTheme);
- };
-
/**
* Open keyboard shortcuts configuration page.
*/
@@ -200,6 +190,13 @@ const Settings: React.FC = () => {
navigate('/settings/identity-generator');
};
+ /**
+ * Navigate to appearance settings.
+ */
+ const navigateToAppearanceSettings = () : void => {
+ navigate('/settings/appearance');
+ };
+
return (
<>
{/* Logout Confirmation Modal */}
@@ -545,74 +542,79 @@ const Settings: React.FC = () => {
</div>
</section>
- {/* Appearance Settings Section */}
+ {/* Appearance & Keyboard Shortcuts Section */}
<section>
- <h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">{t('settings.appearance')}</h3>
- <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
- <div className="p-4">
- <div>
- <p className="font-medium text-gray-900 dark:text-white mb-2">{t('settings.theme')}</p>
- <div className="flex flex-col space-y-2">
- <label className="flex items-center">
- <input
- type="radio"
- name="theme"
- value="system"
- checked={theme === 'system'}
- onChange={() => setThemePreference('system')}
- className="mr-2"
- />
- <span className="text-sm text-gray-700 dark:text-gray-300">{t('settings.useDefault')}</span>
- </label>
- <label className="flex items-center">
- <input
- type="radio"
- name="theme"
- value="light"
- checked={theme === 'light'}
- onChange={() => setThemePreference('light')}
- className="mr-2"
- />
- <span className="text-sm text-gray-700 dark:text-gray-300">{t('settings.light')}</span>
- </label>
- <label className="flex items-center">
- <input
- type="radio"
- name="theme"
- value="dark"
- checked={theme === 'dark'}
- onChange={() => setThemePreference('dark')}
- className="mr-2"
+ <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700 overflow-hidden">
+ <div className="divide-y divide-gray-200 dark:divide-gray-700">
+ {/* Appearance Settings */}
+ <button
+ onClick={navigateToAppearanceSettings}
+ className="w-full px-4 py-3 flex items-center justify-between hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors"
+ >
+ <div className="flex items-center">
+ <svg
+ className="w-5 h-5 mr-3 text-gray-600 dark:text-gray-400"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth={2}
+ viewBox="0 0 24 24"
+ >
+ <path
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828L9.828 19.071M7 17h.01"
/>
- <span className="text-sm text-gray-700 dark:text-gray-300">{t('settings.dark')}</span>
- </label>
+ </svg>
+ <span className="text-gray-900 dark:text-white text-left">{t('settings.appearance')}</span>
</div>
- </div>
- </div>
- </div>
- </section>
+ <svg
+ className="w-4 h-4 text-gray-400"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth={2}
+ viewBox="0 0 24 24"
+ >
+ <path strokeLinecap="round" strokeLinejoin="round" d="M9 5l7 7-7 7" />
+ </svg>
+ </button>
- {/* Keyboard Shortcuts Section */}
- {import.meta.env.CHROME && (
- <section>
- <h3 className="text-md font-semibold text-gray-900 dark:text-white mb-3">{t('settings.keyboardShortcuts')}</h3>
- <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
- <div className="p-4">
- <div className="flex items-center justify-between">
- <div>
- <p className="font-medium text-gray-900 dark:text-white">{t('settings.configureKeyboardShortcuts')}</p>
+ {/* Keyboard Shortcuts (opens browser settings) */}
+ {import.meta.env.CHROME && (
+ <button
+ onClick={openKeyboardShortcuts}
+ className="w-full px-4 py-3 flex items-center justify-between hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors"
+ >
+ <div className="flex items-center">
+ <svg
+ className="w-5 h-5 mr-3 text-gray-600 dark:text-gray-400"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth={2}
+ viewBox="0 0 24 24"
+ >
+ <path
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ d="M5 7h14a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2V9a2 2 0 012-2zM7 11h.01M11 11h.01M15 11h.01M8 15h8"
+ />
+ </svg>
+ <span className="text-gray-900 dark:text-white text-left">{t('settings.keyboardShortcuts')}</span>
</div>
- <button
- onClick={openKeyboardShortcuts}
- className="px-4 py-2 bg-primary-500 hover:bg-primary-600 text-white rounded-md transition-colors"
+ {/* External-link icon: indicates this opens the browser's own settings */}
+ <svg
+ className="w-4 h-4 text-gray-400"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth={2}
+ viewBox="0 0 24 24"
>
- {t('settings.configure')}
- </button>
- </div>
- </div>
+ <path strokeLinecap="round" strokeLinejoin="round" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
+ </svg>
+ </button>
+ )}
</div>
- </section>
- )}
+ </div>
+ </section>
<div className="text-center text-gray-400 dark:text-gray-600">
{t('settings.versionPrefix')}{AppInfo.VERSION} ({getDisplayUrl()})