From 69c3db2caa2bfc31f51d2c2dbf7399d77ee36cf0 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Tue, 22 Mar 2022 14:57:33 +0000
Subject: [PATCH 1/8] SEO & favicon fixes (#1229)

* fix URLs and title

* solve all favicon things

* image optimizations through ImageOptim

* typing fix
---
 content/site.json                   |   5 ++---
 package-lock.json                   |   2 ++
 public/android-chrome-192x192.png   | Bin 0 -> 3326 bytes
 public/android-chrome-512x512.png   | Bin 0 -> 6398 bytes
 public/apple-touch-icon.png         | Bin 0 -> 2962 bytes
 public/favicon.ico                  | Bin 0 -> 15406 bytes
 public/icon.svg                     |   1 +
 {src/@images => public}/share.png   | Bin
 public/site.webmanifest             |  14 ++++++++++++++
 src/@hooks/useSiteMetadata/types.ts |   1 -
 src/components/@shared/Page/Seo.tsx |  25 ++++++++++++++++++-------
 src/pages/asset/[did]/index.tsx     |   2 +-
 12 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 public/android-chrome-192x192.png
 create mode 100644 public/android-chrome-512x512.png
 create mode 100644 public/apple-touch-icon.png
 create mode 100644 public/favicon.ico
 create mode 100644 public/icon.svg
 rename {src/@images => public}/share.png (100%)
 create mode 100644 public/site.webmanifest

diff --git a/content/site.json b/content/site.json
index d3e5f861a..925aa7235 100644
--- a/content/site.json
+++ b/content/site.json
@@ -1,9 +1,8 @@
 {
   "siteTitle": "Ocean Market",
   "siteTagline": "A marketplace to find, publish and trade data sets in the Ocean Network.",
-  "siteUrl": "https://market.oceanprotocol.com",
-  "siteIcon": "node_modules/@oceanprotocol/art/logo/favicon-white.png",
-  "siteImage": "../src/@images/share.png",
+  "siteUrl": "https://v4.market.oceanprotocol.com",
+  "siteImage": "/share.png",
   "copyright": "All Rights Reserved. Powered by [Ocean Protocol](https://oceanprotocol.com)",
   "menu": [
     {
diff --git a/package-lock.json b/package-lock.json
index 9efb9cb38..41bb41a3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26715,6 +26715,7 @@
         "cross-fetch": "^3.1.5",
         "crypto-js": "^4.1.1",
         "decimal.js": "^10.3.1",
+        "web3": "^1.7.1",
         "web3-core": "^1.7.1",
         "web3-eth-contract": "^1.7.1"
       }
@@ -26817,6 +26818,7 @@
       "integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==",
       "dev": true,
       "requires": {
+        "@oclif/config": "^1.15.1",
         "@oclif/errors": "^1.3.3",
         "@oclif/parser": "^3.8.3",
         "@oclif/plugin-help": "^3",
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a46b12529b49870cc1f6504db72f4cee20106df
GIT binary patch
literal 3326
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
CL`~BG

literal 0
HcmV?d00001

diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..5911728ab24543aba9d8662e420bd98d3c375139
GIT binary patch
literal 6398
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

literal 0
HcmV?d00001

diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..30048f0bfd98fba79e3ed2ff121e90cde01ba7d7
GIT binary patch
literal 2962
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
IM6N<$f}fSqUH||9

literal 0
HcmV?d00001

diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..dc1711c0edf65fd253d0c6ae47a089237342694c
GIT binary patch
literal 15406
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
KHUr6?f!_h$iN&4(

literal 0
HcmV?d00001

diff --git a/public/icon.svg b/public/icon.svg
new file mode 100644
index 000000000..b5bcefe32
--- /dev/null
+++ b/public/icon.svg
@@ -0,0 +1 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg"><style>@media (prefers-color-scheme:dark){.logo{fill:#fff}.background{fill:#141414}}</style><rect width="512" height="512" class="background" fill="#fff"/><path d="M255.742 114.263C271.525 114.263 284.33 101.448 284.33 85.6321C284.33 69.82 271.525 57 255.742 57C239.944 57 227.139 69.82 227.139 85.6321C227.139 101.448 239.944 114.263 255.742 114.263Z" class="logo" fill="#141414"/><path d="M88.167 270.019C99.8609 270.019 109.327 260.527 109.327 248.826C109.327 237.125 99.8609 227.644 88.167 227.644C76.4833 227.644 67.0066 237.125 67.0066 248.826C67.0066 260.527 76.4833 270.019 88.167 270.019Z" class="logo" fill="#141414"/><path d="M424.451 270.019C436.129 270.019 445.606 260.527 445.606 248.826C445.606 237.125 436.129 227.644 424.451 227.644C412.762 227.644 403.285 237.125 403.285 248.826C403.285 260.527 412.762 270.019 424.451 270.019Z" class="logo" fill="#141414"/><path d="M277.467 332.433C277.467 344.132 267.991 353.623 256.309 353.623C244.622 353.623 235.146 344.132 235.146 332.433C235.146 320.733 244.622 311.248 256.309 311.248C267.991 311.248 277.467 320.733 277.467 332.433Z" class="logo" fill="#141414"/><path d="M171.662 312.393C183.355 312.393 192.825 302.902 192.825 291.206C192.825 279.5 183.355 270.019 171.662 270.019C159.975 270.019 150.504 279.5 150.504 291.206C150.504 302.902 159.975 312.393 171.662 312.393Z" class="logo" fill="#141414"/><path d="M360.965 291.206C360.965 302.902 351.489 312.393 339.807 312.393C328.114 312.393 318.644 302.902 318.644 291.206C318.644 279.5 328.114 270.019 339.807 270.019C351.489 270.019 360.965 279.5 360.965 291.206Z" class="logo" fill="#141414"/><path d="M88.1748 327.282C96.0689 327.282 102.465 320.864 102.465 312.971C102.465 305.058 96.0689 298.65 88.1748 298.65C80.2703 298.65 73.8695 305.058 73.8695 312.971C73.8695 320.864 80.2703 327.282 88.1748 327.282Z" class="logo" fill="#141414"/><path d="M438.743 312.971C438.743 320.864 432.338 327.282 424.446 327.282C416.548 327.282 410.148 320.864 410.148 312.971C410.148 305.058 416.548 298.65 424.446 298.65C432.338 298.65 438.743 305.058 438.743 312.971Z" class="logo" fill="#141414"/><path d="M256.312 412.031C264.196 412.031 270.604 405.613 270.604 397.705C270.604 389.802 264.196 383.4 256.312 383.4C248.422 383.4 242.009 389.802 242.009 397.705C242.009 405.613 248.422 412.031 256.312 412.031Z" class="logo" fill="#141414"/><path d="M185.962 355.346C185.962 363.251 179.563 369.656 171.67 369.656C163.772 369.656 157.367 363.251 157.367 355.346C157.367 347.435 163.772 341.025 171.67 341.025C179.563 341.025 185.962 347.435 185.962 355.346Z" class="logo" fill="#141414"/><path d="M339.812 369.656C347.693 369.656 354.102 363.251 354.102 355.346C354.102 347.435 347.693 341.025 339.812 341.025C331.91 341.025 325.507 347.435 325.507 355.346C325.507 363.251 331.91 369.656 339.812 369.656Z" class="logo" fill="#141414"/><path d="M95.6018 363.35C95.6018 367.469 92.2752 370.802 88.1697 370.802C84.0588 370.802 80.7323 367.469 80.7323 363.35C80.7323 359.241 84.0588 355.913 88.1697 355.913C92.2752 355.913 95.6018 359.241 95.6018 363.35Z" class="logo" fill="#141414"/><path d="M424.448 370.802C428.546 370.802 431.88 367.469 431.88 363.35C431.88 359.241 428.546 355.913 424.448 355.913C420.335 355.913 417.011 359.241 417.011 363.35C417.011 367.469 420.335 370.802 424.448 370.802Z" class="logo" fill="#141414"/><path d="M263.741 448.102C263.741 452.214 260.407 455.551 256.309 455.551C252.201 455.551 248.872 452.214 248.872 448.102C248.872 443.989 252.201 440.663 256.309 440.663C260.407 440.663 263.741 443.989 263.741 448.102Z" class="logo" fill="#141414"/><path d="M171.662 413.176C175.768 413.176 179.1 409.839 179.1 405.732C179.1 401.615 175.768 398.288 171.662 398.288C167.562 398.288 164.23 401.615 164.23 405.732C164.23 409.839 167.562 413.176 171.662 413.176Z" class="logo" fill="#141414"/><path d="M347.239 405.732C347.239 409.839 343.905 413.176 339.807 413.176C335.688 413.176 332.369 409.839 332.369 405.732C332.369 401.615 335.688 398.288 339.807 398.288C343.905 398.288 347.239 401.615 347.239 405.732Z" class="logo" fill="#141414"/><path d="M284.33 170.381C284.33 186.195 271.525 199.012 255.742 199.012C239.944 199.012 227.139 186.195 227.139 170.381C227.139 154.572 239.944 141.749 255.742 141.749C271.525 141.749 284.33 154.572 284.33 170.381Z" class="logo" fill="#141414"/><path d="M255.742 282.617C271.525 282.617 284.33 269.797 284.33 253.99C284.33 238.173 271.525 225.353 255.742 225.353C239.944 225.353 227.139 238.173 227.139 253.99C227.139 269.797 239.944 282.617 255.742 282.617Z" class="logo" fill="#141414"/><path d="M452.469 170.381C452.469 186.195 439.667 199.012 423.876 199.012C408.081 199.012 395.279 186.195 395.279 170.381C395.279 154.572 408.081 141.749 423.876 141.749C439.667 141.749 452.469 154.572 452.469 170.381Z" class="logo" fill="#141414"/><path d="M87.5977 199.012C103.391 199.012 116.19 186.195 116.19 170.381C116.19 154.572 103.391 141.749 87.5977 141.749C71.8046 141.749 59 154.572 59 170.381C59 186.195 71.8046 199.012 87.5977 199.012Z" class="logo" fill="#141414"/><path d="M200.832 128.006C200.832 143.818 188.031 156.638 172.237 156.638C156.442 156.638 143.642 143.818 143.642 128.006C143.642 112.184 156.442 99.3747 172.237 99.3747C188.031 99.3747 200.832 112.184 200.832 128.006Z" class="logo" fill="#141414"/><path d="M172.237 240.242C188.031 240.242 200.832 227.421 200.832 211.608C200.832 195.8 188.031 182.979 172.237 182.979C156.442 182.979 143.642 195.8 143.642 211.608C143.642 227.421 156.442 240.242 172.237 240.242Z" class="logo" fill="#141414"/><path d="M368.971 128.006C368.971 143.818 356.167 156.638 340.373 156.638C324.58 156.638 311.781 143.818 311.781 128.006C311.781 112.184 324.58 99.3747 340.373 99.3747C356.167 99.3747 368.971 112.184 368.971 128.006Z" class="logo" fill="#141414"/><path d="M340.373 240.242C356.167 240.242 368.971 227.421 368.971 211.608C368.971 195.8 356.167 182.979 340.373 182.979C324.58 182.979 311.781 195.8 311.781 211.608C311.781 227.421 324.58 240.242 340.373 240.242Z" class="logo" fill="#141414"/></svg>
\ No newline at end of file
diff --git a/src/@images/share.png b/public/share.png
similarity index 100%
rename from src/@images/share.png
rename to public/share.png
diff --git a/public/site.webmanifest b/public/site.webmanifest
new file mode 100644
index 000000000..19e8c3f45
--- /dev/null
+++ b/public/site.webmanifest
@@ -0,0 +1,14 @@
+{
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ]
+}
diff --git a/src/@hooks/useSiteMetadata/types.ts b/src/@hooks/useSiteMetadata/types.ts
index fce4f1141..1159b4eb3 100644
--- a/src/@hooks/useSiteMetadata/types.ts
+++ b/src/@hooks/useSiteMetadata/types.ts
@@ -2,7 +2,6 @@ export interface UseSiteMetadata {
   siteTitle: string
   siteTagline: string
   siteUrl: string
-  siteIcon: string
   siteImage: string
   copyright: string
   menu: {
diff --git a/src/components/@shared/Page/Seo.tsx b/src/components/@shared/Page/Seo.tsx
index 7194cad14..11cb3f402 100644
--- a/src/components/@shared/Page/Seo.tsx
+++ b/src/components/@shared/Page/Seo.tsx
@@ -17,24 +17,35 @@ export default function Seo({
   // Remove trailing slash from all URLs
   const canonical = `${siteUrl}${uri}`.replace(/\/$/, '')
 
+  const pageTitle = title
+    ? `${title} - ${siteTitle}`
+    : `${siteTitle} — ${siteTagline}`
+
   return (
     <Head>
       <html lang="en" />
 
-      <title>{`${siteTitle} — ${siteTagline}`}</title>
+      <title>{pageTitle}</title>
 
-      {isBrowser &&
-        window.location &&
-        window.location.hostname !== 'oceanprotocol.com' && (
-          <meta name="robots" content="noindex,nofollow" />
-        )}
+      {isBrowser && window?.location?.hostname !== 'oceanprotocol.com' && (
+        <meta name="robots" content="noindex,nofollow" />
+      )}
 
       <link rel="canonical" href={canonical} />
+      <link rel="icon" href="/favicon.ico" sizes="any" />
+      <link rel="icon" href="/icon.svg" type="image/svg+xml" />
+      <link
+        rel="apple-touch-icon"
+        sizes="180x180"
+        href="/apple-touch-icon.png"
+      />
+      <link rel="manifest" href="/site.webmanifest" />
+      <meta name="theme-color" content="var(--background-content)" />
 
       <meta name="description" content={description} />
       <meta property="og:title" content={title} />
       <meta property="og:description" content={description} />
-      <meta property="og:url" content={uri} />
+      <meta property="og:url" content={canonical} />
 
       <meta name="image" content={`${siteUrl}${siteImage}`} />
       <meta property="og:image" content={`${siteUrl}${siteImage}`} />
diff --git a/src/pages/asset/[did]/index.tsx b/src/pages/asset/[did]/index.tsx
index 50995e81a..22d7caf4f 100644
--- a/src/pages/asset/[did]/index.tsx
+++ b/src/pages/asset/[did]/index.tsx
@@ -8,7 +8,7 @@ export default function PageAssetDetails(): ReactElement {
   const { did } = router.query
   return (
     <AssetProvider did={did as string}>
-      <PageTemplateAssetDetails uri={router.pathname} />
+      <PageTemplateAssetDetails uri={router.asPath} />
     </AssetProvider>
   )
 }

From 926838862a6753e87b62e3bc38f9896325803005 Mon Sep 17 00:00:00 2001
From: EnzoVezzaro <enzo-vezzaro@live.it>
Date: Tue, 22 Mar 2022 11:50:51 -0400
Subject: [PATCH 2/8] Fix No error message for swapping more than max tokens
 (#1230)

* moved Error (field) component in shared components

- moved Error.tsx from Pricing
- change paths to Error.tsx in publish

* added Error component with field validation

* change setTimeout with lodash.debounce
---
 .../Pricing => @shared/FormInput}/Error.tsx      |  0
 .../Asset/AssetActions/Trade/TradeInput.tsx      | 16 ++++++++++------
 src/components/Publish/Pricing/Coin.tsx          |  2 +-
 src/components/Publish/Pricing/Fees.tsx          |  2 +-
 src/components/Publish/Pricing/Price.tsx         |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)
 rename src/components/{Publish/Pricing => @shared/FormInput}/Error.tsx (100%)

diff --git a/src/components/Publish/Pricing/Error.tsx b/src/components/@shared/FormInput/Error.tsx
similarity index 100%
rename from src/components/Publish/Pricing/Error.tsx
rename to src/components/@shared/FormInput/Error.tsx
diff --git a/src/components/Asset/AssetActions/Trade/TradeInput.tsx b/src/components/Asset/AssetActions/Trade/TradeInput.tsx
index 6e29cf5fb..a6552c74b 100644
--- a/src/components/Asset/AssetActions/Trade/TradeInput.tsx
+++ b/src/components/Asset/AssetActions/Trade/TradeInput.tsx
@@ -4,10 +4,13 @@ import {
   Field,
   FieldInputProps,
   FormikContextType,
-  useFormikContext
+  useFormikContext,
+  useField
 } from 'formik'
-import Input from '@shared/FormInput'
+import debounce from 'lodash.debounce'
 import Button from '@shared/atoms/Button'
+import Input from '@shared/FormInput'
+import Error from '@shared/FormInput/Error'
 import { FormTradeData, TradeItem } from './_types'
 import UserLiquidity from '../UserLiquidity'
 import { useWeb3 } from '@context/Web3'
@@ -28,11 +31,10 @@ export default function TradeInput({
   // Connect with form
   const {
     handleChange,
-    setFieldValue,
     validateForm,
     values
   }: FormikContextType<FormTradeData> = useFormikContext()
-
+  const [field, meta] = useField(name)
   const isTopField =
     (name === 'baseToken' && values.type === 'buy') ||
     (name === 'datatoken' && values.type === 'sell')
@@ -61,11 +63,13 @@ export default function TradeInput({
             form={form}
             value={`${field.value}`}
             onChange={(e: ChangeEvent<HTMLInputElement>) => {
-              handleValueChange(name, Number(e.target.value))
-              validateForm()
               handleChange(e)
+              handleValueChange(name, Number(e.target.value))
+              // debounce needed to avoid validating the wrong (pass) value
+              debounce(() => validateForm(), 100)
             }}
             disabled={!accountId || disabled}
+            additionalComponent={<Error meta={meta} />}
           />
         )}
       </Field>
diff --git a/src/components/Publish/Pricing/Coin.tsx b/src/components/Publish/Pricing/Coin.tsx
index 8a2b4bff6..60d38be5d 100644
--- a/src/components/Publish/Pricing/Coin.tsx
+++ b/src/components/Publish/Pricing/Coin.tsx
@@ -4,7 +4,7 @@ import InputElement from '@shared/FormInput/InputElement'
 import Logo from '@images/logo.svg'
 import Conversion from '@shared/Price/Conversion'
 import { useField } from 'formik'
-import Error from './Error'
+import Error from '@shared/FormInput/Error'
 
 export default function Coin({
   datatokenOptions,
diff --git a/src/components/Publish/Pricing/Fees.tsx b/src/components/Publish/Pricing/Fees.tsx
index 3936dbcbf..96ff70e22 100644
--- a/src/components/Publish/Pricing/Fees.tsx
+++ b/src/components/Publish/Pricing/Fees.tsx
@@ -3,7 +3,7 @@ import Tooltip from '@shared/atoms/Tooltip'
 import styles from './Fees.module.css'
 import { useField } from 'formik'
 import Input from '@shared/FormInput'
-import Error from './Error'
+import Error from '@shared/FormInput/Error'
 import { getOpcFees } from '../../../@utils/subgraph'
 import { OpcFeesQuery_opc as OpcFeesData } from '../../../@types/subgraph/OpcFeesQuery'
 import { useWeb3 } from '@context/Web3'
diff --git a/src/components/Publish/Pricing/Price.tsx b/src/components/Publish/Pricing/Price.tsx
index 6484670fe..b18b80292 100644
--- a/src/components/Publish/Pricing/Price.tsx
+++ b/src/components/Publish/Pricing/Price.tsx
@@ -2,7 +2,7 @@ import Conversion from '@shared/Price/Conversion'
 import { Field, useField, useFormikContext } from 'formik'
 import React, { ReactElement } from 'react'
 import Input from '@shared/FormInput'
-import Error from './Error'
+import Error from '@shared/FormInput/Error'
 import PriceUnit from '@shared/Price/PriceUnit'
 import styles from './Price.module.css'
 import { FormPublishData } from '../_types'

From 5f174bca88136f69f760c76f8e385976a5fc3191 Mon Sep 17 00:00:00 2001
From: claudiaHash <49017601+claudiaHash@users.noreply.github.com>
Date: Wed, 23 Mar 2022 15:30:03 +0200
Subject: [PATCH 3/8] Remove collect tokens button (#1235)

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
---
 src/@utils/feedback.ts                        |   7 --
 src/components/@shared/ButtonBuy/index.tsx    |   4 +-
 .../Asset/AssetActions/Download.module.css    |   7 --
 .../Asset/AssetActions/Download.tsx           | 111 +-----------------
 4 files changed, 4 insertions(+), 125 deletions(-)

diff --git a/src/@utils/feedback.ts b/src/@utils/feedback.ts
index c335bddd1..2df15688b 100644
--- a/src/@utils/feedback.ts
+++ b/src/@utils/feedback.ts
@@ -11,13 +11,6 @@ export function getOrderFeedback(
   }
 }
 
-export function getCollectTokensFeedback(
-  baseTokenSymbol: string,
-  baseTokenBalance: string
-) {
-  return `Collecting ${baseTokenBalance} ${baseTokenSymbol} from asset `
-}
-
 // TODO: customize for compute
 export const computeFeedback: { [key in number]: string } = {
   0: 'Ordering asset...',
diff --git a/src/components/@shared/ButtonBuy/index.tsx b/src/components/@shared/ButtonBuy/index.tsx
index 29d3d83a3..e2db0e640 100644
--- a/src/components/@shared/ButtonBuy/index.tsx
+++ b/src/components/@shared/ButtonBuy/index.tsx
@@ -4,7 +4,7 @@ import styles from './index.module.css'
 import Loader from '../atoms/Loader'
 
 interface ButtonBuyProps {
-  action: 'download' | 'compute' | 'collect'
+  action: 'download' | 'compute'
   disabled: boolean
   hasPreviousOrder: boolean
   hasDatatoken: boolean
@@ -153,8 +153,6 @@ export default function ButtonBuy({
       ? 'Start Compute Job'
       : priceType === 'free' && algorithmPriceType === 'free'
       ? 'Order Compute Job'
-      : action === 'collect'
-      ? `Collect ${dtBalance} ${dtSymbol}`
       : `Buy Compute Job`
 
   return (
diff --git a/src/components/Asset/AssetActions/Download.module.css b/src/components/Asset/AssetActions/Download.module.css
index 4efc7f192..d6dc45629 100644
--- a/src/components/Asset/AssetActions/Download.module.css
+++ b/src/components/Asset/AssetActions/Download.module.css
@@ -16,10 +16,3 @@
   width: 100%;
   margin-top: calc(var(--spacer));
 }
-
-.collect {
-  width: 100%;
-  justify-content: center;
-  text-align: center;
-  margin-top: calc(var(--spacer) / 2);
-}
diff --git a/src/components/Asset/AssetActions/Download.tsx b/src/components/Asset/AssetActions/Download.tsx
index 31dfefcff..2a25eaebd 100644
--- a/src/components/Asset/AssetActions/Download.tsx
+++ b/src/components/Asset/AssetActions/Download.tsx
@@ -7,37 +7,16 @@ import ButtonBuy from '@shared/ButtonBuy'
 import { secondsToString } from '@utils/ddo'
 import AlgorithmDatasetsListForCompute from './Compute/AlgorithmDatasetsListForCompute'
 import styles from './Download.module.css'
-import {
-  FileMetadata,
-  LoggerInstance,
-  ZERO_ADDRESS,
-  FixedRateExchange
-} from '@oceanprotocol/lib'
+import { FileMetadata, LoggerInstance, ZERO_ADDRESS } from '@oceanprotocol/lib'
 import { order } from '@utils/order'
 import { AssetExtended } from 'src/@types/AssetExtended'
 import { buyDtFromPool } from '@utils/pool'
 import { downloadFile } from '@utils/provider'
-import { getCollectTokensFeedback, getOrderFeedback } from '@utils/feedback'
+import { getOrderFeedback } from '@utils/feedback'
 import { getOrderPriceAndFees } from '@utils/accessDetailsAndPricing'
 import { OrderPriceAndFees } from 'src/@types/Price'
 import { toast } from 'react-toastify'
-import { gql, OperationResult } from 'urql'
-import { fetchData, getQueryContext } from '@utils/subgraph'
-import { getOceanConfig } from '@utils/ocean'
-import { FixedRateExchanges } from 'src/@types/subgraph/FixedRateExchanges'
 
-const FixedRateExchangesQuery = gql`
-  query FixedRateExchanges($user: String, $exchangeId: String) {
-    fixedRateExchanges(where: { owner: $user, exchangeId: $exchangeId }) {
-      id
-      owner {
-        id
-      }
-      exchangeId
-      baseTokenBalance
-    }
-  }
-`
 export default function Download({
   asset,
   file,
@@ -61,9 +40,7 @@ export default function Download({
   const [isLoading, setIsLoading] = useState(false)
   const [isOwned, setIsOwned] = useState(false)
   const [validOrderTx, setValidOrderTx] = useState('')
-  const [isCollectLoading, setIsCollectLoading] = useState(false)
-  const [baseTokenBalance, setBaseTokenBalance] = useState(0)
-  const [collectStatusText, setCollectStatusText] = useState('')
+
   const [orderPriceAndFees, setOrderPriceAndFees] =
     useState<OrderPriceAndFees>()
   useEffect(() => {
@@ -108,29 +85,6 @@ export default function Download({
     isOwned
   ])
 
-  useEffect(() => {
-    if (!accountId || asset.nft.owner !== accountId) return
-    const queryContext = getQueryContext(Number(asset.chainId))
-
-    async function getBaseTokenBalance() {
-      const variables = {
-        user: accountId.toLowerCase(),
-        exchangeId: asset?.accessDetails?.addressOrId
-      }
-      const result: OperationResult<FixedRateExchanges> = await fetchData(
-        FixedRateExchangesQuery,
-        variables,
-        queryContext
-      )
-      result?.data?.fixedRateExchanges[0]?.baseTokenBalance
-        ? setBaseTokenBalance(
-            parseInt(result?.data?.fixedRateExchanges[0]?.baseTokenBalance)
-          )
-        : setBaseTokenBalance(0)
-    }
-    getBaseTokenBalance()
-  }, [accountId, asset?.accessDetails?.addressOrId, asset.chainId, asset.nft])
-
   async function handleOrderOrDownload() {
     setIsLoading(true)
     if (isOwned) {
@@ -180,38 +134,6 @@ export default function Download({
     setIsLoading(false)
   }
 
-  async function handleCollectTokens() {
-    setIsCollectLoading(true)
-    const config = getOceanConfig(asset?.chainId)
-    const fixed = new FixedRateExchange(web3, config.fixedRateExchangeAddress)
-    try {
-      setCollectStatusText(
-        getCollectTokensFeedback(
-          asset.accessDetails.baseToken?.symbol,
-          baseTokenBalance.toString()
-        )
-      )
-
-      const tx = await fixed.collectBT(
-        accountId,
-        asset?.accessDetails?.addressOrId,
-        baseTokenBalance.toString()
-      )
-
-      if (!tx) {
-        setIsCollectLoading(false)
-        return
-      }
-      setBaseTokenBalance(0)
-      return tx
-    } catch (error) {
-      LoggerInstance.log(error.message)
-      setIsCollectLoading(false)
-    } finally {
-      setIsCollectLoading(false)
-    }
-  }
-
   const PurchaseButton = () => (
     <ButtonBuy
       action="download"
@@ -234,26 +156,6 @@ export default function Download({
     />
   )
 
-  const CollectTokensButton = () => (
-    <ButtonBuy
-      action="collect"
-      onClick={handleCollectTokens}
-      disabled={baseTokenBalance === 0 || !baseTokenBalance}
-      hasPreviousOrder={false}
-      hasDatatoken={false}
-      dtSymbol={asset?.accessDetails?.baseToken.symbol}
-      dtBalance={baseTokenBalance.toString()}
-      datasetLowPoolLiquidity={false}
-      assetType=""
-      stepText={collectStatusText}
-      assetTimeout=""
-      isConsumable={false}
-      consumableFeedback=""
-      isBalanceSufficient={false}
-      isLoading={isCollectLoading}
-    />
-  )
-
   return (
     <aside className={styles.consume}>
       <div className={styles.info}>
@@ -271,13 +173,6 @@ export default function Download({
         </div>
       </div>
 
-      {asset?.accessDetails?.datatoken?.name !== '' &&
-        asset?.nft.owner === accountId && (
-          <div className={styles.collect}>
-            <CollectTokensButton />
-          </div>
-        )}
-
       {asset?.metadata?.type === 'algorithm' && (
         <AlgorithmDatasetsListForCompute
           algorithmDid={asset.id}

From aeb6f06f75b5689075a6740cccacb63155ab0d8d Mon Sep 17 00:00:00 2001
From: EnzoVezzaro <enzo-vezzaro@live.it>
Date: Wed, 23 Mar 2022 10:59:57 -0400
Subject: [PATCH 4/8] catch user signing rejection on download (#1237)

* catch user signing rejection on download

* change LoggerInstance.log to LoggerInstance.error

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
---
 .../Asset/AssetActions/Download.tsx           | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/components/Asset/AssetActions/Download.tsx b/src/components/Asset/AssetActions/Download.tsx
index 2a25eaebd..67c48b511 100644
--- a/src/components/Asset/AssetActions/Download.tsx
+++ b/src/components/Asset/AssetActions/Download.tsx
@@ -87,16 +87,17 @@ export default function Download({
 
   async function handleOrderOrDownload() {
     setIsLoading(true)
-    if (isOwned) {
-      setStatusText(
-        getOrderFeedback(
-          asset.accessDetails?.baseToken?.symbol,
-          asset.accessDetails?.datatoken?.symbol
-        )[3]
-      )
-      await downloadFile(web3, asset, accountId, validOrderTx)
-    } else {
-      try {
+    try {
+      if (isOwned) {
+        setStatusText(
+          getOrderFeedback(
+            asset.accessDetails?.baseToken?.symbol,
+            asset.accessDetails?.datatoken?.symbol
+          )[3]
+        )
+
+        await downloadFile(web3, asset, accountId, validOrderTx)
+      } else {
         if (!hasDatatoken && asset.accessDetails.type === 'dynamic') {
           setStatusText(
             getOrderFeedback(
@@ -106,9 +107,7 @@ export default function Download({
           )
           const tx = await buyDtFromPool(asset.accessDetails, accountId, web3)
           if (!tx) {
-            toast.error('Failed to buy datatoken from pool!')
-            setIsLoading(false)
-            return
+            throw new Error()
           }
         }
         setStatusText(
@@ -119,18 +118,18 @@ export default function Download({
         )
         const orderTx = await order(web3, asset, orderPriceAndFees, accountId)
         if (!orderTx) {
-          toast.error('Failed to buy datatoken from pool!')
-          setIsLoading(false)
-          return
+          throw new Error()
         }
         setIsOwned(true)
         setValidOrderTx(orderTx.transactionHash)
-      } catch (ex) {
-        LoggerInstance.log(ex.message)
-        setIsLoading(false)
       }
+    } catch (error) {
+      LoggerInstance.error(error)
+      const message = isOwned
+        ? 'Failed to download file!'
+        : 'Failed to buy datatoken from pool!'
+      toast.error(message)
     }
-
     setIsLoading(false)
   }
 

From 61d60fd173acd91326ec41195aa9619a834b754c Mon Sep 17 00:00:00 2001
From: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Date: Wed, 23 Mar 2022 17:11:42 +0200
Subject: [PATCH 5/8] Fix edit asset issues (#1190)

* fix loading

* fix cancel acction and some cleanups

* style typo

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

* fix title and replace router with link

* add proper loading to edit components

* add page title

* add more top spacing to form description

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
---
 .../Asset/Edit/DebugEditMetadata.tsx          |  4 +-
 src/components/Asset/Edit/EditMetadata.tsx    |  6 +--
 .../Asset/Edit/FormActions.module.css         | 12 ++++++
 src/components/Asset/Edit/FormActions.tsx     |  9 ++---
 .../Asset/Edit/FormEditComputeDataset.tsx     |  4 +-
 .../Asset/Edit/FormEditMetadata.tsx           | 10 +----
 src/components/Asset/Edit/index.module.css    |  2 +
 src/components/Asset/Edit/index.tsx           | 40 ++++++-------------
 8 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/src/components/Asset/Edit/DebugEditMetadata.tsx b/src/components/Asset/Edit/DebugEditMetadata.tsx
index a58db028e..ea789c48d 100644
--- a/src/components/Asset/Edit/DebugEditMetadata.tsx
+++ b/src/components/Asset/Edit/DebugEditMetadata.tsx
@@ -14,14 +14,14 @@ export default function DebugEditMetadata({
   const linksTransformed = values.links?.length &&
     values.links[0].valid && [values.links[0].url.replace('javascript:', '')]
   const newMetadata: Metadata = {
-    ...asset.metadata,
+    ...asset?.metadata,
     name: values.name,
     description: values.description,
     links: linksTransformed,
     author: values.author
   }
   const updatedService: Service = {
-    ...asset.services[0],
+    ...asset?.services[0],
     timeout: mapTimeoutStringToSeconds(values.timeout)
   }
   const updatedAsset: Asset = {
diff --git a/src/components/Asset/Edit/EditMetadata.tsx b/src/components/Asset/Edit/EditMetadata.tsx
index e1d1fba6c..8da38fdb0 100644
--- a/src/components/Asset/Edit/EditMetadata.tsx
+++ b/src/components/Asset/Edit/EditMetadata.tsx
@@ -17,7 +17,6 @@ import { mapTimeoutStringToSeconds } from '@utils/ddo'
 import styles from './index.module.css'
 import content from '../../../../content/pages/edit.json'
 import { AssetExtended } from 'src/@types/AssetExtended'
-import { setMinterToPublisher, setMinterToDispenser } from '@utils/dispenser'
 import { useAbortController } from '@hooks/useAbortController'
 import DebugEditMetadata from './DebugEditMetadata'
 import { getOceanConfig } from '@utils/ocean'
@@ -36,7 +35,6 @@ export default function Edit({
   const newAbortController = useAbortController()
   const [success, setSuccess] = useState<string>()
   const [error, setError] = useState<string>()
-  const [timeoutStringValue, setTimeoutStringValue] = useState<string>()
   const isComputeType = asset?.services[0]?.type === 'compute'
   const hasFeedback = error || success
 
@@ -130,7 +128,7 @@ export default function Edit({
         await handleSubmit(values, resetForm)
       }}
     >
-      {({ isSubmitting, values, initialValues }) =>
+      {({ isSubmitting, values }) =>
         isSubmitting || hasFeedback ? (
           <EditFeedback
             title="Updating Data Set"
@@ -151,8 +149,6 @@ export default function Edit({
             <article>
               <FormEditMetadata
                 data={content.form.data}
-                setTimeoutStringValue={setTimeoutStringValue}
-                values={initialValues}
                 showPrice={asset?.accessDetails?.type === 'fixed'}
                 isComputeDataset={isComputeType}
               />
diff --git a/src/components/Asset/Edit/FormActions.module.css b/src/components/Asset/Edit/FormActions.module.css
index 67c39f9f6..bc6ad686a 100644
--- a/src/components/Asset/Edit/FormActions.module.css
+++ b/src/components/Asset/Edit/FormActions.module.css
@@ -18,3 +18,15 @@
   margin-left: calc(var(--spacer) / 2);
   margin-right: calc(var(--spacer) / 2);
 }
+
+.actions a {
+  padding: calc(var(--spacer) / 3);
+  font-weight: var(--font-weight-bold);
+  text-transform: uppercase;
+  transition: 0.2s ease-out;
+}
+
+.actions a:hover {
+  transform: translate3d(0, -0.05rem, 0);
+  text-decoration: none;
+}
diff --git a/src/components/Asset/Edit/FormActions.tsx b/src/components/Asset/Edit/FormActions.tsx
index c08a7a0e8..312f0ab2c 100644
--- a/src/components/Asset/Edit/FormActions.tsx
+++ b/src/components/Asset/Edit/FormActions.tsx
@@ -3,15 +3,14 @@ import React, { ReactElement } from 'react'
 import { useAsset } from '@context/Asset'
 import Button from '@shared/atoms/Button'
 import styles from './FormActions.module.css'
+import Link from 'next/link'
 
 export default function FormActions({
-  setShowEdit,
   handleClick
 }: {
-  setShowEdit: (show: boolean) => void
   handleClick?: () => void
 }): ReactElement {
-  const { isAssetNetwork } = useAsset()
+  const { isAssetNetwork, asset } = useAsset()
   const { isValid }: FormikContextType<Partial<any>> = useFormikContext()
 
   return (
@@ -23,9 +22,9 @@ export default function FormActions({
       >
         Submit
       </Button>
-      <Button style="text" onClick={() => setShowEdit(false)}>
+      <Link href={`/asset/${asset?.id}`} key={asset?.id}>
         Cancel
-      </Button>
+      </Link>
     </footer>
   )
 }
diff --git a/src/components/Asset/Edit/FormEditComputeDataset.tsx b/src/components/Asset/Edit/FormEditComputeDataset.tsx
index 55eea4ca6..d4ab305ef 100644
--- a/src/components/Asset/Edit/FormEditComputeDataset.tsx
+++ b/src/components/Asset/Edit/FormEditComputeDataset.tsx
@@ -27,7 +27,6 @@ export default function FormEditComputeDataset({
 }): ReactElement {
   const { appConfig } = useSiteMetadata()
   const { asset } = useAsset()
-  const [showEditCompute, setShowEditCompute] = useState<boolean>()
   const { values }: FormikContextType<ComputePrivacyForm> = useFormikContext()
   const [allAlgorithms, setAllAlgorithms] = useState<AssetSelectionAsset[]>()
   const newCancelToken = useCancelToken()
@@ -83,8 +82,7 @@ export default function FormEditComputeDataset({
         />
       ))}
 
-      {/* <FormActions setShowEdit={setShowEdit} /> */}
-      <FormActions setShowEdit={setShowEditCompute} />
+      <FormActions />
     </Form>
   )
 }
diff --git a/src/components/Asset/Edit/FormEditMetadata.tsx b/src/components/Asset/Edit/FormEditMetadata.tsx
index 5887199ed..64e6285bd 100644
--- a/src/components/Asset/Edit/FormEditMetadata.tsx
+++ b/src/components/Asset/Edit/FormEditMetadata.tsx
@@ -53,19 +53,14 @@ function handleTimeoutCustomOption(
 
 export default function FormEditMetadata({
   data,
-  setTimeoutStringValue,
-  values,
   showPrice,
   isComputeDataset
 }: {
   data: InputProps[]
-  setTimeoutStringValue: (value: string) => void
-  values: Partial<MetadataEditForm>
   showPrice: boolean
   isComputeDataset: boolean
 }): ReactElement {
   const { oceanConfig } = useAsset()
-  const [showEdit, setShowEdit] = useState<boolean>()
   const {
     validateField,
     setFieldValue
@@ -118,10 +113,7 @@ export default function FormEditMetadata({
           )
       )}
 
-      <FormActions
-        setShowEdit={setShowEdit}
-        // handleClick={() => setTimeoutStringValue(values?.services[0]?.timeout)}
-      />
+      <FormActions />
     </Form>
   )
 }
diff --git a/src/components/Asset/Edit/index.module.css b/src/components/Asset/Edit/index.module.css
index c0a991646..0b6f2a606 100644
--- a/src/components/Asset/Edit/index.module.css
+++ b/src/components/Asset/Edit/index.module.css
@@ -32,6 +32,8 @@
 
 .description {
   font-size: var(--font-size-large);
+  margin: calc(var(--spacer) * 0.3 / var(--line-height)) 0
+    calc(var(--spacer) / var(--line-height)) 0;
 }
 
 .title {
diff --git a/src/components/Asset/Edit/index.tsx b/src/components/Asset/Edit/index.tsx
index 1c5457700..b796e3aa7 100644
--- a/src/components/Asset/Edit/index.tsx
+++ b/src/components/Asset/Edit/index.tsx
@@ -11,24 +11,19 @@ import { useWeb3 } from '@context/Web3'
 import Alert from '@shared/atoms/Alert'
 
 export default function Edit({ uri }: { uri: string }): ReactElement {
-  const { asset, error, loading, owner } = useAsset()
+  const { asset, error, isInPurgatory, owner, title } = useAsset()
   const [isCompute, setIsCompute] = useState(false)
-  const [isOnwer, setIsOwner] = useState(false)
+  const [pageTitle, setPageTitle] = useState<string>('')
   const { accountId } = useWeb3()
 
-  // Switch type value upon tab change
-  function handleTabChange(tabName: string) {
-    LoggerInstance.log('switched to tab', tabName)
-    // add store restore from
-  }
-
   useEffect(() => {
-    if (!asset || error) {
+    if (!asset || error || accountId !== owner) {
+      setPageTitle('Edit action not available')
       return
     }
+    setPageTitle(isInPurgatory ? '' : `Edit ${title}`)
     setIsCompute(asset?.services[0]?.type === 'compute')
-    setIsOwner(owner === accountId)
-  }, [asset, error])
+  }, [asset, error, isInPurgatory, title])
 
   const tabs = [
     {
@@ -42,23 +37,14 @@ export default function Edit({ uri }: { uri: string }): ReactElement {
     }
   ].filter((tab) => tab !== undefined)
 
-  return asset && !loading && isOnwer ? (
-    <Page uri={uri}>
-      <div className={styles.contianer}>
-        <Tabs
-          items={tabs}
-          handleTabChange={handleTabChange}
-          defaultIndex={0}
-          className={styles.edit}
-        />
+  return asset && asset?.accessDetails && accountId === owner ? (
+    <Page title={pageTitle} noPageHeader uri={uri}>
+      <div className={styles.container}>
+        <Tabs items={tabs} defaultIndex={0} className={styles.edit} />
       </div>
     </Page>
-  ) : !isOnwer ? (
-    <Page
-      title="Edit action available only to asset owner"
-      noPageHeader
-      uri={uri}
-    >
+  ) : asset && asset?.accessDetails && accountId !== owner ? (
+    <Page title={pageTitle} noPageHeader uri={uri}>
       <Alert
         title="Edit action available only to asset owner"
         text={error}
@@ -66,7 +52,7 @@ export default function Edit({ uri }: { uri: string }): ReactElement {
       />
     </Page>
   ) : (
-    <Page title={undefined} uri={uri}>
+    <Page title={pageTitle} noPageHeader uri={uri}>
       <Loader />
     </Page>
   )

From 300b5b9ef3d63fe85993c12ffa6bdfc4f7583643 Mon Sep 17 00:00:00 2001
From: Luca Milanese <luca.milanese90@gmail.com>
Date: Thu, 24 Mar 2022 13:11:41 +0100
Subject: [PATCH 6/8] fix: assign viewBox property to svg waves (#1247)

---
 src/@utils/SvgWaves.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/@utils/SvgWaves.ts b/src/@utils/SvgWaves.ts
index 217ddbeb5..1a2db1ec5 100644
--- a/src/@utils/SvgWaves.ts
+++ b/src/@utils/SvgWaves.ts
@@ -4,6 +4,7 @@ import { randomIntFromInterval } from './numbers'
 export interface WaveProperties {
   width?: number
   height?: number
+  viewBox?: string
   color?: string
   fill?: boolean
   layerCount?: number
@@ -53,6 +54,7 @@ export class SvgWaves {
     return {
       width: 99,
       height: 99,
+      viewBox: '0 0 99 99',
       color: WaveColors.Pink,
       fill: true,
       layerCount: 4,
@@ -107,8 +109,7 @@ export class SvgWaves {
 
   generateSvg(): Element {
     const svg = document.createElementNS(SvgWaves.xmlns, 'svg')
-    svg.setAttribute('width', this.properties.width.toString())
-    svg.setAttribute('height', this.properties.height.toString())
+    svg.setAttribute('viewBox', this.properties.viewBox.toString())
     svg.setAttribute('fill', this.properties.fill ? undefined : 'transparent')
     svg.setAttribute('xmlns', SvgWaves.xmlns)
 

From 63f0b4100671d152dde8b290d031519ab26d145d Mon Sep 17 00:00:00 2001
From: Norbi <37236152+KatunaNorbert@users.noreply.github.com>
Date: Fri, 25 Mar 2022 14:51:56 +0200
Subject: [PATCH 7/8] added slippage to trade approval (#1252)

---
 .../Asset/AssetActions/Pool/Actions.tsx         | 17 ++++++++++++++++-
 .../Asset/AssetActions/Trade/FormTrade.tsx      |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/components/Asset/AssetActions/Pool/Actions.tsx b/src/components/Asset/AssetActions/Pool/Actions.tsx
index 7eaebcc5e..7c3572b67 100644
--- a/src/components/Asset/AssetActions/Pool/Actions.tsx
+++ b/src/components/Asset/AssetActions/Pool/Actions.tsx
@@ -6,11 +6,13 @@ import ExplorerLink from '@shared/ExplorerLink'
 import SuccessConfetti from '@shared/SuccessConfetti'
 import { useWeb3 } from '@context/Web3'
 import TokenApproval from '@shared/TokenApproval'
+import Decimal from 'decimal.js'
 
 export default function Actions({
   isLoading,
   loaderMessage,
   successMessage,
+  slippage,
   txId,
   actionName,
   amount,
@@ -23,6 +25,7 @@ export default function Actions({
   isLoading: boolean
   loaderMessage: string
   successMessage: string
+  slippage?: string
   txId: string
   actionName: string
   amount?: string
@@ -45,6 +48,18 @@ export default function Actions({
     </Button>
   )
 
+  const applySlippage = (amount: string) => {
+    if (!amount) return '0'
+    const newAmount = new Decimal(amount)
+      .mul(
+        new Decimal(1)
+          .plus(new Decimal(slippage).div(new Decimal(100)))
+          .toString()
+      )
+      .toString()
+    return newAmount
+  }
+
   return (
     <>
       <div className={styles.actions}>
@@ -53,7 +68,7 @@ export default function Actions({
         ) : actionName === 'Supply' || actionName === 'Swap' ? (
           <TokenApproval
             actionButton={actionButton}
-            amount={amount}
+            amount={slippage ? applySlippage(amount) : amount}
             tokenAddress={tokenAddress}
             tokenSymbol={tokenSymbol}
             disabled={isDisabled}
diff --git a/src/components/Asset/AssetActions/Trade/FormTrade.tsx b/src/components/Asset/AssetActions/Trade/FormTrade.tsx
index 96c41aca0..76b236ca3 100644
--- a/src/components/Asset/AssetActions/Trade/FormTrade.tsx
+++ b/src/components/Asset/AssetActions/Trade/FormTrade.tsx
@@ -193,6 +193,7 @@ export default function FormTrade({
             loaderMessage="Swapping tokens..."
             successMessage="Successfully swapped tokens."
             actionName={content.trade.action}
+            slippage={values.slippage}
             amount={
               values.type === 'sell'
                 ? values.datatoken

From 9df8ed49a37c410281176cfc839c5932d1c529a7 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Fri, 25 Mar 2022 15:16:52 +0000
Subject: [PATCH 8/8] disable all actions on publish preview (#1257)

* disable all actions on publish preview

* remove asset actions disabled mechanism
---
 src/components/Asset/AssetActions/index.tsx   | 19 +++----------------
 .../Publish/Preview/index.module.css          |  4 ++++
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/components/Asset/AssetActions/index.tsx b/src/components/Asset/AssetActions/index.tsx
index 6745e45f2..728b30cd4 100644
--- a/src/components/Asset/AssetActions/index.tsx
+++ b/src/components/Asset/AssetActions/index.tsx
@@ -150,25 +150,12 @@ export default function AssetActions({
     />
   )
 
-  const tabs: TabsItem[] = [
-    {
-      title: 'Use',
-      content: UseContent
-    }
-  ]
+  const tabs: TabsItem[] = [{ title: 'Use', content: UseContent }]
 
   asset?.accessDetails?.type === 'dynamic' &&
     tabs.push(
-      {
-        title: 'Pool',
-        content: <Pool />,
-        disabled: asset?.accessDetails.datatoken.name === ''
-      },
-      {
-        title: 'Trade',
-        content: <Trade />,
-        disabled: asset?.accessDetails.datatoken.name === ''
-      }
+      { title: 'Pool', content: <Pool /> },
+      { title: 'Trade', content: <Trade /> }
     )
 
   return (
diff --git a/src/components/Publish/Preview/index.module.css b/src/components/Publish/Preview/index.module.css
index 530957339..dc40b61c5 100644
--- a/src/components/Publish/Preview/index.module.css
+++ b/src/components/Publish/Preview/index.module.css
@@ -4,6 +4,10 @@
   margin-bottom: var(--spacer);
   margin-left: calc(var(--spacer) / -4);
   margin-right: calc(var(--spacer) / -4);
+
+  /* Disable all user actions as to not run into unintended
+  consequences of browsing away from publish. */
+  pointer-events: none;
 }
 
 @media (min-width: 60rem) {