@bosonprotocol/react-kit 0.42.0-alpha.2 → 0.42.0-alpha.4

package/src/hooks/useCheckExchangePolicy.ts

@@ -32,29 +32,34 @@ const getRulesTemplate = async (
   const rulesTemplate = JSON.parse(
     rulesTemplateText
   ) as offers.CheckExchangePolicyRules;
-  // replace DEFAULT_DISPUTE_RESOLVER_ID (environment dependent)
-  const disputeResolverId_matches =
-    rulesTemplate?.yupSchema?.properties?.disputeResolverId?.matches?.replace(
-      "<DEFAULT_DISPUTE_RESOLVER_ID>",
-      defaultDisputeResolverId
-    );
-  if (disputeResolverId_matches) {
-    rulesTemplate.yupSchema.properties.disputeResolverId.matches =
-      disputeResolverId_matches;
-  }
-  // replace TOKENS_LIST (environment dependent)
   const tokensList = defaultTokens.map((token) => token.address);
-  const tokensList_pattern =
-    rulesTemplate?.yupSchema?.properties?.exchangeToken?.properties?.address?.pattern?.replace(
-      "<TOKENS_LIST>",
-      tokensList.join("|")
-    );
-  if (
-    rulesTemplate.yupSchema.properties.exchangeToken.properties &&
-    tokensList_pattern
-  ) {
-    rulesTemplate.yupSchema.properties.exchangeToken.properties.address.pattern =
-      tokensList_pattern;
+  for (const schema of [
+    rulesTemplate.yupSchema,
+    ...(rulesTemplate.yupSchemas || [])
+  ]) {
+    // replace DEFAULT_DISPUTE_RESOLVER_ID (environment dependent)
+    if (schema.properties?.disputeResolverId?.matches) {
+      const disputeResolverId_matches =
+        schema.properties?.disputeResolverId?.matches?.replace(
+          "<DEFAULT_DISPUTE_RESOLVER_ID>",
+          defaultDisputeResolverId
+        );
+      if (disputeResolverId_matches) {
+        schema.properties.disputeResolverId.matches = disputeResolverId_matches;
+      }
+    }
+    // replace TOKENS_LIST (environment dependent)
+    if (schema.properties?.exchangeToken?.properties?.address?.pattern) {
+      const tokensList_pattern =
+        schema.properties?.exchangeToken?.properties?.address?.pattern?.replace(
+          "<TOKENS_LIST>",
+          tokensList.join("|")
+        );
+      if (schema.properties.exchangeToken.properties && tokensList_pattern) {
+        schema.properties.exchangeToken.properties.address.pattern =
+          tokensList_pattern;
+      }
+    }
   }
   return rulesTemplate;
 };
@@ -78,14 +83,13 @@ export default function useCheckExchangePolicy({
       defaultDisputeResolverId,
       defaultTokens
     ],
-    () => {
-      return getRulesTemplate(
+    () =>
+      getRulesTemplate(
         fairExchangePolicyRules,
         ipfsGateway,
         defaultDisputeResolverId,
         defaultTokens
-      );
-    }
+      )
   );
   useEffect(() => {
     if (!core || !offerId || !fairExchangePolicyRules || !rulesTemplate) {

package/src/hooks/useRenderTemplate.ts

@@ -6,6 +6,7 @@ import { ProgressStatus } from "../lib/progress/progressStatus";
 import { useCoreSDKWithContext } from "./core-sdk/useCoreSdkWithContext";
 
 import { useIpfsStorage } from "./useIpfsStorage";
+import { isBundle } from "..";
 
 type OfferFieldsFragment = subgraph.OfferFieldsFragment;
 type AdditionalOfferMetadata = offers.AdditionalOfferMetadata;
@@ -81,6 +82,13 @@ function buildOfferData(offerFields: OfferFieldsFragment): {
   offerArgs: CreateOfferArgs;
   offerMetadata: AdditionalOfferMetadata;
 } {
+  const productItemMetadata = isBundle(offerFields)
+    ? (offerFields.metadata as subgraph.BundleMetadataEntity).items?.find(
+        (item): item is subgraph.ProductV1ItemMetadataEntity =>
+          item.type === subgraph.ItemMetadataType.ITEM_PRODUCT_V1
+      )
+    : undefined;
+
   return {
     offerArgs: {
       price: offerFields.price as string,
@@ -104,6 +112,11 @@ function buildOfferData(offerFields: OfferFieldsFragment): {
       )
         .mul(1000)
         .toString(),
+      voucherValidDurationInMS: ethers.BigNumber.from(
+        offerFields.voucherValidDuration
+      )
+        .mul(1000)
+        .toString(),
       disputePeriodDurationInMS: ethers.BigNumber.from(
         offerFields.disputePeriodDuration
       )
@@ -128,11 +141,15 @@ function buildOfferData(offerFields: OfferFieldsFragment): {
     },
     offerMetadata: {
       sellerContactMethod:
-        (offerFields.metadata as ProductV1MetadataFields)?.exchangePolicy
-          ?.sellerContactMethod || "undefined",
+        (
+          productItemMetadata ||
+          (offerFields.metadata as ProductV1MetadataFields)
+        )?.exchangePolicy?.sellerContactMethod || "undefined",
       disputeResolverContactMethod:
-        (offerFields.metadata as ProductV1MetadataFields)?.exchangePolicy
-          ?.disputeResolverContactMethod || "undefined",
+        (
+          productItemMetadata ||
+          (offerFields.metadata as ProductV1MetadataFields)
+        )?.exchangePolicy?.disputeResolverContactMethod || "undefined",
       escalationDeposit:
         offerFields.disputeResolutionTerms.buyerEscalationDeposit,
       escalationResponsePeriodInSec:
@@ -141,8 +158,10 @@ function buildOfferData(offerFields: OfferFieldsFragment): {
         (offerFields.metadata as ProductV1MetadataFields)?.productV1Seller
           ?.name || "undefined",
       returnPeriodInDays:
-        (offerFields.metadata as ProductV1MetadataFields)?.shipping
-          ?.returnPeriodInDays || 0
+        (
+          productItemMetadata ||
+          (offerFields.metadata as ProductV1MetadataFields)
+        )?.shipping?.returnPeriodInDays || 0
     }
   };
 }

package/src/lib/offer/getOfferDetails.ts

@@ -90,13 +90,15 @@ export const getOfferDetails = (
   const shippingInfo = {
     returnPeriodInDays:
       productV1ItemMetadataEntity?.shipping?.returnPeriodInDays ||
-      isProductV1(offer)
+      (isProductV1(offer)
         ? (offer.metadata as ProductV1Sub).shipping?.returnPeriodInDays
-        : undefined,
+        : undefined),
     shippingTable:
-      (productV1ItemMetadataEntity?.shipping || isProductV1(offer)
-        ? (offer.metadata as ProductV1Sub).shipping
-        : undefined
+      (
+        productV1ItemMetadataEntity?.shipping ||
+        (isProductV1(offer)
+          ? (offer.metadata as ProductV1Sub).shipping
+          : undefined)
       )?.supportedJurisdictions?.map((jurisdiction) => ({
         name: jurisdiction.label,
         value: jurisdiction.deliveryTime

package/src/stories/widgets/Commit.stories.tsx

@@ -45,7 +45,7 @@ Commit.args = {
   defaultCurrencyTicker: "USD",
   contactSellerForExchangeUrl: "https://bosonapp.io/#/chat/{id}",
   fairExchangePolicyRules:
-    "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt",
+    "ipfs://QmPBjCyxLdYFGQRJnD1xfdtBTEUsviwJV5Y4ZN3rCBo2QQ",
   ipfsGateway: process.env.STORYBOOK_DATA_IPFS_GATEWAY,
   ipfsProjectId: process.env.STORYBOOK_DATA_IPFS_PROJECT_ID,
   ipfsProjectSecret: process.env.STORYBOOK_DATA_IPFS_PROJECT_SECRET,
@@ -80,7 +80,7 @@ CommitTokenGated_ERC20.args = {
   defaultCurrencyTicker: "USD",
   contactSellerForExchangeUrl: "https://bosonapp.io/#/chat/{id}",
   fairExchangePolicyRules:
-    "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt",
+    "ipfs://QmPBjCyxLdYFGQRJnD1xfdtBTEUsviwJV5Y4ZN3rCBo2QQ",
   ipfsGateway: process.env.STORYBOOK_DATA_IPFS_GATEWAY,
   ipfsProjectId: process.env.STORYBOOK_DATA_IPFS_PROJECT_ID,
   ipfsProjectSecret: process.env.STORYBOOK_DATA_IPFS_PROJECT_SECRET,
@@ -88,8 +88,8 @@ CommitTokenGated_ERC20.args = {
   defaultSelectedOfferId: "",
   disableVariationsSelects: false,
   bundleUuid: "",
-  productUuid: "cc482a1-c004-d003-c3ca-a1ed7537af1", // token gated no variations
-  sellerId: "138",
+  productUuid: "ee68e2-d038-f433-e421-d053af38c887", // token gated no variations
+  sellerId: "33",
   metaTx: {
     apiKey: process.env.STORYBOOK_DATA_META_TX_API_KEY as string,
     apiIds: process.env.STORYBOOK_DATA_META_TX_API_IDS as string
@@ -114,7 +114,7 @@ CommitWithColorAndSizeVariations.args = {
   ...BASE_ARGS,
   contactSellerForExchangeUrl: "https://bosonapp.io/#/chat/{id}",
   fairExchangePolicyRules:
-    "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt",
+    "ipfs://QmPBjCyxLdYFGQRJnD1xfdtBTEUsviwJV5Y4ZN3rCBo2QQ",
   ipfsGateway: process.env.STORYBOOK_DATA_IPFS_GATEWAY,
   ipfsProjectId: process.env.STORYBOOK_DATA_IPFS_PROJECT_ID,
   ipfsProjectSecret: process.env.STORYBOOK_DATA_IPFS_PROJECT_SECRET,
@@ -122,8 +122,8 @@ CommitWithColorAndSizeVariations.args = {
   defaultSelectedOfferId: "",
   disableVariationsSelects: false,
   bundleUuid: "",
-  productUuid: "1d4573d-42e-f557-0032-b1ab8170c102", // with color and size variations
-  sellerId: "138",
+  productUuid: "f4bb0f8-2f2c-d151-2801-0d3c6250461", // with color and size variations
+  sellerId: "20",
   metaTx: {
     apiKey: process.env.STORYBOOK_DATA_META_TX_API_KEY as string,
     apiIds: process.env.STORYBOOK_DATA_META_TX_API_IDS as string
@@ -151,7 +151,7 @@ CommitTokenGated_ERC721.args = {
   defaultCurrencyTicker: "USD",
   contactSellerForExchangeUrl: "https://bosonapp.io/#/chat/{id}",
   fairExchangePolicyRules:
-    "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt",
+    "ipfs://QmPBjCyxLdYFGQRJnD1xfdtBTEUsviwJV5Y4ZN3rCBo2QQ",
   ipfsGateway: process.env.STORYBOOK_DATA_IPFS_GATEWAY,
   ipfsProjectId: process.env.STORYBOOK_DATA_IPFS_PROJECT_ID,
   ipfsProjectSecret: process.env.STORYBOOK_DATA_IPFS_PROJECT_SECRET,
@@ -159,8 +159,8 @@ CommitTokenGated_ERC721.args = {
   defaultSelectedOfferId: "",
   disableVariationsSelects: false,
   bundleUuid: "",
-  productUuid: "ce7faab-00c-26-a351-c71f615c07c2",
-  sellerId: "138",
+  productUuid: "5366841-ded3-b381-0d8-1536bc1d83a4",
+  sellerId: "2",
   metaTx: {
     apiKey: process.env.STORYBOOK_DATA_META_TX_API_KEY as string,
     apiIds: process.env.STORYBOOK_DATA_META_TX_API_IDS as string
@@ -188,7 +188,7 @@ CommitTokenGated_ERC721_2.args = {
   defaultCurrencyTicker: "USD",
   contactSellerForExchangeUrl: "https://bosonapp.io/#/chat/{id}",
   fairExchangePolicyRules:
-    "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt",
+    "ipfs://QmPBjCyxLdYFGQRJnD1xfdtBTEUsviwJV5Y4ZN3rCBo2QQ",
   ipfsGateway: process.env.STORYBOOK_DATA_IPFS_GATEWAY,
   ipfsProjectId: process.env.STORYBOOK_DATA_IPFS_PROJECT_ID,
   ipfsProjectSecret: process.env.STORYBOOK_DATA_IPFS_PROJECT_SECRET,
@@ -225,7 +225,7 @@ CommitTokenGated_ERC1155.args = {
   defaultCurrencyTicker: "USD",
   contactSellerForExchangeUrl: "https://bosonapp.io/#/chat/{id}",
   fairExchangePolicyRules:
-    "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt",
+    "ipfs://QmPBjCyxLdYFGQRJnD1xfdtBTEUsviwJV5Y4ZN3rCBo2QQ",
   ipfsGateway: process.env.STORYBOOK_DATA_IPFS_GATEWAY,
   ipfsProjectId: process.env.STORYBOOK_DATA_IPFS_PROJECT_ID,
   ipfsProjectSecret: process.env.STORYBOOK_DATA_IPFS_PROJECT_SECRET,
@@ -233,8 +233,8 @@ CommitTokenGated_ERC1155.args = {
   defaultSelectedOfferId: "",
   disableVariationsSelects: false,
   bundleUuid: "",
-  productUuid: "d75860e-da32-224-870e-2a884c51a2ee", // token gated 1155
-  sellerId: "138",
+  productUuid: "5b60fd-de6d-f33-db11-7c70e20bb70e", // token gated 1155
+  sellerId: "6",
   metaTx: {
     apiKey: process.env.STORYBOOK_DATA_META_TX_API_KEY as string,
     apiIds: process.env.STORYBOOK_DATA_META_TX_API_IDS as string
@@ -262,7 +262,7 @@ CommitBundle.args = {
   defaultCurrencyTicker: "USD",
   contactSellerForExchangeUrl: "https://bosonapp.io/#/chat/{id}",
   fairExchangePolicyRules:
-    "ipfs://QmX8Wnq1eWbf7pRhEDQqdAqWp17YSKXQq8ckZVe4YdqAvt",
+    "ipfs://QmPBjCyxLdYFGQRJnD1xfdtBTEUsviwJV5Y4ZN3rCBo2QQ",
   ipfsGateway: process.env.STORYBOOK_DATA_IPFS_GATEWAY,
   ipfsProjectId: process.env.STORYBOOK_DATA_IPFS_PROJECT_ID,
   ipfsProjectSecret: process.env.STORYBOOK_DATA_IPFS_PROJECT_SECRET,