From 10c3d3cae576a671a9963fe40eecdcf78f4e238a Mon Sep 17 00:00:00 2001
From: Sam Babbage <sambabbage76@gmail.com>
Date: Fri, 8 May 2026 11:32:57 -0700
Subject: [PATCH 1/8] fix(storage): repair config Apply, backup add, and add
 runtime primary swap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bundles closely-related fixes and one feature addition for the storage
configuration flow. All surface together when actually using the Settings
storage panel against a self-hosted storage server.

WalletConfig — Apply now persists across panel close
  Previously the toggle/close path always re-applied `backupConfig` (the
  pre-edit snapshot), silently reverting the user's just-applied config.
  We now clear `backupConfig` on a successful Apply, and in controlled mode
  also signal the parent via `onToggle()` so the panel auto-closes.

WalletService — `addBackupStorageUrl` no longer throws "Originator is required"
  `_managers.wallet` is the `WalletPermissionsManager`-wrapped wallet, but
  the BRC-103 handshake inside `StorageClient.makeAvailable()` calls
  `wallet.createHmac` directly with no originator. The permissions wrapper
  rejects that. We now stash the raw `wallet` as `underlyingWallet` in
  `_managers` (alongside the permissioned `wallet`) and use it for the
  StorageClient constructor. Internal-only; never exposed to apps.

Settings — silent failures on Add Backup are now visible
  The catch block had a comment claiming the service layer toasted errors
  itself, but the service only toasts on success. Failed adds are now
  surfaced via `toast.error` and `console.error`.

Feature: Make Primary button on each backup row
  New `WalletService.setPrimaryStorage(target)` calls
  `WalletStorageManager.setActive` — which syncs pending writes to the
  target then atomically flips the active store — and updates
  `useRemoteStorage` / `storageUrl` / `backupStorageUrls` in the snapshot
  together so the swap survives reload. Wired through `WalletContext` and
  `useWalletService`. New "Make Primary" button on each backup row in
  Settings.

i18n: `backup_storage_make_primary_button` and `backup_error_add_failed`
added across all 12 supported languages.
---
 src/lib/WalletContext.tsx                  |  2 +
 src/lib/components/WalletConfig.tsx        | 16 ++++-
 src/lib/hooks/useWalletService.ts          |  5 ++
 src/lib/i18n/translations.ts               | 24 +++++++
 src/lib/pages/Dashboard/Settings/index.tsx | 37 +++++++++-
 src/lib/services/WalletService.ts          | 81 +++++++++++++++++++++-
 6 files changed, 157 insertions(+), 8 deletions(-)

