From 826f7e80c2a5842fd37d3363398deb0b56b55ff7 Mon Sep 17 00:00:00 2001 From: albertfolch-redeemeum <102516373+albertfolch-redeemeum@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:56:26 +0200 Subject: [PATCH] chore: upgrade react-kit version (#1086) Co-authored-by: Ludovic Levalleux --- package-lock.json | 106 +++++++++++------- package.json | 2 +- src/CoreComponentsUpdaters.tsx | 49 +++++++- .../DetailWidget/BasicCommitDetailWidget.tsx | 4 +- .../DetailWidget/CommitDetailWidget.tsx | 4 +- .../DetailWidget/ExchangeDetailWidget.tsx | 5 +- src/components/header/walletModal/index.tsx | 5 +- src/components/header/web3Provider/index.tsx | 4 +- src/pages/common/OfferFullDescription.tsx | 4 +- 9 files changed, 125 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7300f82e..08020fe83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@apollo/client": "^3.8.1", "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/react-kit": "^0.32.0-alpha.1", + "@bosonprotocol/react-kit": "^0.32.0", "@davatar/react": "^1.10.4", "@ethersproject/address": "^5.6.1", "@ethersproject/units": "^5.7.0", @@ -2488,9 +2488,9 @@ } }, "node_modules/@bosonprotocol/common": { - "version": "1.27.3", - "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.27.3.tgz", - "integrity": "sha512-XXBpWLopa/pwODJPiXHbRGpffHtZ5/u3bYABPKM7QeoPf4WSdxH+skF4r722NwN0kvY5F18ykUt/52UcZsWk+g==", + "version": "1.28.0", + "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.28.0.tgz", + "integrity": "sha512-/YS9DIHLFlDa9khkwKSvvG69kZAw5NqZxdJALkfxD61C9PTp4awvDYo6peNMyXwNCK5lJ+KQ+TisEmiFm7Dn/Q==", "dependencies": { "@bosonprotocol/metadata": "^1.16.1", "@ethersproject/abi": "^5.5.0", @@ -2502,11 +2502,11 @@ } }, "node_modules/@bosonprotocol/core-sdk": { - "version": "1.40.3", - "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.40.3.tgz", - "integrity": "sha512-wBlo9+WJfh55B3CgRA5GHpILLaCyfHkdSvYIei/7pE73QUSGwcln9/x2VH25cq2E+iI3Qr1sG8we2XTNlLx+rw==", + "version": "1.40.4", + "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.40.4.tgz", + "integrity": "sha512-3sWTM7TEGI0DBLuOwnzfDgJOlkOrBOo9DhSzXw6X7f1GTn3WeMVlBgCv1CBIpV721SOdQhhVZ1yliQM5Ff6m6g==", "dependencies": { - "@bosonprotocol/common": "^1.27.3", + "@bosonprotocol/common": "^1.28.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -2523,11 +2523,11 @@ } }, "node_modules/@bosonprotocol/ethers-sdk": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.14.3.tgz", - "integrity": "sha512-GKq+pWSzlPSbh7L9lGcKgvW8yEspyEyp70wjmcwuYrKfi+IACFyxQQMtwd7a+yvhH8FXUYPIlL9jybl2PfICaw==", + "version": "1.14.4", + "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.14.4.tgz", + "integrity": "sha512-cvXJzHJwEjGGjmxeXS0q7Qe6KbfAtl3RLFh3Y696EFXpjGSVKeYS1VkAwA9p7VLe2qX9JSh6tdfLgkosx7HiLA==", "dependencies": { - "@bosonprotocol/common": "^1.27.3" + "@bosonprotocol/common": "^1.28.0" }, "peerDependencies": { "ethers": "^5.5.0" @@ -2551,17 +2551,18 @@ } }, "node_modules/@bosonprotocol/react-kit": { - "version": "0.32.0-alpha.1", - "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.32.0-alpha.1.tgz", - "integrity": "sha512-g+oRZ2Px4j/qaadG9uz9ukjLss7vKXnps5XCCICIAo33u5qeMY0+Mv9Q1jcvrKbM31Hcz9brPkD054aMSjLW+w==", + "version": "0.32.0", + "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.32.0.tgz", + "integrity": "sha512-ePdqqrZuzw31DFfiTyaouBTU0joBO9lrGUpes2/qzpLOVkM9kFmXDgwx4jEETkUTps2ureTZ1PwFF7PrnmvDXQ==", "dependencies": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.40.3", - "@bosonprotocol/ethers-sdk": "^1.14.3", + "@bosonprotocol/core-sdk": "^1.40.4", + "@bosonprotocol/ethers-sdk": "^1.14.4", "@bosonprotocol/ipfs-storage": "^1.11.3", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", "@glidejs/glide": "3.6.0", + "@metamask/jazzicon": "^2.0.0", "@rainbow-me/rainbowkit": "^1.3.4", "@sentry/browser": "7.43.0", "@svgr/webpack": "^8.1.0", @@ -2569,6 +2570,14 @@ "@uniswap/redux-multicall": "^1.1.8", "@uniswap/sdk-core": "^4.0.7", "@uniswap/token-lists": "^1.0.0-beta.33", + "@uniswap/v2-sdk": "^3.3.0", + "@uniswap/v3-periphery": "^1.4.4", + "@web3-react/coinbase-wallet": "^8.2.3", + "@web3-react/core": "^8.2.3", + "@web3-react/gnosis-safe": "^8.2.4", + "@web3-react/metamask": "^8.2.4", + "@web3-react/network": "^8.2.3", + "@web3-react/walletconnect-v2": "^8.5.1", "ajv": "^8.12.0", "babel-plugin-styled-components": "^2.1.4", "chart.js": "^4.4.1", @@ -2577,15 +2586,19 @@ "eth-revert-reason": "^1.0.3", "formik": "2.2.9", "graphql-request": "5.2.0", + "jotai": "^1.13.1", "lodash.merge": "4.6.2", "lodash.uniqby": "4.7.0", "magic-sdk": "^20.1.1", "multicodec": "^3.2.1", "multiformats": "^13.1.0", "multihashes": "^4.0.3", - "phosphor-react": "1.4.1", + "phosphor-react": "^1.4.1", "polished": "^4.2.2", + "react-avatar-editor": "^13.0.2", "react-chartjs-2": "^5.2.0", + "react-dropzone": "^14.2.3", + "react-error-boundary": "^4.0.13", "react-hot-toast": "2.4.0", "react-markdown": "8.0.6", "react-phone-number-input": "3.2.19", @@ -2595,6 +2608,7 @@ "react-select": "5.7.0", "react-slick": "^0.29.0", "react-table": "7.8.0", + "react-use-gesture": "^9.1.3", "redux-persist": "^6.0.0", "rehype-raw": "6.1.1", "remark-gfm": "3.0.1", @@ -2602,7 +2616,9 @@ "styled-components": "^6.1.8", "stylis": "^4.3.0", "tippy.js": "6.3.7", + "ua-parser-js": "^1.0.38", "use-async-effect": "2.2.7", + "use-resize-observer": "^9.1.0", "utility-types": "3.10.0", "viem": "^1.21.4", "wagmi": "^1.4.13", @@ -8977,9 +8993,9 @@ } }, "node_modules/@opensea/seaport-js": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@opensea/seaport-js/-/seaport-js-4.0.0.tgz", - "integrity": "sha512-xL0kv4CDdtuuJd7w2zI+cWR0e33T10Y9Sor+R1e1DfBHfc8w0POcgCqG0LsyAM0ZuopuYw4gwYY1eVyoqLJfVg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@opensea/seaport-js/-/seaport-js-4.0.1.tgz", + "integrity": "sha512-zcSXQ9XH55/9RG0dl8jwyUsUEmuZNfrh5OhHVUUAWYQvw1/allhqjwPdIZvKJp/EGXSB7vDBXR5j4T0fN9ssCA==", "hasInstallScript": true, "dependencies": { "ethers": "^6.9.0", @@ -9000,9 +9016,9 @@ "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==" }, "node_modules/@opensea/seaport-js/node_modules/ethers": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.12.1.tgz", - "integrity": "sha512-j6wcVoZf06nqEcBbDWkKg8Fp895SS96dSnTCjiXT+8vt2o02raTn4Lo9ERUuIVU5bAjoPYeA+7ytQFexFmLuVw==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.0.tgz", + "integrity": "sha512-+yyQQQWEntY5UVbCv++guA14RRVFm1rSnO1GoLFdrK7/XRWMoktNgyG9UjwxrQqGBfGyFKknNZ81YpUS2emCgg==", "funding": [ { "type": "individual", @@ -15226,12 +15242,13 @@ } }, "node_modules/@uniswap/v2-sdk": { - "version": "3.2.0", - "license": "MIT", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-3.3.0.tgz", + "integrity": "sha512-cf5PjoNQN5tNELIOVJsqV4/VeuDtxFw6Zl8oFmFJ6PNoQ8sx+XnGoO0aGKTB/o5II3oQ7820xtY3k47UsXgd6A==", "dependencies": { "@ethersproject/address": "^5.0.0", "@ethersproject/solidity": "^5.0.0", - "@uniswap/sdk-core": "^4.0.2", + "@uniswap/sdk-core": "^4.0.7", "tiny-invariant": "^1.1.0", "tiny-warning": "^1.0.3" }, @@ -15247,13 +15264,14 @@ } }, "node_modules/@uniswap/v3-periphery": { - "version": "1.4.3", - "license": "GPL-2.0-or-later", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@uniswap/v3-periphery/-/v3-periphery-1.4.4.tgz", + "integrity": "sha512-S4+m+wh8HbWSO3DKk4LwUCPZJTpCugIsHrWR86m/OrUyvSqGDTXKFfc2sMuGXCZrD1ZqO3rhQsKgdWg3Hbb2Kw==", "dependencies": { "@openzeppelin/contracts": "3.4.2-solc-0.7", "@uniswap/lib": "^4.0.1-alpha", - "@uniswap/v2-core": "1.0.1", - "@uniswap/v3-core": "1.0.0", + "@uniswap/v2-core": "^1.0.1", + "@uniswap/v3-core": "^1.0.0", "base64-sol": "1.0.1" }, "engines": { @@ -37032,9 +37050,9 @@ "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==" }, "node_modules/opensea-js/node_modules/ethers": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.12.1.tgz", - "integrity": "sha512-j6wcVoZf06nqEcBbDWkKg8Fp895SS96dSnTCjiXT+8vt2o02raTn4Lo9ERUuIVU5bAjoPYeA+7ytQFexFmLuVw==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.0.tgz", + "integrity": "sha512-+yyQQQWEntY5UVbCv++guA14RRVFm1rSnO1GoLFdrK7/XRWMoktNgyG9UjwxrQqGBfGyFKknNZ81YpUS2emCgg==", "funding": [ { "type": "individual", @@ -39290,8 +39308,9 @@ } }, "node_modules/react-avatar-editor": { - "version": "13.0.0", - "license": "MIT", + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/react-avatar-editor/-/react-avatar-editor-13.0.2.tgz", + "integrity": "sha512-a4ajbi7lwDh98kgEtSEeKMu0vs0CHTczkq4Xcxr1EiwMFH1GlgHCEtwGU8q/H5W8SeLnH4KPK8LUjEEaZXklxQ==", "dependencies": { "@babel/plugin-transform-runtime": "^7.12.1", "@babel/runtime": "^7.12.5", @@ -39557,8 +39576,9 @@ "license": "0BSD" }, "node_modules/react-error-boundary": { - "version": "4.0.4", - "license": "MIT", + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.0.13.tgz", + "integrity": "sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==", "dependencies": { "@babel/runtime": "^7.12.5" }, @@ -44115,7 +44135,9 @@ } }, "node_modules/ua-parser-js": { - "version": "1.0.37", + "version": "1.0.38", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.38.tgz", + "integrity": "sha512-Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ==", "funding": [ { "type": "opencollective", @@ -44130,7 +44152,6 @@ "url": "https://github.com/sponsors/faisalman" } ], - "license": "MIT", "engines": { "node": "*" } @@ -44673,8 +44694,9 @@ } }, "node_modules/use-resize-observer": { - "version": "9.0.2", - "license": "MIT", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/use-resize-observer/-/use-resize-observer-9.1.0.tgz", + "integrity": "sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==", "dependencies": { "@juggle/resize-observer": "^3.3.1" }, diff --git a/package.json b/package.json index c59821794..1fca92c78 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "dependencies": { "@apollo/client": "^3.8.1", "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/react-kit": "^0.32.0-alpha.1", + "@bosonprotocol/react-kit": "^0.32.0", "@davatar/react": "^1.10.4", "@ethersproject/address": "^5.6.1", "@ethersproject/units": "^5.7.0", diff --git a/src/CoreComponentsUpdaters.tsx b/src/CoreComponentsUpdaters.tsx index 4dbab9da3..bb8ce3b55 100644 --- a/src/CoreComponentsUpdaters.tsx +++ b/src/CoreComponentsUpdaters.tsx @@ -1,14 +1,51 @@ -import { CommitWidgetReduxUpdaters, hooks } from "@bosonprotocol/react-kit"; -import { useProvider } from "lib/utils/hooks/connection/connection"; +import { + CommitWidgetReduxUpdaters, + ConfigProvider, + hooks +} from "@bosonprotocol/react-kit"; +import { useConfigContext } from "components/config/ConfigContext"; +import { CONFIG } from "lib/config"; +import { + useAccount, + useChainId, + useProvider, + useSigner +} from "lib/utils/hooks/connection/connection"; import React from "react"; export const CoreComponentsUpdaters: React.FC = () => { const provider = useProvider(); const isWindowVisible = hooks.useIsWindowVisible(); + const { config } = useConfigContext(); + const connectedChainId = useChainId(); + const { account } = useAccount(); + const signer = useSigner(); return ( - + + + ); }; diff --git a/src/components/detail/DetailWidget/BasicCommitDetailWidget.tsx b/src/components/detail/DetailWidget/BasicCommitDetailWidget.tsx index cd3c8d60a..daff3b641 100644 --- a/src/components/detail/DetailWidget/BasicCommitDetailWidget.tsx +++ b/src/components/detail/DetailWidget/BasicCommitDetailWidget.tsx @@ -38,7 +38,9 @@ export const BasicCommitDetailWidget: React.FC< contactSellerForExchangeUrl: "", sellerCurationListBetweenCommas: curationLists?.sellerCurationList?.join(",") || "", - withReduxProvider: false + withReduxProvider: false, + withCustomReduxContext: false, + withWeb3React: false }} selectedVariant={selectedVariant} showPriceAsterisk={isPreview} diff --git a/src/components/detail/DetailWidget/CommitDetailWidget.tsx b/src/components/detail/DetailWidget/CommitDetailWidget.tsx index 1f9b314f4..63fc201f3 100644 --- a/src/components/detail/DetailWidget/CommitDetailWidget.tsx +++ b/src/components/detail/DetailWidget/CommitDetailWidget.tsx @@ -462,7 +462,9 @@ export const CommitDetailWidget: React.FC = ({ externalConnectedChainId: connectedChainId, externalConnectedAccount: account, externalConnectedSigner: signer, - withReduxProvider: false + withReduxProvider: false, + withWeb3React: false, + withCustomReduxContext: false }} selectedVariant={selectedVariant} showPriceAsterisk={isPreview} diff --git a/src/components/detail/DetailWidget/ExchangeDetailWidget.tsx b/src/components/detail/DetailWidget/ExchangeDetailWidget.tsx index 4f198c175..33d022d60 100644 --- a/src/components/detail/DetailWidget/ExchangeDetailWidget.tsx +++ b/src/components/detail/DetailWidget/ExchangeDetailWidget.tsx @@ -180,7 +180,10 @@ export const ExchangeDetailWidget: React.FC = ({ withExternalConnectionProps: true, externalConnectedChainId: connectedChainId, externalConnectedAccount: address, - externalConnectedSigner: signer + externalConnectedSigner: signer, + withWeb3React: false, + withCustomReduxContext: false, + withReduxProvider: false }} showBosonLogo={isCustomStoreFront} showPriceAsterisk={false} diff --git a/src/components/header/walletModal/index.tsx b/src/components/header/walletModal/index.tsx index faf35072d..fef9287a3 100644 --- a/src/components/header/walletModal/index.tsx +++ b/src/components/header/walletModal/index.tsx @@ -1,4 +1,4 @@ -import { MagicLoginButton } from "@bosonprotocol/react-kit"; +import { bosonButtonThemes, MagicLoginButton } from "@bosonprotocol/react-kit"; import { useWeb3React } from "@web3-react/core"; import { LinkWithQuery } from "components/customNavigation/LinkWithQuery"; import { AutoColumn } from "components/ui/column"; @@ -97,7 +97,8 @@ export default function WalletModal() { = ( withExternalConnectionProps: true, externalConnectedChainId: connectedChainId, externalConnectedAccount: account, - externalConnectedSigner: signer + externalConnectedSigner: signer, + withWeb3React: false, + withCustomReduxContext: false }} /> );