Add indexes

src/apiCalls/configuration/getCleanApiAddress.ts

@@ -1,8 +1,8 @@
 import { networkSelector } from 'store/selectors/networkSelectors';
-import { store } from 'store/store';
+import { getState } from 'store/store';
 
 export const getCleanApiAddress = (customApiAddress?: string) => {
-  const network = networkSelector(store.getState());
+  const network = networkSelector(getState());
   const apiAddress = customApiAddress ?? network.apiAddress;
   return apiAddress.endsWith('/') ? apiAddress.slice(0, -1) : apiAddress;
 };

src/store/actions/account/index.ts

@@ -0,0 +1 @@
+export * from './accountActions';

src/store/actions/index.ts

@@ -0,0 +1,3 @@
+export * from './account';
+export * from './network';
+export * from './sharedActions';

src/store/actions/network/index.ts

@@ -0,0 +1 @@
+export * from './networkActions';

src/store/actions/network/initializeNetwork.ts

@@ -0,0 +1,46 @@
+import { getServerConfiguration } from 'apiCalls/configuration/getServerConfiguration';
+import { fallbackNetworkConfigurations } from 'constants/network';
+import { EnvironmentsEnum } from 'types/enums.types';
+import { CustomNetworkType, NetworkType } from 'types/network.types';
+import { initializeNetworkConfig } from './networkActions';
+
+export type InitializeNetworkPropsType = {
+  customNetworkConfig?: CustomNetworkType;
+  environment: EnvironmentsEnum;
+};
+
+export const initializeNetwork = async ({
+  customNetworkConfig = {},
+  environment
+}: InitializeNetworkPropsType): Promise<NetworkType> => {
+  const fetchConfigFromServer = !customNetworkConfig?.skipFetchFromServer;
+  const customNetworkApiAddress = customNetworkConfig?.apiAddress;
+  const fallbackConfig = fallbackNetworkConfigurations[environment] || {};
+
+  const localConfig = {
+    ...fallbackConfig,
+    ...customNetworkConfig
+  };
+
+  if (fetchConfigFromServer) {
+    const fallbackApiAddress = fallbackConfig?.apiAddress;
+
+    const serverConfig = await getServerConfiguration(
+      customNetworkApiAddress || fallbackApiAddress
+    );
+
+    if (serverConfig != null) {
+      const apiConfig = {
+        ...fallbackConfig,
+        ...serverConfig,
+        ...customNetworkConfig
+      };
+
+      initializeNetworkConfig(apiConfig);
+      return apiConfig;
+    }
+  }
+
+  initializeNetworkConfig(localConfig);
+  return localConfig;
+};

src/store/actions/networkActions.ts → src/store/actions/network/networkActions.ts

@@ -1,7 +1,7 @@
 import { NetworkType } from 'types/network.types';
-import { store } from '../store';
+import { store } from '../../store';
 
-export const initializeNetwork = (newNetwork: NetworkType) =>
+export const initializeNetworkConfig = (newNetwork: NetworkType) =>
   store.setState(({ network: state }) => {
     const walletConnectV2RelayAddress =
       newNetwork.walletConnectV2RelayAddresses[
@@ -22,3 +22,5 @@ export const setCustomWalletAddress = (customWalletAddress: string) =>
   store.setState(({ network: state }) => {
     state.network.customWalletAddress = customWalletAddress;
   });
+
+export { initializeNetwork } from './initializeNetwork';

src/store/actions/sharedActions/index.ts

@@ -0,0 +1 @@
+export * from './sharedActions';

src/store/actions/sharedActions.ts → src/store/actions/sharedActions/sharedActions.ts

@@ -1,6 +1,6 @@
 import { Address } from '@multiversx/sdk-core/out';
 import { initialState as initialAccountState } from 'store/slices/account/accountSlice';
-import { store } from '../store';
+import { store } from '../../store';
 
 export const logout = () =>
   store.setState((state) => {

src/store/selectors/hooks/index.ts

@@ -0,0 +1 @@
+export * from './useSelector';

src/store/selectors/index.ts

@@ -0,0 +1,3 @@
+export * from './accountSelectors';
+export * from './networkSelectors';
+export * from './storeSelector';

src/store/slices/account/accountSlice.ts

@@ -13,7 +13,7 @@ export const initialState: AccountSliceType = {
   walletConnectAccount: null
 };
 
-function getAccountConfigSlice(): StateCreator<
+function getAccountSlice(): StateCreator<
   DAppStoreState,
   MutatorsIn,
   [],
@@ -22,4 +22,4 @@ function getAccountConfigSlice(): StateCreator<
   return () => initialState;
 }
 
-export const accountConfigSlice = getAccountConfigSlice();
+export const accountSlice = getAccountSlice();

src/store/slices/account/index.ts

@@ -0,0 +1 @@
+export * from './accountSlice';

src/store/slices/index.ts

@@ -0,0 +1,2 @@
+export * from './account';
+export * from './network';

src/store/slices/network/index.ts

@@ -0,0 +1 @@
+export * from './networkSlice';

src/store/slices/network/networkSlice.ts

@@ -7,7 +7,7 @@ const initialState: NetworkSliceType = {
   network: emptyNetwork
 };
 
-function getNetworkConfigSlice(): StateCreator<
+function getNetworkSlice(): StateCreator<
   DAppStoreState,
   MutatorsIn,
   [],
@@ -16,4 +16,4 @@ function getNetworkConfigSlice(): StateCreator<
   return () => initialState;
 }
 
-export const networkConfigSlice = getNetworkConfigSlice();
+export const networkSlice = getNetworkSlice();

src/store/store.ts

@@ -1,10 +1,10 @@
 import { createStore } from 'zustand/vanilla';
 import { createJSONStorage, devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
-import { networkConfigSlice } from './slices/network/networkSlice';
+import { networkSlice } from './slices/network/networkSlice';
 import { NetworkSliceType } from './slices/network/networkSlice.types';
 import { AccountSliceType } from './slices/account/account.types';
-import { accountConfigSlice } from './slices/account/accountSlice';
+import { accountSlice } from './slices/account/accountSlice';
 import { createBoundedUseStore } from './createBoundedStore';
 
 export type StoreType = {
@@ -28,8 +28,8 @@ export const store = createStore<StoreType, MutatorsOut>(
   devtools(
     persist(
       immer((...args) => ({
-        network: networkConfigSlice(...args),
-        account: accountConfigSlice(...args)
+        network: networkSlice(...args),
+        account: accountSlice(...args)
       })),
       {
         name: 'sdk-dapp-store',