Merge branch 'main' into feature/compute

src/components/atoms/Markdown.tsx

@@ -11,7 +11,7 @@ const Markdown = ({
 }): ReactElement => {
   // fix react-markdown \n transformation
   // https://github.com/rexxars/react-markdown/issues/105#issuecomment-351585313
-  const textCleaned = text.replace(/\\n/g, '\n ')
+  const textCleaned = text?.replace(/\\n/g, '\n ')
   return (
     <ReactMarkdown
       source={textCleaned}

src/components/organisms/AssetActions/Trade/FormTrade.tsx

@@ -103,7 +103,6 @@ export default function FormTrade({
       toast.error(error.message)
     }
   }
-
   return (
     <Formik
       initialValues={initialValues}
@@ -129,7 +128,7 @@ export default function FormTrade({
           ) : (
             <div className={styles.alertWrap}>
               <Alert
-                text={content.warning.main}
+                text={content.warning}
                 state="info"
                 action={{
                   name: 'I understand',

src/components/organisms/AssetContent/index.tsx

@@ -54,7 +54,7 @@ export default function AssetContent(props: AssetContentProps): ReactElement {
 
   useEffect(() => {
     if (!price) return
-    setShowPricing(isOwner && price.address === '')
+    setShowPricing(isOwner && price.type === '')
   }, [isOwner, price])
 
   function handleEditButton() {

src/components/pages/History/PublishedList.tsx

@@ -29,7 +29,7 @@ export default function PublishedList(): ReactElement {
             query: `(publicKey.owner:${accountId})`
           }
         },
-        sort: { 'price.ocean': -1 }
+        sort: { created: -1 }
       }
       try {
         queryResult || setIsLoading(true)