Merge pull request #279 from P4-Games/develop

Develop
P4-Games · Dec 22, 2023 · cab7183 · cab7183
2 parents 8c27ff9 + 71090e7
commit cab7183
Show file tree

Hide file tree

Showing 18 changed files with 7,395 additions and 13,348 deletions.
diff --git a/.well-known/walletconnect.txt b/.well-known/walletconnect.txt
@@ -0,0 +1 @@
+bc2ec04c-f206-4e6d-8916-4eec594745e1=8cbee2d90ef68158b21c0dcefa72974c3b086a3ca219b7e51f3bcec781a36492
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,17 +27,9 @@
     "@next/eslint-plugin-next": "^14.0.1",
     "@nomicfoundation/hardhat-toolbox": "^2.0.0",
     "@openzeppelin/contracts": "^4.8.0",
-    "@web3-onboard/coinbase": "^2.2.6",
-    "@web3-onboard/common": "^2.3.3",
-    "@web3-onboard/gas": "^2.1.8",
-    "@web3-onboard/gnosis": "^2.2.0",
-    "@web3-onboard/injected-wallets": "^2.10.9",
-    "@web3-onboard/react": "^2.8.13",
-    "@web3-onboard/trust": "^2.0.4",
-    "@web3-onboard/walletconnect": "^2.5.0",
-    "@web3modal/ethereum": "^2.0.0-beta.8",
-    "@web3modal/react": "^2.0.0-beta.8",
-    "axios": "1.6.0",
+    "@walletconnect/web3-provider": "^1.8.0",
+    "@web3modal/ethers5": "^3.5.1",
+    "axios": "^1.6.2",
     "book-flip": "^1.0.0",
     "dotenv": "^16.3.1",
     "eslint": "^8.52.0",
@@ -67,9 +59,7 @@
     "swr": "^2.0.3",
     "url-loader": "^4.1.1",
     "use-local-storage": "^2.3.6",
-    "uuid": "^9.0.1",
-    "wagmi": "^0.9.2",
-    "web3modal": "^1.9.9"
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.4.3",

diff --git a/public/locales/br/common.json b/public/locales/br/common.json
@@ -148,7 +148,9 @@
 
   "account_connect": "Conectar",
   "account_disconnect": "Desconectar",
-  "account_invalid_network": "Rede inválida",
+  "account_invalid_network": "Você está conectado a uma rede inválida. Por favor, mude para a rede {NETWORK}.",
+  "account_no_metamask": "Por favor instale o metamask para usar este site",
+  "account_switch": "Mudar de rede",
   "account_text_copied": "Copiado",
   "account_balance_zero": "Você não tem saldo suficiente para enviar.",
   "account_send_dai_title": "Transferência de token",

diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -148,7 +148,9 @@
 
     "account_connect": "Connect",
     "account_disconnect": "Disconnect",
-    "account_invalid_network": "Invalid Network",
+    "account_invalid_network": "You are connected to an invalid network. Please, switch to {NETWORK} network.",
+    "account_no_metamask": "Please install metamask to use this website",
+    "account_switch": "Switch Network",
     "account_text_copied": "Copied",
     "account_balance_zero": "You do not have enough balance to send.",
     "account_send_dai_title": "Token Transfer",

diff --git a/public/locales/es/common.json b/public/locales/es/common.json
@@ -149,7 +149,9 @@
 
     "account_connect": "Conectar",
     "account_disconnect": "Desconectar",
-    "account_invalid_network": "Red Inválida",
+    "account_invalid_network": "Estás conectado a una red no válida. Por favor, cambia a la red {NETWORK}.",
+    "account_no_metamask": "Por favor instale metamask para usar este sitio web",
+    "account_switch": "Cambiar Red",
     "account_text_copied": "Copiado",
     "account_balance_zero": "No tienes saldo suficiente para enviar.",
     "account_send_dai_title": "Transferencia de Tokens",

