From f51ec5044336d28c0ff01f02e737aa6e4b3d18a8 Mon Sep 17 00:00:00 2001
From: Shuki Vaknin <shukivaknin@gmail.com>
Date: Sat, 27 Jun 2026 00:17:08 +0300
Subject: [PATCH] feat(settings): add "Refresh cached data" recovery action
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the mailbox view gets into a stale or wrong state, the only escape
was the browser's "clear site data" — which also wipes the saved account
list, forcing a re-login of every account.

Add a non-destructive "Refresh cached data" button under Settings →
Data. It clears the server-derived caches (contacts, calendars,
identities, per-account snapshots) and reloads so they re-fetch fresh,
while preserving accounts, sessions, settings, themes and user content
(templates, S/MIME). Two-click confirm to avoid an accidental reload.

English strings added across all locales (translation follow-up); unit
tests cover the cache-clear (keeps account-registry/auth/prefs) and the
reload.
---
 components/settings/about-data-settings.tsx | 21 +++++++++
 lib/__tests__/clear-cached-data.test.ts     | 50 +++++++++++++++++++++
 lib/clear-cached-data.ts                    | 45 +++++++++++++++++++
 locales/cs/common.json                      |  5 +++
 locales/da/common.json                      |  5 +++
 locales/de/common.json                      |  5 +++
 locales/en/common.json                      |  5 +++
 locales/es/common.json                      |  5 +++
 locales/fa/common.json                      |  5 +++
 locales/fr/common.json                      |  5 +++
 locales/hu/common.json                      |  5 +++
 locales/it/common.json                      |  5 +++
 locales/ja/common.json                      |  5 +++
 locales/ko/common.json                      |  5 +++
 locales/lv/common.json                      |  5 +++
 locales/nl/common.json                      |  5 +++
 locales/pl/common.json                      |  5 +++
 locales/pt/common.json                      |  5 +++
 locales/ro/common.json                      |  5 +++
 locales/ru/common.json                      |  5 +++
 locales/tr/common.json                      |  5 +++
 locales/uk/common.json                      |  5 +++
 locales/zh/common.json                      |  5 +++
 23 files changed, 216 insertions(+)
 create mode 100644 lib/__tests__/clear-cached-data.test.ts
 create mode 100644 lib/clear-cached-data.ts

diff --git a/components/settings/about-data-settings.tsx b/components/settings/about-data-settings.tsx
index 7bbde4a7..0c0556b9 100644
--- a/components/settings/about-data-settings.tsx
+++ b/components/settings/about-data-settings.tsx
@@ -11,6 +11,7 @@ import { useUpdateStore } from '@/stores/update-store';
 import { ExternalLink } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { getPathPrefix } from '@/lib/browser-navigation';
+import { clearCachedData } from '@/lib/clear-cached-data';
 import { SpamSiegeGame } from './spam-siege-game';
 
 const APP_VERSION = process.env.NEXT_PUBLIC_APP_VERSION || "0.0.0";
