Merge branch 'main' into feature/multinetwork

package.json

@@ -28,7 +28,7 @@
     "@coingecko/cryptoformat": "^0.4.2",
     "@loadable/component": "^5.15.0",
     "@oceanprotocol/art": "^3.0.0",
-    "@oceanprotocol/lib": "^0.16.4",
+    "@oceanprotocol/lib": "^0.16.5",
     "@oceanprotocol/typographies": "^0.1.0",
     "@portis/web3": "^4.0.4",
     "@sindresorhus/slugify": "^2.1.0",

src/components/molecules/Wallet/Details.tsx

@@ -18,6 +18,7 @@ export default function Details(): ReactElement {
     logout,
     networkData,
     networkId,
+    networkData,
     balance
   } = useWeb3()
   const { locale } = useUserPreferences()
@@ -31,7 +32,9 @@ export default function Details(): ReactElement {
   // const [portisNetwork, setPortisNetwork] = useState<string>()
 
   useEffect(() => {
-    if (!networkData) return
+    const symbol =
+      networkId === 2021000 ? 'GX' : networkData?.nativeCurrency.symbol
+    setMainCurrency(symbol)
 
     setMainCurrency(networkData.nativeCurrency?.symbol)
 

src/components/organisms/AssetActions/Consume.module.css

@@ -6,8 +6,6 @@
 .info {
   display: flex;
   width: auto;
-  margin-left: -2rem;
-  margin-right: -2rem;
   padding: 0 calc(var(--spacer)) 0 calc(var(--spacer));
 }
 

src/components/organisms/AssetActions/index.tsx

@@ -12,7 +12,7 @@ import { useAsset } from '../../../providers/Asset'
 import { useOcean } from '../../../providers/Ocean'
 import { useWeb3 } from '../../../providers/Web3'
 import Web3Feedback from '../../molecules/Web3Feedback'
-import { fileinfo, getFileInfo } from '../../../utils/provider'
+import { getFileInfo } from '../../../utils/provider'
 import axios from 'axios'
 
 export default function AssetActions(): ReactElement {
@@ -45,28 +45,30 @@ export default function AssetActions(): ReactElement {
   }, [accountId, ddo])
 
   useEffect(() => {
-    const { attributes } = ddo.findServiceByType('metadata')
-    setFileMetadata(attributes.main.files[0])
-    // !!!!!  do not remove this, we will enable this again after fileInfo endpoint is fixed !!!
-    // if (!config) return
-    // const source = axios.CancelToken.source()
-    // async function initFileInfo() {
-    //   setFileIsLoading(true)
-    //   try {
-    //     const fileInfo = await getFileInfo(
-    //       DID.parse(`${ddo.id}`),
-    //       config.providerUri,
-    //       source.token
-    //     )
-    //     setFileMetadata(fileInfo.data[0])
-    //   } catch (error) {
-    //     Logger.error(error.message)
-    //   } finally {
-    //     setFileIsLoading(false)
-    //   }
-    // }
-    // initFileInfo()
-  }, [config, ddo.id])
+    if (!config) return
+    const source = axios.CancelToken.source()
+    async function initFileInfo() {
+      setFileIsLoading(true)
+      try {
+        const fileInfo = await getFileInfo(
+          DID.parse(`${ddo.id}`),
+          config.providerUri,
+          source.token
+        )
+
+        setFileMetadata(fileInfo.data[0])
+      } catch (error) {
+        Logger.error(error.message)
+      } finally {
+        // this triggers a memory leak warrning, no idea how to fix
+        setFileIsLoading(false)
+      }
+    }
+    initFileInfo()
+    return () => {
+      source.cancel()
+    }
+  }, [config, ddo])
 
   // Get and set user DT balance
   useEffect(() => {

src/providers/Web3.tsx

@@ -231,14 +231,19 @@ function Web3Provider({ children }: { children: ReactNode }): ReactElement {
 
     const networkData = getNetworkDataById(networksList, networkId)
     setNetworkData(networkData)
-    Logger.log('[web3] Network metadata found.', networkData)
+    Logger.log(
+      networkData
+        ? `[web3] Network metadata found.`
+        : `[web3] No network metadata found.`,
+      networkData
+    )
 
     // Construct network display name
     const networkDisplayName = getNetworkDisplayName(networkData, networkId)
     setNetworkDisplayName(networkDisplayName)
 
     // Figure out if we're on a chain's testnet, or not
-    setIsTestnet(networkData.network !== 'mainnet')
+    setIsTestnet(networkData?.network !== 'mainnet')
 
     Logger.log(`[web3] Network display name set to: ${networkDisplayName}`)
   }, [networkId, networksList])

src/utils/web3.ts

@@ -66,8 +66,9 @@ export function getNetworkDataById(
 ): EthereumListsChain {
   const networkData = data.filter(
     ({ node }: { node: EthereumListsChain }) => node.chainId === networkId
-  )[0]
-  return networkData.node
+  )
+
+  return networkData[0]?.node
 }
 
 export function addCustomNetwork(