add store index changes

app/store/index.ts

@@ -66,36 +66,6 @@ const createStoreAndPersistor = async () => {
    * Initialize services after persist is completed
    */
   const onPersistComplete = () => {
-<<<<<<< HEAD
-    /**
-     * EngineService.initalizeEngine(store) with SES/lockdown:
-     * Requires ethjs nested patches (lib->src)
-     * - ethjs/ethjs-query
-     * - ethjs/ethjs-contract
-     * Otherwise causing the following errors:
-     * - TypeError: Cannot assign to read only property 'constructor' of object '[object Object]'
-     * - Error: Requiring module "node_modules/ethjs/node_modules/ethjs-query/lib/index.js", which threw an exception: TypeError:
-     * -  V8: Cannot assign to read only property 'constructor' of object '[object Object]'
-     * -  JSC: Attempted to assign to readonly property
-     * - node_modules/babel-runtime/node_modules/regenerator-runtime/runtime.js
-     * - V8: TypeError: _$$_REQUIRE(...) is not a constructor
-     * - TypeError: undefined is not an object (evaluating 'TokenListController.tokenList')
-     * - V8: SES_UNHANDLED_REJECTION
-     */
-
-    store.dispatch({
-      type: 'TOGGLE_BASIC_FUNCTIONALITY',
-      basicFunctionalityEnabled:
-        store.getState().settings.basicFunctionalityEnabled,
-    });
-
-    EngineService.initalizeEngine(store);
-
-    Authentication.init(store);
-    AppStateEventProcessor.init(store);
-    LockManagerService.init(store);
-=======
->>>>>>> main
     endTrace({ name: TraceName.StoreInit });
     // Signal that persisted data has been loaded
     store.dispatch(onPersistedDataLoaded());