Skip to content

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

Update warning style color palette and add reminder dismiss button

Leendert de Borst247908e4b01d
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Alert.tsx b/apps/browser-extension/src/entrypoints/popup/components/Alert.tsx
index b9216e4dc..f8a9e6e17 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Alert.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Alert.tsx
@@ -1,31 +1,45 @@
import React from 'react';
+import Icon from '@/entrypoints/popup/components/Icons/Icon';
+
+import type { UiIconName } from '@aliasvault/models/icons';
+
type AlertVariant = 'info' | 'warning' | 'error' | 'success';
interface IAlertProps {
variant: AlertVariant;
children: React.ReactNode;
+ /** Show the variant's icon in front of the text. */
+ icon?: boolean;
className?: string;
}
+/** Surface classes per variant; warnings use a translucent amber tint in dark mode instead of a brown one. */
+const VARIANT_STYLES: Record<AlertVariant, string> = {
+ info: 'bg-blue-50 dark:bg-blue-900/20 border-blue-200 dark:border-blue-800 text-blue-800 dark:text-blue-200',
+ warning: 'bg-amber-50 dark:bg-amber-500/10 border-amber-300 dark:border-amber-500/40 text-amber-900 dark:text-amber-100',
+ error: 'bg-red-50 dark:bg-red-900/20 border-red-200 dark:border-red-800 text-red-800 dark:text-red-200',
+ success: 'bg-green-50 dark:bg-green-900/20 border-green-200 dark:border-green-800 text-green-800 dark:text-green-200'
+};
+
+/** Icon and its color per variant. */
+const VARIANT_ICONS: Record<AlertVariant, { name: UiIconName; className: string }> = {
+ info: { name: 'information-circle', className: 'text-blue-600 dark:text-blue-400' },
+ warning: { name: 'exclamation', className: 'text-amber-600 dark:text-amber-500' },
+ error: { name: 'x-circle', className: 'text-red-600 dark:text-red-400' },
+ success: { name: 'check-circle', className: 'text-green-600 dark:text-green-400' }
+};
+
/**
* Reusable alert component with consistent styling
*/
-const Alert: React.FC<IAlertProps> = ({ variant, children, className = '' }) => {
- const variantStyles = {
- info: 'bg-blue-50 dark:bg-blue-900/20 border-blue-200 dark:border-blue-800 text-blue-800 dark:text-blue-200',
- warning: 'bg-amber-50 dark:bg-amber-900/20 border-amber-200 dark:border-amber-800 text-amber-800 dark:text-amber-200',
- error: 'bg-red-50 dark:bg-red-900/20 border-red-200 dark:border-red-800 text-red-800 dark:text-red-200',
- success: 'bg-green-50 dark:bg-green-900/20 border-green-200 dark:border-green-800 text-green-800 dark:text-green-200'
- };
-
- return (
- <div className={`p-3 border rounded-lg ${variantStyles[variant]} ${className}`}>
- <p className="text-sm">
- {children}
- </p>
- </div>
- );
-};
+const Alert: React.FC<IAlertProps> = ({ variant, children, icon = false, className = '' }) => (
+ <div className={`flex items-start gap-3 p-3 border rounded-lg ${VARIANT_STYLES[variant]} ${className}`}>
+ {icon && <Icon name={VARIANT_ICONS[variant].name} className={`flex-shrink-0 w-5 h-5 mt-0.5 ${VARIANT_ICONS[variant].className}`} />}
+ <p className="text-sm">
+ {children}
+ </p>
+ </div>
+);
export default Alert;
diff --git a/apps/browser-extension/src/entrypoints/popup/components/AlertMessage.tsx b/apps/browser-extension/src/entrypoints/popup/components/AlertMessage.tsx
index 126c71db6..da1b89024 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/AlertMessage.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/AlertMessage.tsx
@@ -37,7 +37,7 @@ const AlertMessage: React.FC<IAlertMessageProps> = ({ type, message, className =
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-amber-100 dark:bg-amber-900/30 border-amber-300 dark:border-amber-700 text-amber-800 dark:text-amber-300`;
+ return `${baseClasses} bg-amber-100 dark:bg-amber-500/10 border-amber-300 dark:border-amber-500/40 text-amber-900 dark:text-amber-100`;
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:
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/ConfirmDeleteModal.tsx b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/ConfirmDeleteModal.tsx
index 8667cabb1..801584c1c 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Dialogs/ConfirmDeleteModal.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Dialogs/ConfirmDeleteModal.tsx
@@ -55,7 +55,7 @@ const ConfirmDeleteModal: React.FC<ConfirmDeleteModalProps> = ({
{message}
</p>
{warning && (
- <p className="mt-3 p-3 border rounded-md text-sm bg-amber-100 dark:bg-amber-900/30 border-amber-300 dark:border-amber-700 text-amber-800 dark:text-amber-300">
+ <p className="mt-3 p-3 border rounded-md text-sm bg-amber-100 dark:bg-amber-500/10 border-amber-300 dark:border-amber-500/40 text-amber-900 dark:text-amber-100">
{warning}
</p>
)}
diff --git a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
index 04f3a5704..f44c7d8f5 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
@@ -266,8 +266,8 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email, manifestId })
};
const ownerNoticeBlock = ownerNotice && (
- <div className="mb-2 p-3 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-800 rounded">
- <p className="text-sm text-amber-800 dark:text-amber-200">{ownerNotice.notice}</p>
+ <div className="mb-2 p-3 bg-amber-50 dark:bg-amber-500/10 border border-amber-300 dark:border-amber-500/40 rounded">
+ <p className="text-sm text-amber-900 dark:text-amber-100">{ownerNotice.notice}</p>
{ownerNotice.canMove && (
<button
id="move-alias-here"
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx b/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx
index 2ff64991f..5231bdc4f 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Layout/ServerSyncIndicator.tsx
@@ -158,7 +158,7 @@ const ServerSyncIndicator: React.FC = () => {
<button
onClick={handleRetry}
disabled={isRetrying}
- className="flex items-center gap-1.5 mx-2 px-2 py-1 bg-amber-100 dark:bg-amber-900/30 text-amber-700 dark:text-amber-400 rounded-md text-xs font-medium cursor-pointer hover:opacity-80 active:opacity-60 transition-colors"
+ className="flex items-center gap-1.5 mx-2 px-2 py-1 bg-amber-100 dark:bg-amber-500/20 text-amber-700 dark:text-amber-300 rounded-md text-xs font-medium cursor-pointer hover:opacity-80 active:opacity-60 transition-colors"
title={t('sync.tapToRetry')}
>
<div className="relative">
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
index 455010c33..c47426817 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
@@ -6,6 +6,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
+import Alert from '@/entrypoints/popup/components/Alert';
import Button from '@/entrypoints/popup/components/Button';
import { CountdownBar, type ICountdownBarHandle } from '@/entrypoints/popup/components/CountdownBar';
import LogoutConfirmModal from '@/entrypoints/popup/components/Dialogs/LogoutConfirmModal';
@@ -475,9 +476,9 @@ const Upgrade: React.FC = () => {
)}
{kind === UpgradeKind.StorageFormat && (
- <div className="bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-900 rounded p-4 text-sm text-amber-800 dark:text-amber-300">
+ <Alert variant="warning" icon>
{t('upgrade.otherDevicesWarning', { version: AppInfo.API_VERSION })}
- </div>
+ </Alert>
)}
</div>
diff --git a/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml b/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml
index a3bd6edbf..74b38d5a9 100644
--- a/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml
@@ -18,7 +18,7 @@
<color name="av_success">#10b981</color>
<color name="av_success_background">#1a3d2b</color>
<color name="av_warning">#f59e0b</color>
- <color name="av_warning_background">#422006</color>
+ <color name="av_warning_background">#352d1e</color>
<color name="av_info">#3b82f6</color>
<color name="av_info_background">#1e3a5f</color>
<color name="av_destructive">#ef4444</color>
diff --git a/apps/mobile-app/ios/VaultUI/ColorConstants.swift b/apps/mobile-app/ios/VaultUI/ColorConstants.swift
index 123714045..d46e7fb86 100644
--- a/apps/mobile-app/ios/VaultUI/ColorConstants.swift
+++ b/apps/mobile-app/ios/VaultUI/ColorConstants.swift
@@ -42,7 +42,7 @@ public struct ColorConstants {
public static let success = SwiftUI.Color(hex: "#10b981")
public static let successBackground = SwiftUI.Color(hex: "#1a3d2b")
public static let warning = SwiftUI.Color(hex: "#f59e0b")
- public static let warningBackground = SwiftUI.Color(hex: "#422006")
+ public static let warningBackground = SwiftUI.Color(hex: "#352d1e")
public static let info = SwiftUI.Color(hex: "#3b82f6")
public static let infoBackground = SwiftUI.Color(hex: "#1e3a5f")
public static let destructive = SwiftUI.Color(hex: "#ef4444")
diff --git a/apps/web/src/components/alerts/MessageInfo.tsx b/apps/web/src/components/alerts/MessageInfo.tsx
index 18b85768a..24a459baa 100644
--- a/apps/web/src/components/alerts/MessageInfo.tsx
+++ b/apps/web/src/components/alerts/MessageInfo.tsx
@@ -1,22 +1,12 @@
import React from 'react';
-import Icon from '@/components/shared/Icon';
+import WarningBox from '@/components/alerts/WarningBox';
/**
* Amber info box with a title.
*/
const MessageInfo: React.FC<{ title?: string; children: React.ReactNode }> = ({ title, children }) => (
- <div className="bg-amber-100 border-l-4 border-amber-500 text-amber-700 p-4 mb-6" role="alert">
- <div className="flex">
- <div className="py-1">
- <Icon name="information-circle" className="h-6 w-6 text-amber-500 mr-4" />
- </div>
- <div>
- {title && <p className="font-bold">{title}</p>}
- <div className="text-sm">{children}</div>
- </div>
- </div>
- </div>
+ <WarningBox icon="information-circle" title={title} className="mb-6">{children}</WarningBox>
);
export default MessageInfo;
diff --git a/apps/web/src/components/alerts/WarningBox.tsx b/apps/web/src/components/alerts/WarningBox.tsx
new file mode 100644
index 000000000..d3d4c4255
--- /dev/null
+++ b/apps/web/src/components/alerts/WarningBox.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+
+import Icon from '@/components/shared/Icon';
+
+import type { UiIconName } from '@aliasvault/models/icons';
+
+type WarningBoxProps = {
+ children: React.ReactNode;
+ /** Bold first line. */
+ title?: string;
+ /** Icon shown in front of the text. */
+ icon?: UiIconName;
+ /** Buttons shown next to the text, or under it when the box is narrow. */
+ actions?: React.ReactNode;
+ id?: string;
+ className?: string;
+};
+
+/**
+ * Amber warning box: a light tint with dark text, and a translucent amber tint in dark mode instead of a brown one.
+ */
+const WarningBox: React.FC<WarningBoxProps> = ({ children, title, icon, actions, id, className = '' }) => (
+ <div id={id} role="alert" className={`flex flex-wrap items-center gap-3 p-4 rounded-lg bg-amber-50 border border-amber-300 text-amber-900 dark:bg-amber-500/10 dark:border-amber-500/40 dark:text-amber-100 ${className}`.trim()}>
+ {icon && <Icon name={icon} className="flex-shrink-0 w-5 h-5 text-amber-600 dark:text-amber-500" />}
+ <div className="flex-1 min-w-[16rem] text-sm">
+ {title && <p className="font-semibold">{title}</p>}
+ {children}
+ </div>
+ {actions && <div className="flex flex-wrap gap-2 ml-auto">{actions}</div>}
+ </div>
+);
+
+export default WarningBox;
diff --git a/apps/web/src/components/email/RecentEmails.tsx b/apps/web/src/components/email/RecentEmails.tsx
index fe765e940..774f78dc0 100644
--- a/apps/web/src/components/email/RecentEmails.tsx
+++ b/apps/web/src/components/email/RecentEmails.tsx
@@ -6,8 +6,10 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import AlertMessageError from '@/components/alerts/AlertMessageError';
+import WarningBox from '@/components/alerts/WarningBox';
import EmailModal from '@/components/email/EmailModal';
import SkeletonBase from '@/components/loading/SkeletonBase';
+import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import Icon from '@/components/shared/Icon';
import SectionTitle from '@/components/shared/SectionTitle';
@@ -238,14 +240,9 @@ const RecentEmails: React.FC<RecentEmailsProps> = ({ emailAddress, manifestId })
</div>
{!isLoading && error.length === 0 && ownerNotice && (
- <div className="mt-4 p-3 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-800 rounded-lg">
- <p className="text-sm text-amber-800 dark:text-amber-200">{ownerNotice.notice}</p>
- {ownerNotice.canMove && (
- <button id="move-alias-here" type="button" onClick={() => void moveHere()} className="mt-2 py-1.5 px-3 bg-primary-600 hover:bg-primary-700 text-white rounded-lg text-sm font-medium">
- {familySharingText.aliasOwner.moveHere}
- </button>
- )}
- </div>
+ <WarningBox className="mt-4" actions={ownerNotice.canMove && <Button id="move-alias-here" onClick={() => void moveHere()}>{familySharingText.aliasOwner.moveHere}</Button>}>
+ <p>{ownerNotice.notice}</p>
+ </WarningBox>
)}
{isLoading ? (
diff --git a/apps/web/src/components/layout/TopMenu.tsx b/apps/web/src/components/layout/TopMenu.tsx
index 19261525e..359995b23 100644
--- a/apps/web/src/components/layout/TopMenu.tsx
+++ b/apps/web/src/components/layout/TopMenu.tsx
@@ -135,8 +135,8 @@ const TopMenu: React.FC = () => {
)}
<AccountMenuLink onNavigate={closeUserMenu} to="/settings/two-factor" icon="twoFactor" label={t('common.twoFactorAuthentication')}>
{reminders.enableTwoFactor && (
- <span title={t('settings.securitySettings.twoFactor.disabledMessage')} className="flex items-center justify-center w-7 h-7 rounded-full bg-amber-100 text-amber-600 dark:bg-amber-900/40 dark:text-amber-400">
- <SettingsIcon name="warning" className="w-4 h-4" />
+ <span title={t('settings.securitySettings.twoFactor.disabledMessage')} className="flex items-center justify-center w-7 h-7">
+ <span className="w-2 h-2 rounded-full bg-primary-500" aria-hidden="true" />
<span className="sr-only">{t('common.disabled')}</span>
</span>
)}
diff --git a/apps/web/src/components/settings/importexport/ImportServiceCard.tsx b/apps/web/src/components/settings/importexport/ImportServiceCard.tsx
index fffe0c6df..28fd8ba60 100644
--- a/apps/web/src/components/settings/importexport/ImportServiceCard.tsx
+++ b/apps/web/src/components/settings/importexport/ImportServiceCard.tsx
@@ -555,7 +555,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
<p className="text-gray-600 dark:text-gray-400 text-sm mb-4">
<strong>{t('importExport.serviceCard.supportedFormats')}:</strong> {acceptedFileExtensions.join(', ')}
</p>
- <div className="mb-4 bg-amber-50 border border-amber-400 dark:bg-amber-800/30 dark:border-amber-500/50 rounded-lg p-4">
+ <div className="mb-4 bg-amber-50 border border-amber-300 dark:bg-amber-500/10 dark:border-amber-500/40 rounded-lg p-4">
<Text className="mb-4">{t('importExport.serviceCard.uploadExportFileText', { service: serviceName })}</Text>
<input ref={fileInputRef} type="file" accept={fileAcceptTypes} onChange={e => void handleFileUpload(e)} className="text-gray-700 dark:text-gray-200 file:mr-4 file:py-2 file:px-4 file:rounded-lg file:border-0 file:text-sm file:font-semibold file:bg-primary-50 file:text-primary-700 hover:file:bg-primary-100 dark:file:bg-primary-900/40 dark:file:text-primary-300 dark:hover:file:bg-primary-800/60" />
</div>
@@ -584,8 +584,8 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
<label htmlFor="decryptionPassword" className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{t('importExport.serviceCard.decryptionPasswordLabel')}</label>
<input id="decryptionPassword" type="password" value={decryptionPassword} onChange={e => setDecryptionPassword(e.target.value)} onKeyDown={handlePasswordKeyDown} autoFocus autoComplete="off" className="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:outline-none focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500" />
</div>
- <div className="mb-4 p-3 bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-lg">
- <p className="text-sm text-amber-800 dark:text-amber-200">{t('importExport.serviceCard.decryptionPasswordHint')}</p>
+ <div className="mb-4 p-3 rounded-lg bg-amber-50 border border-amber-300 dark:bg-amber-500/10 dark:border-amber-500/40">
+ <p className="text-sm text-amber-900 dark:text-amber-100">{t('importExport.serviceCard.decryptionPasswordHint')}</p>
</div>
<div className="flex justify-end mt-6 space-x-2">
<Button onClick={handlePreviousStep} color="secondary" arrow="back">{t('common.back')}</Button>
@@ -600,10 +600,10 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
* The callout listing the items that could not be parsed.
*/
const renderParseFailures = (): React.ReactNode => (
- <div className="mb-4 p-4 rounded-lg bg-amber-50 border border-amber-400 dark:bg-amber-900/20 dark:border-amber-700" role="alert">
+ <div className="mb-4 p-4 rounded-lg bg-amber-50 border border-amber-300 dark:bg-amber-500/10 dark:border-amber-500/40" role="alert">
<div className="flex items-start gap-2 mb-2">
- <Icon name="exclamation" className="w-5 h-5 shrink-0 text-amber-600 dark:text-amber-400" />
- <p className="font-medium text-amber-900 dark:text-amber-200">{t('importExport.serviceCard.importPartialFailureWarning', { count: parseFailures.length })}</p>
+ <Icon name="exclamation" className="w-5 h-5 shrink-0 text-amber-600 dark:text-amber-500" />
+ <p className="font-medium text-amber-900 dark:text-amber-100">{t('importExport.serviceCard.importPartialFailureWarning', { count: parseFailures.length })}</p>
</div>
<ul className="mb-3 ml-7 text-sm list-disc pl-5 space-y-0.5 text-gray-700 dark:text-gray-300">
{parseFailures.slice(0, FAILED_ITEMS_PREVIEW_LIMIT).map(failure => (
@@ -616,7 +616,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
{parseFailures.length > FAILED_ITEMS_PREVIEW_LIMIT && (
<p className="mb-3 ml-7 text-sm text-gray-700 dark:text-gray-300">{t('importExport.serviceCard.moreCredentials', { count: parseFailures.length - FAILED_ITEMS_PREVIEW_LIMIT })}</p>
)}
- <button type="button" onClick={() => setShowFailureDetails(!showFailureDetails)} className="ml-7 inline-flex items-center gap-1 text-sm font-medium text-amber-800 dark:text-amber-300 hover:text-amber-900 dark:hover:text-amber-200 hover:underline">
+ <button type="button" onClick={() => setShowFailureDetails(!showFailureDetails)} className="ml-7 inline-flex items-center gap-1 text-sm font-medium text-amber-900 dark:text-amber-100 hover:underline">
<span className={`${showFailureDetails ? 'rotate-90' : ''} transition-transform`}>▸</span>
{showFailureDetails ? t('common.hideDetails') : t('common.showDetails')}
</button>
@@ -647,7 +647,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
{parseFailures.length > 0 && renderParseFailures()}
{importedCredentials.length === 0 ? (
- <div className="p-4 mb-4 text-amber-700 bg-amber-100 rounded-lg dark:bg-amber-800/30 dark:text-amber-300" role="alert">
+ <div className="p-4 mb-4 rounded-lg bg-amber-50 border border-amber-300 text-amber-900 dark:bg-amber-500/10 dark:border-amber-500/40 dark:text-amber-100" role="alert">
<p>{t('importExport.serviceCard.noNewCredentials')}</p>
</div>
) : (
@@ -727,7 +727,7 @@ const ImportServiceCard: React.FC<ImportServiceCardProps> = ({ serviceName, desc
<div className="mb-4">
<Text className="mb-4">{t('importExport.serviceCard.confirmImportText', { count: importedCredentials.length })}</Text>
{extractFavicons && (
- <div className="p-4 mb-4 text-amber-700 bg-amber-100 rounded-lg dark:bg-amber-800/30 dark:text-amber-300" role="alert">
+ <div className="p-4 mb-4 rounded-lg bg-amber-50 border border-amber-300 text-amber-900 dark:bg-amber-500/10 dark:border-amber-500/40 dark:text-amber-100" role="alert">
<p>{t('importExport.serviceCard.faviconExtractionNote')}</p>
</div>
)}
diff --git a/apps/web/src/components/settings/importexport/ImportServices.tsx b/apps/web/src/components/settings/importexport/ImportServices.tsx
index d9ebfabf7..a6b7af53f 100644
--- a/apps/web/src/components/settings/importexport/ImportServices.tsx
+++ b/apps/web/src/components/settings/importexport/ImportServices.tsx
@@ -166,7 +166,7 @@ const ImportServiceGenericCsv: React.FC = () => {
<ImportServiceCard serviceName="Generic CSV" description={t('importExport.services.genericCsvDescription')} logoUrl="/img/importers/generic-csv.svg" acceptedFileExtensions={['.csv']} processFile={parseByExtension({ '.csv': csv(importGenericCsv) })}>
<Instruction>{t('importExport.services.genericCsvInstructionsPart1')}</Instruction>
<ol className="text-sm text-gray-700 dark:text-gray-300 space-y-2 mb-4">
- {step(1, <>{t('importExport.services.genericCsvStep1')} <button type="button" onClick={downloadTemplate} className="text-amber-600 dark:text-amber-400 hover:text-amber-800 dark:hover:text-amber-200 underline">{t('importExport.services.template')}</button></>)}
+ {step(1, <>{t('importExport.services.genericCsvStep1')} <button type="button" onClick={downloadTemplate} className="text-amber-600 dark:text-amber-500 hover:text-amber-900 dark:hover:text-amber-200 underline">{t('importExport.services.template')}</button></>)}
{step(2, t('importExport.services.genericCsvStep2'))}
{step(3, t('importExport.services.genericCsvStep3'))}
{step(4, t('importExport.services.genericCsvStep4'))}
diff --git a/apps/web/src/components/settings/security/ClipboardClearSection.tsx b/apps/web/src/components/settings/security/ClipboardClearSection.tsx
index eb2dbd3b7..b27bd6ae5 100644
--- a/apps/web/src/components/settings/security/ClipboardClearSection.tsx
+++ b/apps/web/src/components/settings/security/ClipboardClearSection.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
+import WarningBox from '@/components/alerts/WarningBox';
import SecuritySection from '@/components/settings/security/SecuritySection';
import FormLabel from '@/components/shared/FormLabel';
import Select from '@/components/shared/Select';
@@ -43,9 +44,9 @@ const ClipboardClearSection: React.FC = () => {
<option value="15">{t('common.duration.15seconds')}</option>
</Select>
<span className="block text-sm font-normal text-gray-500 dark:text-gray-400">{t('settings.general.clipboardClearSecondsDescription')}</span>
- <div className="mt-2 p-3 bg-amber-50 border border-amber-200 rounded-lg dark:bg-amber-900/20 dark:border-amber-800">
- <p className="text-sm text-amber-800 dark:text-amber-200">{t('settings.general.clipboardClearLimitationNote')}</p>
- </div>
+ <WarningBox className="mt-2">
+ <p>{t('settings.general.clipboardClearLimitationNote')}</p>
+ </WarningBox>
</div>
</SecuritySection>
);
diff --git a/apps/web/src/components/settings/twofactor/TwoFactorEnableStep.tsx b/apps/web/src/components/settings/twofactor/TwoFactorEnableStep.tsx
index 77903441f..a464c39a9 100644
--- a/apps/web/src/components/settings/twofactor/TwoFactorEnableStep.tsx
+++ b/apps/web/src/components/settings/twofactor/TwoFactorEnableStep.tsx
@@ -3,8 +3,8 @@ import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
+import WarningBox from '@/components/alerts/WarningBox';
import LoadingIndicator from '@/components/loading/LoadingIndicator';
-import SettingsIcon from '@/components/settings/SettingsIcon';
import Button from '@/components/shared/Button';
import Card from '@/components/shared/Card';
import InputTextField from '@/components/shared/InputTextField';
@@ -27,13 +27,9 @@ const RecoveryCodes: React.FC<{ recoveryCodes: string[] }> = ({ recoveryCodes })
<Card>
<SectionTitle className="mb-2">{t('settings.securitySettings.recoveryCodes.title')}</SectionTitle>
<Text variant="muted" className="mb-4">{t('settings.securitySettings.recoveryCodes.description')}</Text>
- <div className="flex items-start gap-3 mb-5 p-4 rounded-lg border border-amber-300 bg-amber-50 text-amber-900 dark:border-amber-700 dark:bg-amber-900/20 dark:text-amber-200" role="alert">
- <SettingsIcon name="warning" className="flex-shrink-0 w-5 h-5 mt-0.5 text-amber-600 dark:text-amber-400" />
- <div className="text-sm">
- <p className="font-semibold">{t('settings.securitySettings.recoveryCodes.warningTitle')}</p>
- <p>{t('settings.securitySettings.recoveryCodes.warningDescription')}</p>
- </div>
- </div>
+ <WarningBox icon="exclamation" className="mb-5" title={t('settings.securitySettings.recoveryCodes.warningTitle')}>
+ <p>{t('settings.securitySettings.recoveryCodes.warningDescription')}</p>
+ </WarningBox>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-5 gap-2 mb-6" id="recovery-codes">
{recoveryCodes.map(code => (
<code key={code} className="block p-3 bg-gray-100 dark:bg-gray-700 dark:text-gray-200 rounded-lg border border-gray-200 dark:border-gray-600 font-mono text-center">{code}</code>
diff --git a/apps/web/src/context/AccountReminderContext.tsx b/apps/web/src/context/AccountReminderContext.tsx
index 3dd15461c..56128d5ec 100644
--- a/apps/web/src/context/AccountReminderContext.tsx
+++ b/apps/web/src/context/AccountReminderContext.tsx
@@ -3,24 +3,31 @@ import { useLocation } from 'react-router-dom';
import { useDb } from '@/context/DbContext';
import { useWebApi } from '@/context/WebApiContext';
+import { useVaultMutate } from '@/hooks/useVaultMutate';
import type { TwoFactorStatusResponse } from '@aliasvault/models/webapi';
/** Two-factor is only promoted once the vault has content, so a brand new account is not flagged right away to prevent fatigue in the out-of-the-box experience. */
const TWO_FACTOR_REMINDER_MIN_ITEMS = 10;
+/** Vault setting that records the user chose not to be reminded about two-factor authentication. */
+const TWO_FACTOR_REMINDER_DISMISSED_KEY = 'TwoFactorReminderDismissed';
+
/**
* The account reminders that currently apply, keyed by what they ask the user to do.
*/
export type AccountReminders = {
- /** Two-factor authentication is off on a vault that has content. */
+ /** Two-factor authentication is off on a vault that has content, and the user has not dismissed the reminder. */
enableTwoFactor: boolean;
};
type AccountReminderContextType = {
reminders: AccountReminders;
hasReminders: boolean;
+ /** Whether the user dismissed the two-factor reminder; the reminder and its warning then stay hidden. */
+ twoFactorReminderDismissed: boolean;
refresh: () => Promise<void>;
+ dismissTwoFactorReminder: () => Promise<void>;
};
const AccountReminderContext = createContext<AccountReminderContextType | undefined>(undefined);
@@ -32,27 +39,47 @@ export const AccountReminderProvider: React.FC<{ children: React.ReactNode }> =
const webApi = useWebApi();
const dbContext = useDb();
const location = useLocation();
+ const { executeVaultMutationInBackground } = useVaultMutate();
const [twoFactorEnabled, setTwoFactorEnabled] = useState<boolean | null>(null);
const [itemCount, setItemCount] = useState(0);
+ const [twoFactorReminderDismissed, setTwoFactorReminderDismissed] = useState(false);
+
+ /**
+ * Re-read the vault-side inputs: the item count and the dismissed flag.
+ */
+ const readVaultState = useCallback((): void => {
+ const client = dbContext.sqliteClient;
+ setItemCount(client?.items.getAllSummaries().length ?? 0);
+ setTwoFactorReminderDismissed((client?.settings.getSetting(TWO_FACTOR_REMINDER_DISMISSED_KEY, 'False') ?? 'False').toLowerCase() === 'true');
+ }, [dbContext.sqliteClient]);
const refresh = useCallback(async (): Promise<void> => {
+ readVaultState();
try {
const status = await webApi.get<TwoFactorStatusResponse>('TwoFactorAuth/status');
setTwoFactorEnabled(status.twoFactorEnabled);
} catch {
setTwoFactorEnabled(null);
}
- }, [webApi]);
+ }, [webApi, readVaultState]);
useEffect(() => void refresh(), [refresh]);
- useEffect(() => {
- setItemCount(dbContext.sqliteClient?.items.getAllSummaries().length ?? 0);
- }, [dbContext.sqliteClient, location.pathname]);
+ useEffect(readVaultState, [readVaultState, location.pathname]);
+
+ /**
+ * Persist dismiss state in the vault so it's not prompted again.
+ */
+ const dismissTwoFactorReminder = useCallback(async (): Promise<void> => {
+ setTwoFactorReminderDismissed(true);
+ await executeVaultMutationInBackground(async () => {
+ dbContext.sqliteClient?.settings.updateSetting(TWO_FACTOR_REMINDER_DISMISSED_KEY, 'True');
+ });
+ }, [dbContext.sqliteClient, executeVaultMutationInBackground]);
const value = useMemo((): AccountReminderContextType => {
- const reminders: AccountReminders = { enableTwoFactor: twoFactorEnabled === false && itemCount >= TWO_FACTOR_REMINDER_MIN_ITEMS };
- return { reminders, hasReminders: Object.values(reminders).some(Boolean), refresh };
- }, [twoFactorEnabled, itemCount, refresh]);
+ const reminders: AccountReminders = { enableTwoFactor: twoFactorEnabled === false && !twoFactorReminderDismissed && itemCount >= TWO_FACTOR_REMINDER_MIN_ITEMS };
+ return { reminders, hasReminders: Object.values(reminders).some(Boolean), twoFactorReminderDismissed, refresh, dismissTwoFactorReminder };
+ }, [twoFactorEnabled, twoFactorReminderDismissed, itemCount, refresh, dismissTwoFactorReminder]);
return <AccountReminderContext.Provider value={value}>{children}</AccountReminderContext.Provider>;
};
diff --git a/apps/web/src/pages/sync/Sync.tsx b/apps/web/src/pages/sync/Sync.tsx
index 04c95db00..4095227e8 100644
--- a/apps/web/src/pages/sync/Sync.tsx
+++ b/apps/web/src/pages/sync/Sync.tsx
@@ -9,6 +9,7 @@ import { Link, useNavigate } from 'react-router-dom';
import AlertMessageError from '@/components/alerts/AlertMessageError';
import CriticalErrorPanel from '@/components/alerts/CriticalErrorPanel';
+import WarningBox from '@/components/alerts/WarningBox';
import BoldLoadingIndicator from '@/components/loading/BoldLoadingIndicator';
import Button from '@/components/shared/Button';
import Icon from '@/components/shared/Icon';
@@ -251,11 +252,9 @@ const Sync: React.FC = () => {
</button>
</div>
{showVersionDescription && (
- <div className="mb-4 p-3 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-700 rounded-lg">
- <p className="text-sm text-amber-800 dark:text-amber-200">
- {t('upgrade.upgradeRequiredDescription', { changes: latestVersion?.description ?? t('upgrade.noDescriptionAvailable') })}
- </p>
- </div>
+ <WarningBox className="mb-4">
+ <p>{t('upgrade.upgradeRequiredDescription', { changes: latestVersion?.description ?? t('upgrade.noDescriptionAvailable') })}</p>
+ </WarningBox>
)}
<div className="space-y-2">
<p className="flex justify-between items-center">
@@ -270,11 +269,9 @@ const Sync: React.FC = () => {
</div>
)}
{upgradeKind === 'storage-format' && (
- <div className="rounded-lg dark:bg-gray-900">
- <div className="p-4 text-sm text-left bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-900 rounded-lg text-amber-800 dark:text-amber-300">
- {t('upgrade.otherDevicesWarning', { version: AppInfo.API_VERSION })}
- </div>
- </div>
+ <WarningBox icon="exclamation" className="text-left">
+ <p>{t('upgrade.otherDevicesWarning', { version: AppInfo.API_VERSION })}</p>
+ </WarningBox>
)}
<div>
{upgradeError && <AlertMessageError message={upgradeError} />}
diff --git a/core/assets/colors/palette.json b/core/assets/colors/palette.json
index 9010c0108..ae2b88776 100644
--- a/core/assets/colors/palette.json
+++ b/core/assets/colors/palette.json
@@ -45,7 +45,7 @@
"success": "#10b981",
"successBackground": "#1a3d2b",
"warning": "#f59e0b",
- "warningBackground": "#422006",
+ "warningBackground": "#352d1e",
"info": "#3b82f6",
"infoBackground": "#1e3a5f",
"destructive": "#ef4444"
diff --git a/core/models/src/colors/Palette.ts b/core/models/src/colors/Palette.ts
index 94f8b6630..6fecef0b7 100644
--- a/core/models/src/colors/Palette.ts
+++ b/core/models/src/colors/Palette.ts
@@ -57,7 +57,7 @@ export const ThemeColors = {
success: '#10b981',
successBackground: '#1a3d2b',
warning: '#f59e0b',
- warningBackground: '#422006',
+ warningBackground: '#352d1e',
info: '#3b82f6',
infoBackground: '#1e3a5f',
destructive: '#ef4444',