@bosonprotocol/react-kit 0.30.0-alpha.5 → 0.30.0-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/components/modal/components/Redeem/Confirmation/Confirmation.d.ts.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/Confirmation/Confirmation.js +4 -1
- package/dist/cjs/components/modal/components/Redeem/Confirmation/Confirmation.js.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemForm/RedeemForm.d.ts +3 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemForm/RedeemForm.d.ts.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemForm/RedeemForm.js +11 -2
- package/dist/cjs/components/modal/components/Redeem/RedeemForm/RedeemForm.js.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemForm/RedeemFormView.d.ts.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemForm/RedeemFormView.js +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemForm/RedeemFormView.js.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemFormModel.d.ts +7 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemFormModel.d.ts.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemFormModel.js +6 -0
- package/dist/cjs/components/modal/components/Redeem/RedeemFormModel.js.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemNonModal.d.ts.map +1 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemNonModal.js +16 -1
- package/dist/cjs/components/modal/components/Redeem/RedeemNonModal.js.map +1 -1
- package/dist/cjs/lib/bundle/const.d.ts +5 -0
- package/dist/cjs/lib/bundle/const.d.ts.map +1 -1
- package/dist/cjs/lib/bundle/const.js +7 -1
- package/dist/cjs/lib/bundle/const.js.map +1 -1
- package/dist/cjs/lib/offer/filter.d.ts +3 -0
- package/dist/cjs/lib/offer/filter.d.ts.map +1 -1
- package/dist/cjs/lib/offer/filter.js +21 -1
- package/dist/cjs/lib/offer/filter.js.map +1 -1
- package/dist/esm/components/modal/components/Redeem/Confirmation/Confirmation.d.ts.map +1 -1
- package/dist/esm/components/modal/components/Redeem/Confirmation/Confirmation.js +4 -1
- package/dist/esm/components/modal/components/Redeem/Confirmation/Confirmation.js.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemForm/RedeemForm.d.ts +3 -1
- package/dist/esm/components/modal/components/Redeem/RedeemForm/RedeemForm.d.ts.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemForm/RedeemForm.js +11 -2
- package/dist/esm/components/modal/components/Redeem/RedeemForm/RedeemForm.js.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemForm/RedeemFormView.d.ts.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemForm/RedeemFormView.js +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemForm/RedeemFormView.js.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemFormModel.d.ts +7 -1
- package/dist/esm/components/modal/components/Redeem/RedeemFormModel.d.ts.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemFormModel.js +6 -0
- package/dist/esm/components/modal/components/Redeem/RedeemFormModel.js.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemNonModal.d.ts.map +1 -1
- package/dist/esm/components/modal/components/Redeem/RedeemNonModal.js +16 -1
- package/dist/esm/components/modal/components/Redeem/RedeemNonModal.js.map +1 -1
- package/dist/esm/lib/bundle/const.d.ts +5 -0
- package/dist/esm/lib/bundle/const.d.ts.map +1 -1
- package/dist/esm/lib/bundle/const.js +6 -0
- package/dist/esm/lib/bundle/const.js.map +1 -1
- package/dist/esm/lib/offer/filter.d.ts +3 -0
- package/dist/esm/lib/offer/filter.d.ts.map +1 -1
- package/dist/esm/lib/offer/filter.js +18 -0
- package/dist/esm/lib/offer/filter.js.map +1 -1
- package/package.json +4 -4
- package/src/components/modal/components/Redeem/Confirmation/Confirmation.tsx +6 -1
- package/src/components/modal/components/Redeem/RedeemForm/RedeemForm.tsx +20 -2
- package/src/components/modal/components/Redeem/RedeemForm/RedeemFormView.tsx +1 -0
- package/src/components/modal/components/Redeem/RedeemFormModel.ts +7 -1
- package/src/components/modal/components/Redeem/RedeemNonModal.tsx +20 -1
- package/src/lib/bundle/const.ts +6 -0
- package/src/lib/offer/filter.ts +28 -0
|
@@ -56,6 +56,8 @@ import {
|
|
|
56
56
|
DetailContextProps,
|
|
57
57
|
DetailViewProvider
|
|
58
58
|
} from "../common/detail/DetailViewProvider";
|
|
59
|
+
import { getHasBuyerTransferInfos } from "../../../../lib/offer/filter";
|
|
60
|
+
import { BuyerTransferInfo } from "../../../../lib/bundle/const";
|
|
59
61
|
|
|
60
62
|
const colors = theme.colors.light;
|
|
61
63
|
const UlWithWordBreak = styled.ul`
|
|
@@ -328,6 +330,11 @@ function RedeemNonModal({
|
|
|
328
330
|
const emailPreference =
|
|
329
331
|
exchange?.seller.metadata?.contactPreference ===
|
|
330
332
|
ContactPreference.XMTP_AND_EMAIL;
|
|
333
|
+
const requestBuyerAddress = exchange?.offer
|
|
334
|
+
? getHasBuyerTransferInfos(exchange.offer, [
|
|
335
|
+
BuyerTransferInfo.walletAddress
|
|
336
|
+
])
|
|
337
|
+
: false;
|
|
331
338
|
const validationSchema = useMemo(() => {
|
|
332
339
|
return Yup.object({
|
|
333
340
|
[FormModel.formFields.name.name]: Yup.string()
|
|
@@ -356,11 +363,21 @@ function RedeemNonModal({
|
|
|
356
363
|
.required(FormModel.formFields.email.requiredErrorMessage)
|
|
357
364
|
.email(FormModel.formFields.email.mustBeEmail)
|
|
358
365
|
: Yup.string().trim().email(FormModel.formFields.email.mustBeEmail),
|
|
366
|
+
[FormModel.formFields.walletAddress.name]: requestBuyerAddress
|
|
367
|
+
? Yup.string()
|
|
368
|
+
.trim()
|
|
369
|
+
.required(FormModel.formFields.walletAddress.requiredErrorMessage)
|
|
370
|
+
.test(
|
|
371
|
+
"mustBeAddress",
|
|
372
|
+
FormModel.formFields.walletAddress.mustBeWalletAddress,
|
|
373
|
+
(value) => (value ? ethers.utils.isAddress(value) : true)
|
|
374
|
+
)
|
|
375
|
+
: Yup.string().trim(),
|
|
359
376
|
[FormModel.formFields.phone.name]: Yup.string()
|
|
360
377
|
.trim()
|
|
361
378
|
.required(FormModel.formFields.phone.requiredErrorMessage)
|
|
362
379
|
});
|
|
363
|
-
}, [emailPreference]);
|
|
380
|
+
}, [emailPreference, requestBuyerAddress]);
|
|
364
381
|
type FormType = Yup.InferType<typeof validationSchema>;
|
|
365
382
|
const [{ currentStep }, setStep] = useState<{
|
|
366
383
|
previousStep: ActiveStep[];
|
|
@@ -495,6 +512,7 @@ function RedeemNonModal({
|
|
|
495
512
|
[FormModel.formFields.zip.name]: "",
|
|
496
513
|
[FormModel.formFields.country.name]: "",
|
|
497
514
|
[FormModel.formFields.email.name]: "",
|
|
515
|
+
[FormModel.formFields.walletAddress.name]: "",
|
|
498
516
|
[FormModel.formFields.phone.name]: ""
|
|
499
517
|
}
|
|
500
518
|
}
|
|
@@ -509,6 +527,7 @@ function RedeemNonModal({
|
|
|
509
527
|
!errors[FormModel.formFields.zip.name] &&
|
|
510
528
|
!errors[FormModel.formFields.country.name] &&
|
|
511
529
|
!errors[FormModel.formFields.email.name] &&
|
|
530
|
+
!errors[FormModel.formFields.walletAddress.name] &&
|
|
512
531
|
!errors[FormModel.formFields.phone.name];
|
|
513
532
|
|
|
514
533
|
return (
|
package/src/lib/bundle/const.ts
CHANGED
package/src/lib/offer/filter.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { subgraph } from "@bosonprotocol/core-sdk";
|
|
2
2
|
import type { Offer } from "../../types/offer";
|
|
3
|
+
import { NftItem, isNftItem } from "../bundle/filter";
|
|
4
|
+
import { BUYER_TRANSFER_INFO_KEY, BuyerTransferInfo } from "../bundle/const";
|
|
5
|
+
import { isTruthy } from "../../types/helpers";
|
|
3
6
|
|
|
4
7
|
export type BundleMetadata = Extract<
|
|
5
8
|
Offer["metadata"],
|
|
@@ -30,3 +33,28 @@ export const isProductV1 = (
|
|
|
30
33
|
): offer is ProductV1 =>
|
|
31
34
|
offer.metadata?.__typename === "ProductV1MetadataEntity" ||
|
|
32
35
|
offer.metadata?.type === subgraph.MetadataType.PRODUCT_V1;
|
|
36
|
+
|
|
37
|
+
const getBuyerTransferInfoTerm = (item: NftItem) =>
|
|
38
|
+
item.terms?.find((term) => term.key === BUYER_TRANSFER_INFO_KEY);
|
|
39
|
+
export const getBuyerTransferInfos = (
|
|
40
|
+
offer: Offer | subgraph.OfferFieldsFragment
|
|
41
|
+
): Set<string> => {
|
|
42
|
+
return isBundle(offer)
|
|
43
|
+
? new Set(
|
|
44
|
+
offer.metadata.items
|
|
45
|
+
.filter(isNftItem)
|
|
46
|
+
.map((item) => getBuyerTransferInfoTerm(item)?.value)
|
|
47
|
+
.filter(isTruthy)
|
|
48
|
+
)
|
|
49
|
+
: new Set();
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
export const getHasBuyerTransferInfos = (
|
|
53
|
+
offer: Offer | subgraph.OfferFieldsFragment,
|
|
54
|
+
valuesToFind: BuyerTransferInfo[]
|
|
55
|
+
): boolean => {
|
|
56
|
+
const buyerTransferInfos = getBuyerTransferInfos(offer);
|
|
57
|
+
return valuesToFind.every((buyerTransferInfoValue) => {
|
|
58
|
+
return buyerTransferInfos.has(buyerTransferInfoValue);
|
|
59
|
+
});
|
|
60
|
+
};
|