Fix circular deps. Comment code.

MetaMask · Oct 22, 2021 · 2ebf09f · 2ebf09f
1 parent f0d7f84
commit 2ebf09f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 29 deletions.
diff --git a/app/core/AnalyticsService.ts b/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();
diff --git a/app/reducers/engine/EngineService.ts → app/core/EngineService.ts b/app/reducers/engine/EngineService.ts → app/core/EngineService.ts
@@ -1,10 +1,18 @@
-import UntypedEngine from '../../core/Engine';
-import { store } from '../../store';
+import UntypedEngine from './Engine';
 const Engine = UntypedEngine as any;
+
 class EngineService {
 	private engineInitialized = false;
 
-	initalizeEngine = (state = {}) => {
+	/**
+	 * Initializer for the EngineService
+	 *
+	 * @param store - Redux store
+	 */
+	initalizeEngine = (store: any) => {
+		const reduxState = store.getState?.();
+		const state = reduxState?.engine?.backgroundState || {};
+
 		Engine.init(state);
 
 		Engine?.datamodel?.subscribe?.(() => {

diff --git a/app/reducers/analytics/AnalyticsService.ts b/app/reducers/analytics/AnalyticsService.ts
diff --git a/app/store/index.js b/app/store/index.js
@@ -6,8 +6,8 @@ import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2';
 import rootReducer from '../reducers';
 import { migrations, version } from './migrations';
 import Logger from '../util/Logger';
-import EngineService from '../reducers/engine/EngineService';
-import AnalyticsService from '../reducers/analytics/AnalyticsService';
+import EngineService from '../core/EngineService';
+import AnalyticsService from '../core/AnalyticsService';
 
 const TIMEOUT = 40000;
 
@@ -98,10 +98,13 @@ const persistConfig = {
 const pReducer = persistReducer(persistConfig, rootReducer);
 
 export const store = createStore(pReducer);
-export const persistor = persistStore(store, null, () => {
-	const reduxState = store.getState?.();
-	const backgroundState = reduxState?.engine?.backgroundState || {};
-	const analyticsEnabled = reduxState?.analytics?.enabled;
-	EngineService.initalizeEngine(backgroundState);
-	AnalyticsService.initalizeAnalytics(analyticsEnabled);
-});
+
+/**
+ * Initialize services after persist is completed
+ */
+const onPersistComplete = () => {
+	EngineService.initalizeEngine(store);
+	AnalyticsService.initalizeAnalytics(store);
+};
+
+export const persistor = persistStore(store, null, onPersistComplete);