fix: use single PersistenceManager to avoid undesired cascade mechanisms

app/scripts/background.js

@@ -6,7 +6,8 @@
 
 // This import sets up global functions required for Sentry to function.
 // It must be run first in case an error is thrown later during initialization.
-import './lib/setup-initial-state-hooks';
+// eslint-disable-next-line import/order -- intentional first import for Sentry
+import { persistenceManager } from './lib/setup-initial-state-hooks';
 
 // Import this very early, so globalThis.INFURA_PROJECT_ID_FROM_MANIFEST_FLAGS is always defined
 import '../../shared/constants/infura-project-id';
@@ -57,12 +58,7 @@ import {
   CorruptionHandler,
   hasVault,
 } from './lib/state-corruption/state-corruption-recovery';
-import {
-  backedUpStateKeys,
-  PersistenceManager,
-} from './lib/stores/persistence-manager';
-import ExtensionStore from './lib/stores/extension-store';
-import { FixtureExtensionStore } from './lib/stores/fixture-extension-store';
+import { backedUpStateKeys } from './lib/stores/persistence-manager';
 import { useSplitStateStorage } from './lib/use-split-state-storage';
 import migrations from './migrations';
 import Migrator from './lib/migrator';
@@ -120,12 +116,6 @@ const BADGE_COLOR_APPROVAL = '#0376C9';
 const BADGE_MAX_COUNT = 9;
 
 const inTest = process.env.IN_TEST;
-const useFixtureStore =
-  inTest && getManifestFlags().testing?.forceExtensionStore !== true;
-const localStore = useFixtureStore
-  ? new FixtureExtensionStore({ initialize: true })
-  : new ExtensionStore();
-const persistenceManager = new PersistenceManager({ localStore });
 
 const { safePersist, requestSafeReload, evacuate } =
   getRequestSafeReload(persistenceManager);

app/scripts/lib/setup-initial-state-hooks.js

@@ -1,3 +1,5 @@
+import { ENVIRONMENT_TYPE_BACKGROUND } from '../../../shared/constants/app';
+import { getEnvironmentType } from '../../../shared/lib/environment-type';
 import { getManifestFlags } from '../../../shared/lib/manifestFlags';
 import { maskObject } from '../../../shared/lib/object.utils';
 import ExtensionPlatform from '../platforms/extension';
@@ -11,20 +13,32 @@ const platform = new ExtensionPlatform();
 const useFixtureStore =
   process.env.IN_TEST &&
   getManifestFlags().testing?.forceExtensionStore !== true;
-// This instance of `localStore` is used by Sentry to get the persisted state
-const sentryLocalStore = new PersistenceManager({
-  localStore: useFixtureStore
-    ? new FixtureExtensionStore()
-    : new ExtensionStore(),
-});
+let isBackground = false;
+if (useFixtureStore) {
+  // Use globalThis.self (not window) so this works in both the UI and the background/service worker, where window is undefined.
+  const locationHref = globalThis.self?.location?.href;
+  if (!locationHref) {
+    throw new Error(
+      'setup-initial-state-hooks: globalThis.self?.location?.href is not defined; expected to run in a document or service worker context.',
+    );
+  }
+  isBackground =
+    getEnvironmentType(locationHref) === ENVIRONMENT_TYPE_BACKGROUND;
+}
+const localStore = useFixtureStore
+  ? new FixtureExtensionStore({ initialize: isBackground })
+  : new ExtensionStore();
+
+// Single PersistenceManager per context: one in background, one per UI context.
+export const persistenceManager = new PersistenceManager({ localStore });
 
 /**
  * Get the persisted wallet state.
  *
  * @returns The persisted wallet state.
  */
 globalThis.stateHooks.getPersistedState = async function () {
-  return await sentryLocalStore.get({ validateVault: false });
+  return await persistenceManager.get({ validateVault: false });
 };
 
 /**
@@ -34,7 +48,7 @@ globalThis.stateHooks.getPersistedState = async function () {
  * @returns The backup state, or null if unavailable.
  */
 globalThis.stateHooks.getBackupState = async function () {
-  return await sentryLocalStore.getBackup();
+  return await persistenceManager.getBackup();
 };
 
 const persistedStateMask = {
@@ -65,7 +79,7 @@ globalThis.stateHooks.getSentryState = function () {
   };
   // If `getSentryAppState` is set, it implies that initialization has completed
   if (globalThis.stateHooks.getSentryAppState) {
-    sentryLocalStore.cleanUpMostRecentRetrievedState();
+    persistenceManager.cleanUpMostRecentRetrievedState();
     return {
       ...sentryState,
       state: globalThis.stateHooks.getSentryAppState(),
@@ -74,12 +88,12 @@ globalThis.stateHooks.getSentryState = function () {
     // This is truthy if Sentry has retrieved state at least once already. This
     // should always be true when getting context for an error report, but can
     // be unset when Sentry is performing the opt-in check.
-    sentryLocalStore.mostRecentRetrievedState ||
+    persistenceManager.mostRecentRetrievedState ||
     // This is only set in the background process.
     globalThis.stateHooks.getMostRecentPersistedState
   ) {
     const persistedState =
-      sentryLocalStore.mostRecentRetrievedState ||
+      persistenceManager.mostRecentRetrievedState ||
       globalThis.stateHooks.getMostRecentPersistedState();
     // This can be unset when this method is called in the background for an
     // opt-in check, but the state hasn't been loaded yet.