Merge pull request #423 from reservoirprotocol/ted/upgrade-rk-1.21.0

Upgrade rk to 1.21.0 and add new MintModal

components/buttons/Mint.tsx

@@ -6,7 +6,7 @@ import React, {
   useContext,
 } from 'react'
 import { useConnectModal } from '@rainbow-me/rainbowkit'
-import { CollectModal, CollectStep } from '@reservoir0x/reservoir-kit-ui'
+import { MintStep, MintModal } from '@reservoir0x/reservoir-kit-ui'
 import { useMarketplaceChain } from 'hooks'
 import { CSS } from '@stitches/react'
 import { Button } from 'components/primitives'
@@ -20,7 +20,7 @@ type Props = {
   buttonProps?: ComponentProps<typeof Button>
   buttonChildren?: ReactNode
   mutate?: SWRResponse['mutate']
-  openState?: ComponentPropsWithoutRef<typeof CollectModal>['openState']
+  openState?: ComponentPropsWithoutRef<typeof MintModal>['openState']
 }
 
 const Mint: FC<Props> = ({
@@ -35,35 +35,26 @@ const Mint: FC<Props> = ({
   const { openConnectModal } = useConnectModal()
   const marketplaceChain = useMarketplaceChain()
   const { feesOnTop } = useContext(ReferralContext)
+  const contract = collectionId?.split(':')?.[0]
+  const token = tokenId ? `${contract}:${tokenId}` : undefined
 
   return (
-    <CollectModal
+    <MintModal
       trigger={
         <Button css={buttonCss} color="primary" {...buttonProps}>
           {buttonChildren}
         </Button>
       }
       collectionId={collectionId}
-      tokenId={tokenId}
-      mode={'mint'}
+      token={token}
       openState={openState}
       feesOnTopUsd={feesOnTop}
       chainId={marketplaceChain.id}
       onConnectWallet={() => {
         openConnectModal?.()
       }}
       onClose={(data, currentStep) => {
-        if (mutate && currentStep == CollectStep.Complete) mutate()
-      }}
-      onPointerDownOutside={(e) => {
-        const privyLayer = document.getElementById('privy-dialog')
-
-        const clickedInsidePrivyLayer =
-          privyLayer && e.target ? privyLayer.contains(e.target as Node) : false
-
-        if (clickedInsidePrivyLayer) {
-          e.preventDefault()
-        }
+        if (mutate && currentStep == MintStep.Complete) mutate()
       }}
     />
   )

package.json

@@ -30,7 +30,7 @@
     "@radix-ui/react-toggle-group": "^1.0.1",
     "@radix-ui/react-tooltip": "1.0.6",
     "@rainbow-me/rainbowkit": "^1.1.3",
-    "@reservoir0x/reservoir-kit-ui": "1.20.0",
+    "@reservoir0x/reservoir-kit-ui": "1.21.0",
     "@sentry/nextjs": "^7.53.1",
     "@types/uuid": "^9.0.1",
     "dayjs": "^1.11.6",

yarn.lock

@@ -1435,10 +1435,10 @@
   dependencies:
     "@react-hookz/deep-equal" "^1.0.3"
 
-"@reservoir0x/reservoir-kit-ui@1.20.0":
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-1.20.0.tgz#4650597d9334ab7a3b9c53e83ef5ae20d29e9f63"
-  integrity sha512-ieV/f2b4eMOp2FYdIBLF2vqOUEGmN3dlQGflqq8MrtjKk3GBy6BPi6upvGivnO8bsVjzKH/36ueIcQNkXAG9sA==
+"@reservoir0x/reservoir-kit-ui@1.21.0":
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-1.21.0.tgz#e36aadf4414a53081fe04e5199eec2113b3377b3"
+  integrity sha512-0OViceR3s9vl/ZaCZevyuxlIpXh3DfRR9e4r35QHlzkqok7uyxEX3mc5D/iVXVBMnvGzzY+PNNHyJflgpofmEw==
   dependencies:
     "@fortawesome/fontawesome-svg-core" "^6.1.1"
     "@fortawesome/free-solid-svg-icons" "^6.1.1"
@@ -1454,18 +1454,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" "1.9.2"
+    "@reservoir0x/reservoir-sdk" "1.10.0"
     "@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/reservoir-sdk@1.9.2":
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-1.9.2.tgz#02f19d9fa19ca8f6bd60bc4fbaf3d699cbb06bf0"
-  integrity sha512-5OHQmkJX9mxR2idQypnLgfV44FojyVZ3REQ9Yue46oT24xr51Q4HdlnmqTuaBaVLeCycXK2Vn7CnNOOASf+Nyg==
+"@reservoir0x/reservoir-sdk@1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-1.10.0.tgz#972c1f427d0ab0e070f1e5c6484a2ed9f257ef4c"
+  integrity sha512-VeSx6nDUfCnyEpQL0sOo+U4qAa2pvFUk0vBQdPc2P57RGBs4Ze+xIqP3oj0OcaRavaMeoFrIHK522/nEoSLsBw==
   dependencies:
     axios "^0.27.2"