From 8fb1998b02e412c5dd1c0af08c07824ad170656f Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Fri, 9 Oct 2020 21:31:57 +0200
Subject: [PATCH] add marketFeeAddress to consume/compute

---
 app.config.js                                     | 1 +
 src/components/organisms/AssetActions/Compute.tsx | 7 +++++--
 src/components/organisms/AssetActions/Consume.tsx | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app.config.js b/app.config.js
index f52f49c91..baa5e50ab 100644
--- a/app.config.js
+++ b/app.config.js
@@ -2,6 +2,7 @@ module.exports = {
   network: process.env.GATSBY_NETWORK || 'rinkeby',
   infuraProjectId: process.env.GATSBY_INFURA_PROJECT_ID || 'xxx',
   metadataStoreUri: process.env.GATSBY_METADATA_STORE_URI,
+  // The ETH address the marketplace fee will be sent to.
   marketFeeAddress:
     process.env.GATSBY_MARKET_FEE_ADDRESS ||
     '0x903322C7E45A60d7c8C3EA236c5beA9Af86310c7',
diff --git a/src/components/organisms/AssetActions/Compute.tsx b/src/components/organisms/AssetActions/Compute.tsx
index dc8d2b443..93b3d0cb0 100644
--- a/src/components/organisms/AssetActions/Compute.tsx
+++ b/src/components/organisms/AssetActions/Compute.tsx
@@ -15,6 +15,7 @@ import styles from './Compute.module.css'
 import Button from '../../atoms/Button'
 import Input from '../../atoms/Input'
 import Alert from '../../atoms/Alert'
+import { useSiteMetadata } from '../../../hooks/useSiteMetadata'
 
 export default function Compute({
   ddo,
@@ -25,7 +26,8 @@ export default function Compute({
 }): ReactElement {
   const { ocean } = useOcean()
   const { compute, isLoading, computeStepText, computeError } = useCompute()
-  const computeService = ddo.findServiceByType('compute').attributes.main
+  const { marketFeeAddress } = useSiteMetadata()
+  const computeService = ddo.findServiceByType('compute')
   const metadataService = ddo.findServiceByType('metadata')
 
   const [isJobStarting, setIsJobStarting] = useState(false)
@@ -75,7 +77,8 @@ export default function Compute({
         computeService,
         ddo.dataToken,
         algorithmRawCode,
-        computeContainer
+        computeContainer,
+        marketFeeAddress
       )
 
       setIsPublished(true)
diff --git a/src/components/organisms/AssetActions/Consume.tsx b/src/components/organisms/AssetActions/Consume.tsx
index 486c2f600..275632f23 100644
--- a/src/components/organisms/AssetActions/Consume.tsx
+++ b/src/components/organisms/AssetActions/Consume.tsx
@@ -8,6 +8,7 @@ import Web3Feedback from '../../molecules/Wallet/Feedback'
 import styles from './Consume.module.css'
 import Loader from '../../atoms/Loader'
 import { useOcean, useConsume } from '@oceanprotocol/react'
+import { useSiteMetadata } from '../../../hooks/useSiteMetadata'
 
 export default function Consume({
   ddo,
@@ -19,6 +20,7 @@ export default function Consume({
   isBalanceSufficient: boolean
 }): ReactElement {
   const { ocean } = useOcean()
+  const { marketFeeAddress } = useSiteMetadata()
   const { consumeStepText, consume, consumeError } = useConsume()
 
   const isDisabled = !ocean || !isBalanceSufficient
@@ -34,7 +36,9 @@ export default function Consume({
       ) : (
         <Button
           style="primary"
-          onClick={() => consume(ddo.id, ddo.dataToken, 'access')}
+          onClick={() =>
+            consume(ddo.id, ddo.dataToken, 'access', marketFeeAddress)
+          }
           disabled={isDisabled}
         >
           Buy