Merge branch 'main' into feature/compute

src/components/atoms/Price/index.tsx

@@ -28,10 +28,15 @@ export default function Price({
       conversion={conversion}
       type={price.type}
     />
-  ) : !price || price?.value === 0 ? (
+  ) : !price || !price.address || price.address === '' ? (
     <div className={styles.empty}>
-      No price found{' '}
-      <Tooltip content="We could not find a pool for this data set, which can have multiple reasons. Is your wallet connected to the correct network?" />
+      No price set{' '}
+      <Tooltip content="No pricing mechanism has been set on this asset yet." />
+    </div>
+  ) : price.isConsumable !== 'true' ? (
+    <div className={styles.empty}>
+      Low liquidity{' '}
+      <Tooltip content="This pool does not have enough liquidity for using this data set." />
     </div>
   ) : (
     <Loader message="Retrieving price..." />

src/components/molecules/AssetListTitle.tsx

@@ -2,7 +2,7 @@ import { DDO } from '@oceanprotocol/lib'
 import { useOcean } from '@oceanprotocol/react'
 import { Link } from 'gatsby'
 import React, { ReactElement, useEffect, useState } from 'react'
-import { retrieveDDO } from '../../utils/aquarius'
+import { retrieveDDO, getAssetsNames } from '../../utils/aquarius'
 import styles from './AssetListTitle.module.css'
 import axios from 'axios'
 
@@ -28,15 +28,16 @@ export default function AssetListTitle({
 
     const source = axios.CancelToken.source()
 
-    async function getDDO() {
-      const ddo = await retrieveDDO(did, config.metadataCacheUri, source.token)
-
-      if (!ddo) return
-      const { attributes } = ddo.findServiceByType('metadata')
-      setAssetTitle(attributes.main.name)
+    async function getAssetName() {
+      const title = await getAssetsNames(
+        [did],
+        config.metadataCacheUri,
+        source.token
+      )
+      setAssetTitle(title[did])
     }
 
-    !ddo && did && getDDO()
+    !ddo && did && getAssetName()
 
     return () => {
       console.log('canceled?')

src/components/organisms/AssetActions/Consume.tsx

@@ -158,13 +158,7 @@ export default function Consume({
           <File file={file} />
         </div>
         <div className={styles.pricewrapper}>
-          {isConsumable ? (
-            <Price ddo={ddo} conversion />
-          ) : (
-            <div className={styles.help}>
-              There is not enough liquidity in the pool to buy this data set.
-            </div>
-          )}
+          <Price ddo={ddo} conversion />
           {!isInPurgatory && <PurchaseButton />}
         </div>
       </div>

src/utils/aquarius.ts

@@ -73,3 +73,27 @@ export async function retrieveDDO(
     }
   }
 }
+
+export async function getAssetsNames(
+  didList: string[] | DID[],
+  metadataCacheUri: string,
+  cancelToken: CancelToken
+): Promise<Record<string, string>> {
+  try {
+    const response: AxiosResponse<Record<string, string>> = await axios.post(
+      `${metadataCacheUri}/api/v1/aquarius/assets/names`,
+      {
+        didList,
+        cancelToken
+      }
+    )
+    if (!response || response.status !== 200 || !response.data) return
+    return response.data
+  } catch (error) {
+    if (axios.isCancel(error)) {
+      Logger.log(error.message)
+    } else {
+      Logger.error(error.message)
+    }
+  }
+}

src/utils/profile.ts

@@ -5,7 +5,7 @@ import { Logger } from '@oceanprotocol/lib'
 
 // https://docs.3box.io/api/rest-api
 const apiUri = 'https://3box.oceanprotocol.com'
-const ipfsUrl = 'https://ipfs.oceanprotocol.com'
+const ipfsUrl = 'https://dweb.link'
 
 function decodeProof(proofJWT: string) {
   if (!proofJWT) return