Merge pull request #137 from BuidlerDAO/optimize-chain-config

Optimize chain config
BuidlerDAO · Apr 30, 2024 · 3f53af8 · 3f53af8
2 parents 568fdf6 + 5034400
commit 3f53af8
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 77 deletions.
diff --git a/src/components/Select/index.tsx b/src/components/Select/index.tsx
@@ -1,28 +1,25 @@
 import React from 'react';
 import { MenuItem, Select, SelectChangeEvent } from '@mui/material';
 
-import { getCurrentChain } from '../../config/chainConfig';
-interface TSelectProps {
-  handleChange: (value: string) => void;
-}
+import { Chain } from '../../config/chainConfig';
+import useGlobalStore from '../../store/useGlobalStore';
 
-const TSelect: React.FC<TSelectProps> = ({ handleChange }) => {
-  const [selectedValue, setSelectedValue] = React.useState(getCurrentChain());
+const TSelect = () => {
+  const { chain } = useGlobalStore();
 
-  const handleInternalChange = (event: SelectChangeEvent<string>) => {
-    const value = event.target.value;
-    setSelectedValue(value);
-    handleChange(value); // 调用传入的 handleChange 函数
+  const handleInternalChange = (event: SelectChangeEvent<Chain>) => {
+    const value = event.target.value as Chain;
+    useGlobalStore.setState({ chain: value });
   };
 
   return (
-    <Select
-      value={selectedValue}
+    <Select<Chain>
+      value={chain}
       onChange={handleInternalChange}
       style={{ minWidth: '120px', height: '60px' }}
     >
-      <MenuItem value="arb">arb</MenuItem>
-      <MenuItem value="bera">bera</MenuItem>
+      <MenuItem value={Chain.Arb}>{Chain.Arb}</MenuItem>
+      <MenuItem value={Chain.Bera}>{Chain.Bera}</MenuItem>
     </Select>
   );
 };

diff --git a/src/config/chainConfig.ts b/src/config/chainConfig.ts
@@ -1,39 +1,33 @@
-import { XFANS_NETWORK_ARB, XFANS_NETWORK_BERA } from '../constants';
-interface ChainConfigType {
+export enum Chain {
+  Arb = 'arb',
+  Bera = 'bera',
+}
+
+export const chainNameMap = {
+  [Chain.Arb]: 'Arb Sepolia',
+  [Chain.Bera]: 'Bera Artio',
+};
+
+export interface ChainConfigType {
   vite_socket_base_url: string;
   vite_room_base_url: string;
   vite_contract_base_url: string;
   vite_base_url: string;
 }
 
-const _chainConfig: Record<string, ChainConfigType> = {
-  arb: {
-    vite_socket_base_url: import.meta.env.VITE_ARB_SOCKET_BASE_URL!,
-    vite_room_base_url: import.meta.env.VITE_ARB_ROOM_BASE_URL!,
-    vite_contract_base_url: import.meta.env.VITE_ARB_CONTRACT_BASE_URL!,
-    vite_base_url: import.meta.env.VITE_ARB_BASE_URL!,
+const chainConfig: Record<Chain, ChainConfigType> = {
+  [Chain.Arb]: {
+    vite_socket_base_url: import.meta.env.VITE_ARB_SOCKET_BASE_URL,
+    vite_room_base_url: import.meta.env.VITE_ARB_ROOM_BASE_URL,
+    vite_contract_base_url: import.meta.env.VITE_ARB_CONTRACT_BASE_URL,
+    vite_base_url: import.meta.env.VITE_ARB_BASE_URL,
   },
-  bera: {
-    vite_socket_base_url: import.meta.env.VITE_BERA_SOCKET_BASE_URL!,
-    vite_room_base_url: import.meta.env.VITE_BERA_ROOM_BASE_URL!,
-    vite_contract_base_url: import.meta.env.VITE_BERA_CONTRACT_BASE_URL!,
-    vite_base_url: import.meta.env.VITE_BERA_BASE_URL!,
+  [Chain.Bera]: {
+    vite_socket_base_url: import.meta.env.VITE_BERA_SOCKET_BASE_URL,
+    vite_room_base_url: import.meta.env.VITE_BERA_ROOM_BASE_URL,
+    vite_contract_base_url: import.meta.env.VITE_BERA_CONTRACT_BASE_URL,
+    vite_base_url: import.meta.env.VITE_BERA_BASE_URL,
   },
 };
 
-console.log('_chainConfig', _chainConfig);
-const ChainConfig = () => {
-  if (getCurrentChain() == '') console.error('chain info undefined!');
-  return _chainConfig[getCurrentChain()];
-};
-
-export const getCurrentChain = () => localStorage.getItem('current_chain') ?? 'arb';
-export const setCurrentChain = (chain: string) => {
-  localStorage.setItem('current_chain', chain);
-};
-
-export const getCurrentChainName = () => {
-  return getCurrentChain() == 'arb' ? XFANS_NETWORK_ARB : XFANS_NETWORK_BERA;
-};
-
-export default ChainConfig;
+export default chainConfig;
diff --git a/src/constants.ts b/src/constants.ts
@@ -19,8 +19,5 @@ export enum ContractError {
 export const XFANS_CONTENT_WIDTH = 433;
 export const XFANS_MIN_WIDTH = 458;
 
-export const XFANS_NETWORK_ARB = 'Arb Sepolia';
-export const XFANS_NETWORK_BERA = 'Bera Artio';
-
 // shares 精度单位，输出除以10，输入乘以10
 export const SHARE_UNIT_MODIFIER = 10;
diff --git a/src/content/drawer/index.tsx b/src/content/drawer/index.tsx
@@ -5,7 +5,6 @@ import Divider from '@mui/material/Divider';
 import Drawer from '@mui/material/Drawer';
 
 import * as toaster from '../../components/Toaster';
-import { getCurrentChain, setCurrentChain } from '../../config/chainConfig';
 import { XFANS_CONTENT_WIDTH } from '../../constants';
 import { XFANS_TOKEN } from '../../constants';
 import { ProfileData } from '../../service/login/me';
@@ -243,11 +242,6 @@ export default function PersistentDrawerRight() {
                   });
                   clickLogin();
                 }}
-                handleSwitchSelect={(x: string) => {
-                  setCurrentChain(x);
-                  console.log('select chain', getCurrentChain());
-                  checkProfileData();
-                }}
               />
             )}
             {page === PageType.Invite && (

diff --git a/src/content/loginPage/signInWithXPage.tsx b/src/content/loginPage/signInWithXPage.tsx
@@ -2,21 +2,15 @@ import React, { FC } from 'react';
 
 import { NextButton } from '../../components/buttons/loginButton';
 import TSelect from '../../components/Select/index';
-import { getCurrentChain, setCurrentChain } from '../../config/chainConfig';
 
 import '../../tailwind.css';
 
 interface SignInWithXPageProps {
   handleButtonClick: () => void; // 定义一个函数类型的属性
-  handleSwitchSelect: (x: string) => void;
   showLoading: boolean;
 }
 
-const SignInWithXPage: FC<SignInWithXPageProps> = ({
-  handleButtonClick,
-  handleSwitchSelect,
-  showLoading,
-}) => {
+const SignInWithXPage: FC<SignInWithXPageProps> = ({ handleButtonClick, showLoading }) => {
   return (
     <div className="h-full min-h-screen w-full items-center justify-center text-center">
       <img
@@ -60,7 +54,7 @@ const SignInWithXPage: FC<SignInWithXPageProps> = ({
           'Login With X'
         )}
       </NextButton>
-      <TSelect handleChange={handleSwitchSelect} />
+      <TSelect />
     </div>
   );
 };

diff --git a/src/service/request.ts b/src/service/request.ts
@@ -7,7 +7,7 @@ import axios, {
 } from 'axios';
 
 import * as toaster from '../components/Toaster';
-import ChainConfig, { getCurrentChain } from '../config/chainConfig';
+import chainConfig from '../config/chainConfig';
 import useGlobalStore from '../store/useGlobalStore';
 
 import { checkStatus } from './checkStatus';
@@ -33,7 +33,7 @@ export enum ResultEnum {
 
 const config = {
   // 默认地址请求地址，可在 .env.** 文件中修改
-  baseURL: ChainConfig().vite_base_url,
+  baseURL: chainConfig[useGlobalStore.getState().chain].vite_base_url,
   // 设置超时时间
   timeout: ResultEnum.TIMEOUT as number,
   // 跨域时候允许携带凭证
@@ -42,7 +42,7 @@ const config = {
 
 const contractConfig = {
   // 默认地址请求地址，可在 .env.** 文件中修改
-  baseURL: ChainConfig().vite_contract_base_url,
+  baseURL: chainConfig[useGlobalStore.getState().chain].vite_contract_base_url,
   // 设置超时时间
   timeout: ResultEnum.TIMEOUT as number,
   // 跨域时候允许携带凭证
@@ -51,7 +51,7 @@ const contractConfig = {
 
 const chatConfig = {
   // 默认地址请求地址，可在 .env.** 文件中修改
-  baseURL: ChainConfig().vite_room_base_url,
+  baseURL: chainConfig[useGlobalStore.getState().chain].vite_room_base_url,
   // 设置超时时间
   timeout: ResultEnum.TIMEOUT as number,
   // 跨域时候允许携带凭证
@@ -77,8 +77,8 @@ class RequestHttp {
           config.headers.set('Authorization', 'Bearer ' + token);
         }
         if (chainInfo) {
-          const chainInfo = getCurrentChain();
-          config.url = config?.url?.replace(/(\/xfans\/api\/)/, `/xfans/api/${chainInfo}/`);
+          const currentChain = useGlobalStore.getState().chain;
+          config.url = config?.url?.replace(/(\/xfans\/api\/)/, `/xfans/api/${currentChain}/`);
         }
         return config;
       },

diff --git a/src/store/useGlobalStore.ts b/src/store/useGlobalStore.ts
@@ -4,6 +4,8 @@
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 
+import ChainConfig, { Chain, ChainConfigType } from '../config/chainConfig';
+
 export enum PageType {
   Login = 'login',
   Invite = 'invite',
@@ -25,11 +27,12 @@ export interface GlobalStoreProps {
   goPage(page: PageType): void;
   logout(): void;
   userVote: Record<string, boolean> | null;
+  chain: Chain;
 }
 
 const useGlobalStore = create<GlobalStoreProps>()(
   persist(
-    (set) => ({
+    (set, get) => ({
       page: PageType.Login,
       token: '',
       isShowPrice: false,
@@ -49,6 +52,7 @@ const useGlobalStore = create<GlobalStoreProps>()(
         });
       },
       userVote: null,
+      chain: Chain.Arb,
     }),
     {
       name: 'xfans-user-config',

diff --git a/src/welcome/Profile/community/useRoom.ts b/src/welcome/Profile/community/useRoom.ts
@@ -3,7 +3,7 @@ import { nanoid } from '@reduxjs/toolkit';
 import { io, Socket } from 'socket.io-client';
 
 import { error } from '../../../components/Toaster';
-import ChainConfig from '../../../config/chainConfig';
+import chainConfig from '../../../config/chainConfig';
 import { getMessagesByRoom, ReceiveMessage, SendMessage } from '../../../service/room';
 import useGlobalStore from '../../../store/useGlobalStore';
 
@@ -13,11 +13,12 @@ export default function useRoom(user: string, room?: string) {
   const [messages, setMessages] = useState<ReceiveMessage[]>([]);
   const [socket, setSocket] = useState<Socket>();
   const [members, setMembers] = useState<CommunityUserInfo[]>([]);
+  const { chain } = useGlobalStore();
 
   // 建立 socket
   useEffect(() => {
     if (room == null) return;
-    const socket = io(ChainConfig().vite_socket_base_url, {
+    const socket = io(chainConfig[chain].vite_socket_base_url, {
       autoConnect: false,
       extraHeaders: {
         Authorization: 'Bearer ' + useGlobalStore.getState().token,
@@ -33,7 +34,7 @@ export default function useRoom(user: string, room?: string) {
       setMembers([]);
       socket.disconnect();
     };
-  }, [room, user]);
+  }, [chain, room, user]);
 
   useEffect(() => {
     function handle() {

diff --git a/src/welcome/Wallet/Deposit.tsx b/src/welcome/Wallet/Deposit.tsx
@@ -5,11 +5,14 @@ import { useToggle } from 'ahooks';
 import { BackButton, BasicButton, PrimaryButton } from '../../components/Button';
 import Modal from '../../components/Modal';
 import * as toaster from '../../components/Toaster';
-import { getCurrentChainName } from '../../config/chainConfig';
+import { chainNameMap } from '../../config/chainConfig';
+import useGlobalStore from '../../store/useGlobalStore';
 import useGlobalUserStore from '../../store/useGlobalUserStore';
+
 const Deposit = () => {
   const [isOpen, { setLeft: close, setRight: open }] = useToggle(false);
   const accounts = useGlobalUserStore((state) => state.accounts);
+  const { chain } = useGlobalStore();
 
   return (
     <>
@@ -38,7 +41,7 @@ const Deposit = () => {
             <div className="flex flex-col space-y-[14px]">
               <span className="text-base font-medium text-[#919099]">Network</span>
               <div className="rounded-[8px] bg-[#F7F9FA] py-[18px] pl-[26px] text-base font-medium text-[#1A1D1F]">
-                {getCurrentChainName()}
+                {chainNameMap[chain]}
               </div>
             </div>
             <div className="flex flex-col space-y-[14px]">

diff --git a/src/welcome/Wallet/WithDraw.tsx b/src/welcome/Wallet/WithDraw.tsx
@@ -9,10 +9,12 @@ import ETHIcon from '../../components/icons/ETHIcon';
 import Modal from '../../components/Modal';
 import { NumberDisplayer } from '../../components/NumberDisplayer';
 import { error, success } from '../../components/Toaster';
-import { getCurrentChainName } from '../../config/chainConfig';
+import { chainNameMap } from '../../config/chainConfig';
 import { ContractError } from '../../constants';
 import useAccount from '../../hooks/useAccount';
 import { transfer as transferApi } from '../../service/contract/shares';
+import useGlobalStore from '../../store/useGlobalStore';
+
 const TextField = styled(MTextField)({
   width: '493px',
   '& label.Mui-focused': {
@@ -44,6 +46,7 @@ const WithDraw = ({ onClose }: Props) => {
   const { balance, refresh } = useAccount();
   const [address, setAddress] = useState('');
   const [amount, setAmount] = useState('');
+  const { chain } = useGlobalStore();
   const { run: transfer, loading } = useRequest(() => transferApi(address, amount), {
     manual: true,
     onSuccess() {
@@ -95,7 +98,7 @@ const WithDraw = ({ onClose }: Props) => {
         <h2 className="xfans-font-sf text-[24px] font-medium text-[#2E2E32]">Withdraw</h2>
         <div className="mt-[15px] h-[1px] w-[438px] bg-[#EBEEF0]"></div>
         <p className="xfans-font-sf my-6 text-sm text-black text-opacity-50">
-          {`Send your ETH to another wallet address on the ${getCurrentChainName()}`}
+          {`Send your ETH to another wallet address on the ${chainNameMap[chain]}`}
         </p>
 
         <div className="mb-6 w-full space-y-6">

diff --git a/src/welcome/Wallet/index.tsx b/src/welcome/Wallet/index.tsx
@@ -9,7 +9,7 @@ import { InfoCircle } from '../../components/icons/InfoCircle';
 import { NumberDisplayer } from '../../components/NumberDisplayer';
 import * as toaster from '../../components/Toaster';
 import TruncateText from '../../components/TruncateText';
-import { getCurrentChainName } from '../../config/chainConfig';
+import { chainNameMap } from '../../config/chainConfig';
 import useAccount from '../../hooks/useAccount';
 import { useUserInfo } from '../../service/user';
 import { useWalletAccounts } from '../../service/wallet';
@@ -24,7 +24,7 @@ import WithDraw from './WithDraw';
 const Wallet = (props: { back?: () => void; logout?: () => void }) => {
   const { openProfile } = useProfileModal((state) => ({ ...state }));
 
-  const { isShowPrice } = useGlobalStore((state) => ({ ...state }));
+  const { isShowPrice, chain } = useGlobalStore((state) => ({ ...state }));
   const { userInfo } = useAccount();
   const { run: getUserInfo } = useUserInfo();
   const [isWithDrawOpen, setIsWithDrawOpen] = useState(false);
@@ -77,7 +77,7 @@ const Wallet = (props: { back?: () => void; logout?: () => void }) => {
               </CopyToClipboard>
 
               <div className="flex items-center space-x-1">
-                <span className="text-[#919099]">{`Network:${getCurrentChainName()}`}</span>
+                <span className="text-[#919099]">{`Network:${chainNameMap[chain]}`}</span>
                 <Network />
               </div>
             </div>