various fixes

packages/react-app/src/components/Account.tsx

@@ -189,7 +189,7 @@ export default function Account({ minimized }: AccountsProps) {
     const chainInfo = await getCurrentChainId()
     const { chainId } = chainInfo[0]
     console.log({ chainId })
-    if (chainId !== selectedChainId) {
+    if (chainId !== 5 && chainId !== 534352) {
       setShowWrongNetworkToast(true)
       await switchNetworkChain(selectedChainId)
       accounts = await (window.ethereum as any).request({
@@ -199,7 +199,7 @@ export default function Account({ minimized }: AccountsProps) {
       setNetInfo(chainInfo)
       return
     }
-    if (chainId === selectedChainId) {
+    if (chainId !== 5 || chainId !== 534352) {
       accounts = await (window.ethereum as any).request({
         method: 'eth_requestAccounts',
       })

packages/react-app/src/components/AddressedCard.tsx

@@ -8,7 +8,7 @@ export default function AddressedCard({ badges, etherscanRef }: { badges: any[],
     <>
       {badges && badges.length > 0 ? (
         badges.map(badge => {
-          const src = badge.fileName // 'https://ipfs.io/ipfs/' + badge.decodedIpfsHash
+          const src = 'https://ipfs-cluster.ethdevops.io/ipfs/' + badge.decodedIpfsHash // badge.fileName // 'https://ipfs.io/ipfs/' + badge.decodedIpfsHash
           const txLink = etherscanRef + badge.transactionHash
           return (
             <Box

packages/react-app/src/components/NftCard.tsx

@@ -53,7 +53,7 @@ export default function NftCard(props: NftCardProps) {
       const name = await getEnsName(toFormatted)
       let title = name ? name : toFormatted
 
-      const src = data.image || '' // 'https://ipfs.io/ipfs/' + toBase58(data.hash)
+      const src = 'https://ipfs-cluster.ethdevops.io/ipfs/' + toBase58(data.hash) // data.image || '' // 'https://ipfs.io/ipfs/' + toBase58(data.hash)
       const txLink = etherscan + transactionHash
       setState({ data, title, src, txLink })
     } catch (error) {

packages/react-app/src/components/RewardGroupCard.tsx

@@ -45,7 +45,7 @@ export default function RewardGroupCard(props: any) {
       const title = props.event[0].tokenType
       const tokenType = props.event[0].tokenType
       const payload = props.event[0].payload
-      const src = props.event[0].fileName || 'https://ipfs.io/ipfs/' + toBase58(props.event[0].hash)
+      const src = 'https://ipfs-cluster.ethdevops.io/ipfs/' + toBase58(props.event[0].hash) // props.event[0].fileName || 'https://ipfs.io/ipfs/' + toBase58(props.event[0].hash)
 
       const rewardCount = props.event.length
       setState({ title, src, rewardCount, tokenType, payload })

packages/react-app/src/helpers/getTokenData.js

@@ -11,31 +11,19 @@ const chainsAddresses = {
 
 const cache = {}
 
-let globalCache
-
 export async function getTokenData(chainId, id) {
     id = parseInt(id)
-    if (!globalCache) {
-        globalCache = await fetch(`https://remix-reward-api.vercel.app/cache`)
-        globalCache = await globalCache.json()
-    }
-
-    let result
+   let result
     if (cache[chainId + ' ' + id]) {
         result = cache[chainId + ' ' + id]
     }
 
-    const chainName = chains[chainId]
-    const address = chainsAddresses[chainName]
-    if (!result && globalCache[address + '_' + id]) {
-        result = globalCache[address + '_' + id]
-        console.log('using server cache')
-    }
 
     if (!result) {
         try {
-            console.log('getTokenData', result)
+            console.log('getTokenData', id)
             result = await fetch(`https://remix-reward-api.vercel.app/api-${chains[chainId]}/${id}`)
+            console.log('getTokenData response', id)
             result = await result.json()
             cache[chainId + ' ' + id] = result
         } catch (e) {

packages/react-app/src/views/BrowseBadges.tsx

@@ -67,10 +67,12 @@ export default function BrowseBadges() {
     providerRef = externalContracts[selectedChainId].provider
     etherscanRef = externalContracts[selectedChainId].etherscan
   }
-  const contract = useRef(new ethers.Contract(contractRef.address, contractRef.abi, localProvider))
+  const contract = useRef(new ethers.Contract(contractRef.address, contractRef.abi, injectedProvider))
 
   useEffect(() => {
     const run = async () => {
+      contract.current = new ethers.Contract(contractRef.address, contractRef.abi, injectedProvider)
+
       if (!contractRef) {
         setErrorMessage('chain not supported. ' + selectedChainId)
         return
@@ -102,8 +104,8 @@ export default function BrowseBadges() {
               const found = eventBadges.find(x => ethers.utils.hexStripZeros(x.id) === ethers.utils.hexStripZeros(tId))
               // eslint-disable-next-line no-undef
               const badge = Object.assign({}, { transactionHash: found.transactionHash }, data, {
-                decodedIpfsHash: toBase58(data.hash),
-                fileName: data.image
+                decodedIpfsHash: toBase58(data[2]),
+                fileName: data[3]
               })
               badges.push(badge)
             } catch (e) {
@@ -120,7 +122,7 @@ export default function BrowseBadges() {
           setErrorMessage('')
         } catch (e) {
           setShowSpinner(false)
-          setErrorMessage(e.message)
+          setErrorMessage("Please make sure your injected provider (metamask) is connected to the right network." + e.message)
         }
       } else {
         setErrorMessage('')
@@ -136,8 +138,8 @@ export default function BrowseBadges() {
               const found = eventBadges.find(x => ethers.utils.hexStripZeros(x.id) === ethers.utils.hexStripZeros(tId))
               // eslint-disable-next-line no-undef
               const badge = Object.assign({}, { transactionHash: found.transactionHash }, data, {
-                decodedIpfsHash: toBase58(data.hash),
-                fileName: data.image
+                decodedIpfsHash: toBase58(data[2]),
+                fileName: data[3]
               })
               badges.push(badge)
             } catch (e) {