diff --git a/public/service-worker.js b/public/service-worker.js
@@ -42,7 +42,6 @@ try {
 
     try {
       console.log("SW installing")
-
       event.waitUntil(
         Promise.all([
           fetchFilesFromFolder(IMAGES_FOLDER, ['png', 'jpg', 'jpeg', 'gif']),
@@ -94,7 +93,7 @@ try {
 
     if (!isValidToCache) {
       if (!event.request.url.startsWith(self.location.origin + NEXT_FOLDER))
-        console.log('**SW Skiping 1: ', event.request.url)
+        console.log('**SW Skiping: ', event.request.url)
       return 
     }
 

diff --git a/src/components/Navbar/AccountInfo.jsx b/src/components/Navbar/AccountInfo.jsx
@@ -6,7 +6,7 @@ import Swal from 'sweetalert2'
 import { HiOutlineClipboardDocument } from 'react-icons/hi2'
 import { GoLinkExternal } from 'react-icons/go'
 import { AiOutlineSend } from 'react-icons/ai'
-import { MdOutlinePublishedWithChanges } from 'react-icons/md'
+// import { MdOutlinePublishedWithChanges } from 'react-icons/md'
 import { useWeb3Context, useLayoutContext } from '../../hooks'
 import { NETWORK, CONTRACTS } from '../../config'
 import { getBalance, getTokenName, transfer } from '../../services/dai'
@@ -17,27 +17,22 @@ import { getAccountAddressText } from '../../utils/stringUtils'
 const AccountInfo = ({ showAccountInfo, setShowAccountInfo }) => {
   const { t } = useTranslation()
   const {
-    chainId,
     walletAddress,
     connectWallet,
     disconnectWallet,
     isValidNetwork,
     daiContract,
-    switchOrCreateNetwork
+    isConnected // ,
+    // switchOrCreateNetwork
   } = useWeb3Context()
   const { startLoading, stopLoading } = useLayoutContext()
   const [copiedTextVisible, setCopiedTextVisible] = useState(false)
   const [copiedTextPosition, setCopiedTextPosition] = useState(0)
   const [walletBalance, setWalletBalance] = useState(0)
   const [tokenName, setTokenName] = useState('')
-  const [validNetwork, setValidNetwork] = useState(false)
-
-  useEffect(() => {
-    setValidNetwork(isValidNetwork())
-  }, [showAccountInfo, chainId]) //eslint-disable-line react-hooks/exhaustive-deps
 
   const fetchTokenName = async () => {
-    if (!walletAddress || !daiContract || !validNetwork) return
+    if (!walletAddress || !daiContract || !isValidNetwork) return
     try {
       const token = await getTokenName(daiContract)
       setTokenName(token)
@@ -48,10 +43,10 @@ const AccountInfo = ({ showAccountInfo, setShowAccountInfo }) => {
 
   useEffect(() => {
     fetchTokenName()
-  }, [showAccountInfo, tokenName, walletAddress, validNetwork]) //eslint-disable-line react-hooks/exhaustive-deps
+  }, [showAccountInfo, tokenName, walletAddress, isValidNetwork]) //eslint-disable-line react-hooks/exhaustive-deps
 
   const fetchBalance = async () => {
-    if (!walletAddress || !daiContract || !validNetwork) return
+    if (!walletAddress || !daiContract || !isValidNetwork) return
     try {
       const balance = await getBalance(daiContract, walletAddress)
       setWalletBalance(balance)
@@ -62,7 +57,7 @@ const AccountInfo = ({ showAccountInfo, setShowAccountInfo }) => {
 
   useEffect(() => {
     fetchBalance()
-  }, [showAccountInfo, walletBalance, walletAddress, validNetwork]) //eslint-disable-line react-hooks/exhaustive-deps
+  }, [showAccountInfo, walletBalance, walletAddress, isValidNetwork]) //eslint-disable-line react-hooks/exhaustive-deps
 
   function copyToClipboard(text) {
     navigator.clipboard.writeText(text)
@@ -173,28 +168,24 @@ const AccountInfo = ({ showAccountInfo, setShowAccountInfo }) => {
       <div>
         <p
           className={`account__info__account__network ${
-            !validNetwork ? 'account__info__invalid__network' : ''
+            !isValidNetwork ? 'account__info__invalid__network' : ''
           }`}
         >
-          {validNetwork ? NETWORK.chainName : t('account_invalid_network')}
+          {isValidNetwork
+            ? NETWORK.chainName
+            : t('account_invalid_network').replace('{NETWORK}', NETWORK.chainName)}
         </p>
       </div>
-      {!validNetwork && (
+      {/*!isValidNetwork && (
         <div className='account__info__icon__container'>
           <MdOutlinePublishedWithChanges
             onClick={() => {
-              switchOrCreateNetwork(
-                NETWORK.chainId,
-                NETWORK.chainName,
-                NETWORK.ChainRpcUrl,
-                NETWORK.chainCurrency,
-                NETWORK.chainExplorerUrl
-              )
+              switchOrCreateNetwork()
             }}
             className='account__info__icon'
           />
         </div>
-      )}
+      )*/}
     </div>
   )
 
@@ -250,11 +241,11 @@ const AccountInfo = ({ showAccountInfo, setShowAccountInfo }) => {
 
   return (
     <div className={`account__info ${showAccountInfo ? 'active' : ''}`}>
-      {walletAddress ? (
+      {isConnected ? (
         <React.Fragment>
           <div className='account__info__data'>
             <NetworkComponent />
-            {validNetwork && (
+            {isValidNetwork && (
               <React.Fragment>
                 <hr className='account__info__separator' />
                 <WalletComponent />

diff --git a/src/config.js b/src/config.js
@@ -37,7 +37,7 @@ export const NETWORK = {
 }
 
 export const WalletConnectProjectId =
-  process.env.NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID || 'bc09ad4a99cebe270fcc24bd6925f4fe'
+  process.env.NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID || 'd66ff03f26d5a3ef19530ba69b815448'
 
 export const CONTRACTS = {
   daiAddress: process.env.NEXT_PUBLIC_DAI_ADDRESS || '0xEa4c35c858E15Cef77821278A88435dE57bc8707',