feat: add in address pass through to offers

blockchain · May 4, 2022 · 74174e8 · 74174e8
1 parent ff0e660
commit 74174e8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Asset/Asset.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Asset/Asset.tsx
@@ -848,6 +848,7 @@ const NftAsset: React.FC<Props> = ({
                     <Offers
                       columns={['price', 'amount', 'from', 'expiration', 'cancel_offer']}
                       bidsAndOffers={bidsAndOffers}
+                      defaultEthAddr={defaultEthAddr}
                     />
                   </div>
                 ) : openSeaAsset.isLoading ? (

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Offers/Offers.table.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Offers/Offers.table.tsx
@@ -15,17 +15,18 @@ import {
 } from './OffersTableColumns'
 
 const getTableColumns = (
-  columns: ('price' | 'amount' | 'from' | 'expiration' | 'cancel_offer')[]
+  columns: ('price' | 'amount' | 'from' | 'expiration' | 'cancel_offer')[],
+  defaultEthAddr
 ) =>
   [
     columns.includes('price') ? getPriceColumn() : null,
     columns.includes('amount') ? getAmountColumn() : null,
     columns.includes('expiration') ? getExpirationColumn() : null,
     columns.includes('from') ? getFromColumn() : null,
-    columns.includes('cancel_offer') ? getOfferCancelColumn() : null
+    columns.includes('cancel_offer') ? getOfferCancelColumn(defaultEthAddr) : null
   ].filter(Boolean)
 
-const OffersTable: React.FC<Props> = ({ bidsAndOffers, columns }) => {
+const OffersTable: React.FC<Props> = ({ bidsAndOffers, columns, defaultEthAddr }) => {
   const { getTableBodyProps, getTableProps, headerGroups, prepareRow, rows } = useTable(
     {
       autoResetExpanded: false,
@@ -35,7 +36,7 @@ const OffersTable: React.FC<Props> = ({ bidsAndOffers, columns }) => {
       autoResetRowState: false,
       autoResetSelectedRows: false,
       autoResetSortBy: false,
-      columns: useMemo(() => getTableColumns(columns), [columns]),
+      columns: useMemo(() => getTableColumns(columns, defaultEthAddr), [columns, defaultEthAddr]),
       data: useMemo(() => bidsAndOffers, [bidsAndOffers]),
       disableMultiSort: true,
       disableSortRemove: true,
@@ -110,6 +111,7 @@ const OffersTable: React.FC<Props> = ({ bidsAndOffers, columns }) => {
 type Props = {
   bidsAndOffers: RawOrder[]
   columns: ('price' | 'amount' | 'from' | 'expiration' | 'cancel_offer')[]
+  defaultEthAddr: string
 }
 
 export default OffersTable
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Offers/Offers.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Nfts/Offers/Offers.tsx
@@ -5,12 +5,13 @@ import { TableWrapper } from 'components/Table'
 
 import OffersTable from './Offers.table'
 
-const Offers: React.FC<Props> = ({ bidsAndOffers, columns }) => {
+const Offers: React.FC<Props> = ({ bidsAndOffers, columns, defaultEthAddr }) => {
   return (
     <TableWrapper height='auto'>
       <OffersTable
         columns={columns || ['price', 'amount', 'from', 'expiration']}
         bidsAndOffers={bidsAndOffers}
+        defaultEthAddr={defaultEthAddr}
       />
     </TableWrapper>
   )
@@ -20,6 +21,7 @@ type Props = {
   address?: never
   bidsAndOffers: RawOrder[]
   columns?: ('price' | 'amount' | 'from' | 'expiration' | 'cancel_offer')[]
+  defaultEthAddr: string
 }
 
 export default Offers
diff --git a/...v4-frontend/src/scenes/Nfts/Offers/OffersTableColumns/OffersTableColumns.cancel_offer.tsx b/...v4-frontend/src/scenes/Nfts/Offers/OffersTableColumns/OffersTableColumns.cancel_offer.tsx
@@ -3,19 +3,18 @@ import React from 'react'
 import { FormattedMessage } from 'react-intl'
 import { useDispatch } from 'react-redux'
 import { colors } from '@blockchain-com/constellation'
-import { getUnixTime } from 'date-fns'
 
 import { Button, Text } from 'blockchain-info-components'
 import { CellHeaderText } from 'components/Table'
 import { actions } from 'data'
 import { NftOrderStepEnum } from 'data/components/nfts/types'
 
-export const getOfferCancelColumn = () => ({
+export const getOfferCancelColumn = (defaultEthAddr) => ({
   Cell: ({ row: { original: values } }) => {
     const dispatch = useDispatch()
     return (
       <>
-        {values.maker.address === '0x9e38f81217f693367f03e7bbd583fdea1ee297e3' && (
+        {defaultEthAddr.toLowerCase() === values.maker.address.toLowerCase() && (
           <Button
             nature='empty-blue'
             onClick={() =>