Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated deprecated apis used in hooks/modals #123

Merged
merged 1 commit into from
Dec 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/ui/src/hooks/useBids.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { paths, setParams } from '@reservoir0x/reservoir-sdk'
import useReservoirClient from './useReservoirClient'
import useSWRInfinite, { SWRInfiniteConfiguration } from 'swr/infinite'

type Bids = paths['/orders/bids/v4']['get']['responses']['200']['schema']
type BidsQuery = paths['/orders/bids/v4']['get']['parameters']['query']
type Bids = paths['/orders/bids/v5']['get']['responses']['200']['schema']
type BidsQuery = paths['/orders/bids/v5']['get']['parameters']['query']

export default function (
options: BidsQuery,
Expand All @@ -19,7 +19,7 @@ export default function (
return null
}

const url = new URL(`${client?.apiBase || ''}/orders/bids/v4`)
const url = new URL(`${client?.apiBase || ''}/orders/bids/v5`)
let query = options || {}

if (
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/hooks/useCollectionActivity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import useReservoirClient from './useReservoirClient'
import useSWRInfinite, { SWRInfiniteConfiguration } from 'swr/infinite'

type CollectionActivityResponse =
paths['/collections/activity/v4']['get']['responses']['200']['schema']
paths['/collections/activity/v5']['get']['responses']['200']['schema']

type CollectionActivityQuery =
paths['/collections/activity/v4']['get']['parameters']['query']
paths['/collections/activity/v5']['get']['parameters']['query']

export default function (
options?: CollectionActivityQuery | false,
Expand All @@ -26,7 +26,7 @@ export default function (
return null
}

const url = new URL(`${client?.apiBase}/collections/activity/v4`)
const url = new URL(`${client?.apiBase}/collections/activity/v5`)

let query: CollectionActivityQuery = { ...options }

Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/hooks/useListings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { paths, setParams } from '@reservoir0x/reservoir-sdk'
import useReservoirClient from './useReservoirClient'
import useSWRInfinite, { SWRInfiniteConfiguration } from 'swr/infinite'

type Asks = paths['/orders/asks/v3']['get']['responses']['200']['schema']
type AsksQuery = paths['/orders/asks/v3']['get']['parameters']['query']
type Asks = paths['/orders/asks/v4']['get']['responses']['200']['schema']
type AsksQuery = paths['/orders/asks/v4']['get']['parameters']['query']

export default function (
options: AsksQuery,
Expand All @@ -19,7 +19,7 @@ export default function (
return null
}

const url = new URL(`${client?.apiBase || ''}/orders/asks/v3`)
const url = new URL(`${client?.apiBase || ''}/orders/asks/v4`)
let query: AsksQuery = options || {}

if (
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/hooks/useOwnerListings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { paths } from '@reservoir0x/reservoir-sdk'
import { SWRConfiguration } from 'swr'

export default function (
query?: paths['/orders/asks/v3']['get']['parameters']['query'] | false,
query?: paths['/orders/asks/v4']['get']['parameters']['query'] | false,
swrOptions?: SWRConfiguration
) {
const { address } = useAccount()
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/hooks/useUserTopBids.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import useReservoirClient from './useReservoirClient'
import useSWRInfinite, { SWRInfiniteConfiguration } from 'swr/infinite'

type Bids =
paths['/orders/users/{user}/top-bids/v1']['get']['responses']['200']['schema']
paths['/orders/users/{user}/top-bids/v2']['get']['responses']['200']['schema']
type BidsQuery =
paths['/orders/users/{user}/top-bids/v1']['get']['parameters']['query']
paths['/orders/users/{user}/top-bids/v2']['get']['parameters']['query']

export default function (
user?: string,
Expand All @@ -21,7 +21,7 @@ export default function (
return null
}
const url = new URL(
`${client?.apiBase || ''}/orders/users/${user}/top-bids/v1`
`${client?.apiBase || ''}/orders/users/${user}/top-bids/v2`
)
let query: BidsQuery = options || {}

Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/hooks/useUsersActivity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import useReservoirClient from './useReservoirClient'
import useSWRInfinite, { SWRInfiniteConfiguration } from 'swr/infinite'

type UsersActivityResponse =
paths['/users/activity/v4']['get']['responses']['200']['schema']
paths['/users/activity/v5']['get']['responses']['200']['schema']

type UsersActivityBaseQuery =
paths['/users/activity/v4']['get']['parameters']['query']
paths['/users/activity/v5']['get']['parameters']['query']

type UsersQuery = UsersActivityBaseQuery['users'] | undefined
type UsersActivityQuery = Omit<UsersActivityBaseQuery, 'users'>
Expand All @@ -25,7 +25,7 @@ export default function (
return null
}

const url = new URL(`${client?.apiBase}/users/activity/v4`)
const url = new URL(`${client?.apiBase}/users/activity/v5`)

let query: UsersActivityBaseQuery = { ...options, users }

Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/modal/acceptBid/AcceptBidModalRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export const AcceptBidModalRenderer: FC<Props> = ({
{
ids: bidId,
status: 'active',
includeMetadata: true,
includeCriteriaMetadata: true,
normalizeRoyalties,
},
{
Expand Down Expand Up @@ -289,9 +289,9 @@ export const AcceptBidModalRenderer: FC<Props> = ({
bid &&
bid.status === 'active' &&
bid.price?.netAmount?.native &&
bid.metadata?.data?.collectionId === collectionId
bid.criteria?.data?.collection?.id === collectionId
) {
if (bid.metadata?.kind === 'token') {
if (bid.criteria?.kind === 'token') {
const tokenSetPieces = bid.tokenSetId.split(':')
const bidTokenId = tokenSetPieces[tokenSetPieces.length - 1]
if (tokenId === bidTokenId) {
Expand Down
16 changes: 8 additions & 8 deletions packages/ui/src/modal/cancelBid/CancelBidModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ export function CancelBidModal({
cancelOrder,
}) => {
const expires = useTimeSince(bid?.expiration)
const collectionId = bid?.metadata?.data?.collectionId
const collectionId = bid?.criteria?.data?.collection?.id
const bidImg = tokenId
? `${client?.apiBase}/redirect/tokens/${collectionId}:${tokenId}/image/v1`
: `${client?.apiBase}/redirect/collections/${collectionId}/image/v1`
const isAttributeOffer = (bid?.metadata?.kind as any) === 'attribute'
const isAttributeOffer = (bid?.criteria?.kind as any) === 'attribute'

useEffect(() => {
if (cancelStep === CancelStep.Complete && onCancelComplete) {
Expand Down Expand Up @@ -112,10 +112,10 @@ export function CancelBidModal({
<Box css={{ p: '$4', borderBottom: '1px solid $borderColor' }}>
<TokenPrimitive
img={bidImg}
name={bid?.metadata?.data?.tokenName}
name={bid?.criteria?.data?.token?.name}
price={bid?.price?.amount?.decimal}
usdPrice={totalUsd}
collection={bid?.metadata?.data?.collectionName || ''}
collection={bid?.criteria?.data?.collection?.name || ''}
currencyContract={bid?.price?.currency?.contract}
currencyDecimals={bid?.price?.currency?.decimals}
expires={expires}
Expand All @@ -141,10 +141,10 @@ export function CancelBidModal({
<Box css={{ p: '$4', borderBottom: '1px solid $borderColor' }}>
<TokenPrimitive
img={bidImg}
name={bid?.metadata?.data?.tokenName}
name={bid?.criteria?.data?.token?.name}
price={bid?.price?.amount?.decimal}
usdPrice={totalUsd}
collection={bid?.metadata?.data?.collectionName || ''}
collection={bid?.criteria?.data?.collection?.name || ''}
currencyContract={bid?.price?.currency?.contract}
currencyDecimals={bid?.price?.currency?.decimals}
expires={expires}
Expand Down Expand Up @@ -208,8 +208,8 @@ export function CancelBidModal({
</Text>{' '}
offer for{' '}
<Text style="body3" color="accent">
{bid?.metadata?.data?.tokenName ||
bid?.metadata?.data?.collectionName}{' '}
{bid?.criteria?.data?.token?.name ||
bid?.criteria?.data?.collection?.name}{' '}
</Text>
at {bid?.price?.amount?.decimal}{' '}
{bid?.price?.currency?.symbol} has been canceled.
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/modal/cancelBid/CancelBidModalRenderer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const CancelBidModalRenderer: FC<Props> = ({
{
ids: bidId,
normalizeRoyalties,
includeMetadata: true,
includeCriteriaMetadata: true,
},
{
revalidateFirstPage: true,
Expand Down Expand Up @@ -176,7 +176,7 @@ export const CancelBidModalRenderer: FC<Props> = ({

let tokenId = undefined

if (bid?.metadata?.kind === 'token') {
if (bid?.criteria?.kind === 'token') {
tokenId = bid?.tokenSetId?.split(':')[2]
}

Expand Down