Merge pull request #546 from liteflow-labs/fix/erc-1155-cart-case

Fix / ERC1155 token card fixed price sale cases

components/HomeSection/Assets.gql

@@ -83,6 +83,9 @@ query FetchAssets(
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
     }

components/Sales/Direct/CardFooter.tsx

@@ -1,6 +1,8 @@
 import { Divider, Flex, HStack, Text } from '@chakra-ui/react'
 import useTranslation from 'next-translate/useTranslation'
 import { FC, useMemo } from 'react'
+import useAccount from '../../../hooks/useAccount'
+import { isSameAddress } from '../../../utils'
 import AddToCartButton from '../../Button/AddToCart'
 import Link from '../../Link/Link'
 import Price from '../../Price/Price'
@@ -13,21 +15,31 @@ type Props = {
       decimals: number
       symbol: string
     }
+    maker: {
+      address: string
+    }
   }
   numberOfSales: number
   hasMultiCurrency: boolean
-  isOwner: boolean
   showButton?: boolean
 }
 
 const SaleDirectCardFooter: FC<Props> = ({
   sale,
   numberOfSales,
   hasMultiCurrency,
-  isOwner,
   showButton = true,
 }) => {
   const { t } = useTranslation('components')
+  const { address } = useAccount()
+
+  // TODO: we should have a modal if there is more than one sale like we have on detail page
+  // issue is tracked on https://github.com/liteflow-labs/starter-kit/issues/529 for this modal improvement
+  const isOwner = useMemo(
+    () => (address ? isSameAddress(sale.maker.address, address) : false),
+    [address, sale.maker],
+  )
+
   const chip = useMemo(() => {
     switch (numberOfSales) {
       case 0:
@@ -94,7 +106,7 @@ const SaleDirectCardFooter: FC<Props> = ({
             : chip}
         </Text>
       </Flex>
-      {showButton && (
+      {showButton && address && (
         <>
           <Divider orientation="vertical" />
           <AddToCartButton

components/Token/Card.tsx

@@ -72,6 +72,9 @@ export type Props = {
               decimals: number
               symbol: string
             }
+            maker: {
+              address: string
+            }
           }[]
         }
       | undefined
@@ -107,7 +110,6 @@ const TokenCard: FC<Props> = ({ asset }) => {
           sale={sale}
           numberOfSales={numberOfSales}
           hasMultiCurrency={hasMultiCurrency}
-          isOwner={isOwner}
           showButton={isHovered}
         />
       )

pages/checkout/[id].gql

@@ -63,6 +63,9 @@ query Checkout($id: UUID!, $address: Address, $now: Datetime!) {
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
     }

pages/collection/[chainId]/[id]/index.gql

@@ -136,6 +136,9 @@ query FetchCollectionAssets(
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
     }

pages/explore/explore.gql

@@ -68,6 +68,9 @@ query FetchAllERC721And1155(
             decimals
             symbol
           }
+          maker {
+            address
+          }
         }
       }
       creator {

pages/tokens/[id]/bid.gql

@@ -70,6 +70,9 @@ query BidOnAsset(
           decimals
           symbol
         }
+        maker {
+          address
+        }
       }
     }
     ownerships(first: 1) {

pages/tokens/[id]/offer.gql

@@ -65,6 +65,9 @@ query OfferForAsset(
           decimals
           symbol
         }
+        maker {
+          address
+        }
       }
     }
     creator {

pages/users/[id]/assetDetail.gql

@@ -48,6 +48,9 @@ fragment AssetDetail on Asset {
         decimals
         symbol
       }
+      maker {
+        address
+      }
     }
   }
   creator {