Improvement/3308 isolate persisted data

app/core/AnalyticsService.ts

@@ -0,0 +1,24 @@
+import Analytics from './Analytics';
+
+class AnalyticsService {
+	/**
+	 * Initializer for the AnalyticsService
+	 *
+	 * @param store - Redux store
+	 */
+	initalizeAnalytics = (store: any) => {
+		const reduxState = store.getState?.();
+		const analyticsEnabled = reduxState?.analytics?.enabled || true;
+
+		Analytics.init(analyticsEnabled);
+
+		Analytics.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_ANALYTICS_STATE' });
+		});
+	};
+}
+
+/**
+ * AnalyticsService class for initializing and subscribing to analytics
+ */
+export default new AnalyticsService();

app/core/EngineService.ts

@@ -0,0 +1,106 @@
+import UntypedEngine from './Engine';
+
+class EngineService {
+	private engineInitialized = false;
+
+	/**
+	 * Initializer for the EngineService
+	 *
+	 * @param store - Redux store
+	 */
+	initalizeEngine = (store: any) => {
+		const reduxState = store.getState?.();
+		const state = reduxState?.engine?.backgroundState || {};
+		const Engine = UntypedEngine as any;
+
+		Engine.init(state);
+
+		Engine?.datamodel?.subscribe?.(() => {
+			if (!this.engineInitialized) {
+				store.dispatch({ type: 'INIT_BG_STATE' });
+				this.engineInitialized = true;
+			}
+		});
+
+		Engine.context.AccountTrackerController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AccountTrackerController' });
+		});
+
+		Engine.context.AddressBookController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AddressBookController' });
+		});
+
+		Engine.context.AssetsContractController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AssetsContractController' });
+		});
+
+		Engine.context.CollectiblesController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'CollectiblesController' });
+		});
+
+		Engine.context.TokensController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokensController' });
+		});
+
+		Engine.context.AssetsDetectionController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AssetsDetectionController' });
+		});
+
+		Engine.controllerMessenger.subscribe(`${Engine.context.TokenListController.name}:stateChange`, () => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokenListController' });
+		});
+
+		Engine.controllerMessenger.subscribe(`${Engine.context.CurrencyRateController.name}:stateChange`, () => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'CurrencyRateController' });
+		});
+
+		Engine.context.KeyringController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'KeyringController' });
+		});
+
+		Engine.context.PersonalMessageManager.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AccountTrackerController' });
+		});
+
+		Engine.context.NetworkController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'NetworkController' });
+		});
+
+		Engine.context.PhishingController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'PhishingController' });
+		});
+
+		Engine.context.PreferencesController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'PreferencesController' });
+		});
+
+		Engine.context.TokenBalancesController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokenBalancesController' });
+		});
+
+		Engine.context.TokenRatesController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokenRatesController' });
+		});
+
+		Engine.context.TransactionController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TransactionController' });
+		});
+
+		Engine.context.TypedMessageManager.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TypedMessageManager' });
+		});
+
+		Engine.context.SwapsController.subscribe(() => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'SwapsController' });
+		});
+
+		Engine.controllerMessenger.subscribe(`${Engine.context.GasFeeController.name}:stateChange`, () => {
+			store.dispatch({ type: 'UPDATE_BG_STATE', key: 'GasFeeController' });
+		});
+	};
+}
+
+/**
+ * EngineService class used for initializing and subscribing to the engine controllers
+ */
+export default new EngineService();

app/reducers/analytics/index.js

@@ -1,27 +1,11 @@
-import { REHYDRATE } from 'redux-persist';
 import Analytics from '../../core/Analytics';
-import { store } from '../../store';
 
 const initialState = {
 	enabled: false,
 };
 
