Merge pull request #369 from P4-Games/develop

Deploy 20240704
P4-Games · Jul 4, 2024 · 55262ae · 55262ae
2 parents e50d705 + 643107d
commit 55262ae
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/context/Web3Context.js b/src/context/Web3Context.js
@@ -26,6 +26,7 @@ function Web3ContextProvider({ children }) {
   const [web3Error, setWeb3Error] = useState('')
   const [wallets, setWallets] = useState(null)
   const [isValidNetwork, setIsValidNetwork] = useState(false)
+  const [isValidNetworkForAlpha, setIsValidNetworkForAlpha] = useState(false)
   const [daiContract, setDaiContract] = useState(null)
   const [alphaContract, setAlphaContract] = useState(null)
   const [gammaPacksContract, setGammaPacksContract] = useState(null)
@@ -114,13 +115,29 @@ function Web3ContextProvider({ children }) {
         )
       })
 
+      const isValidNetworkForAlpha = () => {
+        const network = NETWORKS['sepolia']
+        return (
+          network.config.chainId === chainIdHex
+        )
+      }
+
       if (isValidNetwork) {
         connectContracts(web3Provider.getSigner())
         setIsValidNetwork(true)
       } else {
         setIsValidNetwork(false)
         setWeb3Error('account_invalid_network')
       }
+
+      if(isValidNetworkForAlpha()) {
+        connectContractsForAlpha(web3Provider.getSigner())
+        setIsValidNetworkForAlpha(true)
+      } else {
+        setIsValidNetworkForAlpha(false)
+        setWeb3Error('account_invalid_network')
+      }
+
       return [web3Provider, accountAddress]
     } catch (e) {
       console.error({ e })
@@ -145,6 +162,11 @@ function Web3ContextProvider({ children }) {
     return network ? network : null
   }
 
+  function getCurrentNetworkForAlpha() {
+    const network = NETWORKS['sepolia'].config.chainId === decToHex(chainId)
+    return network ? NETWORKS['sepolia'] : null
+  }
+
   function connectContracts(_signer) {
     try {
       const _contracts = getCurrentNetwork().contracts
@@ -239,10 +261,29 @@ function Web3ContextProvider({ children }) {
     }
   }
 
+  function connectContractsForAlpha (_signer) {
+    try {
+      const _contracts = getCurrentNetworkForAlpha().contracts
+
+      const daiContractInstance = new ethers.Contract(_contracts.daiAddress, daiAbi.abi, _signer)
+
+      const alphaContractInstance = new ethers.Contract(
+        _contracts.alphaAddress,
+        alphaAbi.abi,
+        _signer
+      )
+      setDaiContract(daiContractInstance)
+      setAlphaContract(alphaContractInstance)
+    } catch (e) {
+      console.error({ e })
+    }
+  }
+
   async function disconnectWallet() {
     disconnect()
     setWallets(null)
     setIsValidNetwork(false)
+    setIsValidNetworkForAlpha(false)
     setWeb3Error('')
   }
 
@@ -269,13 +310,21 @@ function Web3ContextProvider({ children }) {
         setWeb3Error('account_invalid_network')
         const _chanIdHex = decToHex(newChain)
         setIsValidNetwork(false)
+        setIsValidNetworkForAlpha(false)
 
         if (enabledNetworkChainIds.includes(_chanIdHex)) {
           const provider = new ethers.providers.Web3Provider(window.ethereum, 'any')
           const signer = provider.getSigner()
           connectContracts(signer)
           setIsValidNetwork(true)
         }
+
+        if(_chanIdHex === NETWORKS['sepolia'].config.chainId) {
+          const provider = new ethers.providers.Web3Provider(window.ethereum, 'any')
+          const signer = provider.getSigner()
+          connectContractsForAlpha(signer)
+          setIsValidNetworkForAlpha(true)
+        }
       })
     }
   }, []) //eslint-disable-line react-hooks/exhaustive-deps
@@ -293,6 +342,7 @@ function Web3ContextProvider({ children }) {
     web3Error,
     isConnected,
     isValidNetwork,
+    isValidNetworkForAlpha,
     enabledNetworkNames,
     connectWallet,
     disconnectWallet,

diff --git a/src/sections/Alpha/AlphaMain.jsx b/src/sections/Alpha/AlphaMain.jsx
@@ -67,6 +67,7 @@ const AlphaMain = () => {
     connectWallet,
     isConnected,
     isValidNetwork,
+    isValidNetworkForAlpha,
     enabledNetworkNames
   } = useWeb3Context()
   const [showRules, setShowRules] = useState(false)
@@ -76,7 +77,7 @@ const AlphaMain = () => {
 
   const fetchAlbums = async () => {
     try {
-      if (!walletAddress || !isValidNetwork || !alphaContract || !seasonNames) return
+      if (!walletAddress || !isValidNetworkForAlpha || !alphaContract || !seasonNames) return
       startLoading()
 
       let albumsArr = []
@@ -100,12 +101,12 @@ const AlphaMain = () => {
 
   useEffect(() => {
     fetchAlbums()
-  }, [isValidNetwork, albums]) //eslint-disable-line react-hooks/exhaustive-deps
+  }, [isValidNetworkForAlpha, albums]) //eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     fetchSeasonData()
     setShowMain(false)
-  }, [walletAddress, isValidNetwork]) //eslint-disable-line react-hooks/exhaustive-deps
+  }, [walletAddress, isValidNetworkForAlpha]) //eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     swiper = new Swiper('.swiper-container', {
@@ -200,7 +201,7 @@ const AlphaMain = () => {
 
   const fetchSeasonData = async () => {
     try {
-      if (!walletAddress || !isValidNetwork || !alphaContract) return
+      if (!walletAddress || !isValidNetworkForAlpha || !alphaContract) return
       startLoading()
       let seasonData = await alphaContract.getSeasonData()
 
@@ -629,10 +630,10 @@ const AlphaMain = () => {
             {t('connect_wallet')}
           </button>
         )}
-        {isConnected && !isValidNetwork && (
+        {isConnected && !isValidNetworkForAlpha && (
           <div className='invalid__network__div'>
             <span className='invalid__network'>
-              {t('account_invalid_network').replace('{NETWORKS}', enabledNetworkNames)}
+              {t('account_invalid_network').replace('{NETWORKS}', 'sepolia')}
             </span>
           </div>
         )}
@@ -650,11 +651,11 @@ const AlphaMain = () => {
   return (
     <div className='alpha_main'>
       <div className='alpha'>
-        {(!isConnected || !isValidNetwork) && <NotConnected />}
+        {(!isConnected || !isValidNetworkForAlpha) && <NotConnected />}
 
         {showRules && <Rules type='alpha' setShowRules={setShowRules} />}
 
-        {isConnected && isValidNetwork && alphaContract && seasonNames && (
+        {isConnected && isValidNetworkForAlpha && alphaContract && seasonNames && (
           <div
             className={
               showMain