@@ -19,7 +19,7 @@ const Admin = () => {
>
{t('connect_wallet')}
- {noMetamaskError}
+ {web3Error}
)}
{adminAccounts.includes(walletAddress) && }
diff --git a/src/sections/Alpha/AlphaMain.jsx b/src/sections/Alpha/AlphaMain.jsx
index 2540a51d..6fda0710 100644
--- a/src/sections/Alpha/AlphaMain.jsx
+++ b/src/sections/Alpha/AlphaMain.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useRef } from 'react'
import { ethers } from 'ethers'
import 'swiper/css/bundle'
import Swiper from 'swiper/bundle'
@@ -11,10 +11,11 @@ import CustomImage from '../../components/CustomImage'
import { emitError, emitSuccess } from '../../utils/alert'
import { useTranslation } from 'next-i18next'
-import { useWeb3Context } from '../../hooks'
-import { useLayoutContext } from '../../hooks'
+import { useWeb3Context, useLayoutContext } from '../../hooks'
import { checkInputAddress } from '../../utils/InputValidators'
+import { NETWORK } from '../../config'
+
const vidas = [
'/images/alpha/vida0.png',
'/images/alpha/vida1.png',
@@ -49,7 +50,7 @@ const AlphaMain = () => {
const [, setDisableTransfer] = useState(false)
const [seasonFolder, setSeasonFolder] = useState(null)
const { startLoading, stopLoading } = useLayoutContext()
- const { walletAddress, daiContract, alphaContract, noMetamaskError, connectWallet } =
+ const { walletAddress, daiContract, alphaContract, connectWallet, isConnected, isValidNetwork } =
useWeb3Context()
const [showRules, setShowRules] = useState(false)
const [albums, setAlbums] = useState(null)
@@ -71,7 +72,7 @@ const AlphaMain = () => {
const fetchAlbums = async () => {
try {
- if (!walletAddress || !alphaContract || !seasonNames) return
+ if (!walletAddress || !isValidNetwork || !alphaContract || !seasonNames) return
startLoading()
let albumsArr = []
@@ -93,66 +94,69 @@ const AlphaMain = () => {
}
}
- const fetchSeasonData = async () => {
- try {
- if (!walletAddress || !alphaContract) return
- startLoading()
- let seasonData = await alphaContract.getSeasonData()
+ const hasFetchedSeasonData = useRef(false)
- if (seasonData) {
- let currentSeason
- let currentPrice
+ useEffect(() => {
+ fetchAlbums()
+ }, [walletAddress, isValidNetwork, albums]) //eslint-disable-line react-hooks/exhaustive-deps
- for (let i = 0; i < seasonData[0].length; i++) {
- const season = await alphaContract.getSeasonAlbums(seasonData[0][i])
+ useEffect(() => {
+ const fetchSeasonData = async () => {
+ try {
+ if (!walletAddress || !isValidNetwork || !alphaContract) return
+ startLoading()
+ let seasonData = await alphaContract.getSeasonData()
- if (season.length > 0) {
- currentSeason = seasonData[0][i]
- currentPrice = seasonData[1][i]
- break
- } else {
- currentSeason = seasonData[0][i]
- currentPrice = seasonData[1][i]
+ if (seasonData) {
+ let currentSeason
+ let currentPrice
+
+ for (let i = 0; i < seasonData[0].length; i++) {
+ const season = await alphaContract.getSeasonAlbums(seasonData[0][i])
+
+ if (season.length > 0) {
+ currentSeason = seasonData[0][i]
+ currentPrice = seasonData[1][i]
+ break
+ } else {
+ currentSeason = seasonData[0][i]
+ currentPrice = seasonData[1][i]
+ }
}
- }
- const seasonWinnersCount = {}
- const winnersQuery = await fetchDataAlpha()
- const { winners } = winnersQuery.data
+ const seasonWinnersCount = {}
+ const winnersQuery = await fetchDataAlpha()
+ const { winners } = winnersQuery.data
- for (let i = 0; i < winners.length; i++) {
- if (!seasonWinnersCount[winners[i].season]) {
- seasonWinnersCount[winners[i].season] = 1
- } else {
- seasonWinnersCount[winners[i].season]++
+ for (let i = 0; i < winners.length; i++) {
+ if (!seasonWinnersCount[winners[i].season]) {
+ seasonWinnersCount[winners[i].season] = 1
+ } else {
+ seasonWinnersCount[winners[i].season]++
+ }
}
- }
- const finishedSeasons = Object.entries(seasonWinnersCount)
- .filter((season) => season[1] == 10)
- .map((season) => season[0])
- const activeSeasons = seasonData[0].filter((season) => !finishedSeasons.includes(season))
- setSeasonName(currentSeason) // sets the season name as the oldest season with cards still available
- setPackPrice(currentPrice?.toString()) // sets the season price as the last season price created
- setSeasonNames(activeSeasons)
+ const finishedSeasons = Object.entries(seasonWinnersCount)
+ .filter((season) => season[1] == 10)
+ .map((season) => season[0])
+ const activeSeasons = seasonData[0].filter((season) => !finishedSeasons.includes(season))
- if (!activeSeasons || activeSeasons.length === 0) {
- setError(t('no_season_nampes'))
+ setSeasonName(currentSeason)
+ setPackPrice(currentPrice?.toString())
+ setPackPrices(seasonData[1])
+ setSeasonNames(activeSeasons)
+ setError(!activeSeasons || !activeSeasons.length ? t('no_season_nampes') : error)
}
-
- setPackPrices(seasonData[1])
+ stopLoading()
+ } catch (ex) {
+ stopLoading()
+ console.error(ex)
+ emitError(t('alpha_fetch_season_data_error'))
}
- stopLoading()
- } catch (ex) {
- stopLoading()
- console.error(ex)
- emitError(t('alpha_fetch_season_data_error'))
}
- }
- useEffect(() => {
- fetchAlbums()
- }, [walletAddress, albums]) //eslint-disable-line react-hooks/exhaustive-deps
+ fetchSeasonData()
+ }, [walletAddress, isValidNetwork])
useEffect(() => {
swiper = new Swiper('.swiper-container', {
@@ -217,10 +221,6 @@ const AlphaMain = () => {
}
}, [seasonName])
- useEffect(() => {
- fetchSeasonData()
- }, [walletAddress, alphaContract]) //eslint-disable-line react-hooks/exhaustive-deps
-
const getUserCards = async (address, seasonName) => {
try {
const cards = await alphaContract.getCardsByUserBySeason(address, seasonName)
@@ -487,32 +487,53 @@ const AlphaMain = () => {
}
}
- return (
-
-
- {!walletAddress && (
-
-
+ const NotConnected = () => (
+
+ )
+
+ return (
+
+
+
+ {!isConnected && (
+
+ )}
+ {isConnected && !isValidNetwork && (
+
- )}
+ )*/}
+
+
+
+ {t('account_invalid_network').replace('{NETWORK}', NETWORK.chainName)}
+
+
+ )}
+ {/*isConnected && !isValidNetwork && (
- {noMetamaskError}
-
+
+ {(!isConnected || !isValidNetwork) &&
{
}
>
- {seasonNames && seasonNames.length > 0 && !showMain && (
+ {seasonNames && seasonNames.length && seasonName && !showMain && (
<>
diff --git a/src/sections/Gamma/GammaMain.jsx b/src/sections/Gamma/GammaMain.jsx
index 5352e98b..ef3b87c1 100644
--- a/src/sections/Gamma/GammaMain.jsx
+++ b/src/sections/Gamma/GammaMain.jsx
@@ -21,7 +21,7 @@ import {
getPackPrice,
getUserAlbums120Qtty
} from '../../services/gamma'
-
+import { NETWORK } from '../../config'
import { useWeb3Context, useLayoutContext, useGammaDataContext } from '../../hooks'
const GammaMain = () => {
@@ -37,8 +37,9 @@ const GammaMain = () => {
daiContract,
gammaCardsContract,
gammaPacksContract,
- noMetamaskError,
- connectWallet
+ connectWallet,
+ isConnected,
+ isValidNetwork
} = useWeb3Context()
const {
startLoading,
@@ -320,10 +321,6 @@ const GammaMain = () => {
const data = await fetchPackData(walletAddress, packNumber)
const { packet_data, signature } = data
- // verify signer
- // const signer = await verifyPackSigner(gammaCardsContract, packNumber, packet_data, signature.signature)
- // console.log('pack signer', signer)
-
setOpenPackCardsNumbers(packet_data)
openedPack = await openPack(
gammaCardsContract,
@@ -461,10 +458,6 @@ const GammaMain = () => {
}
}
- const connectWallet1 = async () => {
- await connectWallet()
- }
-
const handleSwitchBook = useCallback(async () => {
setCardInfoOpened(false)
setAlbumInfoOpened(false)
@@ -509,13 +502,31 @@ const GammaMain = () => {
const NotConnected = () => (
)
@@ -687,11 +697,11 @@ const GammaMain = () => {
return (
diff --git a/src/sections/Gamma/GammaMain.jsx b/src/sections/Gamma/GammaMain.jsx
index 5352e98b..ef3b87c1 100644
--- a/src/sections/Gamma/GammaMain.jsx
+++ b/src/sections/Gamma/GammaMain.jsx
@@ -21,7 +21,7 @@ import {
getPackPrice,
getUserAlbums120Qtty
} from '../../services/gamma'
-
+import { NETWORK } from '../../config'
import { useWeb3Context, useLayoutContext, useGammaDataContext } from '../../hooks'
const GammaMain = () => {
@@ -37,8 +37,9 @@ const GammaMain = () => {
daiContract,
gammaCardsContract,
gammaPacksContract,
- noMetamaskError,
- connectWallet
+ connectWallet,
+ isConnected,
+ isValidNetwork
} = useWeb3Context()
const {
startLoading,
@@ -320,10 +321,6 @@ const GammaMain = () => {
const data = await fetchPackData(walletAddress, packNumber)
const { packet_data, signature } = data
- // verify signer
- // const signer = await verifyPackSigner(gammaCardsContract, packNumber, packet_data, signature.signature)
- // console.log('pack signer', signer)
-
setOpenPackCardsNumbers(packet_data)
openedPack = await openPack(
gammaCardsContract,
@@ -461,10 +458,6 @@ const GammaMain = () => {
}
}
- const connectWallet1 = async () => {
- await connectWallet()
- }
-
const handleSwitchBook = useCallback(async () => {
setCardInfoOpened(false)
setAlbumInfoOpened(false)
@@ -509,13 +502,31 @@ const GammaMain = () => {
const NotConnected = () => (
-
+ {!isConnected && (
+
+ )}
+ {isConnected && !isValidNetwork && (
+
+
+ {t('account_invalid_network').replace('{NETWORK}', NETWORK.chainName)}
+
+
+ )}
+ {/*isConnected && !isValidNetwork && (
+
+ )*/}
- {noMetamaskError}
- {!walletAddress && {
/>
)}
- {walletAddress && {
/>
)}
- {walletAddress &&
)
}
diff --git a/src/services/gamma.js b/src/services/gamma.js
index 3f85c446..7842890b 100644
--- a/src/services/gamma.js
+++ b/src/services/gamma.js
@@ -28,18 +28,6 @@ export const getGammacardsPages = () => {
return gammaCardsPages
}
-/*
-export const getGammacardsExchangePages = (userCards) => {
- const gammaCardsExchangePages = {
- page1: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
- user: userCards
- }
-
- // console.log(gammaCardsExchangePages.user)
- return gammaCardsExchangePages
-}
-*/
-
export const fetchPackData = async (walletAddress, pack_number) => {
// llamada a la api para que nos de la data a pasar en la llamada al contrato
try {
diff --git a/src/styles/_navbar-account.scss b/src/styles/_navbar-account.scss
index 8a81ea07..2c3ba6d7 100644
--- a/src/styles/_navbar-account.scss
+++ b/src/styles/_navbar-account.scss
@@ -9,6 +9,11 @@
display: none;
font-family: 'Press Start 2P', 'Share Tech Mono', 'Share Tech', sans-serif;
font-size: 0.9em !important;
+
+ @media (max-width: 1400px) {
+ right: 0;
+ margin: 2px;
+ }
}
.account__info.active {
@@ -73,6 +78,11 @@
}
.account__info__invalid__network {
+ max-width: 300px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: inherit;
+ line-height: 1rem;
color: #f60008;
}
@@ -149,3 +159,14 @@ account__info__icon__link:hover,
font-size: 10px;
width: 80%;
}
+
+.invalid__network__div {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.invalid__network {
+ width: 100%;
+ padding: 10px;
+}