diff --git a/src/lib/WalletContext.tsx b/src/lib/WalletContext.tsx
index 13d8091..89f72f4 100644
--- a/src/lib/WalletContext.tsx
+++ b/src/lib/WalletContext.tsx
@@ -161,6 +161,7 @@ export interface WalletContextValue {
   addBackupStorageUrl: (url: string) => Promise<void>;
   removeBackupStorageUrl: (url: string) => Promise<void>;
   syncBackupStorage: (progressCallback?: (message: string) => void) => Promise<void>;
+  setPrimaryStorage: (target: string, progressCallback?: (message: string) => void) => Promise<void>;
   updateMessageBoxUrl: (url: string) => Promise<void>;
   removeMessageBoxUrl: () => Promise<void>;
   initializingBackendServices: boolean;
@@ -221,6 +222,7 @@ export const WalletContext = createContext<WalletContextValue>({
   addBackupStorageUrl: async () => {},
   removeBackupStorageUrl: async () => {},
   syncBackupStorage: async () => {},
+  setPrimaryStorage: async () => {},
   updateMessageBoxUrl: async () => {},
   removeMessageBoxUrl: async () => {},
   initializingBackendServices: false,
diff --git a/src/lib/components/WalletConfig.tsx b/src/lib/components/WalletConfig.tsx
index 33cb242..8c951ae 100644
--- a/src/lib/components/WalletConfig.tsx
+++ b/src/lib/components/WalletConfig.tsx
@@ -122,8 +122,20 @@ const WalletConfig: React.FC<WalletConfigProps> = ({ autoExpand = false, hideLog
       useRemoteStorage,
       useMessageBox,
     })
-    if (valid) setShowWalletConfig(false)
-  }, [wabUrl, wabInfo, method, network, storageUrl, messageBoxUrl, loginType, useRemoteStorage, useMessageBox, finalizeConfig, setShowWalletConfig])
+    if (valid) {
+      // The toggle/close path calls `resetCurrentConfig()`, which re-applies `backupConfig`
+      // (the pre-edit snapshot). After a successful Apply we must clear `backupConfig` so
+      // that a subsequent close — including the parent's auto-close below — doesn't
+      // immediately revert the freshly-applied configuration.
+      setBackupConfig(undefined)
+      if (isControlled) {
+        // Parent owns visibility; signal it to close the panel automatically.
+        onToggle?.()
+      } else {
+        setShowWalletConfig(false)
+      }
+    }
+  }, [wabUrl, wabInfo, method, network, storageUrl, messageBoxUrl, loginType, useRemoteStorage, useMessageBox, finalizeConfig, setShowWalletConfig, isControlled, onToggle])
 
   // Force the manager to use the "presentation-key-and-password" flow (only for WAB/CWIStyle managers):
   useEffect(() => {
diff --git a/src/lib/hooks/useWalletService.ts b/src/lib/hooks/useWalletService.ts
index 00132b1..98b0f0c 100644
--- a/src/lib/hooks/useWalletService.ts
+++ b/src/lib/hooks/useWalletService.ts
@@ -251,6 +251,10 @@ export function useWalletService() {
   const addBackupStorageUrl = useCallback((url: string) => svc.addBackupStorageUrl(url), [svc])
   const removeBackupStorageUrl = useCallback((url: string) => svc.removeBackupStorageUrl(url), [svc])
   const syncBackupStorage = useCallback((cb?: any) => svc.syncBackupStorage(cb), [svc])
+  const setPrimaryStorage = useCallback(
+    (target: string, cb?: (message: string) => void) => svc.setPrimaryStorage(target, cb),
+    [svc]
+  )
   const updateMessageBoxUrl = useCallback((url: string) => svc.updateMessageBoxUrl(url), [svc])
   const removeMessageBoxUrl = useCallback(() => svc.removeMessageBoxUrl(), [svc])
   const updateSettings = useCallback((s: any) => svc.updateSettings(s), [svc])
@@ -375,6 +379,7 @@ export function useWalletService() {
     addBackupStorageUrl,
     removeBackupStorageUrl,
     syncBackupStorage,
+    setPrimaryStorage,
     updateMessageBoxUrl,
     removeMessageBoxUrl,
     initializingBackendServices: walletState.initializingBackendServices,
diff --git a/src/lib/i18n/translations.ts b/src/lib/i18n/translations.ts
index 13a1b30..2406e2c 100644
--- a/src/lib/i18n/translations.ts
+++ b/src/lib/i18n/translations.ts
@@ -95,6 +95,8 @@ const en = {
     backup_storage_providers_label: 'Backup Storage Providers ({{count}})',
     backup_storage_local_electron: 'Local Electron Storage (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'Remove',
+    backup_storage_make_primary_button: 'Make Primary',
+    backup_error_add_failed: 'Failed to add backup storage: {{message}}',
     backup_storage_add_button: 'Add Backup Storage',
     backup_storage_sync_button: 'Sync All Backups',
     backup_storage_sync_syncing: 'Syncing...',
@@ -1077,6 +1079,8 @@ const es = {
     backup_storage_providers_label: 'Proveedores de Almacenamiento de Respaldo ({{count}})',
     backup_storage_local_electron: 'Almacenamiento Local Electron (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'Eliminar',
+    backup_storage_make_primary_button: 'Hacer Primario',
+    backup_error_add_failed: 'Error al añadir almacenamiento de respaldo: {{message}}',
     backup_storage_add_button: 'Agregar Almacenamiento de Respaldo',
     backup_storage_sync_button: 'Sincronizar Todos los Respaldos',
     backup_storage_sync_syncing: 'Sincronizando...',
@@ -2001,6 +2005,8 @@ const fr = {
     backup_storage_providers_label: 'Fournisseurs de Stockage de Sauvegarde ({{count}})',
     backup_storage_local_electron: 'Stockage Electron Local (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'Supprimer',
+    backup_storage_make_primary_button: 'Définir comme Principal',
+    backup_error_add_failed: 'Échec de l\'ajout du stockage de sauvegarde : {{message}}',
     backup_storage_add_button: 'Ajouter un Stockage de Sauvegarde',
     backup_storage_sync_button: 'Synchroniser Toutes les Sauvegardes',
     backup_storage_sync_syncing: 'Synchronisation...',
@@ -2949,6 +2955,8 @@ const pt = {
     backup_storage_providers_label: 'Provedores de Armazenamento de Backup ({{count}})',
     backup_storage_local_electron: 'Armazenamento Electron Local (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'Remover',
+    backup_storage_make_primary_button: 'Tornar Primário',
+    backup_error_add_failed: 'Falha ao adicionar armazenamento de backup: {{message}}',
     backup_storage_add_button: 'Adicionar Armazenamento de Backup',
     backup_storage_sync_button: 'Sincronizar Todos os Backups',
     backup_storage_sync_syncing: 'Sincronizando...',
@@ -3885,6 +3893,8 @@ const zh = {
     backup_storage_providers_label: '备份存储提供商（{{count}}）',
     backup_storage_local_electron: '本地 Electron 存储（~/.bsv-desktop/wallet-*.db）',
     backup_storage_remove_button: '移除',
+    backup_storage_make_primary_button: '设为主要',
+    backup_error_add_failed: '添加备份存储失败：{{message}}',
     backup_storage_add_button: '添加备份存储',
     backup_storage_sync_button: '同步所有备份',
     backup_storage_sync_syncing: '同步中...',
@@ -4821,6 +4831,8 @@ const hi = {
     backup_storage_providers_label: 'बैकअप स्टोरेज प्रदाता ({{count}})',
     backup_storage_local_electron: 'स्थानीय Electron स्टोरेज (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'हटाएं',
+    backup_storage_make_primary_button: 'प्राथमिक बनाएं',
+    backup_error_add_failed: 'बैकअप स्टोरेज जोड़ने में विफल: {{message}}',
     backup_storage_add_button: 'बैकअप स्टोरेज जोड़ें',
     backup_storage_sync_button: 'सभी बैकअप सिंक करें',
     backup_storage_sync_syncing: 'सिंक हो रहा है...',
@@ -5757,6 +5769,8 @@ const bn = {
     backup_storage_providers_label: 'ব্যাকআপ স্টোরেজ প্রদানকারী ({{count}})',
     backup_storage_local_electron: 'স্থানীয় Electron স্টোরেজ (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'সরান',
+    backup_storage_make_primary_button: 'প্রাথমিক করুন',
+    backup_error_add_failed: 'ব্যাকআপ স্টোরেজ যোগ করতে ব্যর্থ: {{message}}',
     backup_storage_add_button: 'ব্যাকআপ স্টোরেজ যোগ করুন',
     backup_storage_sync_button: 'সব ব্যাকআপ সিঙ্ক করুন',
     backup_storage_sync_syncing: 'সিঙ্ক হচ্ছে...',
@@ -6693,6 +6707,8 @@ const ar = {
     backup_storage_providers_label: 'مزودو التخزين الاحتياطي ({{count}})',
     backup_storage_local_electron: 'التخزين المحلي Electron (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'إزالة',
+    backup_storage_make_primary_button: 'تعيين كأساسي',
+    backup_error_add_failed: 'فشل إضافة تخزين النسخة الاحتياطية: {{message}}',
     backup_storage_add_button: 'إضافة تخزين احتياطي',
     backup_storage_sync_button: 'مزامنة جميع النسخ الاحتياطية',
     backup_storage_sync_syncing: 'جارٍ المزامنة...',
@@ -7629,6 +7645,8 @@ const ru = {
     backup_storage_providers_label: 'Провайдеры резервного хранилища ({{count}})',
     backup_storage_local_electron: 'Локальное хранилище Electron (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'Удалить',
+    backup_storage_make_primary_button: 'Сделать основным',
+    backup_error_add_failed: 'Не удалось добавить резервное хранилище: {{message}}',
     backup_storage_add_button: 'Добавить резервное хранилище',
     backup_storage_sync_button: 'Синхронизировать все резервные копии',
     backup_storage_sync_syncing: 'Синхронизация...',
@@ -8565,6 +8583,8 @@ const id = {
     backup_storage_providers_label: 'Penyedia Penyimpanan Cadangan ({{count}})',
     backup_storage_local_electron: 'Penyimpanan Lokal Electron (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'Hapus',
+    backup_storage_make_primary_button: 'Jadikan Utama',
+    backup_error_add_failed: 'Gagal menambahkan penyimpanan cadangan: {{message}}',
     backup_storage_add_button: 'Tambah Penyimpanan Cadangan',
     backup_storage_sync_button: 'Sinkronkan Semua Cadangan',
     backup_storage_sync_syncing: 'Menyinkronkan...',
@@ -9506,6 +9526,8 @@ const ja = {
     backup_storage_providers_label: 'バックアップストレージプロバイダー ({{count}})',
     backup_storage_local_electron: 'ローカルElectronストレージ (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: '削除',
+    backup_storage_make_primary_button: 'プライマリに設定',
+    backup_error_add_failed: 'バックアップストレージの追加に失敗しました: {{message}}',
     backup_storage_add_button: 'バックアップストレージを追加',
     backup_storage_sync_button: 'すべてのバックアップを同期',
     backup_storage_sync_syncing: '同期中...',
@@ -10488,6 +10510,8 @@ const pl = {
     backup_storage_providers_label: 'Dostawcy kopii zapasowej ({{count}})',
     backup_storage_local_electron: 'Lokalna pamięć Electron (~/.bsv-desktop/wallet-*.db)',
     backup_storage_remove_button: 'Usuń',
+    backup_storage_make_primary_button: 'Ustaw jako główne',
+    backup_error_add_failed: 'Nie udało się dodać pamięci kopii zapasowej: {{message}}',
     backup_storage_add_button: 'Dodaj kopię zapasową',
     backup_storage_sync_button: 'Synchronizuj wszystkie kopie',
     backup_storage_sync_syncing: 'Synchronizuję...',
diff --git a/src/lib/pages/Dashboard/Settings/index.tsx b/src/lib/pages/Dashboard/Settings/index.tsx
index 8160a15..8be287a 100644
--- a/src/lib/pages/Dashboard/Settings/index.tsx
+++ b/src/lib/pages/Dashboard/Settings/index.tsx
@@ -78,7 +78,7 @@ const Settings = () => {
   const classes = useStyles()
   const { t } = useTranslation()
   const { currentLanguage, setCurrentLanguage, supportedLanguages } = useLanguage()
-  const { settings, updateSettings, wabUrl, useRemoteStorage, useMessageBox, storageUrl, useWab, messageBoxUrl, backupStorageUrls, addBackupStorageUrl, removeBackupStorageUrl, syncBackupStorage, permissionsConfig, updatePermissionsConfig } = useContext(WalletContext)
+  const { settings, updateSettings, wabUrl, useRemoteStorage, useMessageBox, storageUrl, useWab, messageBoxUrl, backupStorageUrls, addBackupStorageUrl, removeBackupStorageUrl, syncBackupStorage, setPrimaryStorage, permissionsConfig, updatePermissionsConfig } = useContext(WalletContext)
   const { pageLoaded, setManualUpdateInfo } = useContext(UserContext)
   const [settingsLoading, setSettingsLoading] = useState(false)
   const theme = useTheme()
@@ -184,8 +184,9 @@ const Settings = () => {
       await addBackupStorageUrl(local ? 'LOCAL_STORAGE' : newBackupUrl);
       setShowBackupDialog(false);
       setNewBackupUrl('');
-    } catch (e) {
-      // Error already shown by addBackupStorageUrl
+    } catch (e: any) {
+      console.error('[Settings] addBackupStorageUrl failed:', e);
+      toast.error(t('backup_error_add_failed', { message: e?.message || 'unknown error' }));
     } finally {
       setBackupLoading(false);
     }
@@ -202,6 +203,27 @@ const Settings = () => {
     }
   }
 
+  const handleMakePrimary = async (target: string) => {
+    try {
+      setBackupLoading(true);
+      setSyncError('');
+      setSyncProgressLogs([]);
+      setSyncComplete(false);
+      setShowSyncProgress(true);
+      const progressCallback = (message: string) => {
+        for (const line of message.split('\n')) {
+          if (line.trim()) setSyncProgressLogs((prev) => [...prev, line]);
+        }
+      };
+      await setPrimaryStorage(target, progressCallback);
+      setSyncComplete(true);
+    } catch (e: any) {
+      setSyncError(e?.message || 'Failed to switch primary storage');
+    } finally {
+      setBackupLoading(false);
+    }
+  }
+
   const handleSyncBackupStorage = async () => {
     // Reset state
     setSyncError('');
@@ -571,6 +593,15 @@ const Settings = () => {
                     }}>
                       {url === 'LOCAL_STORAGE' ? t('backup_storage_local_electron') : url}
                     </Box>
+                    <Button
+                      variant="contained"
+                      color="primary"
+                      size="small"
+                      onClick={() => handleMakePrimary(url)}
+                      disabled={backupLoading}
+                    >
+                      {t('backup_storage_make_primary_button')}
+                    </Button>
                     <Button
                       variant="outlined"
                       color="error"
diff --git a/src/lib/services/WalletService.ts b/src/lib/services/WalletService.ts
index 2295548..6643cbe 100644
--- a/src/lib/services/WalletService.ts
+++ b/src/lib/services/WalletService.ts
@@ -78,7 +78,15 @@ export type WalletServiceSnapshot = {
     walletManager?: any
     permissionsManager?: WalletPermissionsManager
     settingsManager?: WalletSettingsManager
+    /** Permission-wrapped wallet used for app-originated requests. Always passes through `permissionsManager`. */
     wallet?: WalletInterface
+    /**
+     * Raw, unwrapped wallet for internal wallet-toolbox plumbing that calls wallet methods
+     * without an originator (e.g. `StorageClient`'s BRC-103 handshake, which calls
+     * `wallet.createHmac` directly). Routing those through the permissions manager throws
+     * "Originator is required for permission checks". Internal-only — never expose to apps.
+     */
+    underlyingWallet?: WalletInterface
     storageManager?: WalletStorageManager
   }
   settings: WalletSettings
@@ -504,6 +512,7 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
         permissionsManager,
         settingsManager: (wallet as any).settingsManager,
         wallet: permissionsManager,
+        underlyingWallet: wallet,
         storageManager,
       }
 
@@ -676,8 +685,8 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
       throw new Error('Local storage is already your primary storage. Cannot add it as a backup.')
     }
 
-    const { wallet, storageManager } = this._managers
-    if (!wallet || !storageManager) throw new Error('Wallet not available')
+    const { underlyingWallet, storageManager } = this._managers
+    if (!underlyingWallet || !storageManager) throw new Error('Wallet not available')
 
     let backupProvider: any
     if (isLocalStorage) {
@@ -689,7 +698,9 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
       await electronStorage.makeAvailable()
       backupProvider = electronStorage
     } else {
-      backupProvider = new StorageClient(wallet, url)
+      // Use the underlying (unwrapped) wallet — StorageClient's BRC-103 handshake calls
+      // wallet.createHmac without an originator, which the permissionsManager wrapper rejects.
+      backupProvider = new StorageClient(underlyingWallet, url)
       await backupProvider.makeAvailable()
     }
 
@@ -733,6 +744,70 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
     }
   }
 
+  /**
+   * Switch the active (primary) storage to one of the currently-configured backups.
+   *
+   * - `target` is a storage URL (`http://...` / `https://...`) or the `'LOCAL_STORAGE'`
+   *   sentinel for the local Electron-IPC backend.
+   * - Underneath this calls `WalletStorageManager.setActive`, which syncs pending writes
+   *   to the target backup before atomically flipping the active pointer. The wallet
+   *   object is not rebuilt; subsequent reads/writes route through the new active store.
+   * - The old primary is demoted to a backup, and the snapshot fields
+   *   (`useRemoteStorage`, `storageUrl`, `backupStorageUrls`) are updated together so
+   *   the swap survives a reload.
+   */
+  async setPrimaryStorage(target: string, progressCallback?: (message: string) => void): Promise<void> {
+    const { storageManager } = this._managers
+    if (!storageManager) throw new Error('Storage manager not available')
+
+    const isLocal = target === 'LOCAL_STORAGE'
+    const normalizedTarget = isLocal ? target : target.trim().replace(/\/+$/, '')
+    if (!isLocal && !normalizedTarget.startsWith('http://') && !normalizedTarget.startsWith('https://')) {
+      throw new Error('Storage target must be a URL or LOCAL_STORAGE')
+    }
+
+    const stores = storageManager.getStores()
+    if (!stores || stores.length === 0) throw new Error('No storage providers configured')
+
+    const targetStore = stores.find(s =>
+      isLocal ? !s.endpointURL : s.endpointURL === normalizedTarget
+    )
+    if (!targetStore) {
+      throw new Error(`No storage provider matching ${normalizedTarget}. Add it as a backup first.`)
+    }
+    if (targetStore.isActive) {
+      toast.info('Already the primary storage')
+      return
+    }
+
+    // Capture the current primary so we can demote it to a backup after the swap.
+    const oldPrimary = this._useRemoteStorage ? this._selectedStorageUrl : 'LOCAL_STORAGE'
+
+    await storageManager.setActive(targetStore.storageIdentityKey, (s: string) => {
+      console.log('[WalletService setPrimaryStorage]', s)
+      progressCallback?.(s)
+      return s
+    })
+
+    if (isLocal) {
+      this._useRemoteStorage = false
+      this._selectedStorageUrl = ''
+    } else {
+      this._useRemoteStorage = true
+      this._selectedStorageUrl = normalizedTarget
+    }
+    // The new primary is no longer a backup; the old primary becomes one.
+    this._backupStorageUrls = this._backupStorageUrls.filter(u => u !== normalizedTarget)
+    if (oldPrimary && !this._backupStorageUrls.includes(oldPrimary)) {
+      this._backupStorageUrls = [oldPrimary, ...this._backupStorageUrls]
+    }
+
+    const snapshot = this.saveEnhancedSnapshot()
+    localStorage.snap = snapshot
+    this._emitState()
+    toast.success('Primary storage switched!')
+  }
+
   async updateMessageBoxUrl(url: string): Promise<void> {
     if (!url?.trim()) throw new Error('Message Box URL cannot be empty')
     const trimmedUrl = url.trim().replace(/\/+$/, '')

From c867b34d60f9c3668ad9eae067ba637b09a6073b Mon Sep 17 00:00:00 2001
From: Sam Babbage <sambabbage76@gmail.com>
Date: Fri, 8 May 2026 11:53:19 -0700
Subject: [PATCH 2/8] fix(Settings): handleMakePrimary marks sync complete on
 failure

The dialog's footer button reads 'Cancel' while syncComplete is false and
'Close' once it flips true. handleMakePrimary only set syncComplete in the
success path of the try block, so on failure (e.g., a transient 502 from
one of the backup writers during the underlying setActive's updateBackups
phase) the button stayed on 'Cancel' even though the operation had finished.

Move setSyncComplete(true) into finally to mirror handleSyncBackupStorage.
Also log the error to the console for parity with handleAddBackupStorage.
---
 src/lib/pages/Dashboard/Settings/index.tsx | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/lib/pages/Dashboard/Settings/index.tsx b/src/lib/pages/Dashboard/Settings/index.tsx
index 8be287a..6356c79 100644
--- a/src/lib/pages/Dashboard/Settings/index.tsx
+++ b/src/lib/pages/Dashboard/Settings/index.tsx
@@ -204,22 +204,24 @@ const Settings = () => {
   }
 
   const handleMakePrimary = async (target: string) => {
+    setSyncError('');
+    setSyncProgressLogs([]);
+    setSyncComplete(false);
+    setShowSyncProgress(true);
+    setBackupLoading(true);
+    const progressCallback = (message: string) => {
+      for (const line of message.split('\n')) {
+        if (line.trim()) setSyncProgressLogs((prev) => [...prev, line]);
+      }
+    };
     try {
-      setBackupLoading(true);
-      setSyncError('');
-      setSyncProgressLogs([]);
-      setSyncComplete(false);
-      setShowSyncProgress(true);
-      const progressCallback = (message: string) => {
-        for (const line of message.split('\n')) {
-          if (line.trim()) setSyncProgressLogs((prev) => [...prev, line]);
-        }
-      };
       await setPrimaryStorage(target, progressCallback);
-      setSyncComplete(true);
     } catch (e: any) {
+      console.error('[Settings] setPrimaryStorage failed:', e);
       setSyncError(e?.message || 'Failed to switch primary storage');
     } finally {
+      // Mark complete regardless of outcome so the dialog button flips from Cancel to Close.
+      setSyncComplete(true);
       setBackupLoading(false);
     }
   }

From eff40dd971562245b3edd7fc331933258d89e052 Mon Sep 17 00:00:00 2001
From: Sam Babbage <sambabbage76@gmail.com>
Date: Fri, 8 May 2026 11:57:56 -0700
Subject: [PATCH 3/8] fix(setPrimaryStorage): always reconcile snapshot from
 storageManager state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the snapshot's view of the primary (`useRemoteStorage`/`storageUrl`)
drifts out of sync with `WalletStorageManager.getStores()` — for example
when a previous swap flipped the manager but failed to persist to
localStorage, or a reload happened mid-flight — the prior implementation
would early-return on `targetStore.isActive === true` with an
"Already the primary storage" toast, but never write back the corrected
snapshot. The Settings UI continued to show the stale primary.

Always reconcile the snapshot from the manager's store list after the
operation, including on the no-op path. `useRemoteStorage`,
`storageUrl`, and `backupStorageUrls` are re-derived from `getStores()`,
which is the authoritative source. The toast now distinguishes the
genuine no-op case (target was already active AND visible primary
matched) from the heal case (visible primary changed).
---
 src/lib/services/WalletService.ts | 70 +++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/lib/services/WalletService.ts b/src/lib/services/WalletService.ts
index 6643cbe..939298a 100644
--- a/src/lib/services/WalletService.ts
+++ b/src/lib/services/WalletService.ts
@@ -752,9 +752,11 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
    * - Underneath this calls `WalletStorageManager.setActive`, which syncs pending writes
    *   to the target backup before atomically flipping the active pointer. The wallet
    *   object is not rebuilt; subsequent reads/writes route through the new active store.
-   * - The old primary is demoted to a backup, and the snapshot fields
-   *   (`useRemoteStorage`, `storageUrl`, `backupStorageUrls`) are updated together so
-   *   the swap survives a reload.
+   * - The snapshot fields (`useRemoteStorage`, `storageUrl`, `backupStorageUrls`) are
+   *   re-derived from `storageManager.getStores()` after the operation. The manager is
+   *   the authoritative source of truth, so the snapshot always matches its actual
+   *   active store. This also self-heals any prior divergence (e.g., a swap that
+   *   flipped the manager but failed to persist to the snapshot).
    */
   async setPrimaryStorage(target: string, progressCallback?: (message: string) => void): Promise<void> {
     const { storageManager } = this._managers
@@ -775,37 +777,59 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
     if (!targetStore) {
       throw new Error(`No storage provider matching ${normalizedTarget}. Add it as a backup first.`)
     }
-    if (targetStore.isActive) {
-      toast.info('Already the primary storage')
-      return
-    }
 
-    // Capture the current primary so we can demote it to a backup after the swap.
-    const oldPrimary = this._useRemoteStorage ? this._selectedStorageUrl : 'LOCAL_STORAGE'
+    // Snapshot the *visible* primary before any change, so we can decide which toast to
+    // show after reconciliation.
+    const visiblePrimaryBefore = this._useRemoteStorage ? this._selectedStorageUrl : 'LOCAL_STORAGE'
+    const targetWasAlreadyActive = targetStore.isActive
 
-    await storageManager.setActive(targetStore.storageIdentityKey, (s: string) => {
-      console.log('[WalletService setPrimaryStorage]', s)
-      progressCallback?.(s)
-      return s
-    })
+    if (!targetWasAlreadyActive) {
+      await storageManager.setActive(targetStore.storageIdentityKey, (s: string) => {
+        console.log('[WalletService setPrimaryStorage]', s)
+        progressCallback?.(s)
+        return s
+      })
+    }
+
+    // Reconcile the snapshot from the manager's authoritative store list. Always run
+    // this — even on the no-op path — because the snapshot may have drifted out of
+    // sync from a prior operation (e.g., a swap that completed in the manager but
+    // didn't persist to localStorage). Re-deriving `useRemoteStorage` / `storageUrl` /
+    // `backupStorageUrls` from `getStores()` heals any divergence.
+    const reconciledStores = storageManager.getStores() || []
+    const activeStore = reconciledStores.find(s => s.isActive)
+    if (!activeStore) throw new Error('No active storage after setPrimaryStorage')
 
-    if (isLocal) {
+    if (activeStore.endpointURL) {
+      this._useRemoteStorage = true
+      this._selectedStorageUrl = activeStore.endpointURL
+    } else {
       this._useRemoteStorage = false
       this._selectedStorageUrl = ''
-    } else {
-      this._useRemoteStorage = true
-      this._selectedStorageUrl = normalizedTarget
     }
-    // The new primary is no longer a backup; the old primary becomes one.
-    this._backupStorageUrls = this._backupStorageUrls.filter(u => u !== normalizedTarget)
-    if (oldPrimary && !this._backupStorageUrls.includes(oldPrimary)) {
-      this._backupStorageUrls = [oldPrimary, ...this._backupStorageUrls]
+    const newBackups: string[] = []
+    let localSeenAsBackup = false
+    for (const s of reconciledStores) {
+      if (s.isActive) continue
+      if (s.endpointURL) {
+        if (!newBackups.includes(s.endpointURL)) newBackups.push(s.endpointURL)
+      } else if (!localSeenAsBackup) {
+        newBackups.push('LOCAL_STORAGE')
+        localSeenAsBackup = true
+      }
     }
+    this._backupStorageUrls = newBackups
 
     const snapshot = this.saveEnhancedSnapshot()
     localStorage.snap = snapshot
     this._emitState()
-    toast.success('Primary storage switched!')
+
+    const visiblePrimaryAfter = this._useRemoteStorage ? this._selectedStorageUrl : 'LOCAL_STORAGE'
+    if (targetWasAlreadyActive && visiblePrimaryBefore === visiblePrimaryAfter) {
+      toast.info('Already the primary storage')
+    } else {
+      toast.success('Primary storage switched!')
+    }
   }
 
   async updateMessageBoxUrl(url: string): Promise<void> {

From 45338472ffa955c434f5f6fd4eb137e99bc3eaca Mon Sep 17 00:00:00 2001
From: Sam Babbage <sambabbage76@gmail.com>
Date: Fri, 8 May 2026 12:23:55 -0700
Subject: [PATCH 4/8] fix(removeBackupStorageUrl): reload renderer to actually
 disconnect the provider
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`WalletStorageManager` exposes no runtime API to detach a registered
storage provider. The previous implementation acknowledged this in its
toast — "It will be disconnected on next restart" — but left the live
manager attached to the just-removed URL, which meant Sync All Backups
and setPrimaryStorage would still iterate the removed provider. Worse,
`setActive`'s internal updateBackups loop could leave a user-removed
store as a sync target, or fail mid-flight against a flaky removed
backup that the user thought was already gone.

Persist the updated snapshot, then trigger a renderer reload. The
existing auto-init path reads the snapshot and rebuilds the wallet
without the removed provider — no bespoke teardown logic to maintain.
Snapshot save errors are now surfaced via toast.error and rethrown
rather than silently swallowed, so the user sees a real failure rather
than a misleading success.
---
 src/lib/services/WalletService.ts | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/lib/services/WalletService.ts b/src/lib/services/WalletService.ts
index 939298a..6c50d4b 100644
--- a/src/lib/services/WalletService.ts
+++ b/src/lib/services/WalletService.ts
@@ -718,16 +718,35 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
   }
 
   async removeBackupStorageUrl(url: string): Promise<void> {
+    if (!this._backupStorageUrls.includes(url)) return
+
     const newBackupUrls = this._backupStorageUrls.filter(u => u !== url)
+
+    // Persist before reload so the rebuilt wallet sees the updated snapshot.
+    // If the snapshot fails to save we abort — leaving the live storageManager
+    // attached to a backup the user thinks is gone is worse than a visible error.
+    let snapshot: string
     try {
-      const snapshot = this.saveEnhancedSnapshot({ backupStorageUrls: newBackupUrls })
-      localStorage.snap = snapshot
-    } catch (err) {
+      snapshot = this.saveEnhancedSnapshot({ backupStorageUrls: newBackupUrls })
+    } catch (err: any) {
       console.error('[WalletService] Failed to save snapshot:', err)
+      toast.error('Failed to remove backup: could not save snapshot')
+      throw err
     }
+    localStorage.snap = snapshot
     this._backupStorageUrls = newBackupUrls
     this._emitState()
-    toast.success('Backup storage removed. It will be disconnected on next restart.')
+
+    // wallet-toolbox has no runtime API to detach a storage provider, so the
+    // live storageManager keeps writing to the just-removed URL until the wallet
+    // is rebuilt. Without this reload, syncBackupStorage and setPrimaryStorage
+    // would still iterate the removed provider — which can fail mid-flight (e.g.,
+    // a flaky removed backup) and, worse, could leave a user-removed store as a
+    // sync target. A renderer reload triggers the standard auto-init path, which
+    // reads the just-persisted snapshot and rebuilds the wallet cleanly with no
+    // bespoke teardown logic for us to maintain.
+    toast.info('Backup storage removed. Reloading wallet...')
+    setTimeout(() => window.location.reload(), 600)
   }
 
   async syncBackupStorage(progressCallback?: (message: string) => void): Promise<void> {

From e31b963f3220cace41f2fd3a0fe5baea27dbb1fa Mon Sep 17 00:00:00 2001
From: Deggen <d.kellenschwiler@bsvassociation.org>
Date: Mon, 11 May 2026 21:25:05 -0500
Subject: [PATCH 5/8] clarify

Signed-off-by: Deggen <d.kellenschwiler@bsvassociation.org>
---
 src/lib/WalletContext.tsx                     | 20 ++++++---
 src/lib/hooks/useWalletService.ts             |  3 ++
 .../Dashboard/Settings/WalletDiagnosis.tsx    |  9 ++--
 src/lib/services/WalletService.ts             | 44 ++++++++++++-------
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/lib/WalletContext.tsx b/src/lib/WalletContext.tsx
index 89f72f4..32a1ee4 100644
--- a/src/lib/WalletContext.tsx
+++ b/src/lib/WalletContext.tsx
@@ -98,7 +98,6 @@ interface ManagerState {
   walletManager?: WalletAuthenticationManager;
   permissionsManager?: WalletPermissionsManager;
   settingsManager?: any;
-  wallet?: WalletInterface;
   storageManager?: WalletStorageManager;
 }
 
@@ -118,6 +117,13 @@ export interface WABConfig {
 export interface WalletContextValue {
   managers: ManagerState;
   updateManagers: (newManagers: ManagerState) => void;
+  /**
+   * Raw, unwrapped `Wallet` from `@bsv/wallet-toolbox`. Standalone — kept
+   * outside `managers` so it is never confused with `permissionsManager`.
+   * Internal/first-party use only (e.g. diagnostic UI, BRC-103 handshake
+   * plumbing). App-originated requests must go through `managers.permissionsManager`.
+   */
+  wallet?: WalletInterface;
   settings: WalletSettings;
   updateSettings: (newSettings: WalletSettings) => Promise<void>;
   network: 'mainnet' | 'testnet';
@@ -346,9 +352,11 @@ export const WalletContextProvider: React.FC<WalletContextProps> = ({
   const DEBOUNCE_TIME_MS = 5000
 
   useEffect(() => {
-    // Use managers.wallet (set by _buildWallet) instead of walletManager.authenticated
-    // SimpleWalletManager (direct-key) doesn't expose an authenticated property
-    const walletReady = !!managers?.wallet
+    // External BRC-100 traffic (port 3321) hits permissionsManager so app-originated
+    // requests pass through permission prompts. The standalone raw `wallet` (separate
+    // from `managers`) is reserved for internal wallet-toolbox plumbing that
+    // intentionally bypasses permissions (e.g. StorageClient BRC-103 handshake).
+    const walletReady = !!managers?.permissionsManager
     console.log('[onWalletReady effect] check:', {
       walletReady,
       profileId: activeProfile?.id ? `[${activeProfile.id.length} bytes]` : null,
@@ -359,7 +367,7 @@ export const WalletContextProvider: React.FC<WalletContextProps> = ({
     }
 
     console.log('[onWalletReady effect] guard passed — registering wallet ref')
-    const wallet = managers.wallet!
+    const wallet = managers.permissionsManager! as unknown as WalletInterface
 
     const updateRecentAppWrapper = async (profileId: string, origin: string): Promise<void> => {
       try {
@@ -380,7 +388,7 @@ export const WalletContextProvider: React.FC<WalletContextProps> = ({
     onWalletReady(interceptorWallet)
 
     // No cleanup — IPC listener is permanent, wallet ref is swapped not re-registered
-  }, [managers?.wallet, activeProfile?.id, onWalletReady])
+  }, [managers?.permissionsManager, activeProfile?.id, onWalletReady])
 
   // ---- Context value ----
   const contextValue = useMemo<WalletContextValue>(() => ({
diff --git a/src/lib/hooks/useWalletService.ts b/src/lib/hooks/useWalletService.ts
index 98b0f0c..433539c 100644
--- a/src/lib/hooks/useWalletService.ts
+++ b/src/lib/hooks/useWalletService.ts
@@ -330,6 +330,9 @@ export function useWalletService() {
     // Managers
     managers: walletState.managers,
     updateManagers,
+    // Raw, unwrapped Wallet — for internal first-party use only. App-originated
+    // requests must go through managers.permissionsManager.
+    wallet: walletState.wallet,
     // Settings
     settings: walletState.settings,
     updateSettings,
diff --git a/src/lib/pages/Dashboard/Settings/WalletDiagnosis.tsx b/src/lib/pages/Dashboard/Settings/WalletDiagnosis.tsx
index 0e8b7bb..e0a0df2 100644
--- a/src/lib/pages/Dashboard/Settings/WalletDiagnosis.tsx
+++ b/src/lib/pages/Dashboard/Settings/WalletDiagnosis.tsx
@@ -36,7 +36,7 @@ interface ConfirmationState {
 
 const WalletDiagnosis = () => {
   const { t } = useTranslation()
-  const { managers } = useContext(WalletContext)
+  const { wallet: rawWallet } = useContext(WalletContext)
 
   const [expanded, setExpanded] = useState(false)
   const [loading, setLoading] = useState(false)
@@ -54,10 +54,9 @@ const WalletDiagnosis = () => {
   }, [])
 
   const getWallet = useCallback(() => {
-    const wallet = managers.wallet
-    if (!wallet) throw new Error('Wallet not available. Please ensure you are logged in.')
-    return wallet
-  }, [managers.wallet])
+    if (!rawWallet) throw new Error('Wallet not available. Please ensure you are logged in.')
+    return rawWallet
+  }, [rawWallet])
 
   const getWalletClass = useCallback((): Wallet => {
     const wallet = getWallet()
diff --git a/src/lib/services/WalletService.ts b/src/lib/services/WalletService.ts
index 6c50d4b..5818bcb 100644
--- a/src/lib/services/WalletService.ts
+++ b/src/lib/services/WalletService.ts
@@ -78,17 +78,20 @@ export type WalletServiceSnapshot = {
     walletManager?: any
     permissionsManager?: WalletPermissionsManager
     settingsManager?: WalletSettingsManager
-    /** Permission-wrapped wallet used for app-originated requests. Always passes through `permissionsManager`. */
-    wallet?: WalletInterface
-    /**
-     * Raw, unwrapped wallet for internal wallet-toolbox plumbing that calls wallet methods
-     * without an originator (e.g. `StorageClient`'s BRC-103 handshake, which calls
-     * `wallet.createHmac` directly). Routing those through the permissions manager throws
-     * "Originator is required for permission checks". Internal-only — never expose to apps.
-     */
-    underlyingWallet?: WalletInterface
     storageManager?: WalletStorageManager
   }
+  /**
+   * Raw, unwrapped `Wallet` from `@bsv/wallet-toolbox`. Standalone — deliberately
+   * kept out of `managers` so it's never confused with the permission-aware
+   * `permissionsManager`. Used for internal wallet-toolbox plumbing that calls
+   * wallet methods without an originator (e.g. `StorageClient`'s BRC-103
+   * handshake calls `wallet.createHmac` directly). Routing those through
+   * `permissionsManager` throws "Originator is required for permission checks".
+   *
+   * App-originated requests (anything carrying an originator from a third
+   * party) must go through `managers.permissionsManager`, not this field.
+   */
+  wallet?: WalletInterface
   settings: WalletSettings
   activeProfile: WalletProfile | null
   snapshotLoaded: boolean
@@ -123,6 +126,7 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
 
   // ---- Runtime state ----
   private _managers: WalletServiceSnapshot['managers'] = {}
+  private _wallet?: WalletInterface
   private _settings: WalletSettings = DEFAULT_SETTINGS
   private _activeProfile: WalletProfile | null = null
   private _snapshotLoaded = false
@@ -157,6 +161,7 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
   get backupStorageUrls() { return this._backupStorageUrls }
   get adminOriginator() { return this._adminOriginator }
   get managers() { return this._managers }
+  get wallet() { return this._wallet }
   get settings() { return this._settings }
   get activeProfile() { return this._activeProfile }
   get snapshotLoaded() { return this._snapshotLoaded }
@@ -178,6 +183,7 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
       backupStorageUrls: this._backupStorageUrls,
       adminOriginator: this._adminOriginator,
       managers: this._managers,
+      wallet: this._wallet,
       settings: this._settings,
       activeProfile: this._activeProfile,
       snapshotLoaded: this._snapshotLoaded,
@@ -247,6 +253,7 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
         console.log(`[WalletService] loginType changing, clearing existing wallet manager`)
         const { walletManager, permissionsManager, settingsManager, ...rest } = this._managers
         this._managers = rest
+        this._wallet = undefined
         this._initInFlight = false
       }
 
@@ -511,10 +518,9 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
         ...this._managers,
         permissionsManager,
         settingsManager: (wallet as any).settingsManager,
-        wallet: permissionsManager,
-        underlyingWallet: wallet,
         storageManager,
       }
+      this._wallet = wallet
 
       // Load settings
       try {
@@ -547,7 +553,8 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
   }
 
   private async _updateActiveProfile() {
-    const { walletManager, wallet } = this._managers
+    const { walletManager } = this._managers
+    const wallet = this._wallet
 
     // Use wallet existence (set by _buildWallet) as ready signal.
     // walletManager.authenticated is unreliable for SimpleWalletManager (direct-key).
@@ -685,8 +692,9 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
       throw new Error('Local storage is already your primary storage. Cannot add it as a backup.')
     }
 
-    const { underlyingWallet, storageManager } = this._managers
-    if (!underlyingWallet || !storageManager) throw new Error('Wallet not available')
+    const wallet = this._wallet
+    const { storageManager } = this._managers
+    if (!wallet || !storageManager) throw new Error('Wallet not available')
 
     let backupProvider: any
     if (isLocalStorage) {
@@ -698,9 +706,10 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
       await electronStorage.makeAvailable()
       backupProvider = electronStorage
     } else {
-      // Use the underlying (unwrapped) wallet — StorageClient's BRC-103 handshake calls
-      // wallet.createHmac without an originator, which the permissionsManager wrapper rejects.
-      backupProvider = new StorageClient(underlyingWallet, url)
+      // Use the raw `wallet` (not `permissionsManager`) — StorageClient's BRC-103
+      // handshake calls wallet.createHmac without an originator, which the
+      // permissionsManager wrapper rejects with "Originator is required".
+      backupProvider = new StorageClient(wallet, url)
       await backupProvider.makeAvailable()
     }
 
@@ -908,6 +917,7 @@ export class WalletService extends EventEmittable<WalletServiceEvents> {
     }
 
     this._managers = {}
+    this._wallet = undefined
     this._lifecycle = 'configured'
     this._snapshotLoaded = false
     this._activeProfile = null

From ca277cd846799a1500a3455b45d453c6b9906074 Mon Sep 17 00:00:00 2001
From: Deggen <d.kellenschwiler@bsvassociation.org>
Date: Mon, 11 May 2026 22:55:24 -0500
Subject: [PATCH 6/8] permissions were being forced back to default, fixed here

Signed-off-by: Deggen <d.kellenschwiler@bsvassociation.org>
---
 src/lib/WalletContext.tsx                  | 16 ++++---------
 src/lib/hooks/useWalletService.ts          | 26 ++++++++++++++++++++--
 src/lib/services/PermissionQueueManager.ts | 25 +++++++++++++++++++++
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/lib/WalletContext.tsx b/src/lib/WalletContext.tsx
index 32a1ee4..00c8100 100644
--- a/src/lib/WalletContext.tsx
+++ b/src/lib/WalletContext.tsx
@@ -322,18 +322,10 @@ export const WalletContextProvider: React.FC<WalletContextProps> = ({
     svc.permissionQueue.setPermissionsModuleHelpers(getPermissionModuleById as any, permissionPromptHandlersRef.current)
   }, [enabledPermissionModules, getPermissionModuleById, svc])
 
-  // ---- Permissions config (load from localStorage once) ----
-  useEffect(() => {
-    try {
-      const stored = localStorage.getItem('permissionsConfig')
-      if (stored) {
-        const merged = { ...DEFAULT_PERMISSIONS_CONFIG, ...JSON.parse(stored) }
-        svc.permissionQueue.permissionsConfig = merged
-      }
-    } catch (e) {
-      console.error('Failed to load permissions config:', e)
-    }
-  }, [svc])
+  // Permissions config is loaded from localStorage inside getWalletService()
+  // before React mounts, so the primed _queueSnapshot already reflects the
+  // saved value. Loading here in a useEffect creates a race against
+  // useSyncExternalStore's subscribe phase and the snapshot update is lost.
 
   // ---- Dark mode for permission prompts ----
   const tokenPromptPaletteMode = useMemo<import('@mui/material').PaletteMode>(() => {
diff --git a/src/lib/hooks/useWalletService.ts b/src/lib/hooks/useWalletService.ts
index 433539c..8e6fdee 100644
--- a/src/lib/hooks/useWalletService.ts
+++ b/src/lib/hooks/useWalletService.ts
@@ -13,6 +13,7 @@ import { UserContext } from '../UserContext'
 import { WalletService, WalletServiceSnapshot } from '../services/WalletService'
 import type { QueueSnapshot } from '../services/PermissionQueueManager'
 import type { PeerPaySnapshot } from '../services/PeerPayManager'
+import { DEFAULT_PERMISSIONS_CONFIG } from '../WalletContext'
 
 // Module-level singleton — survives React re-renders and hot reloads
 let _walletServiceInstance: WalletService | null = null
@@ -29,6 +30,19 @@ export function getWalletService(): WalletService {
     _walletServiceInstance = new WalletService()
     // Restore config from snapshot synchronously before first render
     _walletServiceInstance.restoreConfigFromSnapshot()
+    // Restore permissions config from localStorage BEFORE priming snapshot cache.
+    // Doing this in a React useEffect creates a race: the useEffect's emit fires
+    // before useSyncExternalStore's subscribe has registered, so the snapshot
+    // update is lost and React keeps reading the DEFAULT-primed cache.
+    try {
+      const stored = typeof localStorage !== 'undefined' ? localStorage.getItem('permissionsConfig') : null
+      if (stored) {
+        const merged = { ...DEFAULT_PERMISSIONS_CONFIG, ...JSON.parse(stored) }
+        _walletServiceInstance.permissionQueue.permissionsConfig = merged
+      }
+    } catch (e) {
+      console.error('[getWalletService] Failed to load permissionsConfig from localStorage:', e)
+    }
     // Prime the caches so getSnapshot functions never return null on first call
     _walletSnapshot = _walletServiceInstance.getSnapshot()
     _queueSnapshot = _walletServiceInstance.permissionQueue.getSnapshot()
@@ -259,8 +273,16 @@ export function useWalletService() {
   const removeMessageBoxUrl = useCallback(() => svc.removeMessageBoxUrl(), [svc])
   const updateSettings = useCallback((s: any) => svc.updateSettings(s), [svc])
   const updatePermissionsConfig = useCallback(async (config: any) => {
-    svc.permissionQueue.permissionsConfig = config
-    localStorage.setItem('permissionsConfig', JSON.stringify(config))
+    // Persist first — if storage fails we don't want to silently update the
+    // in-memory config and have the change disappear on reload.
+    try {
+      localStorage.setItem('permissionsConfig', JSON.stringify(config))
+    } catch (e) {
+      console.error('[useWalletService] failed to persist permissionsConfig:', e)
+      throw e
+    }
+    // Apply to queue + live WalletPermissionsManager and re-emit snapshot.
+    svc.permissionQueue.setPermissionsConfig(config)
   }, [svc])
 
   const anointCurrentHost = useCallback(
diff --git a/src/lib/services/PermissionQueueManager.ts b/src/lib/services/PermissionQueueManager.ts
index c0e1b4e..c0685a2 100644
--- a/src/lib/services/PermissionQueueManager.ts
+++ b/src/lib/services/PermissionQueueManager.ts
@@ -169,6 +169,31 @@ export class PermissionQueueManager extends EventEmittable<PermissionQueueEvents
     this._permissionsManager = pm
   }
 
+  /**
+   * Replace the current permissions config. Updates three things:
+   *   1. The queue's `permissionsConfig` (snapshot/UI source).
+   *   2. The live `WalletPermissionsManager.config` so subsequent BRC-100
+   *      requests honor the new flags without rebuilding the wallet —
+   *      `WalletPermissionsManager` reads `this.config.seek*` on every call.
+   *      `permissionModules` are preserved from the existing config.
+   *   3. Emits a snapshot so `useSyncExternalStore` consumers re-render.
+   *
+   * Persistence to `localStorage` is the caller's responsibility (the React
+   * adapter writes `permissionsConfig` to localStorage so the value survives
+   * reloads). The queue stays storage-agnostic.
+   */
+  setPermissionsConfig(config: PermissionsConfig) {
+    this.permissionsConfig = config
+    if (this._permissionsManager) {
+      const existingModules = this._permissionsManager.config?.permissionModules
+      this._permissionsManager.config = {
+        ...config,
+        permissionModules: existingModules,
+      }
+    }
+    this._emitSnapshot()
+  }
+
   setPermissionsModuleHelpers(
     getById: (id: string) => any,
     promptHandlers: Map<string, PermissionPromptHandler>

From 72968d857737774f813da998c7b78d594be7a796 Mon Sep 17 00:00:00 2001
From: Deggen <d.kellenschwiler@bsvassociation.org>
Date: Mon, 11 May 2026 23:08:03 -0500
Subject: [PATCH 7/8] cleaner

Signed-off-by: Deggen <d.kellenschwiler@bsvassociation.org>
---
 src/lib/WalletContext.tsx | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/lib/WalletContext.tsx b/src/lib/WalletContext.tsx
index 00c8100..40b5a6e 100644
--- a/src/lib/WalletContext.tsx
+++ b/src/lib/WalletContext.tsx
@@ -21,14 +21,12 @@ import React, {
 } from 'react'
 import { useMediaQuery } from '@mui/material'
 import { DEFAULT_SETTINGS, WalletSettings } from '@bsv/wallet-toolbox-client/out/src/WalletSettingsManager'
-import { WalletPermissionsManager, PrivilegedKeyManager } from '@bsv/wallet-toolbox-client'
-import { WalletStorageManager, WalletAuthenticationManager } from '@bsv/wallet-toolbox-client'
-import { WalletInterface } from '@bsv/sdk'
+import { WalletPermissionsManager, PrivilegedKeyManager, WalletStorageManager, WalletAuthenticationManager } from '@bsv/wallet-toolbox-client'
+import { WalletInterface, Utils } from '@bsv/sdk'
 import { PeerPayClient, AdvertisementToken } from '@bsv/message-box-client'
-import { toast } from 'react-toastify'
 import 'react-toastify/dist/ReactToastify.css'
 
-import { DEFAULT_CHAIN, ADMIN_ORIGINATOR, DEFAULT_USE_WAB } from './config'
+import { ADMIN_ORIGINATOR } from './config'
 import { UserContext } from './UserContext'
 import { useWalletService, getWalletService } from './hooks/useWalletService'
 import { buildPermissionModuleRegistry } from './permissionModules/registry'
@@ -37,7 +35,6 @@ import type { GroupPermissionRequest, CounterpartyPermissionRequest } from './ty
 import type { WalletProfile } from './types/WalletProfile'
 import { RequestInterceptorWallet } from './RequestInterceptorWallet'
 import { updateRecentApp } from './pages/Dashboard/Apps/getApps'
-import { Utils } from '@bsv/sdk'
 
 // -----
 // Permission Configuration Types (preserved for backward compatibility)
@@ -359,7 +356,6 @@ export const WalletContextProvider: React.FC<WalletContextProps> = ({
     }
 
     console.log('[onWalletReady effect] guard passed — registering wallet ref')
-    const wallet = managers.permissionsManager! as unknown as WalletInterface
 
     const updateRecentAppWrapper = async (profileId: string, origin: string): Promise<void> => {
       try {
@@ -369,13 +365,13 @@ export const WalletContextProvider: React.FC<WalletContextProps> = ({
         if (lastProcessed && (now - lastProcessed) < DEBOUNCE_TIME_MS) return
         recentOriginsRef.current.set(cacheKey, now)
         await updateRecentApp(profileId, origin)
-        window.dispatchEvent(new CustomEvent('recentAppsUpdated', { detail: { profileId, origin } }))
+        globalThis.dispatchEvent(new CustomEvent('recentAppsUpdated', { detail: { profileId, origin } }))
       } catch (error) {
         console.debug('Error tracking recent app:', error)
       }
     }
 
-    const interceptorWallet = new RequestInterceptorWallet(wallet, Utils.toBase64(activeProfile.id), updateRecentAppWrapper)
+    const interceptorWallet = new RequestInterceptorWallet(managers.permissionsManager, Utils.toBase64(activeProfile.id), updateRecentAppWrapper)
     // onWalletReady registers IPC listener once, subsequent calls just swap wallet ref
     onWalletReady(interceptorWallet)
 

From 37c822eb1d1f39586c37e3473820328ebc3be7ef Mon Sep 17 00:00:00 2001
From: Deggen <d.kellenschwiler@bsvassociation.org>
Date: Mon, 11 May 2026 23:10:21 -0500
Subject: [PATCH 8/8] 2.3.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cc3f4ba..0d2b58f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "bsv-desktop-electron",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bsv-desktop-electron",
-      "version": "2.3.0",
+      "version": "2.3.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@bsv/amountinator": "^2.0.1",
diff --git a/package.json b/package.json
index 3883ad8..029292f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bsv-desktop-electron",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "BSV Desktop Wallet - Electron Edition",
   "main": "dist-electron/main.js",
   "type": "module",