From fc1966aa4ee161d60176cd810d07ea10e860ae1a Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Mon, 15 Nov 2021 15:42:50 +0000
Subject: [PATCH] copy

---
 content/publish/form.json                                 | 6 +++---
 .../@shared/Form/FormFields/Datatoken/index.module.css    | 4 ++--
 .../@shared/Form/FormFields/Datatoken/index.tsx           | 6 +++---
 .../@shared/Form/FormFields/Nft/index.module.css          | 4 ++--
 src/components/@shared/Form/FormFields/Nft/index.tsx      | 8 ++++----
 src/components/Asset/AssetActions/index.tsx               | 4 ++--
 src/components/Publish/index.tsx                          | 2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/content/publish/form.json b/content/publish/form.json
index ae15c64cb..c28acd1f5 100644
--- a/content/publish/form.json
+++ b/content/publish/form.json
@@ -6,7 +6,7 @@
         "name": "nft",
         "label": "Data NFT",
         "type": "nft",
-        "help": "All metadata is stored on-chain in a newly deployed ERC-721 contract representing this asset.",
+        "help": "All metadata is stored on-chain in a newly deployed ERC-721 contract representing this asset, created with this name & symbol.",
         "required": true
       },
       {
@@ -85,9 +85,9 @@
     "fields": [
       {
         "name": "dataTokenOptions",
-        "label": "Datatoken Name & Symbol",
+        "label": "Datatoken",
         "type": "datatoken",
-        "help": "The datatoken for this data set will be created with this name & symbol.",
+        "help": "The datatoken used for accessing this asset will be created with this name & symbol.",
         "required": true
       },
       {
diff --git a/src/components/@shared/Form/FormFields/Datatoken/index.module.css b/src/components/@shared/Form/FormFields/Datatoken/index.module.css
index 65ccb2414..2e227b493 100644
--- a/src/components/@shared/Form/FormFields/Datatoken/index.module.css
+++ b/src/components/@shared/Form/FormFields/Datatoken/index.module.css
@@ -1,7 +1,7 @@
 .datatoken {
   display: grid;
-  gap: var(--spacer);
-  grid-template-columns: 3fr 1fr;
+  gap: calc(var(--spacer) / 2);
+  grid-template-columns: 1fr 4fr;
   margin-bottom: var(--spacer);
   align-items: center;
 }
diff --git a/src/components/@shared/Form/FormFields/Datatoken/index.tsx b/src/components/@shared/Form/FormFields/Datatoken/index.tsx
index e3355db90..955ce2a5a 100644
--- a/src/components/@shared/Form/FormFields/Datatoken/index.tsx
+++ b/src/components/@shared/Form/FormFields/Datatoken/index.tsx
@@ -23,14 +23,14 @@ export default function Datatoken(props: InputProps): ReactElement {
 
   return (
     <div className={styles.datatoken}>
+      <figure className={styles.image}>
+        <Logo />
+      </figure>
       <div className={styles.token}>
         <strong>{field?.value?.name}</strong> —{' '}
         <strong>{field?.value?.symbol}</strong>
         <RefreshName generateName={generateName} />
       </div>
-      <figure className={styles.image}>
-        <Logo />
-      </figure>
     </div>
   )
 }
diff --git a/src/components/@shared/Form/FormFields/Nft/index.module.css b/src/components/@shared/Form/FormFields/Nft/index.module.css
index ea4eb0fcd..cdfa369ef 100644
--- a/src/components/@shared/Form/FormFields/Nft/index.module.css
+++ b/src/components/@shared/Form/FormFields/Nft/index.module.css
@@ -1,7 +1,7 @@
 .nft {
   display: grid;
-  gap: var(--spacer);
-  grid-template-columns: 3fr 1fr;
+  gap: calc(var(--spacer) / 2);
+  grid-template-columns: 1fr 4fr;
   margin-bottom: var(--spacer);
   align-items: center;
 }
diff --git a/src/components/@shared/Form/FormFields/Nft/index.tsx b/src/components/@shared/Form/FormFields/Nft/index.tsx
index 97841e6e4..f9fd708ee 100644
--- a/src/components/@shared/Form/FormFields/Nft/index.tsx
+++ b/src/components/@shared/Form/FormFields/Nft/index.tsx
@@ -17,16 +17,16 @@ export default function Nft(props: InputProps): ReactElement {
 
   return (
     <div className={styles.nft}>
-      <div className={styles.token}>
-        <strong>{field?.value?.name}</strong> —{' '}
-        <strong>{field?.value?.symbol}</strong>
-      </div>
       <img
         src="//placekitten.com/g/128/128"
         className={styles.image}
         width="128"
         height="128"
       />
+      <div className={styles.token}>
+        <strong>{field?.value?.name}</strong> —{' '}
+        <strong>{field?.value?.symbol}</strong>
+      </div>
     </div>
   )
 }
diff --git a/src/components/Asset/AssetActions/index.tsx b/src/components/Asset/AssetActions/index.tsx
index a1ca0c08c..a3ffd237f 100644
--- a/src/components/Asset/AssetActions/index.tsx
+++ b/src/components/Asset/AssetActions/index.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement, useState, useEffect } from 'react'
 import Compute from './Compute'
 import Consume from './Consume'
-import { Logger, DID } from '@oceanprotocol/lib'
+import { Logger } from '@oceanprotocol/lib'
 import Tabs from '@shared/atoms/Tabs'
 import { compareAsBN } from '@utils/numbers'
 import Pool from './Pool'
@@ -58,7 +58,7 @@ export default function AssetActions(): ReactElement {
       setFileIsLoading(true)
       try {
         const fileInfoResponse = await getFileInfo(
-          DID.parse(`${ddo.id}`),
+          ddo.id,
           oceanConfig.providerUri,
           newCancelToken()
         )
diff --git a/src/components/Publish/index.tsx b/src/components/Publish/index.tsx
index 3987d6f9b..8edc001f2 100644
--- a/src/components/Publish/index.tsx
+++ b/src/components/Publish/index.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement, useState, useRef } from 'react'
 import { Form, Formik, FormikState } from 'formik'
 import { initialValues, validationSchema } from './_constants'
 import { validateDockerImage } from '@utils/docker'
-import { Logger, Metadata } from '@oceanprotocol/lib'
+import { Logger } from '@oceanprotocol/lib'
 import { useAccountPurgatory } from '@hooks/useAccountPurgatory'
 import { useWeb3 } from '@context/Web3'
 import { transformPublishFormToDdo } from './_utils'