Skip to content

Commit

Permalink
Merge pull request #489 from reservoirprotocol/ted/upgrade-rk-2.4.0
Browse files Browse the repository at this point in the history
Upgrade rk to 2.4.0
  • Loading branch information
ted-palmer authored Mar 18, 2024
2 parents a1dff39 + 17f381c commit ec6edb4
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 27 deletions.
8 changes: 4 additions & 4 deletions components/portfolio/BatchListings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,14 @@ const BatchListings: FC<Props> = ({
return (
prevListings?.map((listing) => {
if (
listing.token.token?.collection?.floorAskPrice?.amount?.decimal &&
listing.token.token?.collection?.floorAskPrice.currency
listing.token.token?.collection?.floorAsk?.price?.amount?.decimal &&
listing.token.token?.collection?.floorAsk?.price?.currency
) {
return {
...listing,
price:
listing.token.token.collection.floorAskPrice.amount.decimal.toString(),
currency: listing.token.token?.collection?.floorAskPrice
listing.token.token.collection?.floorAsk?.price?.amount.decimal.toString(),
currency: listing.token.token?.collection?.floorAsk?.price
.currency as Currency,
}
}
Expand Down
14 changes: 7 additions & 7 deletions components/portfolio/BatchListingsTableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -290,26 +290,26 @@ export const BatchListingsTableRow: FC<BatchListingsTableRowProps> = ({
size="large"
css={{ minWidth: 'max-content', minHeight: 48, py: 14 }}
disabled={
!listing.token?.token?.collection?.floorAskPrice?.amount
!listing.token?.token?.collection?.floorAsk?.price?.amount
?.decimal
}
onClick={() => {
if (
listing.token?.token?.collection?.floorAskPrice?.amount
listing.token?.token?.collection?.floorAsk?.price?.amount
?.decimal
) {
handlePriceChange(
listing.token?.token?.collection?.floorAskPrice?.amount?.decimal?.toString()
listing.token?.token?.collection?.floorAsk?.price?.amount?.decimal?.toString()
)
}
}}
>
Floor
</Button>
{listing.token?.token?.collection?.floorAskPrice?.amount
{listing.token?.token?.collection?.floorAsk?.price?.amount
?.decimal ? (
<Text style="subtitle3" color="subtle">
{`${listing.token?.token?.collection?.floorAskPrice?.amount?.decimal} ${listing.token?.token?.collection?.floorAskPrice?.currency?.symbol}`}
{`${listing.token?.token?.collection?.floorAsk?.price?.amount?.decimal} ${listing.token?.token?.collection?.floorAsk?.price?.currency?.symbol}`}
</Text>
) : null}
</Flex>
Expand All @@ -330,8 +330,8 @@ export const BatchListingsTableRow: FC<BatchListingsTableRowProps> = ({
<Text style="subtitle3" color="subtle">
{topTraitPrice}{' '}
{
listing.token?.token?.collection?.floorAskPrice?.currency
?.symbol
listing.token?.token?.collection?.floorAsk?.price
?.currency?.symbol
}
</Text>
) : null}
Expand Down
18 changes: 12 additions & 6 deletions components/portfolio/TokenTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,14 @@ const TokenTableRow: FC<TokenTableRowProps> = ({
Floor
</Text>
<FormatCryptoCurrency
amount={token?.token?.collection?.floorAskPrice?.amount?.decimal}
amount={
token?.token?.collection?.floorAsk?.price?.amount?.decimal
}
address={
token?.token?.collection?.floorAskPrice?.currency?.contract
token?.token?.collection?.floorAsk?.price?.currency?.contract
}
decimals={
token?.token?.collection?.floorAskPrice?.currency?.decimals
token?.token?.collection?.floorAsk?.price?.currency?.decimals
}
textStyle="subtitle2"
logoHeight={14}
Expand Down Expand Up @@ -789,9 +791,13 @@ const TokenTableRow: FC<TokenTableRowProps> = ({
</TableCell>
<TableCell>
<FormatCryptoCurrency
amount={token?.token?.collection?.floorAskPrice?.amount?.decimal}
address={token?.token?.collection?.floorAskPrice?.currency?.contract}
decimals={token?.token?.collection?.floorAskPrice?.currency?.decimals}
amount={token?.token?.collection?.floorAsk?.price?.amount?.decimal}
address={
token?.token?.collection?.floorAsk?.price?.currency?.contract
}
decimals={
token?.token?.collection?.floorAsk?.price?.currency?.decimals
}
textStyle="subtitle1"
logoHeight={14}
/>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@radix-ui/react-toggle-group": "^1.0.1",
"@radix-ui/react-tooltip": "1.0.6",
"@rainbow-me/rainbowkit": "2.0.0",
"@reservoir0x/reservoir-kit-ui": "2.3.8",
"@reservoir0x/reservoir-kit-ui": "2.4.0",
"@sentry/nextjs": "^7.85.0",
"@tanstack/react-query": "5.20.2",
"@types/uuid": "^9.0.1",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1888,10 +1888,10 @@
dependencies:
merge-options "^3.0.4"

"@reservoir0x/reservoir-kit-ui@2.3.8":
version "2.3.8"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.3.8.tgz#a0774bfb579b093ceac8e24867a7f62a585e0db7"
integrity sha512-Ga8osHLIki/pLl0bR1WPN0Zk+lloUzsuhQByAGS10BzvZHn26xZFnrZvkxE21PCj83EpMwm+TnhPQ0bWyvLN+Q==
"@reservoir0x/reservoir-kit-ui@2.4.0":
version "2.4.0"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.4.0.tgz#3a2114170c901552ff316105a7605d226eeac8de"
integrity sha512-j+V3tQah77grMwhWjPQdRDCslmOIa6moyVaFPerHhZAMVhdYJ+DFtb2RdLa4j/RusS74HKhszfAWPFQacokA1g==
dependencies:
"@fortawesome/fontawesome-svg-core" "^6.1.1"
"@fortawesome/free-solid-svg-icons" "^6.1.1"
Expand All @@ -1907,18 +1907,18 @@
"@radix-ui/react-toggle-group" "1.0.4"
"@radix-ui/react-tooltip" "1.0.6"
"@react-hookz/web" "^19.2.0"
"@reservoir0x/reservoir-sdk" "2.0.7"
"@reservoir0x/reservoir-sdk" "2.0.9"
"@stitches/react" "1.3.1-1"
dayjs "^1.11.4"
flatpickr "^4.6.13"
framer-motion "^6.4.2"
react-flatpickr "^3.10.13"
swr "2.0.1"

"@reservoir0x/[email protected].7":
version "2.0.7"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.0.7.tgz#4d3c2a8bb0059c2c925f7bf74934390ad8f12fc4"
integrity sha512-HimR3H1urwiYeWOME2XZd/2nkclkHjq0jEM5wAJa46zM3k6GjGMThp95Jg/LV6cV2Cu4ydD68zSrRpwnQTvbCQ==
"@reservoir0x/[email protected].9":
version "2.0.9"
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.0.9.tgz#a2baffbfb9a17ed8340ef7a8404a505590c7cae2"
integrity sha512-kDuwq8wtL8DydyqQFjmVbu9zYORNOZWNplU8i+TftswjfMOpHkmuNxjg83HiJX0QWhZ51TY3j0dx9CiTcxDF4w==
dependencies:
axios "^1.6.7"

Expand Down

0 comments on commit ec6edb4

Please sign in to comment.