From 796fc6be81ba51b55d0429424de94a46e13871b3 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Fri, 4 Jun 2021 15:50:24 +0200
Subject: [PATCH] get all screens to render again

---
 app.config.js                                       |  5 ++++-
 src/components/atoms/AssetType.tsx                  |  4 ++--
 src/components/atoms/ExplorerLink.tsx               |  4 ++--
 .../molecules/FormFields/FilesInput/index.tsx       | 13 +++++--------
 src/components/organisms/AssetContent/index.tsx     |  2 +-
 src/components/pages/History/PublishedList.tsx      |  9 ++++++---
 src/components/pages/Home.tsx                       |  3 ---
 src/providers/Ocean.tsx                             |  6 +++++-
 8 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app.config.js b/app.config.js
index cdcfe7228..4d3c8f82a 100644
--- a/app.config.js
+++ b/app.config.js
@@ -1,5 +1,8 @@
 module.exports = {
-  metadataCacheUri: 'https://aquarius.mainnet.oceanprotocol.com',
+  metadataCacheUri:
+    process.env.METADATACACHE_URI ||
+    'https://aquarius.mainnet.oceanprotocol.com',
+
   // List of supported chainIds which metadata cache queries
   // will return by default
   chainIds: [1, 3, 4, 137, 1287],
diff --git a/src/components/atoms/AssetType.tsx b/src/components/atoms/AssetType.tsx
index 235d72b5d..7a3878551 100644
--- a/src/components/atoms/AssetType.tsx
+++ b/src/components/atoms/AssetType.tsx
@@ -37,9 +37,9 @@ export default function AssetType({
         {type === 'dataset' ? 'data set' : 'algorithm'}
       </div>
       {/* TODO: networkId needs to come from the multinetwork DDO for each asset */}
-      {config?.networkId && (
+      {(config?.networkId || 1) && (
         <NetworkName
-          networkId={config.networkId}
+          networkId={config?.networkId || 1}
           className={styles.network}
           minimal
         />
diff --git a/src/components/atoms/ExplorerLink.tsx b/src/components/atoms/ExplorerLink.tsx
index 4104e4e86..bde8f5fad 100644
--- a/src/components/atoms/ExplorerLink.tsx
+++ b/src/components/atoms/ExplorerLink.tsx
@@ -26,13 +26,13 @@ export default function ExplorerLink({
   })
 
   useEffect(() => {
-    setUrl((config as ConfigHelperConfig).explorerUri)
+    setUrl((config as ConfigHelperConfig)?.explorerUri)
   }, [config])
 
   return (
     <a
       href={`${url}/${path}`}
-      title={`View on ${(config as ConfigHelperConfig).explorerUri}`}
+      title={`View on ${(config as ConfigHelperConfig)?.explorerUri}`}
       target="_blank"
       rel="noreferrer"
       className={styleClasses}
diff --git a/src/components/molecules/FormFields/FilesInput/index.tsx b/src/components/molecules/FormFields/FilesInput/index.tsx
index e4ab3d84c..bd411943d 100644
--- a/src/components/molecules/FormFields/FilesInput/index.tsx
+++ b/src/components/molecules/FormFields/FilesInput/index.tsx
@@ -4,7 +4,6 @@ import { useField } from 'formik'
 import { toast } from 'react-toastify'
 import FileInfo from './Info'
 import FileInput from './Input'
-import { useOcean } from '../../../../providers/Ocean'
 import { InputProps } from '../../../atoms/Input'
 import { fileinfo } from '../../../../utils/provider'
 
@@ -12,19 +11,17 @@ export default function FilesInput(props: InputProps): ReactElement {
   const [field, meta, helpers] = useField(props.name)
   const [isLoading, setIsLoading] = useState(false)
   const [fileUrl, setFileUrl] = useState<string>()
-  const { config } = useOcean()
 
   function loadFileInfo() {
     const source = axios.CancelToken.source()
 
     async function validateUrl() {
+      // TODO: get the providerUri
+      const providerUri = ''
+
       try {
         setIsLoading(true)
-        const checkedFile = await fileinfo(
-          fileUrl,
-          config.providerUri,
-          source.token
-        )
+        const checkedFile = await fileinfo(fileUrl, providerUri, source.token)
         checkedFile && helpers.setValue([checkedFile])
       } catch (error) {
         toast.error('Could not fetch file info. Please check URL and try again')
@@ -43,7 +40,7 @@ export default function FilesInput(props: InputProps): ReactElement {
 
   useEffect(() => {
     loadFileInfo()
-  }, [fileUrl, config.providerUri])
+  }, [fileUrl])
 
   async function handleButtonClick(e: React.SyntheticEvent, url: string) {
     // hack so the onBlur-triggered validation does not show,
diff --git a/src/components/organisms/AssetContent/index.tsx b/src/components/organisms/AssetContent/index.tsx
index abd48cbe6..ef4550209 100644
--- a/src/components/organisms/AssetContent/index.tsx
+++ b/src/components/organisms/AssetContent/index.tsx
@@ -80,7 +80,7 @@ export default function AssetContent(props: AssetContentProps): ReactElement {
         {showPricing && <Pricing ddo={ddo} />}
         <div className={styles.content}>
           <MetaMain />
-          <Bookmark did={ddo.id} />
+          {/* <Bookmark did={ddo.id} /> */}
 
           {isInPurgatory ? (
             <Alert
diff --git a/src/components/pages/History/PublishedList.tsx b/src/components/pages/History/PublishedList.tsx
index 21abec760..fa33773ac 100644
--- a/src/components/pages/History/PublishedList.tsx
+++ b/src/components/pages/History/PublishedList.tsx
@@ -6,10 +6,11 @@ import axios from 'axios'
 import { queryMetadata } from '../../../utils/aquarius'
 import { useWeb3 } from '../../../providers/Web3'
 import { useOcean } from '../../../providers/Ocean'
+import { useSiteMetadata } from '../../../hooks/useSiteMetadata'
 
 export default function PublishedList(): ReactElement {
   const { accountId } = useWeb3()
-  const { metadataCacheUri } = useOcean()
+  const { appConfig } = useSiteMetadata()
 
   const [queryResult, setQueryResult] = useState<QueryResult>()
   const [isLoading, setIsLoading] = useState(false)
@@ -20,6 +21,8 @@ export default function PublishedList(): ReactElement {
   useEffect(() => {
     async function getPublished() {
       if (!accountId) return
+
+      // TODO: this query needs to adapt to chainIds
       const queryPublishedAssets = {
         page: page,
         offset: 9,
@@ -34,7 +37,7 @@ export default function PublishedList(): ReactElement {
         queryResult || setIsLoading(true)
         const result = await queryMetadata(
           queryPublishedAssets,
-          metadataCacheUri,
+          appConfig.metadataCacheUri,
           source.token
         )
         setQueryResult(result)
@@ -45,7 +48,7 @@ export default function PublishedList(): ReactElement {
       }
     }
     getPublished()
-  }, [accountId, page, metadataCacheUri])
+  }, [accountId, page, appConfig.metadataCacheUri])
 
   return accountId ? (
     <AssetList
diff --git a/src/components/pages/Home.tsx b/src/components/pages/Home.tsx
index a9a227574..dd032110f 100644
--- a/src/components/pages/Home.tsx
+++ b/src/components/pages/Home.tsx
@@ -7,16 +7,13 @@ import {
   SearchQuery
 } from '@oceanprotocol/lib/dist/node/metadatacache/MetadataCache'
 import Container from '../atoms/Container'
-import { useOcean } from '../../providers/Ocean'
 import Button from '../atoms/Button'
 import Bookmarks from '../molecules/Bookmarks'
 import axios from 'axios'
 import { queryMetadata } from '../../utils/aquarius'
 import { getHighestLiquidityDIDs } from '../../utils/subgraph'
 import { DDO, Logger } from '@oceanprotocol/lib'
-import { useWeb3 } from '../../providers/Web3'
 import { useSiteMetadata } from '../../hooks/useSiteMetadata'
-import { getOceanConfig } from '../../utils/ocean'
 
 async function getQueryHighest(
   chainIds: number[]
diff --git a/src/providers/Ocean.tsx b/src/providers/Ocean.tsx
index 6add08d0e..4ca8bc367 100644
--- a/src/providers/Ocean.tsx
+++ b/src/providers/Ocean.tsx
@@ -22,6 +22,7 @@ import { useAsset } from './Asset'
 interface OceanProviderValue {
   ocean: Ocean
   account: Account
+  config: Config
   connect: (config: Config) => Promise<void>
 }
 
@@ -33,6 +34,7 @@ function OceanProvider({ children }: { children: ReactNode }): ReactElement {
 
   const [ocean, setOcean] = useState<Ocean>()
   const [account, setAccount] = useState<Account>()
+  const [config, setConfig] = useState<Config>()
 
   // -----------------------------------
   // Helper: Create Ocean instance
@@ -50,6 +52,7 @@ function OceanProvider({ children }: { children: ReactNode }): ReactElement {
         Logger.log('[ocean] Connecting Ocean...', newConfig)
         const newOcean = await Ocean.getInstance(newConfig)
         setOcean(newOcean)
+        setConfig(newConfig)
         Logger.log('[ocean] Ocean instance created.', newOcean)
       } catch (error) {
         Logger.error('[ocean] Error: ', error.message)
@@ -99,7 +102,8 @@ function OceanProvider({ children }: { children: ReactNode }): ReactElement {
         {
           ocean,
           account,
-          connect
+          connect,
+          config
           // refreshBalance
         } as OceanProviderValue
       }