-function initalizeAnalytics(enabled = true) {
-	Analytics.init(enabled);
-
-	Analytics.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_ANALYTICS_STATE' });
-	});
-}
-
 const analyticsReducer = (state = initialState, action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			initalizeAnalytics(action.payload?.analytics?.enabled);
-			if (action.payload?.analytics) {
-				return { ...state, ...action.payload.analytics };
-			}
-			return state;
 		case 'UPDATE_ANALYTICS_STATE':
 			return { enabled: Analytics.getEnabled() };
 		default:

app/reducers/bookmarks/index.js

@@ -1,11 +1,5 @@
-import { REHYDRATE } from 'redux-persist';
 const bookmarksReducer = (state = [], action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			if (action.payload && action.payload.bookmarks) {
-				return [...state, ...action.payload.bookmarks];
-			}
-			return state;
 		case 'ADD_BOOKMARK':
 			return [...state, action.bookmark];
 		case 'REMOVE_BOOKMARK':

app/reducers/browser/index.js

@@ -1,5 +1,3 @@
-import { REHYDRATE } from 'redux-persist';
-
 const initialState = {
 	history: [],
 	whitelist: [],
@@ -8,11 +6,6 @@ const initialState = {
 };
 const browserReducer = (state = initialState, action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			if (action.payload && action.payload.browser) {
-				return { ...state, ...action.payload.browser };
-			}
-			return state;
 		case 'ADD_TO_BROWSER_HISTORY':
 			return {
 				...state,

app/reducers/engine/index.js

@@ -1,109 +1,11 @@
-import { REHYDRATE } from 'redux-persist';
 import Engine from '../../core/Engine';
-import { store } from '../../store';
 
 const initialState = {
 	backgroundState: {},
 };
 
-let engineInitialized = false;
-
-function initalizeEngine(state = {}) {
-	Engine.init(state);
-
-	Engine.datamodel &&
-		Engine.datamodel.subscribe(() => {
-			if (!engineInitialized) {
-				store.dispatch({ type: 'INIT_BG_STATE' });
-				engineInitialized = true;
-			}
-		});
-
-	Engine.context.AccountTrackerController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AccountTrackerController' });
-	});
-
-	Engine.context.AddressBookController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AddressBookController' });
-	});
-
-	Engine.context.AssetsContractController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AssetsContractController' });
-	});
-
-	Engine.context.CollectiblesController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'CollectiblesController' });
-	});
-
-	Engine.context.TokensController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokensController' });
-	});
-
-	Engine.context.AssetsDetectionController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AssetsDetectionController' });
-	});
-
-	Engine.controllerMessenger.subscribe(`${Engine.context.TokenListController.name}:stateChange`, () => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokenListController' });
-	});
-
-	Engine.controllerMessenger.subscribe(`${Engine.context.CurrencyRateController.name}:stateChange`, () => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'CurrencyRateController' });
-	});
-
-	Engine.context.KeyringController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'KeyringController' });
-	});
-
-	Engine.context.PersonalMessageManager.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'AccountTrackerController' });
-	});
-
-	Engine.context.NetworkController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'NetworkController' });
-	});
-
-	Engine.context.PhishingController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'PhishingController' });
-	});
-
-	Engine.context.PreferencesController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'PreferencesController' });
-	});
-
-	Engine.context.TokenBalancesController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokenBalancesController' });
-	});
-
-	Engine.context.TokenRatesController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TokenRatesController' });
-	});
-
-	Engine.context.TransactionController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TransactionController' });
-	});
-
-	Engine.context.TypedMessageManager.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'TypedMessageManager' });
-	});
-
-	Engine.context.SwapsController.subscribe(() => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'SwapsController' });
-	});
-
-	Engine.controllerMessenger.subscribe(`${Engine.context.GasFeeController.name}:stateChange`, () => {
-		store.dispatch({ type: 'UPDATE_BG_STATE', key: 'GasFeeController' });
-	});
-}
-
 const engineReducer = (state = initialState, action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			initalizeEngine(action.payload && action.payload.engine && action.payload.engine.backgroundState);
-			if (action.payload && action.payload.engine) {
-				return { ...state, ...action.payload.engine };
-			}
-			return state;
 		case 'INIT_BG_STATE':
 			return { backgroundState: Engine.state };
 		case 'UPDATE_BG_STATE': {

app/reducers/onboarding/index.js

@@ -1,5 +1,3 @@
-import { REHYDRATE } from 'redux-persist';
-
 const initialState = {
 	events: [],
 };
@@ -10,11 +8,6 @@ const initialState = {
  */
 const onboardingReducer = (state = initialState, action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			if (action.payload && action.payload.onboarding) {
-				return { ...state, ...action.payload.onboarding };
-			}
-			return state;
 		case 'SAVE_EVENT':
 			return {
 				...state,

app/reducers/privacy/index.js

@@ -1,5 +1,3 @@
-import { REHYDRATE } from 'redux-persist';
-
 const initialState = {
 	approvedHosts: {},
 	privacyMode: true,
@@ -9,11 +7,6 @@ const initialState = {
 const privacyReducer = (state = initialState, action) => {
 	const newHosts = { ...state.approvedHosts };
 	switch (action.type) {
-		case REHYDRATE:
-			if (action.payload && action.payload.privacy) {
-				return { ...state, ...action.payload.privacy };
-			}
-			return state;
 		case 'APPROVE_HOST':
 			return {
 				...state,

app/reducers/recents/index.js

@@ -1,12 +1,6 @@
-import { REHYDRATE } from 'redux-persist';
 const recentsLength = 3;
 const recentsReducer = (state = [], action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			if (action.payload?.recents) {
-				return [...state, ...action.payload.recents];
-			}
-			return state;
 		case 'ADD_RECENT':
 			if (action.recent && !state.includes(action.recent)) {
 				const recents = [action.recent, ...state];

app/reducers/settings/index.js

@@ -1,4 +1,3 @@
-import { REHYDRATE } from 'redux-persist';
 import AppConstants from '../../core/AppConstants';
 
 const initialState = {
@@ -11,11 +10,6 @@ const initialState = {
 
 const settingsReducer = (state = initialState, action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			if (action.payload && action.payload.settings) {
-				return { ...state, ...action.payload.settings };
-			}
-			return state;
 		case 'SET_SEARCH_ENGINE':
 			return {
 				...state,

app/reducers/user/index.js

@@ -1,5 +1,3 @@
-import { REHYDRATE } from 'redux-persist';
-
 const initialState = {
 	loadingMsg: '',
 	loadingSet: false,
@@ -12,11 +10,6 @@ const initialState = {
 
 const userReducer = (state = initialState, action) => {
 	switch (action.type) {
-		case REHYDRATE:
-			if (action.payload && action.payload.user) {
-				return { ...state, ...action.payload.user };
-			}
-			return state;
 		case 'LOADING_SET':
 			return {
 				...state,