undefined? creator fix

hicetnunc2000 · Sep 22, 2021 · 4746ce3 · 4746ce3 · tortulez · Sep 22, 2021
1 parent 4df8a91
commit 4746ce3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/src/components/item-info/index.js b/src/components/item-info/index.js
@@ -172,13 +172,13 @@ export const ItemInfo = ({
           <div className={styles.inline}>
             <Button
               to={
-                `/tz/${creator.address}`
+                `/tz/${creator?.address}`
               }
             >
-              {creator.name ? (
-                <Primary>{encodeURI(creator.name)}</Primary>
+              {creator?.name ? (
+                <Primary>{encodeURI(creator?.name)}</Primary>
               ) : (
-                <Primary>{walletPreview(creator.address)}</Primary>
+                <Primary>{walletPreview(creator?.address)}</Primary>
               )}
             </Button>
           </div>

diff --git a/src/components/owner-list/index.js b/src/components/owner-list/index.js
@@ -34,8 +34,7 @@ export const OwnerList = ({ owners, creator_id, acc, swaps }) => {
       ))}
       {
         swaps.map((e, index) => {
-          if (acc) {
-            if (acc && !acc.address == e.creator_id) {
+
               return (
                 <div>
                   <div key={`${e.id}-${index}`} className={styles.swap}>
@@ -48,12 +47,6 @@ export const OwnerList = ({ owners, creator_id, acc, swaps }) => {
                   </div>
                 </div>
               )
-            } else {
-              return undefined
-            }
-          } else {
-            return undefined
-          }
         })
       }
     </div>

diff --git a/src/pages/objkt-display/tabs/swap.js b/src/pages/objkt-display/tabs/swap.js
@@ -6,7 +6,7 @@ import { Loading } from '../../../components/loading'
 import { Input } from '../../../components/input'
 import { Button, Curate, Purchase } from '../../../components/button'
 import { stubFalse } from 'lodash'
-export const Swap = ({ total_amount, owners, creator, royalties, token_info, address }) => {
+export const Swap = ({ total_amount, owners, creator, royalties, token_info, address, restricted }) => {
   const { id } = useParams()
   const { swap, swapv2, acc, swap_hDAO, progress, setProgress, message, setMessage } = useContext(HicetnuncContext)
   const [amount, setAmount] = useState()
@@ -47,8 +47,8 @@ export const Swap = ({ total_amount, owners, creator, royalties, token_info, add
       console.log(acc.address, royalties, parseFloat(price) * 1000000, id, creator.address, parseFloat(amount))
 
       if (currency === 'tez') {
-        swapv2(acc.address, royalties, parseFloat(price) * 1000000, id, creator.address, parseFloat(amount))
-          //swap(parseFloat(amount), id, parseFloat(price) * 1000000)  
+        //swapv2(acc.address, royalties, parseFloat(price) * 1000000, id, creator.address, parseFloat(amount))
+          swap(parseFloat(amount), id, parseFloat(price) * 1000000)  
           .then((e) => {
             // when taquito returns a success/fail message
             //setProgress(false)