Skip to content

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

Refactor success/failed message component (#1338)

Leendert de Borstbb1549458ff3
diff --git a/apps/browser-extension/src/entrypoints/popup/components/AlertMessage.tsx b/apps/browser-extension/src/entrypoints/popup/components/AlertMessage.tsx
new file mode 100644
index 000000000..09c1b369c
--- /dev/null
+++ b/apps/browser-extension/src/entrypoints/popup/components/AlertMessage.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+
+export type AlertType = 'error' | 'success' | 'warning' | 'info';
+
+interface IAlertMessageProps {
+ type: AlertType;
+ message: string;
+ className?: string;
+}
+
+/**
+ * Alert message component for displaying error, success, warning, or info messages.
+ * @param props - The component props.
+ * @param props.type - The type of alert (error, success, warning, info).
+ * @param props.message - The message to display.
+ * @param props.className - Optional additional CSS classes.
+ * @returns The rendered alert message component.
+ */
+const AlertMessage: React.FC<IAlertMessageProps> = ({ type, message, className = '' }) => {
+ /**
+ * Get the appropriate CSS classes based on alert type.
+ * @returns CSS class string.
+ */
+ const getAlertClasses = (): string => {
+ const baseClasses = 'p-3 border rounded-md text-sm';
+
+ switch (type) {
+ case 'error':
+ return `${baseClasses} bg-red-100 dark:bg-red-900/30 border-red-300 dark:border-red-700 text-red-800 dark:text-red-300`;
+ case 'success':
+ return `${baseClasses} bg-green-100 dark:bg-green-900/30 border-green-300 dark:border-green-700 text-green-800 dark:text-green-300`;
+ case 'warning':
+ return `${baseClasses} bg-yellow-100 dark:bg-yellow-900/30 border-yellow-300 dark:border-yellow-700 text-yellow-800 dark:text-yellow-300`;
+ case 'info':
+ return `${baseClasses} bg-blue-100 dark:bg-blue-900/30 border-blue-300 dark:border-blue-700 text-blue-800 dark:text-blue-300`;
+ default:
+ return baseClasses;
+ }
+ };
+
+ return (
+ <div className={`${getAlertClasses()} ${className}`}>
+ {message}
+ </div>
+ );
+};
+
+export default AlertMessage;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
index 08f844de0..e2dd49106 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
@@ -4,6 +4,7 @@ import React, { useEffect, useState, useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
+import AlertMessage from '@/entrypoints/popup/components/AlertMessage';
import Button from '@/entrypoints/popup/components/Button';
import HeaderButton from '@/entrypoints/popup/components/HeaderButton';
import { HeaderIcon, HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';
@@ -411,11 +412,7 @@ const Unlock: React.FC = () => {
</div>
{/* Error Message */}
- {error && (
- <div className="mb-3 p-2 bg-red-100 dark:bg-red-900/30 border border-red-300 dark:border-red-700 rounded-md text-red-800 dark:text-red-300 text-xs text-center">
- {error}
- </div>
- )}
+ {error && <AlertMessage type="error" message={error} className="mb-3 text-center" />}
{/* Hidden Input for Keyboard Entry */}
<input
@@ -497,11 +494,7 @@ const Unlock: React.FC = () => {
</div>
{/* Error Message */}
- {error && (
- <div className="mb-4 p-2 bg-red-100 dark:bg-red-900/30 border border-red-300 dark:border-red-700 rounded-md text-red-800 dark:text-red-300 text-xs text-center">
- {error}
- </div>
- )}
+ {error && <AlertMessage type="error" message={error} className="mb-4 text-center" />}
<div className="mb-4">
<label className="block text-gray-700 dark:text-gray-200 font-medium mb-2" htmlFor="password">
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 0abe64afa..a9ce2affa 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx
@@ -537,7 +537,7 @@ const Settings: React.FC = () => {
</div>
<button
onClick={openKeyboardShortcuts}
- className="px-4 py-2 bg-blue-500 hover:bg-blue-600 text-white rounded-md transition-colors"
+ className="px-4 py-2 bg-primary-500 hover:bg-primary-600 text-white rounded-md transition-colors"
>
{t('settings.configure')}
</button>
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx
index 56faf2e7e..f140262e9 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/VaultUnlockSettings.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
+import AlertMessage from '@/entrypoints/popup/components/AlertMessage';
import Button from '@/entrypoints/popup/components/Button';
import HelpModal from '@/entrypoints/popup/components/Dialogs/HelpModal';
import { useDb } from '@/entrypoints/popup/context/DbContext';
@@ -173,22 +174,16 @@ const VaultUnlockSettings: React.FC = () => {
</div>
<div className="mt-6">
{/* Error/Success Messages */}
- {error && (
- <div className="mb-4 p-3 bg-red-100 dark:bg-red-900/30 border border-red-300 dark:border-red-700 rounded-md text-red-800 dark:text-red-300 text-sm">
- {error}
- </div>
- )}
- {success && (
- <div className="mb-4 p-3 bg-green-100 dark:bg-green-900/30 border border-green-300 dark:border-green-700 rounded-md text-green-800 dark:text-green-300 text-sm">
- {success}
- </div>
- )}
+ {error && <AlertMessage type="error" message={error} className="mb-4" />}
+ {success && <AlertMessage type="success" message={success} className="mb-4" />}
{/* Locked Warning */}
{isLocked && (
- <div className="p-3 bg-yellow-100 dark:bg-yellow-900/30 border border-yellow-300 dark:border-yellow-700 rounded-md text-yellow-800 dark:text-yellow-300 text-sm">
- {t('settings.unlockMethod.pinLocked')}
- </div>
+ <AlertMessage
+ type="warning"
+ message={t('settings.unlockMethod.pinLocked')}
+ className="mb-4"
+ />
)}
{/* PIN Code option */}
@@ -296,11 +291,7 @@ const VaultUnlockSettings: React.FC = () => {
autoFocus
/>
</div>
- {error && (
- <div className="mb-4 text-red-500 dark:text-red-400 text-sm">
- {error}
- </div>
- )}
+ {error && <AlertMessage type="error" message={error} className="mb-4" />}
<Button type="submit">
{t('common.next')}
</Button>
@@ -330,11 +321,7 @@ const VaultUnlockSettings: React.FC = () => {
autoFocus
/>
</div>
- {error && (
- <div className="mb-4 text-red-500 dark:text-red-400 text-sm">
- {error}
- </div>
- )}
+ {error && <AlertMessage type="error" message={error} className="mb-4" />}
<Button type="submit">
{t('common.confirm')}
</Button>
diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.json
index caa8c6652..9f604d095 100644
--- a/apps/browser-extension/src/i18n/locales/en.json
+++ b/apps/browser-extension/src/i18n/locales/en.json
@@ -199,7 +199,6 @@
"noMatchingCredentials": "No matching credentials found",
"createdAt": "Created",
"updatedAt": "Last updated",
- "saveSuccess": "Credential saved successfully",
"saveCredential": "Save credential",
"deleteCredentialTitle": "Delete Credential",
"deleteCredentialConfirm": "Are you sure you want to delete this credential? This action cannot be undone.",