fix conflicts

reservoirprotocol · Feb 29, 2024 · 141f79a · 141f79a
2 parents 4d30ed2 + 44b51de
commit 141f79a
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 23 deletions.
diff --git a/components/buttons/BuyNow.tsx b/components/buttons/BuyNow.tsx
@@ -51,13 +51,7 @@ const BuyNow: FC<Props> = ({
       token={`${contract}:${tokenId}`}
       orderId={orderId}
       openState={openState}
-      executeBuyOptions={
-        executionMethod
-          ? {
-              executionMethod: executionMethod,
-            }
-          : undefined
-      }
+      executeBuyOptions={executionMethod ? { executionMethod } : undefined}
       onConnectWallet={() => {
         openConnectModal?.()
       }}

diff --git a/package.json b/package.json
@@ -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.1",
+    "@reservoir0x/reservoir-kit-ui": "2.3.3",
     "@sentry/nextjs": "^7.85.0",
     "@tanstack/react-query": "5.20.2",
     "@types/uuid": "^9.0.1",

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -13,7 +13,6 @@ import '@rainbow-me/rainbowkit/styles.css'
 import {
   RainbowKitProvider,
   getDefaultConfig,
-  getDefaultWallets,
   darkTheme as rainbowDarkTheme,
   lightTheme as rainbowLightTheme,
 } from '@rainbow-me/rainbowkit'
@@ -64,14 +63,14 @@ const wagmiConfig = getDefaultConfig({
   projectId: WALLET_CONNECT_PROJECT_ID,
   chains: (supportedChains.length === 0 ? [mainnet] : supportedChains) as [
     Chain,
-    ...Chain[]
+    ...Chain[],
   ],
   ssr: true,
   transports: supportedChains.reduce((transportsConfig: _transports, chain) => {
     const network = chainIdToAlchemyNetworkMap[chain.id]
     if (network && ALCHEMY_API_KEY) {
       transportsConfig[chain.id] = http(
-        `https://${network}.g.alchemy.com/v2/${ALCHEMY_API_KEY}`
+        `https://${network}.g.alchemy.com/v2/${ALCHEMY_API_KEY}`,
       )
     } else {
       transportsConfig[chain.id] = http() // Fallback to default HTTP transport
@@ -142,14 +141,14 @@ function MyApp({
       setRainbowKitTheme(
         rainbowDarkTheme({
           borderRadius: 'small',
-        })
+        }),
       )
     } else {
       setReservoirKitTheme(reservoirLightTheme(reservoirKitThemeOverrides))
       setRainbowKitTheme(
         rainbowLightTheme({
           borderRadius: 'small',
-        })
+        }),
       )
     }
   }, [theme])
@@ -204,7 +203,7 @@ function MyApp({
                   checkPollingInterval: checkPollingInterval,
                   paymentTokens: chainPaymentTokensMap[id],
                 }
-              }
+              },
             ),
             logLevel: 4,
             source: source,

diff --git a/public/icons/blast-icon-dark.svg b/public/icons/blast-icon-dark.svg
diff --git a/public/icons/blast-icon-light.svg b/public/icons/blast-icon-light.svg
diff --git a/utils/chains.ts b/utils/chains.ts
@@ -346,4 +346,18 @@ export default [
     community: process.env.NEXT_PUBLIC_APEX_COMMUNITY,
     checkPollingInterval: reservoirChains.apexPop.checkPollingInterval,
   },
+  {
+    ...customChains.blast,
+    name: 'Blast',
+    lightIconUrl: '/icons/blast-icon-light.svg',
+    darkIconUrl: '/icons/blast-icon-dark.svg',
+    reservoirBaseUrl: 'https://api-blast.reservoir.tools',
+    proxyApi: '/api/reservoir/blast',
+    routePrefix: 'blast',
+    apiKey: process.env.RESERVOIR_API_KEY,
+    coingeckoId: 'ethereum',
+    collectionSetId: process.env.NEXT_PUBLIC_BLAST_COLLECTION_SET_ID,
+    community: process.env.NEXT_PUBLIC_BLAST_COMMUNITY,
+    checkPollingInterval: reservoirChains.blast.checkPollingInterval,
+  },
 ] as ReservoirChain[]
diff --git a/yarn.lock b/yarn.lock
@@ -1888,10 +1888,10 @@
   dependencies:
     merge-options "^3.0.4"
 
-"@reservoir0x/reservoir-kit-ui@2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.3.1.tgz#c8f70bb551be97c659213f3c7e74889318ced8b2"
-  integrity sha512-t2dauj/fkbWxw+MW1NONOO/Soar2EGTMuFzCguz0oY2YDgdBumhhX4chSJ3NqdxjJg3XWDMnxqnyIhEEcV1MDQ==
+"@reservoir0x/reservoir-kit-ui@2.3.3":
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.3.3.tgz#d6be9bebeb02dedc260fa359189f96330116e620"
+  integrity sha512-mBvZIIS9k8KE/fiifCeFUKer2lC09THC4YSHx454ReRA9ifUKZmYgue8Kyend/bouAZXFMi9rBd58eQx96Uc4A==
   dependencies:
     "@fortawesome/fontawesome-svg-core" "^6.1.1"
     "@fortawesome/free-solid-svg-icons" "^6.1.1"
@@ -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.3"
+    "@reservoir0x/reservoir-sdk" "2.0.5"
     "@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@2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.0.3.tgz#4a05a006a5d5ede6f9a794d14d2a6a1e32c25fbb"
-  integrity sha512-BxT5o94FDcns1rnk4jpqGkEWswT/4MCQppGtmTQoYHpMP0L1yhTfySWfUXuSgwA2e9xq/JMupGNviy+YE4JDig==
+"@reservoir0x/reservoir-sdk@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.0.5.tgz#f158627ab8c4f5ceba2402d8e5cf3e3a82b9d4d9"
+  integrity sha512-UOLxzIyR+cOpuenC0EuqX4GX4FgH3GkyTi3eQFC1Tnc+zU1SSdMiF8caXPe0csWEIwtDysQ0L0Vzk2suBg07bQ==
   dependencies:
     axios "^1.6.7"