feat: #870 - Slice Storage Engine

app/components/UI/DrawerView/index.js

@@ -7,7 +7,6 @@ import {
   StyleSheet,
   Text,
   InteractionManager,
-  Platform,
 } from 'react-native';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
@@ -28,7 +27,6 @@ import { strings } from '../../../../locales/i18n';
 import Modal from 'react-native-modal';
 import {
   toggleInfoNetworkModal,
-  toggleNetworkModal,
   toggleReceiveModal,
 } from '../../../actions/modals';
 import { showAlert } from '../../../actions/alert';
@@ -49,7 +47,6 @@ import { getEther } from '../../../util/transactions';
 import { newAssetTransaction } from '../../../actions/transaction';
 import { protectWalletModalVisible } from '../../../actions/user';
 import DeeplinkManager from '../../../core/DeeplinkManager/SharedDeeplinkManager';
-import SettingsNotification from '../SettingsNotification';
 import { RPC } from '../../../constants/network';
 import { findRouteNameFromNavigatorState } from '../../../util/general';
 import AnalyticsV2 from '../../../util/analyticsV2';
@@ -59,7 +56,6 @@ import {
 } from '../../../util/ENSUtils';
 import ClipboardManager from '../../../core/ClipboardManager';
 import { collectiblesSelector } from '../../../reducers/collectibles';
-import { getCurrentRoute } from '../../../reducers/navigation';
 import { ScrollView } from 'react-native-gesture-handler';
 import { isZero } from '../../../util/lodash';
 import { Authentication } from '../../../core/';
@@ -71,7 +67,6 @@ import {
 } from '../../../actions/onboardNetwork';
 import Routes from '../../../constants/navigation/Routes';
 import { scale } from 'react-native-size-matters';
