From 54ee6faff7084c3d9aa1c8cc08c090e7353f95a4 Mon Sep 17 00:00:00 2001 From: Albert Folch Date: Tue, 21 Nov 2023 10:41:05 +0100 Subject: [PATCH 1/2] feat: check max commits --- src/components/detail/DetailWidget/DetailWidget.tsx | 2 +- src/lib/utils/hooks/offer/useCheckTokenGatedOffer.ts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/detail/DetailWidget/DetailWidget.tsx b/src/components/detail/DetailWidget/DetailWidget.tsx index c44b9937a..c32bb42b1 100644 --- a/src/components/detail/DetailWidget/DetailWidget.tsx +++ b/src/components/detail/DetailWidget/DetailWidget.tsx @@ -697,7 +697,7 @@ const DetailWidget: React.FC = ({ const offerCurationList = useCustomStoreQueryParameter("offerCurationList"); const { isConditionMet } = useCheckTokenGatedOffer({ commitProxyAddress, - condition: offer.condition + offer }); const numSellers = new Set( sellerCurationList diff --git a/src/lib/utils/hooks/offer/useCheckTokenGatedOffer.ts b/src/lib/utils/hooks/offer/useCheckTokenGatedOffer.ts index 78adf798b..52fb7649f 100644 --- a/src/lib/utils/hooks/offer/useCheckTokenGatedOffer.ts +++ b/src/lib/utils/hooks/offer/useCheckTokenGatedOffer.ts @@ -9,21 +9,22 @@ import { useAccount, useSigner } from "../connection/connection"; interface Props { commitProxyAddress?: string | undefined; - condition?: Offer["condition"] | undefined; + offer: Offer | undefined; } export default function useCheckTokenGatedOffer({ commitProxyAddress, - condition + offer }: Props) { const signer = useSigner(); const { account: address } = useAccount(); + const { id: offerId, condition } = offer ?? {}; const core = useCoreSDK(); const [isConditionMet, setConditionMet] = useState(false); useEffect(() => { - if (!address || !condition) { + if (!address || !condition || !offerId) { return; } (async () => { @@ -58,7 +59,7 @@ export default function useCheckTokenGatedOffer({ } try { - const met = await core.checkTokenGatedCondition(condition, address); + const met = await core.checkTokenGatedCondition(offerId, address); setConditionMet(met); } catch (error) { console.error(error); From 0a5b4accce6e01a3553f70dd950601e7f0e0f507 Mon Sep 17 00:00:00 2001 From: Albert Folch Date: Tue, 21 Nov 2023 16:22:24 +0100 Subject: [PATCH 2/2] update deps --- package-lock.json | 66 +++++++++---------- package.json | 2 +- .../detail/DetailWidget/TokenGated.tsx | 5 +- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index da1b709d4..b0235f337 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.22.0-alpha.12", + "@bosonprotocol/react-kit": "^0.22.0-alpha.15", "@davatar/react": "^1.10.4", "@ethersproject/address": "^5.6.1", "@ethersproject/units": "^5.6.1", @@ -2303,9 +2303,9 @@ } }, "node_modules/@bosonprotocol/common": { - "version": "1.24.0-alpha.9", - "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.24.0-alpha.9.tgz", - "integrity": "sha512-hwbPMVp/6LpPqa20xBaZzO/jKiVxOWYuZaweSHrwWfaHEtNcXCGOydx0EsFjNRwBY16EwlLJJhl++RnXQ44/vw==", + "version": "1.24.0-alpha.12", + "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.24.0-alpha.12.tgz", + "integrity": "sha512-4jjiiTWMvye5dMkp/eFU/3vTn8XbsL9bLEU3YR8nQhe/3EFIfc2o+FVQ0hw8HrpGsV4g25B48GajDZwghKmJmg==", "dependencies": { "@bosonprotocol/metadata": "^1.13.0", "@ethersproject/abi": "^5.5.0", @@ -2317,11 +2317,11 @@ } }, "node_modules/@bosonprotocol/core-sdk": { - "version": "1.33.0-alpha.9", - "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.33.0-alpha.9.tgz", - "integrity": "sha512-j+bsLYtAA78HU/Wl7zHmW4XhY220FUdgBQIW5BgNyXr7KcEa8eBnBDcbCHEFLsGIPiPwkx4g5pjDUK57tSFoEg==", + "version": "1.33.0-alpha.12", + "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.33.0-alpha.12.tgz", + "integrity": "sha512-vUn492lC/TBSqIFW0EIG7AgeJ6Q1Y0ORvXoX83Vvm/Dx6LDtLvpX8ZXIPwLgXqkCfuu+j9/0s/inlP43lP9PfQ==", "dependencies": { - "@bosonprotocol/common": "^1.24.0-alpha.9", + "@bosonprotocol/common": "^1.24.0-alpha.12", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -2337,11 +2337,11 @@ } }, "node_modules/@bosonprotocol/ethers-sdk": { - "version": "1.12.10-alpha.9", - "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.12.10-alpha.9.tgz", - "integrity": "sha512-fXio8iqTOIRaOGRkc1vs7/HATfFnw03qYet9zil5nuzRf9ATRMzaZAriWWRSFDsr//NNvNHHuWqebs6TjlncWQ==", + "version": "1.12.10-alpha.12", + "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.12.10-alpha.12.tgz", + "integrity": "sha512-ivGcRrOHt58yhQoFMXw+6gAp/ToRi/cpbOPzWb9VQk7S35HAHOpIorwHbH1ufvYAMGcI18Stf4SF53DdWl1cvA==", "dependencies": { - "@bosonprotocol/common": "^1.24.0-alpha.9" + "@bosonprotocol/common": "^1.24.0-alpha.12" }, "peerDependencies": { "ethers": "^5.5.0" @@ -2367,13 +2367,13 @@ } }, "node_modules/@bosonprotocol/react-kit": { - "version": "0.22.0-alpha.12", - "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.22.0-alpha.12.tgz", - "integrity": "sha512-iXyq6nK5z4V1eAuKo4U47ZOsx/xJQHWETnjYEldD6+qu9rZo9aLMJIE2CZui80cvk72nm6o36HWBIXa8ks6/yA==", + "version": "0.22.0-alpha.15", + "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.22.0-alpha.15.tgz", + "integrity": "sha512-yiCD8Q8T1k9CkaiDihe+ZGhmujD0G8gW91W8InIBYa0eEaO41kSHgdPhcRfyEQSxrkRouhBfaU9YMquf3sRCVw==", "dependencies": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.33.0-alpha.9", - "@bosonprotocol/ethers-sdk": "^1.12.10-alpha.9", + "@bosonprotocol/core-sdk": "^1.33.0-alpha.12", + "@bosonprotocol/ethers-sdk": "^1.12.10-alpha.12", "@bosonprotocol/ipfs-storage": "^1.10.10", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", @@ -47191,9 +47191,9 @@ } }, "@bosonprotocol/common": { - "version": "1.24.0-alpha.9", - "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.24.0-alpha.9.tgz", - "integrity": "sha512-hwbPMVp/6LpPqa20xBaZzO/jKiVxOWYuZaweSHrwWfaHEtNcXCGOydx0EsFjNRwBY16EwlLJJhl++RnXQ44/vw==", + "version": "1.24.0-alpha.12", + "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.24.0-alpha.12.tgz", + "integrity": "sha512-4jjiiTWMvye5dMkp/eFU/3vTn8XbsL9bLEU3YR8nQhe/3EFIfc2o+FVQ0hw8HrpGsV4g25B48GajDZwghKmJmg==", "requires": { "@bosonprotocol/metadata": "^1.13.0", "@ethersproject/abi": "^5.5.0", @@ -47205,11 +47205,11 @@ } }, "@bosonprotocol/core-sdk": { - "version": "1.33.0-alpha.9", - "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.33.0-alpha.9.tgz", - "integrity": "sha512-j+bsLYtAA78HU/Wl7zHmW4XhY220FUdgBQIW5BgNyXr7KcEa8eBnBDcbCHEFLsGIPiPwkx4g5pjDUK57tSFoEg==", + "version": "1.33.0-alpha.12", + "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.33.0-alpha.12.tgz", + "integrity": "sha512-vUn492lC/TBSqIFW0EIG7AgeJ6Q1Y0ORvXoX83Vvm/Dx6LDtLvpX8ZXIPwLgXqkCfuu+j9/0s/inlP43lP9PfQ==", "requires": { - "@bosonprotocol/common": "^1.24.0-alpha.9", + "@bosonprotocol/common": "^1.24.0-alpha.12", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -47225,11 +47225,11 @@ } }, "@bosonprotocol/ethers-sdk": { - "version": "1.12.10-alpha.9", - "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.12.10-alpha.9.tgz", - "integrity": "sha512-fXio8iqTOIRaOGRkc1vs7/HATfFnw03qYet9zil5nuzRf9ATRMzaZAriWWRSFDsr//NNvNHHuWqebs6TjlncWQ==", + "version": "1.12.10-alpha.12", + "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.12.10-alpha.12.tgz", + "integrity": "sha512-ivGcRrOHt58yhQoFMXw+6gAp/ToRi/cpbOPzWb9VQk7S35HAHOpIorwHbH1ufvYAMGcI18Stf4SF53DdWl1cvA==", "requires": { - "@bosonprotocol/common": "^1.24.0-alpha.9" + "@bosonprotocol/common": "^1.24.0-alpha.12" } }, "@bosonprotocol/ipfs-storage": { @@ -47252,13 +47252,13 @@ } }, "@bosonprotocol/react-kit": { - "version": "0.22.0-alpha.12", - "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.22.0-alpha.12.tgz", - "integrity": "sha512-iXyq6nK5z4V1eAuKo4U47ZOsx/xJQHWETnjYEldD6+qu9rZo9aLMJIE2CZui80cvk72nm6o36HWBIXa8ks6/yA==", + "version": "0.22.0-alpha.15", + "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.22.0-alpha.15.tgz", + "integrity": "sha512-yiCD8Q8T1k9CkaiDihe+ZGhmujD0G8gW91W8InIBYa0eEaO41kSHgdPhcRfyEQSxrkRouhBfaU9YMquf3sRCVw==", "requires": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.33.0-alpha.9", - "@bosonprotocol/ethers-sdk": "^1.12.10-alpha.9", + "@bosonprotocol/core-sdk": "^1.33.0-alpha.12", + "@bosonprotocol/ethers-sdk": "^1.12.10-alpha.12", "@bosonprotocol/ipfs-storage": "^1.10.10", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", diff --git a/package.json b/package.json index e9d59f83f..7098a2e15 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "dependencies": { "@apollo/client": "^3.8.1", "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/react-kit": "^0.22.0-alpha.12", + "@bosonprotocol/react-kit": "^0.22.0-alpha.15", "@davatar/react": "^1.10.4", "@ethersproject/address": "^5.6.1", "@ethersproject/units": "^5.6.1", diff --git a/src/components/detail/DetailWidget/TokenGated.tsx b/src/components/detail/DetailWidget/TokenGated.tsx index 31f70e17c..e0b2ada02 100644 --- a/src/components/detail/DetailWidget/TokenGated.tsx +++ b/src/components/detail/DetailWidget/TokenGated.tsx @@ -147,10 +147,11 @@ const TokenGated = ({ (async () => { if (condition?.tokenAddress && condition?.tokenType === 0) { try { - const { name, decimals, symbol } = await core.getExchangeTokenInfo( + const result = await core.getExchangeTokenInfo( condition.tokenAddress ); - setTokenInfo({ name, decimals: decimals?.toString(), symbol }); + const { name = "", decimals, symbol = "" } = result; + setTokenInfo({ name, decimals: decimals?.toString() ?? "", symbol }); } catch (error) { setTokenInfo({ name: "", decimals: "", symbol: "" }); }