diff --git a/src/components/app/AppHeader.vue b/src/components/app/AppHeader.vue
index f31c75922..8adb3cb1d 100644
--- a/src/components/app/AppHeader.vue
+++ b/src/components/app/AppHeader.vue
@@ -188,7 +188,7 @@
       <NetworkPopup
         :isOpen="isOpenNetworkPopup"
         @closePopup="closeNetworkPopup"
-        :networksArr="popupNetworksArr"
+        :networksArr="networksArr"
         :activeChain="chainId"
       />
 
@@ -223,18 +223,10 @@ export default {
       networksArr: "getAvailableNetworks",
     }),
 
-    popupNetworksArr() {
-      return this.networksArr.map((chain) => {
-        if (chain?.title) return chain;
-        chain.title = chain.name;
-        return chain;
-      });
-    },
-
     networcIcon() {
       if (!this.chainId) return "";
-      if (this.popupNetworksArr.length && this.chainId) {
-        const chain = this.popupNetworksArr.find((chain) => {
+      if (this.networksArr.length && this.chainId) {
+        const chain = this.networksArr.find((chain) => {
           if (chain.chainId === this.chainId) return chain;
         });
 
@@ -245,7 +237,7 @@ export default {
     },
 
     isUnsupportedChain() {
-      const chain = this.popupNetworksArr.find((chain) => {
+      const chain = this.networksArr.find((chain) => {
         if (chain.chainId === this.chainId) return chain;
       });
 
diff --git a/src/components/beam/successPopup/SendFromBlock.vue b/src/components/beam/successPopup/SendFromBlock.vue
index bedd012af..4a155f902 100644
--- a/src/components/beam/successPopup/SendFromBlock.vue
+++ b/src/components/beam/successPopup/SendFromBlock.vue
@@ -64,9 +64,9 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import filters from "@/filters/index.js";
 import { useImage } from "@/helpers/useImage";
-import { getChainInfo } from "@/helpers/chain/getChainInfo.ts";
 import ExplorerLink from "@/components/beam/successPopup/ExplorerLink.vue";
 export default {
   props: {
@@ -77,11 +77,14 @@ export default {
   },
 
   computed: {
+    ...mapGetters({ getChainById: "getChainById" }),
+
     fromScanUrl() {
       if (!this.config.tx?.hash) return "";
-      return `${getChainInfo(this.config.originChain.chainId).scanUrl}${
-        this.config.tx.hash
-      }`;
+      return `${
+        this.getChainById(this.config.originChain.chainId).blockExplorers
+          .etherscan.url
+      }/tx/${this.config.tx.hash}`;
     },
 
     sendFromCheck() {
diff --git a/src/components/beam/successPopup/SendToBlock.vue b/src/components/beam/successPopup/SendToBlock.vue
index af949d742..d7f34117d 100644
--- a/src/components/beam/successPopup/SendToBlock.vue
+++ b/src/components/beam/successPopup/SendToBlock.vue
@@ -46,9 +46,9 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import filters from "@/filters/index.js";
 import { useImage } from "@/helpers/useImage";
-import { getChainInfo } from "@/helpers/chain/getChainInfo.ts";
 import ExplorerLink from "@/components/beam/successPopup/ExplorerLink.vue";
 export default {
   props: {
@@ -59,6 +59,8 @@ export default {
   },
 
   computed: {
+    ...mapGetters({ getChainById: "getChainById" }),
+
     sendToCheck() {
       if (this.dstScanUrl) return useImage("assets/images/beam/complete.png");
       return useImage("assets/images/beam/check.png");
@@ -73,7 +75,9 @@ export default {
     dstScanUrl() {
       const { txInfo, dstChain } = this.config;
       if (!txInfo || txInfo?.status === "INFLIGHT") return "";
-      return `${getChainInfo(dstChain.chainId).scanUrl}${txInfo.dstTxHash}`;
+      return `${
+        this.getChainById(dstChain.chainId).blockExplorers.etherscan.url
+      }/tx/${txInfo.dstTxHash}`;
     },
 
     destinationTokenUsd() {
diff --git a/src/components/borrow/BalanceBlock.vue b/src/components/borrow/BalanceBlock.vue
index 8cdd51aa2..5d746af1b 100644
--- a/src/components/borrow/BalanceBlock.vue
+++ b/src/components/borrow/BalanceBlock.vue
@@ -60,12 +60,11 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
 import { utils } from "ethers";
+import { mapGetters } from "vuex";
 import filters from "@/filters/index.js";
-import { useImage } from "@/helpers/useImage";
-import { getChainInfo } from "@/helpers/chain/getChainInfo.ts";
 import { defineAsyncComponent } from "vue";
+import { useImage } from "@/helpers/useImage";
 import { ONE_ETHER } from "@/constants/global";
 export default {
   props: {
@@ -82,16 +81,16 @@ export default {
   },
 
   computed: {
-    ...mapGetters({ chainId: "getChainId" }),
+    ...mapGetters({ chainId: "getChainId", getChainById: "getChainById" }),
 
     nativeTokenInfo() {
       const { acceptUseDefaultBalance } = this.cauldron.config.cauldronSettings;
       if (!acceptUseDefaultBalance) return null;
 
       const { nativeTokenBalance } = this.cauldron.userTokensInfo;
-      const { symbol, icon } = getChainInfo(this.chainId);
+      const { symbol, baseTokenIcon } = this.getChainById(this.chainId);
       const balance = utils.formatUnits(nativeTokenBalance);
-      return { name: symbol, icon, balance };
+      return { name: symbol, icon: baseTokenIcon, balance };
     },
 
     mimInfo() {
diff --git a/src/components/markets/CauldronItem.test.ts b/src/components/markets/CauldronItem.test.ts
index 0c0677a12..580d39ccb 100644
--- a/src/components/markets/CauldronItem.test.ts
+++ b/src/components/markets/CauldronItem.test.ts
@@ -47,9 +47,6 @@ const store = new Vuex.Store({
       state: {
         chainIcon: useImage("assets/images/networks/arbitrum-icon.svg"),
       },
-      getters: {
-        getChainIcon: (state) => (chainId: number) => state.chainIcon,
-      },
     },
   },
 });
diff --git a/src/components/markets/CauldronItem.vue b/src/components/markets/CauldronItem.vue
index 0a884899a..8196a7aef 100644
--- a/src/components/markets/CauldronItem.vue
+++ b/src/components/markets/CauldronItem.vue
@@ -3,7 +3,7 @@
     <div class="cauldron-info">
       <div class="chain-info">
         <p class="chain-title">Chain</p>
-        <BaseTokenIcon :icon="getChainIcon(chainId)" size="26px" />
+        <BaseTokenIcon :icon="chainIcon" size="26px" />
       </div>
 
       <div class="collateral-info">
@@ -41,9 +41,9 @@
 </template>
 
 <script>
-import filters from "@/filters/index.js";
 import { utils } from "ethers";
 import { mapGetters } from "vuex";
+import filters from "@/filters/index.js";
 import BaseTokenIcon from "@/components/base/BaseTokenIcon.vue";
 
 export default {
@@ -54,7 +54,11 @@ export default {
   },
 
   computed: {
-    ...mapGetters({ chainId: "getChainId", getChainIcon: "getChainIcon" }),
+    ...mapGetters({ chainId: "getChainId", getChainById: "getChainById" }),
+
+    chainIcon() {
+      return this.getChainById(this.chainId).icon;
+    },
 
     goToCauldron() {
       const name = this.isDeprecatedCauldron ? "RepayId" : "BorrowId";
diff --git a/src/components/markets/FarmItem.vue b/src/components/markets/FarmItem.vue
index 2bea49ec0..5979ac13e 100644
--- a/src/components/markets/FarmItem.vue
+++ b/src/components/markets/FarmItem.vue
@@ -3,7 +3,7 @@
     <div class="stats-wrap">
       <div>
         <p class="chain-title">CHAIN</p>
-        <img class="chain-icon" :src="getChainIcon" alt="Chain icon" />
+        <img class="chain-icon" :src="chainIcon" alt="Chain icon" />
       </div>
 
       <div class="farm-info">
@@ -35,7 +35,6 @@
 import { mapGetters } from "vuex";
 import filters from "@/filters/index.js";
 import BaseTokenIcon from "@/components/base/BaseTokenIcon.vue";
-import { useImage } from "@/helpers/useImage";
 
 export default {
   props: {
@@ -45,7 +44,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters({ chainId: "getChainId" }),
+    ...mapGetters({ chainId: "getChainId", getChainById: "getChainById" }),
 
     goToPage() {
       return { name: "Farm", params: { id: this.farm.id } };
@@ -61,32 +60,8 @@ export default {
       ];
     },
 
-    getChainIcon() {
-      if (this.chainId === 56) {
-        return useImage("assets/images/networks/BNB.svg");
-      }
-
-      if (this.chainId === 250) {
-        return useImage("assets/images/networks/fantom-icon.svg");
-      }
-
-      if (this.chainId === 43114) {
-        return useImage("assets/images/networks/avalanche-icon.png");
-      }
-
-      if (this.chainId === 137) {
-        return useImage("assets/images/networks/polygon-icon.svg");
-      }
-
-      if (this.chainId === 42161) {
-        return useImage("assets/images/networks/Arbitrum.svg");
-      }
-
-      if (this.chainId === 10) {
-        return useImage("assets/images/networks/optimism-icon.svg");
-      }
-
-      return useImage("assets/images/networks/ethereum-icon.svg");
+    chainIcon() {
+      return this.getChainById(this.chainId).icon;
     },
   },
 
diff --git a/src/components/popups/NetworkPopup.vue b/src/components/popups/NetworkPopup.vue
index 29ac987f1..9c0a33eb6 100644
--- a/src/components/popups/NetworkPopup.vue
+++ b/src/components/popups/NetworkPopup.vue
@@ -17,7 +17,7 @@
           @click="switchHandler(network.chainId)"
         >
           <img class="network-image" :src="network.icon" alt="network" />
-          <span>{{ network.title }}</span>
+          <span>{{ network.symbol }}</span>
         </button>
       </div>
     </div>
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import switchNetwork from "@/helpers/switchNetwork";
+import { switchNetwork } from "@/helpers/chains/switchNetwork";
 
 export default {
   props: {
diff --git a/src/components/ui/NetworksList.vue b/src/components/ui/NetworksList.vue
index 5c68ee0c2..06babbee9 100644
--- a/src/components/ui/NetworksList.vue
+++ b/src/components/ui/NetworksList.vue
@@ -12,7 +12,7 @@
           v-for="network in activeNetworks"
           :key="network.chainId"
           :selected="network.chainId === chainId"
-          :name="network.name"
+          :name="network.symbol"
           :icon="network.icon"
           :disabled="loading"
           @click="changeNetwork(network.chainId)"
@@ -36,7 +36,7 @@
 <script>
 import { mapGetters } from "vuex";
 import NetworkChip from "@/components/ui/NetworkChip.vue";
-import switchNetwork from "@/helpers/switchNetwork";
+import { switchNetwork } from "@/helpers/chains/switchNetwork";
 
 export default {
   name: "NetworksList",
@@ -59,7 +59,7 @@ export default {
       try {
         await switchNetwork(chainId);
       } catch (error) {
-        console.log(error)
+        console.log("Switch Network Error", error);
       } finally {
         this.loading = false;
       }
diff --git a/src/components/ui/checkboxes/UseCheckbox.vue b/src/components/ui/checkboxes/UseCheckbox.vue
index 855047257..16d103f70 100644
--- a/src/components/ui/checkboxes/UseCheckbox.vue
+++ b/src/components/ui/checkboxes/UseCheckbox.vue
@@ -13,7 +13,6 @@
 <script>
 import { mapGetters } from "vuex";
 import { useImage } from "@/helpers/useImage";
-import { getChainInfo } from "@/helpers/chain/getChainInfo.ts";
 export default {
   props: {
     config: {
@@ -31,6 +30,7 @@ export default {
   computed: {
     ...mapGetters({
       chainId: "getChainId",
+      getChainById: "getChainById",
     }),
 
     isVisibility() {
@@ -48,7 +48,7 @@ export default {
 
     tokenSymbol() {
       if (this.config?.cauldronSettings?.acceptUseDefaultBalance)
-        return getChainInfo(this.chainId).symbol;
+        return this.getChainById(this.chainId).symbol;
       return this.config.collateralInfo.name;
     },
   },
diff --git a/src/constants/chains.ts b/src/constants/chains.ts
new file mode 100644
index 000000000..71d58cb86
--- /dev/null
+++ b/src/constants/chains.ts
@@ -0,0 +1,3 @@
+export const MAINNET_RPC_URLS: string[] = [
+  "https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
+];
diff --git a/src/constants/tokensAddress.ts b/src/constants/tokensAddress.ts
index ae0928648..b507438ef 100644
--- a/src/constants/tokensAddress.ts
+++ b/src/constants/tokensAddress.ts
@@ -1,2 +1,6 @@
+import type { Address } from "viem";
+
 export const MAINNET_SPELL_ADDRESS: string =
   "0x090185f2135308BaD17527004364eBcC2D37e5F6";
+export const SANCTIONS_LIST_ADDRESS: Address =
+  "0x40c57923924b5c5c5455c48d93317139addac8fb";
diff --git a/src/helpers/beam/createBeamConfig.ts b/src/helpers/beam/createBeamConfig.ts
index 9cd492936..0061f7e94 100644
--- a/src/helpers/beam/createBeamConfig.ts
+++ b/src/helpers/beam/createBeamConfig.ts
@@ -1,8 +1,8 @@
-import { BigNumber, Contract, providers, utils } from "ethers";
-import mimConfigs from "@/utils/contracts/mimToken";
-import chainConfig from "@/utils/beam/chainConfig";
-import beamConfigs from "@/utils/beam/beamConfigs";
 import { markRaw } from "vue";
+import beamConfigs from "@/utils/beam/beamConfigs";
+import mimConfigs from "@/utils/contracts/mimToken";
+import { chains, chainsList } from "@/helpers/chains";
+import { BigNumber, Contract, providers, utils } from "ethers";
 import type { BeamConfig, UserInfo } from "@/helpers/beam/types";
 
 const emptyState = {
@@ -47,22 +47,23 @@ export const createBeamConfig = async (
   const beamConfig = beamConfigs.find((item) => item.chainId === chainId);
 
   const fromChains = beamConfigs.map((configItem) => {
+    const { chainId } = configItem;
     return {
       chainId: configItem.chainId,
       title: configItem.chainName,
-      icon: configItem.chainIcon,
+      icon: chainsList[chainId as keyof typeof chainsList].networkIcon,
       defaultValue: configItem.defaultValue,
     };
   });
 
-  const chainsInfo = chainConfig.filter((chain) => chain.chainId !== chainId);
+  const chainsInfo = chains.filter((chain) => chain.chainId !== chainId);
 
   const toChains = chainsInfo.map((chainItem) => {
     return {
       chainId: chainItem.chainId,
       lzChainId: chainItem.lzChainId,
-      title: chainItem.name,
-      icon: chainItem.icon,
+      title: chainItem.symbol,
+      icon: chainItem.networkIcon,
     };
   });
 
diff --git a/src/helpers/chain/getChainInfo.ts b/src/helpers/chain/getChainInfo.ts
deleted file mode 100644
index 0b682e8ed..000000000
--- a/src/helpers/chain/getChainInfo.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { useImage } from "@/helpers/useImage";
-// todo rename getNativeTokenInfoByChain
-
-const tokens: any = {
-  1: {
-    symbol: "ETH",
-    icon: useImage("assets/images/tokens/ETH.png"),
-    scanUrl: "https://etherscan.io/tx/",
-  },
-  10: {
-    symbol: "ETH",
-    icon: useImage("assets/images/tokens/ETH.png"),
-    scanUrl: "https://optimistic.etherscan.io/tx/",
-  },
-  56: {
-    symbol: "BNB",
-    icon: useImage("assets/images/tokens/BNB.png"),
-    scanUrl: "https://bscscan.com/tx/",
-  },
-  137: {
-    symbol: "MATIC",
-    icon: useImage("assets/images/tokens/MATIC.png"),
-    scanUrl: "https://polygonscan.com/tx/",
-  },
-  250: {
-    symbol: "FTM",
-    icon: useImage("assets/images/tokens/FTM2.png"),
-    scanUrl: "https://ftmscan.com/tx/",
-  },
-  1285: {
-    symbol: "MOVR",
-    icon: useImage("assets/images/tokens/MOVR.png"),
-    scanUrl: "https://moonriver.moonscan.io/tx/",
-  },
-  2222: {
-    symbol: "KAVA",
-    icon: useImage("assets/images/tokens/KAVA.png"),
-    scanUrl: "https://explorer.kava.io/tx/",
-  },
-  42161: {
-    symbol: "ETH",
-    icon: useImage("assets/images/tokens/ETH.png"),
-    scanUrl: "https://arbiscan.io/tx/",
-  },
-  43114: {
-    symbol: "AVAX",
-    icon: useImage("assets/images/tokens/AVAX.png"),
-    scanUrl: "https://snowtrace.io/tx/",
-  },
-  8453: {
-    symbol: "ETH",
-    icon: useImage("assets/images/tokens/ETH.png"),
-    scanUrl: "https://basescan.org/tx/",
-  },
-  59144: {
-    symbol: "ETH",
-    icon: useImage("assets/images/tokens/ETH.png"),
-    scanUrl: "https://lineascan.build/tx/",
-  },
-};
-
-export const getChainInfo = (chainId: number): Object => tokens[chainId];
diff --git a/src/helpers/chains/configs/arbitrum.ts b/src/helpers/chains/configs/arbitrum.ts
new file mode 100644
index 000000000..bb47aa1c7
--- /dev/null
+++ b/src/helpers/chains/configs/arbitrum.ts
@@ -0,0 +1,12 @@
+import { arbitrum } from "@wagmi/core/chains";
+import { useImage } from "@/helpers/useImage";
+
+export const arbitrumConfig = {
+  ...arbitrum,
+  chainId: arbitrum.id,
+  symbol: "AETH",
+  icon: useImage("assets/images/networks/arbitrum-icon.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/ETH.png"),
+  networkIcon: useImage(`assets/images/networks/arbitrum-chain.svg`),
+  lzChainId: 110,
+};
diff --git a/src/helpers/chains/configs/avalanche.ts b/src/helpers/chains/configs/avalanche.ts
new file mode 100644
index 000000000..2b4a5ae5f
--- /dev/null
+++ b/src/helpers/chains/configs/avalanche.ts
@@ -0,0 +1,12 @@
+import { useImage } from "@/helpers/useImage";
+import { avalanche } from "@wagmi/core/chains";
+
+export const avalancheConfig = {
+  ...avalanche,
+  chainId: avalanche.id,
+  symbol: "AVAX",
+  icon: useImage("assets/images/networks/avalanche.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/AVAX.png"),
+  networkIcon: useImage(`assets/images/networks/avalanche.svg`),
+  lzChainId: 106,
+};
diff --git a/src/helpers/chains/configs/base.ts b/src/helpers/chains/configs/base.ts
new file mode 100644
index 000000000..8749d64a1
--- /dev/null
+++ b/src/helpers/chains/configs/base.ts
@@ -0,0 +1,28 @@
+import { useImage } from "@/helpers/useImage";
+
+export const baseConfig = {
+  id: 8453,
+  chainId: 8453,
+  name: "Base",
+  network: "base-mainnet",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    public: { http: ["https://mainnet.base.org"] },
+    default: { http: ["https://mainnet.base.org"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "Basescan", url: "https://basescan.org" },
+    default: { name: "Basescan", url: "https://basescan.org" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xcA11bde05977b3631167028862bE2a173976CA11",
+      blockCreated: 5022,
+    },
+  },
+  symbol: "Base",
+  icon: useImage("assets/images/networks/base.png"),
+  baseTokenIcon: useImage("assets/images/tokens/ETH.png"),
+  networkIcon: useImage(`assets/images/networks/base.png`),
+  lzChainId: 184,
+};
diff --git a/src/helpers/chains/configs/binance.ts b/src/helpers/chains/configs/binance.ts
new file mode 100644
index 000000000..1c61fa875
--- /dev/null
+++ b/src/helpers/chains/configs/binance.ts
@@ -0,0 +1,12 @@
+import { bsc } from "@wagmi/core/chains";
+import { useImage } from "@/helpers/useImage";
+
+export const binanceConfig = {
+  ...bsc,
+  chainId: bsc.id,
+  symbol: "BSC",
+  icon: useImage("assets/images/networks/binance-icon.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/BNB.png"),
+  networkIcon: useImage(`assets/images/networks/binance.svg`),
+  lzChainId: 102,
+};
diff --git a/src/helpers/chains/configs/fantom.ts b/src/helpers/chains/configs/fantom.ts
new file mode 100644
index 000000000..16b2b69bd
--- /dev/null
+++ b/src/helpers/chains/configs/fantom.ts
@@ -0,0 +1,12 @@
+import { fantom } from "@wagmi/core/chains";
+import { useImage } from "@/helpers/useImage";
+
+export const fantomConfig = {
+  ...fantom,
+  chainId: fantom.id,
+  symbol: "FTM",
+  icon: useImage("assets/images/networks/fantom-icon.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/FTM2.png"),
+  networkIcon: useImage(`assets/images/networks/fantom.svg`),
+  lzChainId: 112,
+};
diff --git a/src/helpers/chains/configs/kava.ts b/src/helpers/chains/configs/kava.ts
new file mode 100644
index 000000000..c19034637
--- /dev/null
+++ b/src/helpers/chains/configs/kava.ts
@@ -0,0 +1,32 @@
+import { useImage } from "@/helpers/useImage";
+
+export const kavaConfig = {
+  id: 2222,
+  chainId: 2222,
+  name: "Kava EVM",
+  network: "Kava EVM",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Kava EVM",
+    symbol: "Kava",
+  },
+  rpcUrls: {
+    public: { http: ["https://evm.kava.io"] },
+    default: { http: ["https://evm.kava.io"] },
+  },
+  blockExplorers: {
+    etherscan: { name: "Kava", url: "https://explorer.kava.io" },
+    default: { name: "Kava", url: "https://explorer.kava.io" },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xcA11bde05977b3631167028862bE2a173976CA11",
+      blockCreated: 3661165,
+    },
+  },
+  symbol: "Kava EVM",
+  icon: useImage("assets/images/networks/kava.png"),
+  baseTokenIcon: useImage("assets/images/tokens/KAVA.png"),
+  networkIcon: useImage(`assets/images/networks/kava.png`),
+  lzChainId: 177,
+};
diff --git a/src/helpers/chains/configs/linea.ts b/src/helpers/chains/configs/linea.ts
new file mode 100644
index 000000000..3c1334c0d
--- /dev/null
+++ b/src/helpers/chains/configs/linea.ts
@@ -0,0 +1,34 @@
+import { useImage } from "@/helpers/useImage";
+
+export const lineaConfig = {
+  id: 59144,
+  chainId: 59144,
+  name: "Linea",
+  network: "Linea Mainnet",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  rpcUrls: {
+    public: { http: ["https://rpc.linea.build"] },
+    default: { http: ["https://rpc.linea.build"] },
+  },
+  blockExplorers: {
+    etherscan: {
+      name: "Lineascan",
+      url: "https://lineascan.build",
+    },
+    default: {
+      name: "Lineascan",
+      url: "https://lineascan.build",
+    },
+  },
+  contracts: {
+    multicall3: {
+      address: "0xcA11bde05977b3631167028862bE2a173976CA11",
+      blockCreated: 498623,
+    },
+  },
+  symbol: "Linea",
+  icon: useImage("assets/images/networks/linea.png"),
+  baseTokenIcon: useImage("assets/images/tokens/ETH.png"),
+  networkIcon: useImage(`assets/images/networks/linea.png`),
+  lzChainId: 183,
+};
diff --git a/src/helpers/chains/configs/mainnet.ts b/src/helpers/chains/configs/mainnet.ts
new file mode 100644
index 000000000..02849ef9a
--- /dev/null
+++ b/src/helpers/chains/configs/mainnet.ts
@@ -0,0 +1,17 @@
+import { mainnet } from "@wagmi/core/chains";
+import { useImage } from "@/helpers/useImage";
+import { MAINNET_RPC_URLS } from "@/constants/chains";
+
+const config = JSON.parse(JSON.stringify(mainnet));
+config.rpcUrls.default.http = MAINNET_RPC_URLS;
+config.rpcUrls.public.http = MAINNET_RPC_URLS;
+
+export const mainnetConfig = {
+  ...config,
+  chainId: config.id,
+  symbol: "ETH",
+  icon: useImage("assets/images/networks/ethereum-icon.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/ETH.png"),
+  networkIcon: useImage(`assets/images/networks/ethereum.svg`),
+  lzChainId: 101,
+};
diff --git a/src/helpers/chains/configs/moonriver.ts b/src/helpers/chains/configs/moonriver.ts
new file mode 100644
index 000000000..008fa98e4
--- /dev/null
+++ b/src/helpers/chains/configs/moonriver.ts
@@ -0,0 +1,12 @@
+import { useImage } from "@/helpers/useImage";
+import { moonriver } from "@wagmi/core/chains";
+
+export const moonriverConfig = {
+  ...moonriver,
+  chainId: moonriver.id,
+  symbol: "Moonriver",
+  icon: useImage("assets/images/networks/moonriver.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/MOVR.png"),
+  networkIcon: useImage(`assets/images/networks/moonriver.svg`),
+  lzChainId: 167,
+};
diff --git a/src/helpers/chains/configs/optimism.ts b/src/helpers/chains/configs/optimism.ts
new file mode 100644
index 000000000..ac822cf7c
--- /dev/null
+++ b/src/helpers/chains/configs/optimism.ts
@@ -0,0 +1,12 @@
+import { optimism } from "@wagmi/core/chains";
+import { useImage } from "@/helpers/useImage";
+
+export const optimismConfig = {
+  ...optimism,
+  chainId: optimism.id,
+  symbol: "OP",
+  icon: useImage("assets/images/networks/optimism-icon.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/ETH.png"),
+  networkIcon: useImage(`assets/images/networks/optimism.svg`),
+  lzChainId: 111,
+};
diff --git a/src/helpers/chains/configs/polygon.ts b/src/helpers/chains/configs/polygon.ts
new file mode 100644
index 000000000..711e26b2e
--- /dev/null
+++ b/src/helpers/chains/configs/polygon.ts
@@ -0,0 +1,12 @@
+import { polygon } from "@wagmi/core/chains";
+import { useImage } from "@/helpers/useImage";
+
+export const polygonConfig = {
+  ...polygon,
+  chainId: polygon.id,
+  symbol: "MATIC",
+  icon: useImage("assets/images/networks/polygon-icon.svg"),
+  baseTokenIcon: useImage("assets/images/tokens/MATIC.png"),
+  networkIcon: useImage(`assets/images/networks/polygon.svg`),
+  lzChainId: 109,
+};
diff --git a/src/helpers/chains/index.ts b/src/helpers/chains/index.ts
new file mode 100644
index 000000000..a8da86849
--- /dev/null
+++ b/src/helpers/chains/index.ts
@@ -0,0 +1,53 @@
+import { mainnetConfig } from "@/helpers/chains/configs/mainnet";
+import { optimismConfig } from "@/helpers/chains/configs/optimism";
+import { binanceConfig } from "@/helpers/chains/configs/binance";
+import { polygonConfig } from "@/helpers/chains/configs/polygon";
+import { fantomConfig } from "@/helpers/chains/configs/fantom";
+import { moonriverConfig } from "@/helpers/chains/configs/moonriver";
+import { kavaConfig } from "@/helpers/chains/configs/kava";
+import { baseConfig } from "@/helpers/chains/configs/base";
+import { arbitrumConfig } from "@/helpers/chains/configs/arbitrum";
+import { avalancheConfig } from "@/helpers/chains/configs/avalanche";
+import { lineaConfig } from "@/helpers/chains/configs/linea";
+
+export const chains = [
+  mainnetConfig,
+  optimismConfig,
+  binanceConfig,
+  polygonConfig,
+  fantomConfig,
+  moonriverConfig,
+  kavaConfig,
+  baseConfig,
+  arbitrumConfig,
+  avalancheConfig,
+  lineaConfig,
+];
+
+export const chainsList = {
+  1: mainnetConfig,
+  10: optimismConfig,
+  56: binanceConfig,
+  137: polygonConfig,
+  250: fantomConfig,
+  1285: moonriverConfig,
+  2222: kavaConfig,
+  8453: baseConfig,
+  42161: arbitrumConfig,
+  43114: avalancheConfig,
+  59144: lineaConfig,
+};
+
+export const defaultRpc = {
+  1: "https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
+  10: "https://mainnet.optimism.io",
+  56: "https://bsc-dataseed.binance.org/",
+  137: "https://polygon-rpc.com",
+  250: "https://rpc.ftm.tools/",
+  1285: "https://rpc.api.moonriver.moonbeam.network",
+  8453: "https://mainnet.base.org",
+  42161: "https://arb1.arbitrum.io/rpc",
+  43114: "https://api.avax.network/ext/bc/C/rpc",
+  2222: "https://evm.kava.io ",
+  59144: "https://rpc.linea.build",
+};
diff --git a/src/helpers/chains/switchNetwork.ts b/src/helpers/chains/switchNetwork.ts
new file mode 100644
index 000000000..10de998ab
--- /dev/null
+++ b/src/helpers/chains/switchNetwork.ts
@@ -0,0 +1,21 @@
+import { getWalletClient } from "@wagmi/core";
+import { chainsList } from "@/helpers/chains/index";
+
+export const switchNetwork = async (chainId: number) => {
+  const walletClient = await getWalletClient();
+  if (walletClient) {
+    try {
+      await walletClient.switchChain({ id: chainId });
+    } catch (error) {
+      if (String(error).indexOf("Unrecognized chain ID") !== -1) {
+        await walletClient.addChain({
+          chain: chainsList[chainId as keyof typeof chainsList],
+        });
+        await walletClient.switchChain({ id: chainId });
+      }
+    }
+  } else {
+    localStorage.setItem("MAGIC_MONEY_CHAIN_ID", chainId.toString());
+    window.location.reload();
+  }
+};
diff --git a/src/helpers/notification/notification.js b/src/helpers/notification/notification.js
index 2d271ac59..b838cf8ff 100644
--- a/src/helpers/notification/notification.js
+++ b/src/helpers/notification/notification.js
@@ -51,8 +51,15 @@ export default {
     msg: "The amount you are borrowing is higher than the maximum per wallet allowance. Please borrow less and try again.",
     type: "error",
   },
+
   whitelisted: {
     msg: "Your wallet is not currently whitelisted. Please try again once the whitelist is removed.",
     type: "error",
   },
+
+  sanctionAddress: {
+    title: "Sanction address Warning",
+    msg: "It looks like the address you have connected to Abracadabra UI is on a Sanction List. Abracadabra Money is not offering services to sanctioned addresses.",
+    type: "error",
+  },
 };
diff --git a/src/helpers/switchNetwork.js b/src/helpers/switchNetwork.js
deleted file mode 100644
index 4a47d086b..000000000
--- a/src/helpers/switchNetwork.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { getWalletClient } from "@wagmi/core";
-
-import {
-  mainnet,
-  optimism,
-  bsc,
-  polygon,
-  fantom,
-  moonriver,
-  arbitrum,
-  avalanche,
-} from "@wagmi/core/chains";
-import { kava } from "@/plugins/connectWallet/chains/kava";
-import { base } from "@/plugins/connectWallet/chains/base";
-import { linea } from "@/plugins/connectWallet/chains/linea";
-
-const chains = {
-  1: mainnet,
-  10: optimism,
-  56: bsc,
-  137: polygon,
-  250: fantom,
-  1285: moonriver,
-  2222: kava,
-  8453: base,
-  42161: arbitrum,
-  43114: avalanche,
-  59144: linea,
-};
-
-export default async (chainId) => {
-  const walletClient = await getWalletClient();
-  if (walletClient) {
-    try {
-      await walletClient.switchChain({ id: chainId });
-    } catch (error) {
-      if (String(error).indexOf("Unrecognized chain ID") !== -1) {
-        await walletClient.addChain({ chain: chains[chainId] });
-        await walletClient.switchChain({ id: chainId });
-      }
-    }
-  } else {
-    localStorage.setItem("MAGIC_MONEY_CHAIN_ID", chainId);
-    window.location.reload();
-  }
-};
diff --git a/src/mixins/chainSwitch.js b/src/mixins/chainSwitch.js
deleted file mode 100644
index d0768ac2b..000000000
--- a/src/mixins/chainSwitch.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { mapGetters } from "vuex";
-export default {
-  data() {
-    return {};
-  },
-  computed: {
-    ...mapGetters({ networks: "getAvailableNetworks" }),
-  },
-  methods: {
-    async switchNetwork(chainId) {
-      const provider = this.$store.getters.getProvider;
-      const isCoinbase = this.$store.getters.getIsCoinbase;
-      const data = this.networks.find(
-        (item) => item.chainId === chainId
-      )?.switchData;
-      try {
-        await provider.provider.request({
-          method: "wallet_switchEthereumChain",
-          params: [
-            {
-              chainId: data.chainId === "0x01" ? "0x1" : data.chainId,
-            },
-          ],
-        });
-
-        if (isCoinbase) {
-          window.location.reload();
-        }
-      } catch (error) {
-        console.log("switch network err:", error);
-
-        try {
-          await provider.provider.request({
-            method: "wallet_addEthereumChain",
-            params: [data],
-          });
-
-          if (isCoinbase) {
-            window.location.reload();
-          }
-        } catch (e) {
-          console.log("wallet_addEthereumChain err:", e);
-        }
-      }
-    },
-    switchNetworkWithoutConnect(chainId) {
-      localStorage.setItem("MAGIC_MONEY_CHAIN_ID", chainId);
-      window.location.reload();
-    },
-  },
-};
diff --git a/src/mixins/getCollateralLogic/threeCryptoDeposit.js b/src/mixins/getCollateralLogic/threeCryptoDeposit.js
deleted file mode 100644
index 4b91b1905..000000000
--- a/src/mixins/getCollateralLogic/threeCryptoDeposit.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import { markRaw } from "vue";
-import depositConf from "@/utils/collateralConfig/crv3crypto/depositConfig";
-import { mapGetters } from "vuex";
-
-export default {
-  computed: {
-    ...mapGetters({
-      chainId: "getChainId",
-      signer: "getSigner",
-      account: "getAccount",
-    }),
-  },
-  methods: {
-    async createCrvDeposit() {
-      if (!depositConf) {
-        return false;
-      }
-
-      if (this.chainId !== 1) return false;
-
-      const { mainToken, depositToken, stakeToken } = depositConf;
-
-      const mainTokenInstance = new this.$ethers.Contract(
-        mainToken.address,
-        JSON.stringify(mainToken.abi),
-        this.signer
-      );
-
-      let mainTokenBalance = await mainTokenInstance.balanceOf(this.account);
-
-      mainTokenBalance = this.$ethers.utils.formatUnits(
-        mainTokenBalance.toString(),
-        mainToken.decimals
-      );
-
-      const depositTokenInstance = new this.$ethers.Contract(
-        depositToken.address,
-        JSON.stringify(depositToken.abi),
-        this.signer
-      );
-
-      let depositTokenBalance = await depositTokenInstance.balanceOf(
-        this.account
-      );
-
-      depositTokenBalance = this.$ethers.utils.formatUnits(
-        depositTokenBalance.toString(),
-        depositToken.decimals
-      );
-
-      const stakeTokenInstance = new this.$ethers.Contract(
-        stakeToken.address,
-        JSON.stringify(stakeToken.abi),
-        this.signer
-      );
-
-      let stakeTokenBalance = await stakeTokenInstance.balanceOf(this.account);
-
-      stakeTokenBalance = this.$ethers.utils.formatUnits(
-        stakeTokenBalance.toString(),
-        stakeToken.decimals
-      );
-
-      const tokensRate = 1;
-
-      const isTokenDepositApprowed = await this.isTokenApprowed(
-        depositTokenInstance,
-        this.account,
-        mainToken.address
-      );
-
-      const isTokenStakeApprowed = await this.isTokenApprowed(
-        stakeTokenInstance,
-        this.account,
-        mainToken.address
-      );
-
-      const stakeObject = {
-        tokensRate,
-        mainToken: {
-          ...mainToken,
-          contractInstance: mainTokenInstance,
-          balance: mainTokenBalance,
-        },
-        depositToken: {
-          ...depositToken,
-          contractInstance: depositTokenInstance,
-          balance: depositTokenBalance,
-          isTokenApprowed: isTokenDepositApprowed,
-        },
-        stakeToken: {
-          ...stakeToken,
-          contractInstance: stakeTokenInstance,
-          balance: stakeTokenBalance,
-          isTokenApprowed: isTokenStakeApprowed,
-        },
-      };
-
-      return markRaw(stakeObject);
-    },
-
-    async isTokenApprowed(tokenContract, userAddr, approveAddr) {
-      try {
-        const addressApprowed = await tokenContract.allowance(
-          userAddr,
-          approveAddr
-        );
-
-        return parseFloat(addressApprowed.toString()) > 0;
-      } catch (e) {
-        console.log("isApprowed err:", e);
-        return false;
-      }
-    },
-  },
-};
diff --git a/src/store/modules/connectProvider.js b/src/store/modules/connectProvider.js
index 48aafeccb..c0592d7a3 100644
--- a/src/store/modules/connectProvider.js
+++ b/src/store/modules/connectProvider.js
@@ -1,4 +1,5 @@
 import { ethers } from "ethers";
+import { MAINNET_RPC_URLS } from "@/constants/chains";
 
 export default {
   state: {
@@ -6,7 +7,6 @@ export default {
     signer: null,
     account: null,
     ensName: null,
-    chainId: null,
     isMetamaskActive: false,
     isCoinbase: false,
     isWalletConnected: false,
@@ -25,9 +25,6 @@ export default {
     setENSName(state, payload) {
       state.ensName = payload;
     },
-    setChainId(state, payload) {
-      state.chainId = payload;
-    },
     setWalletConnection(state, payload) {
       state.isWalletConnected = payload;
     },
@@ -46,12 +43,10 @@ export default {
     async checkENSName({ commit }, address) {
       try {
         const ensName = await new ethers.providers.StaticJsonRpcProvider(
-          "https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161"
+          MAINNET_RPC_URLS
         ).lookupAddress(address);
 
-        if (ensName) {
-          commit("setENSName", ensName);
-        }
+        if (ensName) commit("setENSName", ensName);
       } catch (error) {
         console.log("fetchENSName ERR:", error);
       }
@@ -62,10 +57,7 @@ export default {
     getSigner: (state) => state.signer,
     getAccount: (state) => state.account,
     getEnsName: (state) => state.ensName,
-    getChainId: (state) => state.chainId,
     getWalletIsConnected: (state) => state.isWalletConnected,
-    getWalletCheckInProcess: (state) => state.walletCheckInProcess,
     getMetamaskActive: (state) => state.isMetamaskActive,
-    getIsCoinbase: (state) => state.isCoinbase,
   },
 };
diff --git a/src/store/modules/networks.js b/src/store/modules/networks.js
index 763ea85b2..2710f18fe 100644
--- a/src/store/modules/networks.js
+++ b/src/store/modules/networks.js
@@ -1,193 +1,20 @@
-import ethIcon from "@/assets/images/networks/ethereum-icon.svg";
-import fantomIcon from "@/assets/images/networks/fantom-icon.svg";
-import polygonIcon from "@/assets/images/networks/polygon-icon.svg";
-import binanceIcon from "@/assets/images/networks/binance-icon.svg";
-import avalancheIcon from "@/assets/images/networks/avalanche-icon.png";
-import arbitrumIcon from "@/assets/images/networks/arbitrum-icon.svg";
-import optimismIcon from "@/assets/images/networks/optimism-icon.svg";
-import moonriver from "@/assets/images/networks/moonriver.svg";
-import kava from "@/assets/images/networks/kava.png";
-import base from "@/assets/images/networks/base.png";
-import linea from "@/assets/images/networks/linea.png";
-
-import { providers } from "ethers";
+import { chains } from "@/helpers/chains";
 
 export default {
   state: {
-    networks: [
-      {
-        chainId: 1,
-        name: "ETH",
-        rpc: "https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
-        icon: ethIcon,
-        switchData: {
-          chainId: "0x01",
-        },
-      },
-      {
-        chainId: 42161,
-        name: "AETH",
-        rpc: "https://arb1.arbitrum.io/rpc",
-        icon: arbitrumIcon,
-        switchData: {
-          chainId: "0xa4b1",
-          chainName: "Arbitrum One",
-
-          rpcUrls: ["https://arb1.arbitrum.io/rpc"],
-
-          blockExplorerUrls: ["https://arbiscan.io"],
-        },
-      },
-      {
-        chainId: 43114,
-        name: "AVAX",
-        rpc: "https://api.avax.network/ext/bc/C/rpc",
-        icon: avalancheIcon,
-        switchData: {
-          chainId: "0xa86a",
-          chainName: "Avalanche Mainnet",
-
-          rpcUrls: ["https://api.avax.network/ext/bc/C/rpc"],
-
-          blockExplorerUrls: ["https://cchain.explorer.avax.network/"],
-        },
-      },
-      {
-        chainId: 250,
-        name: "FTM",
-        rpc: "https://rpc.ftm.tools/",
-        icon: fantomIcon,
-        switchData: {
-          chainId: "0xfa",
-          chainName: "Fantom Opera Mainnet",
-
-          rpcUrls: [
-            "https://rpcapi.fantom.network/",
-            "https://rpc.fantom.network/",
-          ],
-
-          iconUrls: ["https://ftmscan.com/images/logo-ftmscan.svg?v=0.0.2"],
-
-          blockExplorerUrls: ["https://ftmscan.com/"],
-
-          nativeCurrency: {
-            name: "Fantom",
-            symbol: "FTM",
-            decimals: 18,
-          },
-        },
-      },
-      {
-        chainId: 56,
-        name: "BSC",
-        rpc: "https://bsc-dataseed.binance.org/",
-        icon: binanceIcon,
-        switchData: {
-          chainId: "0x38",
-          chainName: "Binance Smart Chain",
-          nativeCurrency: {
-            name: "BNB",
-            symbol: "BNB",
-            decimals: 18,
-          },
-          rpcUrls: [
-            "https://bsc-dataseed.binance.org/",
-            "https://bsc-dataseed1.defibit.io/",
-            "https://bsc-dataseed1.ninicoin.io/",
-          ],
-          blockExplorerUrls: ["https://bscscan.com"],
-          iconUrls: [
-            "https://s2.coinmarketcap.com/static/img/coins/200x200/1839.png",
-          ],
-        },
-      },
-      {
-        chainId: 137,
-        name: "MATIC",
-        rpc: null,
-        icon: polygonIcon,
-        switchData: {
-          chainId: "0x89",
-          chainName: "Polygon Mainnet",
-
-          rpcUrls: ["https://polygon-rpc.com/"],
-
-          iconUrls: ["https://polygonscan.com/images/svg/brands/polygon.svg"],
-
-          blockExplorerUrls: ["https://polygonscan.com/"],
-
-          nativeCurrency: {
-            name: "Polygon",
-            symbol: "MATIC",
-            decimals: 18,
-          },
-        },
-      },
-      {
-        chainId: 10,
-        name: "OP",
-        rpc: null,
-        icon: optimismIcon,
-        switchData: {
-          chainId: "0xa",
-          chainName: "Optimism (mainnet)",
-          rpcUrls: ["https://mainnet.optimism.io"],
-          blockExplorerUrls: ["https://optimistic.etherscan.io"],
-        },
-      },
-      {
-        chainId: 1285,
-        name: "Moonriver",
-        rpc: "https://rpc.api.moonriver.moonbeam.network",
-        icon: moonriver,
-        switchData: {
-          chainId: "0x505",
-          chainName: "Moonriver",
-          rpcUrls: ["https://rpc.api.moonriver.moonbeam.network"],
-          blockExplorerUrls: ["https://moonriver.moonscan.io/"],
-        },
-      },
-      {
-        chainId: 2222,
-        name: "Kava EVM",
-        rpc: "https://arb1.arbitrum.io/rpc",
-        icon: kava,
-        switchData: {
-          chainId: "0x8ae",
-          chainName: "Kava EVM",
-
-          rpcUrls: ["https://evm.kava.io"],
-
-          blockExplorerUrls: ["https://explorer.kava.io"],
-        },
-      },
-      {
-        chainId: 8453,
-        name: "Base",
-        rpc: "https://mainnet.base.org",
-        icon: base,
-      },
-      {
-        chainId: 59144,
-        name: "Linea",
-        rpc: "https://rpc.linea.build",
-        icon: linea,
-      },
-    ],
+    networks: chains,
+    chainId: null,
+  },
+  mutations: {
+    setChainId(state, payload) {
+      state.chainId = payload;
+    },
   },
   getters: {
     getAvailableNetworks: (state) => state.networks,
-    getChainIcon: (state) => (chainId) => {
-      const network = state.networks.find(
-        (network) => network.chainId === +chainId
-      );
-      return network.icon;
-    },
-    getDefaultSigner: (state) => (chainId) => {
-      const chain = state.networks.find(
-        (network) => network.chainId == chainId
-      );
-      return new providers.StaticJsonRpcProvider(chain.rpc);
+    getChainId: (state) => state.chainId,
+    getChainById: (state) => (chainId) => {
+      return state.networks.find((chain) => chain.chainId === chainId);
     },
   },
 };
diff --git a/src/utils/beam/beamConfigs.ts b/src/utils/beam/beamConfigs.ts
index c75877779..b5b59e661 100644
--- a/src/utils/beam/beamConfigs.ts
+++ b/src/utils/beam/beamConfigs.ts
@@ -1,22 +1,8 @@
 import abi from "@/utils/abi/beam/";
-import { useImage } from "@/helpers/useImage";
-
-const ethIcon = useImage(`assets/images/networks/ethereum.svg`);
-const binanceIcon = useImage(`assets/images/networks/binance.svg`);
-const fantomIcon = useImage(`assets/images/networks/fantom.svg`);
-const avalancheIcon = useImage(`assets/images/networks/avalanche.svg`);
-const arbitrumIcon = useImage(`assets/images/networks/arbitrum-chain.svg`);
-const polygonIcon = useImage(`assets/images/networks/polygon.svg`);
-const optimismIcon = useImage(`assets/images/networks/optimism.svg`);
-const moonriver = useImage(`assets/images/networks/moonriver.svg`);
-const kava = useImage(`assets/images/networks/kava.png`);
-const base = useImage(`assets/images/networks/base.png`);
-const linea = useImage(`assets/images/networks/linea.png`);
 
 export type BeamConfig = {
   chainId: number;
   chainName: string;
-  chainIcon: string;
   contract: {
     address: string;
     abi: any;
@@ -28,7 +14,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 1,
     chainName: "Ethereum",
-    chainIcon: ethIcon,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -48,7 +33,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 56,
     chainName: "BSC",
-    chainIcon: binanceIcon,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -69,7 +53,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 42161,
     chainName: "Arbitrum",
-    chainIcon: arbitrumIcon,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -90,7 +73,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 137,
     chainName: "Polygon",
-    chainIcon: polygonIcon,
     contract: {
       address: "0xE1261E47b08a22Df93af46889EE504C2Aa6DfD4c",
       abi: abi.OFTWrapper,
@@ -111,7 +93,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 10,
     chainName: "Optimism",
-    chainIcon: optimismIcon,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -132,7 +113,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 43114,
     chainName: "Avalanche",
-    chainIcon: avalancheIcon,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -153,7 +133,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 250,
     chainName: "Fantom",
-    chainIcon: fantomIcon,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -174,7 +153,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 1285,
     chainName: "Moonriver",
-    chainIcon: moonriver,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -195,7 +173,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 2222,
     chainName: "Kava EVM",
-    chainIcon: kava,
     contract: {
       address: "0x287176dfBEC7E8cee0f876FC7B52960ee1784AdC",
       abi: abi.OFTWrapper,
@@ -216,7 +193,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 8453,
     chainName: "Base",
-    chainIcon: base,
     contract: {
       address: "0x4035957323FC05AD9704230E3dc1E7663091d262",
       abi: abi.LzIndirectOFTV2,
@@ -237,7 +213,6 @@ const config: Array<BeamConfig> = [
   {
     chainId: 59144,
     chainName: "Linea",
-    chainIcon: linea,
     contract: {
       address: "0x60bbeFE16DC584f9AF10138Da1dfbB4CDf25A097",
       abi: abi.LzIndirectOFTV2,
diff --git a/src/utils/beam/chainConfig.ts b/src/utils/beam/chainConfig.ts
deleted file mode 100644
index 389d30ce1..000000000
--- a/src/utils/beam/chainConfig.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { useImage } from "@/helpers/useImage";
-
-const ethIcon = useImage(`assets/images/networks/ethereum.svg`);
-const binanceIcon = useImage(`assets/images/networks/binance.svg`);
-const fantomIcon = useImage(`assets/images/networks/fantom.svg`);
-const avalancheIcon = useImage(`assets/images/networks/avalanche.svg`);
-const arbitrumIcon = useImage(`assets/images/networks/arbitrum-chain.svg`);
-const polygonIcon = useImage(`assets/images/networks/polygon.svg`);
-const optimismIcon = useImage(`assets/images/networks/optimism.svg`);
-const moonriver = useImage(`assets/images/networks/moonriver.svg`);
-const kava = useImage(`assets/images/networks/kava.png`);
-const base = useImage(`assets/images/networks/base.png`);
-const linea = useImage(`assets/images/networks/linea.png`);
-
-export type ChainConfig = {
-  name: string;
-  icon: string;
-  chainId: number;
-  lzChainId: number;
-};
-
-const config: Array<ChainConfig> = [
-  {
-    name: "Ethereum",
-    icon: ethIcon,
-    chainId: 1,
-    lzChainId: 101,
-  },
-  {
-    name: "BSC",
-    icon: binanceIcon,
-    chainId: 56,
-    lzChainId: 102,
-  },
-  {
-    name: "Arbitrum",
-    icon: arbitrumIcon,
-    chainId: 42161,
-    lzChainId: 110,
-  },
-  {
-    name: "Polygon",
-    icon: polygonIcon,
-    chainId: 137,
-    lzChainId: 109,
-  },
-  {
-    name: "Optimism",
-    icon: optimismIcon,
-    chainId: 10,
-    lzChainId: 111,
-  },
-  {
-    name: "Avalanche",
-    icon: avalancheIcon,
-    chainId: 43114,
-    lzChainId: 106,
-  },
-  {
-    name: "Fantom",
-    icon: fantomIcon,
-    chainId: 250,
-    lzChainId: 112,
-  },
-  {
-    name: "Moonriver",
-    icon: moonriver,
-    chainId: 1285,
-    lzChainId: 167,
-  },
-  {
-    name: "Kava EVM",
-    icon: kava,
-    chainId: 2222,
-    lzChainId: 177,
-  },
-  {
-    name: "Base",
-    icon: base,
-    chainId: 8453,
-    lzChainId: 184,
-  },
-  {
-    name: "Linea",
-    icon: linea,
-    chainId: 59144,
-    lzChainId: 183,
-  },
-];
-
-export default config;
diff --git a/src/utils/beam/scanConfig.ts b/src/utils/beam/scanConfig.ts
deleted file mode 100644
index f7769006b..000000000
--- a/src/utils/beam/scanConfig.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-const config = {
-  1: { name: "Etherscan", url: "https://etherscan.io/tx/" },
-  10: { name: "Optimistscan", url: "https://optimistic.etherscan.io/tx/" },
-  56: { name: "Bscscan", url: "https://bscscan.com/tx/" },
-  137: { name: "Polygonscan", url: "https://polygonscan.com/tx/" },
-  250: { name: "Ftmscan", url: "https://ftmscan.com/tx/" },
-  1285: { name: "Moonscan", url: "https://moonriver.moonscan.io/tx/" },
-  8453: { name: "Base", url: "https://basescan.org/tx/" },
-  2222: { name: "Explorer Kava", url: "https://explorer.kava.io/tx/" },
-  42161: { name: "Arbiscan", url: "https://arbiscan.io/tx/" },
-  43114: { name: "Snowtrace", url: "https://snowtrace.io/tx/" },
-  59144: { name: "Lineascan", url: "https://lineascan.build/tx/" },
-};
-
-export default config;
diff --git a/src/utils/collateralConfig/crv3crypto/depositConfig.js b/src/utils/collateralConfig/crv3crypto/depositConfig.js
deleted file mode 100644
index 92a43f0bc..000000000
--- a/src/utils/collateralConfig/crv3crypto/depositConfig.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import depositTokenAbi from "@/utils/abi/tokensAbi/crv3crypto";
-import mainTokenAbi from "@/utils/abi/tokensAbi/stkcvxcrv3crypto";
-import stakeTokenAbi from "@/utils/abi/tokensAbi/cvxcrv3crypto";
-import { useImage } from "@/helpers/useImage";
-
-export default {
-  depositToken: {
-    name: "3Crypto2",
-    icon: useImage(`assets/images/tokens/3Crypto2.png`),
-
-    decimals: 18,
-    address: "0xc4AD29ba4B3c580e6D59105FFf484999997675Ff",
-    abi: depositTokenAbi,
-  },
-  stakeToken: {
-    name: "Tricripto2",
-    decimals: 18,
-    address: "0x903C9974aAA431A765e60bC07aF45f0A1B3b61fb",
-    abi: stakeTokenAbi,
-  },
-  mainToken: {
-    name: "cvxtricrypto2",
-    icon: useImage(`assets/images/tokens/Convex-Curve3.png`),
-    decimals: 18,
-    address: "0x5958A8DB7dfE0CC49382209069b00F54e17929C2",
-    abi: mainTokenAbi,
-  },
-};
diff --git a/src/views/Beam.vue b/src/views/Beam.vue
index d9aac2b5b..26749af9a 100644
--- a/src/views/Beam.vue
+++ b/src/views/Beam.vue
@@ -125,13 +125,12 @@ import {
 import filters from "@/filters/index.js";
 import { defineAsyncComponent } from "vue";
 import { useImage } from "@/helpers/useImage";
-import switchNetwork from "@/helpers/switchNetwork";
 import { approveToken } from "@/helpers/approval.ts";
 import { sendFrom } from "@/helpers/beam/sendFrom.ts";
 import { mapGetters, mapActions, mapMutations } from "vuex";
 import { getMimPrice } from "@/helpers/prices/getMimPrice.ts";
+import { switchNetwork } from "@/helpers/chains/switchNetwork";
 import { getNativeTokenPrice } from "@/helpers/priceHelper.js";
-import { getChainInfo } from "@/helpers/chain/getChainInfo.ts";
 import { getDstTokenMax } from "@/helpers/beam/getDstTokenMax.ts";
 import notification from "@/helpers/notification/notification.js";
 import { createBeamConfig } from "@/helpers/beam/createBeamConfig";
@@ -178,6 +177,7 @@ export default {
       signer: "getSigner",
       provider: "getProvider",
       chainId: "getChainId",
+      getChainById: "getChainById",
     }),
 
     isUnsupportedNetwork() {
@@ -312,11 +312,11 @@ export default {
     },
 
     srcTokenInfo() {
-      return getChainInfo(this.chainId);
+      return this.getChainById(this.chainId);
     },
 
     dstTokenInfo() {
-      return getChainInfo(this.targetToChain);
+      return this.getChainById(this.targetToChain);
     },
 
     getFee() {
@@ -341,7 +341,7 @@ export default {
 
     settingConfig() {
       return {
-        icon: this.dstTokenInfo.icon,
+        icon: this.dstTokenInfo.baseTokenIcon,
         nativeTokenBalance: this.beamConfig.nativeTokenBalance,
         nativeSymbol: this.srcTokenInfo?.symbol,
         contract: this.beamConfig.contractInstance,
diff --git a/src/views/Claim.vue b/src/views/Claim.vue
index 4e7ee30cb..79e4f350b 100644
--- a/src/views/Claim.vue
+++ b/src/views/Claim.vue
@@ -330,7 +330,7 @@ export default {
       return filters.formatTokenBalance(value);
     },
     async actionHandler() {
-      if (!this.account) await this.$connectWallet();
+      if (!this.account) await this.$openWeb3modal();
       else {
         if (this.isApproveMasterContracts) {
           const arr = this.isEthChain
diff --git a/src/views/borrow/Borrow.vue b/src/views/borrow/Borrow.vue
index be0c4d0a2..2182f883e 100644
--- a/src/views/borrow/Borrow.vue
+++ b/src/views/borrow/Borrow.vue
@@ -143,7 +143,6 @@ import { defineAsyncComponent } from "vue";
 import { useImage } from "@/helpers/useImage";
 import cookMixin from "@/mixins/borrow/cooksV2.js";
 import { mapGetters, mapActions, mapMutations } from "vuex";
-import { getChainInfo } from "@/helpers/chain/getChainInfo.ts";
 import notification from "@/helpers/notification/notification.js";
 import { getCauldronInfo } from "@/helpers/cauldron/getCauldronInfo";
 import { approveToken } from "@/helpers/approval";
@@ -174,6 +173,7 @@ export default {
       account: "getAccount",
       provider: "getProvider",
       signer: "getSigner",
+      getChainById: "getChainById",
     }),
 
     isCauldronLoading() {
@@ -264,12 +264,12 @@ export default {
     },
 
     nativeToken() {
-      const { symbol, icon } = getChainInfo(this.chainId);
+      const { symbol, baseTokenIcon } = this.getChainById(this.chainId);
       const { nativeTokenBalance } = this.cauldron.userTokensInfo;
 
       return {
         name: symbol,
-        icon,
+        icon: baseTokenIcon,
         balance: {
           hex: nativeTokenBalance,
           value: utils.formatUnits(nativeTokenBalance),
diff --git a/src/views/borrow/Leverage.vue b/src/views/borrow/Leverage.vue
index a1412209d..72fd5fd1e 100644
--- a/src/views/borrow/Leverage.vue
+++ b/src/views/borrow/Leverage.vue
@@ -162,7 +162,6 @@ import { defineAsyncComponent } from "vue";
 import { useImage } from "@/helpers/useImage";
 import cookMixin from "@/mixins/borrow/cooksV2.js";
 import { mapGetters, mapActions, mapMutations } from "vuex";
-import { getChainInfo } from "@/helpers/chain/getChainInfo.ts";
 import notification from "@/helpers/notification/notification.js";
 import { getCauldronInfo } from "@/helpers/cauldron/getCauldronInfo";
 import { approveToken } from "@/helpers/approval";
@@ -198,6 +197,7 @@ export default {
       account: "getAccount",
       provider: "getProvider",
       signer: "getSigner",
+      getChainById: "getChainById",
     }),
 
     isCauldronLoading() {
@@ -473,13 +473,13 @@ export default {
     },
 
     nativeToken() {
-      const { symbol, icon } = getChainInfo(this.chainId);
+      const { symbol, baseTokenIcon } = this.getChainById(this.chainId);
       const { nativeTokenBalance } = this.cauldron.userTokensInfo;
       const { collateral } = this.cauldron.contracts;
 
       return {
         name: symbol,
-        icon,
+        icon: baseTokenIcon,
         balance: utils.formatUnits(nativeTokenBalance),
         decimals: 18,
         allowance: BigNumber.from(MAX_ALLOWANCE_VALUE),