-import generateTestId from '../../../../wdio/utils/generateTestId';
 import { DRAWER_VIEW_LOCK_TEXT_ID } from '../../../../wdio/screen-objects/testIDs/Screens/DrawerView.testIds';
 import {
   selectNetworkConfigurations,
@@ -362,10 +357,6 @@ class DrawerView extends PureComponent {
      * List of keyrings
      */
     keyrings: PropTypes.array,
-    /**
-     * Action that toggles the network modal
-     */
-    toggleNetworkModal: PropTypes.func,
     /**
      * Action that toggles the receive modal
      */
@@ -374,10 +365,6 @@ class DrawerView extends PureComponent {
      * Action that shows the global alert
      */
     showAlert: PropTypes.func.isRequired,
-    /**
-     * Boolean that determines the status of the networks modal
-     */
-    networkModalVisible: PropTypes.bool.isRequired,
     /**
      * Boolean that determines the status of the receive modal
      */
@@ -390,10 +377,6 @@ class DrawerView extends PureComponent {
      * Boolean that determines if the user has set a password before
      */
     passwordSet: PropTypes.bool,
-    /**
-     * Wizard onboarding state
-     */
-    wizard: PropTypes.object,
     /**
      * Current provider ticker
      */
@@ -427,18 +410,11 @@ class DrawerView extends PureComponent {
      * Callback to close drawer
      */
     onCloseDrawer: PropTypes.func,
-    /**
-     * Latest navigation route
-     */
-    currentRoute: PropTypes.string,
+
     /**
      * handles action for onboarding to a network
      */
     onboardNetworkAction: PropTypes.func,
-    /**
-     * returns switched network state
-     */
-    switchedNetwork: PropTypes.object,
     /**
      * updates when network is switched
      */
@@ -1000,8 +976,6 @@ class DrawerView extends PureComponent {
       identities,
       selectedAddress,
       currentCurrency,
-      seedphraseBackedUp,
-      currentRoute,
       navigation,
       infoNetworkModalVisible,
     } = this.props;
@@ -1118,81 +1092,6 @@ class DrawerView extends PureComponent {
               </View>
             </StyledButton>
           </View>
-          <View style={styles.menu}>
-            {this.getSections().map(
-              (section, i) =>
-                section?.length > 0 && (
-                  <View
-                    key={`section_${i}`}
-                    style={[
-                      styles.menuSection,
-                      i === 0 ? styles.noTopBorder : null,
-                    ]}
-                  >
-                    {section
-                      .filter((item) => {
-                        if (!item) return undefined;
-                        const { name = undefined } = item;
-                        if (
-                          name &&
-                          name.toLowerCase().indexOf('etherscan') !== -1
-                        ) {
-                          const type = providerConfig?.type;
-                          return (
-                            (type && this.hasBlockExplorer(type)) || undefined
-                          );
-                        }
-                        return true;
-                      })
-                      .map((item, j) => (
-                        <TouchableOpacity
-                          key={`item_${i}_${j}`}
-                          style={[
-                            styles.menuItem,
-                            item.routeNames &&
-                            item.routeNames.includes(currentRoute)
-                              ? styles.selectedRoute
-                              : null,
-                          ]}
-                          ref={
-                            item.name === strings('drawer.browser') &&
-                            this.browserSectionRef
-                          }
-                          onPress={() => item.action()} // eslint-disable-line
-                        >
-                          {item.icon
-                            ? item.routeNames &&
-                              item.routeNames.includes(currentRoute)
-                              ? item.selectedIcon
-                              : item.icon
-                            : null}
-                          <Text
-                            style={[
-                              styles.menuItemName,
-                              !item.icon ? styles.noIcon : null,
-                              item.routeNames &&
-                              item.routeNames.includes(currentRoute)
-                                ? styles.selectedName
-                                : null,
-                            ]}
-                            {...generateTestId(Platform, item.testID)}
-                            numberOfLines={1}
-                          >
-                            {item.name}
-                          </Text>
-                          {!seedphraseBackedUp && item.warning ? (
-                            <SettingsNotification isNotification isWarning>
-                              <Text style={styles.menuItemWarningText}>
-                                {item.warning}
-                              </Text>
-                            </SettingsNotification>
-                          ) : null}
-                        </TouchableOpacity>
-                      ))}
-                  </View>
-                ),
-            )}
-          </View>
         </ScrollView>
 
         <Modal
@@ -1243,22 +1142,17 @@ const mapStateToProps = (state) => ({
   networkConfigurations: selectNetworkConfigurations(state),
   currentCurrency: selectCurrentCurrency(state),
   keyrings: state.engine.backgroundState.KeyringController.keyrings,
-  networkModalVisible: state.modals.networkModalVisible,
   receiveModalVisible: state.modals.receiveModalVisible,
   infoNetworkModalVisible: state.modals.infoNetworkModalVisible,
   passwordSet: state.user.passwordSet,
-  wizard: state.wizard,
   ticker: selectTicker(state),
   tokens: selectTokens(state),
   tokenBalances: selectContractBalances(state),
   collectibles: collectiblesSelector(state),
   seedphraseBackedUp: state.user.seedphraseBackedUp,
-  currentRoute: getCurrentRoute(state),
-  switchedNetwork: state.networkOnboarded.switchedNetwork,
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  toggleNetworkModal: () => dispatch(toggleNetworkModal()),
   toggleReceiveModal: () => dispatch(toggleReceiveModal()),
   showAlert: (config) => dispatch(showAlert(config)),
   newAssetTransaction: (selectedAsset) =>

app/core/EngineService/EngineService.ts

@@ -13,8 +13,10 @@ interface InitializeEngineResult {
   error?: string;
 }
 
-const UPDATE_BG_STATE_KEY = 'UPDATE_BG_STATE';
-const INIT_BG_STATE_KEY = 'INIT_BG_STATE';
+const UPDATE_BG_STATE_KEY = (controllerName: string) =>
+  `UPDATE_BG_STATE_${controllerName}`;
+const INIT_BG_STATE_KEY = (controllerName: string) =>
+  `INIT_BG_STATE_${controllerName}`;
 class EngineService {
   private engineInitialized = false;
 
@@ -102,15 +104,24 @@ class EngineService {
 
     engine?.datamodel?.subscribe?.(() => {
       if (!this.engineInitialized) {
-        store.dispatch({ type: INIT_BG_STATE_KEY });
+        controllers.forEach((controller) => {
+          const { name } = controller;
+          store.dispatch({
+            type: INIT_BG_STATE_KEY(name),
+            payload: { key: name },
+          });
+        });
         this.engineInitialized = true;
       }
     });
 
     controllers.forEach((controller) => {
       const { name, key = undefined } = controller;
       const update_bg_state_cb = () => {
-        store.dispatch({ type: UPDATE_BG_STATE_KEY, payload: { key: name } });
+        store.dispatch({
+          type: UPDATE_BG_STATE_KEY(name),
+          payload: { key: name },
+        });
       };
       if (key) {
         engine.controllerMessenger.subscribe(key, update_bg_state_cb);

app/reducers/index.ts

@@ -1,6 +1,6 @@
 import bookmarksReducer from './bookmarks';
 import browserReducer from './browser';
-import engineReducer from '../core/redux/slices/engine';
+import engineReducer from '../redux/slices/engine';
 import privacyReducer from './privacy';
 import modalsReducer from './modals';
 import settingsReducer from './settings';
@@ -11,11 +11,11 @@ import wizardReducer from './wizard';
 import onboardingReducer from './onboarding';
 import fiatOrders from './fiatOrders';
 import swapsReducer from './swaps';
+import navigationReducer from './navigation';
 import signatureRequestReducer from './signatureRequest';
 import notificationReducer from './notification';
 import infuraAvailabilityReducer from './infuraAvailability';
 import collectiblesReducer from './collectibles';
-import navigationReducer from './navigation';
 import networkOnboardReducer from './networkSelector';
 import securityReducer from './security';
 import { combineReducers, Reducer } from 'redux';
@@ -83,11 +83,11 @@ const rootReducer = combineReducers<RootState, any>({
   wizard: wizardReducer,
   onboarding: onboardingReducer,
   notification: notificationReducer,
+  navigation: navigationReducer,
   signatureRequest: signatureRequestReducer,
   swaps: swapsReducer,
   fiatOrders,
   infuraAvailability: infuraAvailabilityReducer,
-  navigation: navigationReducer,
   networkOnboarded: networkOnboardReducer,
   security: securityReducer,
   experimentalSettings: experimentalSettingsReducer,

app/reducers/navigation/index.ts

@@ -37,8 +37,5 @@ const navigationReducer = (state = initialState, action: any = {}) => {
 /**
  * Selectors
  */
-export const getCurrentRoute = (state: any) => state.navigation.currentRoute;
-export const getCurrentBottomNavRoute = (state: any) =>
-  state.navigation.currentBottomNavRoute;
 
 export default navigationReducer;