@@ -54,6 +55,7 @@ export function AboutDataSettings() {
     useSettingsStore();
   const { settingsSyncEnabled } = useConfig();
   const [showResetConfirm, setShowResetConfirm] = useState(false);
+  const [showRefreshConfirm, setShowRefreshConfirm] = useState(false);
   const fileInputRef = useRef<HTMLInputElement>(null);
   const { isFeatureEnabled } = usePolicyStore();
   const [showGame, setShowGame] = useState(false);
@@ -105,6 +107,15 @@ export function AboutDataSettings() {
     reader.readAsText(file);
   };
 
+  const handleRefreshCache = () => {
+    if (showRefreshConfirm) {
+      clearCachedData(); // reloads the page
+    } else {
+      setShowRefreshConfirm(true);
+      setTimeout(() => setShowRefreshConfirm(false), 5000);
+    }
+  };
+
   const handleReset = () => {
     if (showResetConfirm) {
       resetToDefaults();
@@ -187,6 +198,16 @@ export function AboutDataSettings() {
         </SettingItem>
         )}
 
+        <SettingItem label={t('refresh_cache.label')} description={t('refresh_cache.description')}>
+          <Button
+            variant={showRefreshConfirm ? 'default' : 'outline'}
+            size="sm"
+            onClick={handleRefreshCache}
+          >
+            {showRefreshConfirm ? tCommon('yes') : t('refresh_cache.button')}
+          </Button>
+        </SettingItem>
+
         <SettingItem label={t('reset_settings.label')} description={t('reset_settings.description')}>
           <Button
             variant={showResetConfirm ? 'destructive' : 'outline'}
diff --git a/lib/__tests__/clear-cached-data.test.ts b/lib/__tests__/clear-cached-data.test.ts
new file mode 100644
index 00000000..b29db774
--- /dev/null
+++ b/lib/__tests__/clear-cached-data.test.ts
@@ -0,0 +1,50 @@
+import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import { clearCachedData } from '../clear-cached-data';
+
+describe('clearCachedData', () => {
+  let reload: ReturnType<typeof vi.fn>;
+  let originalLocation: Location;
+
+  beforeEach(() => {
+    localStorage.clear();
+    reload = vi.fn();
+    originalLocation = window.location;
+    Object.defineProperty(window, 'location', {
+      configurable: true,
+      value: { ...originalLocation, reload },
+    });
+  });
+
+  afterEach(() => {
+    Object.defineProperty(window, 'location', { configurable: true, value: originalLocation });
+  });
+
+  it('clears re-fetchable caches but keeps accounts, sessions and prefs', () => {
+    localStorage.setItem('contact-storage', '1');
+    localStorage.setItem('calendar-storage', '1');
+    localStorage.setItem('identity-storage', '1');
+    localStorage.setItem('calendar-notification-storage', '1');
+    // Must survive — losing these is exactly the pain we're avoiding.
+    localStorage.setItem('account-registry', 'accounts');
+    localStorage.setItem('auth-storage', 'session');
+    localStorage.setItem('settings-storage', 'prefs');
+    localStorage.setItem('template-storage', 'my templates');
+
+    clearCachedData();
+
+    expect(localStorage.getItem('contact-storage')).toBeNull();
+    expect(localStorage.getItem('calendar-storage')).toBeNull();
+    expect(localStorage.getItem('identity-storage')).toBeNull();
+    expect(localStorage.getItem('calendar-notification-storage')).toBeNull();
+
+    expect(localStorage.getItem('account-registry')).toBe('accounts');
+    expect(localStorage.getItem('auth-storage')).toBe('session');
+    expect(localStorage.getItem('settings-storage')).toBe('prefs');
+    expect(localStorage.getItem('template-storage')).toBe('my templates');
+  });
+
+  it('reloads so data is re-fetched fresh', () => {
+    clearCachedData();
+    expect(reload).toHaveBeenCalledOnce();
+  });
+});
diff --git a/lib/clear-cached-data.ts b/lib/clear-cached-data.ts
new file mode 100644
index 00000000..c9f3fffa
--- /dev/null
+++ b/lib/clear-cached-data.ts
@@ -0,0 +1,45 @@
+import { evictAll } from '@/lib/account-state-manager';
+
+// localStorage keys holding server-derived, re-fetchable caches. The "Refresh
+// cached data" action clears these so a stale or wrong-account view can be
+// fixed WITHOUT signing out (which would drop the whole account list).
+//
+// Deliberately excluded:
+//  - 'account-registry' / 'auth-storage'  → keep accounts + sessions
+//  - 'settings-storage' / 'theme-storage' / 'locale-storage' → user prefs
+//  - 'template-storage' / 'smime-preferences' → user-created content
+const CACHE_STORAGE_KEYS = [
+  'identity-storage',
+  'contact-storage',
+  'calendar-storage',
+  'calendar-notification-storage',
+];
+
+/**
+ * Clear cached, server-derived data (contacts, calendars, identities, and the
+ * in-memory per-account snapshots), then reload so everything is re-fetched
+ * fresh for the active account. Accounts and sessions are preserved — this is
+ * the non-destructive alternative to the browser's "clear site data", which
+ * also wipes the account list.
+ */
+export function clearCachedData(): void {
+  // Drop the in-memory per-account store snapshots so a reload can't restore
+  // stale cached state for any account.
+  try {
+    evictAll();
+  } catch {
+    /* snapshots are best-effort */
+  }
+
+  if (typeof window === 'undefined') return;
+
+  for (const key of CACHE_STORAGE_KEYS) {
+    try {
+      window.localStorage.removeItem(key);
+    } catch {
+      /* ignore storage access errors */
+    }
+  }
+
+  window.location.reload();
+}
diff --git a/locales/cs/common.json b/locales/cs/common.json
index a5440033..c50565f9 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -1628,6 +1628,11 @@
         "description": "Zobrazit dostupné klávesové zkratky",
         "button": "Zobrazit zkratky"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Resetovat nastavení",
         "description": "Obnovit všechna nastavení na výchozí hodnoty",
diff --git a/locales/da/common.json b/locales/da/common.json
index b7e39993..d1956177 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -1631,6 +1631,11 @@
         "description": "Se tilgængelige tastaturgenveje",
         "button": "Vis genveje"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Nulstil indstillinger",
         "description": "Gendan alle indstillinger til standardværdier",
diff --git a/locales/de/common.json b/locales/de/common.json
index 841eb9d8..b4676020 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -1628,6 +1628,11 @@
         "description": "Verfügbare Tastaturkürzel anzeigen",
         "button": "Tastaturkürzel anzeigen"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Einstellungen zurücksetzen",
         "description": "Alle Einstellungen auf Standardwerte zurücksetzen",
diff --git a/locales/en/common.json b/locales/en/common.json
index b79716cb..9fbf67fb 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1637,6 +1637,11 @@
         "description": "View available keyboard shortcuts",
         "button": "View Shortcuts"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Reset Settings",
         "description": "Restore all settings to default values",
diff --git a/locales/es/common.json b/locales/es/common.json
index c201b2d8..2a2b0ffd 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -1628,6 +1628,11 @@
         "description": "Ver atajos de teclado disponibles",
         "button": "Ver Atajos"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Restablecer Configuración",
         "description": "Restaurar toda la configuración a los valores predeterminados",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 835e7a27..69982ebc 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -1635,6 +1635,11 @@
         "description": "مشاهده میانبرهای صفحه کلید موجود",
         "button": "مشاهده میانبرها"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "بازنشانی تنظیمات",
         "description": "بازگردانی همه تنظیمات به مقادیر پیش‌فرض",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 7945acba..9603a2c5 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -1628,6 +1628,11 @@
         "description": "Voir les raccourcis clavier disponibles",
         "button": "Voir les raccourcis"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Réinitialiser les paramètres",
         "description": "Restaurer tous les paramètres par défaut",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index a0f6bbb5..e45826d2 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -1631,6 +1631,11 @@
         "description": "Elérhető billentyűparancsok megtekintése",
         "button": "Parancsok megtekintése"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Beállítások visszaállítása",
         "description": "Összes beállítás visszaállítása az alapértelmezett értékekre",
diff --git a/locales/it/common.json b/locales/it/common.json
index 40341c4d..7d276203 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -1628,6 +1628,11 @@
         "description": "Visualizza le scorciatoie da tastiera disponibili",
         "button": "Visualizza scorciatoie"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Ripristina impostazioni",
         "description": "Ripristina tutte le impostazioni ai valori predefiniti",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 37bc216b..234390a5 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -1628,6 +1628,11 @@
         "description": "利用可能なキーボードショートカットを表示",
         "button": "ショートカットを表示"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "設定をリセット",
         "description": "すべての設定をデフォルト値に戻す",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 4c01023f..ef5723bb 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -1628,6 +1628,11 @@
         "description": "사용 가능한 키보드 단축키를 확인해 보세요",
         "button": "단축키 보기"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "설정 초기화",
         "description": "모든 설정을 기본값으로 되돌려요",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 8a485c27..22fddbe9 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -1609,6 +1609,11 @@
         "description": "Skatīt pieejamos tastatūras īsinājumtaustiņus",
         "button": "Rādīt īsinājumtaustiņus"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Atiestatīt iestatījumus",
         "description": "Atjaunot visus iestatījumus uz noklusējuma vērtībām",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 13f2d1ed..43c63cc0 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -1628,6 +1628,11 @@
         "description": "Bekijk beschikbare sneltoetsen",
         "button": "Sneltoetsen bekijken"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Instellingen resetten",
         "description": "Herstel alle instellingen naar standaardwaarden",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 36f13971..4c4656be 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -1628,6 +1628,11 @@
         "description": "Wyświetl dostępne skróty klawiszowe",
         "button": "Pokaż skróty"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Resetuj ustawienia",
         "description": "Przywróć wszystkie ustawienia do wartości domyślnych",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 422c04a9..17453f63 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -1628,6 +1628,11 @@
         "description": "Visualizar atalhos de teclado disponíveis",
         "button": "Ver Atalhos"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Redefinir Configurações",
         "description": "Restaurar todas as configurações para valores padrão",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 723faa3f..3c33493a 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -1635,6 +1635,11 @@
         "description": "Vedeți comenzile rapide de la tastatură disponibile",
         "button": "Comenzi rapide de vizualizare"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Resetare setări",
         "description": "Restabiliți toate setările la valorile implicite",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 94ab0e79..f3859b57 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -1628,6 +1628,11 @@
         "description": "Просмотреть доступные сочетания клавиш",
         "button": "Показать сочетания"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Сбросить настройки",
         "description": "Восстановить все настройки до значений по умолчанию",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 936c5a3a..d6ab561e 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -1628,6 +1628,11 @@
         "description": "Mevcut klavye kısayollarını görüntüleyin",
         "button": "Kısayolları Görüntüle"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Ayarları Sıfırla",
         "description": "Tüm ayarları varsayılan değerlerine geri yükle",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index d29e1f7c..95b1e129 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -1628,6 +1628,11 @@
         "description": "Переглянути доступні комбінації клавіш",
         "button": "Перегляд ярликів"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "Скинути налаштування",
         "description": "Відновити всі налаштування до значень за замовчуванням",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 21f240fb..637b257b 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -1628,6 +1628,11 @@
         "description": "查看可用快捷键",
         "button": "查看快捷方式"
       },
+      "refresh_cache": {
+        "label": "Refresh cached data",
+        "description": "Reload contacts, calendars, and folders from the server. Keeps your accounts and sessions \u2014 fixes a stale or wrong view without signing out.",
+        "button": "Refresh"
+      },
       "reset_settings": {
         "label": "重置设置",
         "description": "将所有设置恢复为默认值",