@0xsequence/marketplace-sdk 0.8.12 → 0.10.0
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/.storybook/main.ts +63 -0
- package/.storybook/preview.ts +24 -0
- package/.storybook/vitest.setup.ts +6 -0
- package/CHANGELOG.md +158 -21
- package/dist/{CartIcon-Bll1rbxv.js → CalendarIcon-CqsuAuCm.js} +30 -77
- package/dist/CalendarIcon-CqsuAuCm.js.map +1 -0
- package/dist/{types-BIJOaL4j.d.ts → CollectibleCard-Dd-CG6dE.d.ts} +11 -7
- package/dist/InfoIcon-v0w_Lu7t.js +53 -0
- package/dist/InfoIcon-v0w_Lu7t.js.map +1 -0
- package/dist/_internal-C75gOSNo.js +14 -0
- package/dist/_internal-C75gOSNo.js.map +1 -0
- package/dist/actionModal-CMUeVsFX.js +116 -0
- package/dist/actionModal-CMUeVsFX.js.map +1 -0
- package/dist/{alien_swap-B_76IMma.js → alien_swap-CYv6YlOF.js} +1 -1
- package/dist/{alien_swap-B_76IMma.js.map → alien_swap-CYv6YlOF.js.map} +1 -1
- package/dist/{api-1KFxYh7o.js → api-BiMGqWdz.js} +79 -87
- package/dist/api-BiMGqWdz.js.map +1 -0
- package/dist/{aqua-xyz-CMN_TFY5.js → aqua-xyz-Bzn5baeH.js} +1 -1
- package/dist/{aqua-xyz-CMN_TFY5.js.map → aqua-xyz-Bzn5baeH.js.map} +1 -1
- package/dist/{aura-Cye_TuHj.js → aura-DzIWh8WT.js} +1 -1
- package/dist/{aura-Cye_TuHj.js.map → aura-DzIWh8WT.js.map} +1 -1
- package/dist/base-DqaJPvfN.js +22 -0
- package/dist/base-DqaJPvfN.js.map +1 -0
- package/dist/{blur-DWDMyMpK.js → blur-DSH-Cbpj.js} +1 -1
- package/dist/{blur-DWDMyMpK.js.map → blur-DSH-Cbpj.js.map} +1 -1
- package/dist/{builder-api-BQvzykoU.js → builder-api-BFuZNOaN.js} +2 -2
- package/dist/{builder-api-BQvzykoU.js.map → builder-api-BFuZNOaN.js.map} +1 -1
- package/dist/{builder.gen-CxP9NT1p.js → builder.gen-B9wR2nvF.js} +1 -1
- package/dist/builder.gen-B9wR2nvF.js.map +1 -0
- package/dist/{coinbase-ByA_XRB0.js → coinbase-Df8URNxq.js} +1 -1
- package/dist/{coinbase-ByA_XRB0.js.map → coinbase-Df8URNxq.js.map} +1 -1
- package/dist/{sdk-config-DJzxVPld.d.ts → create-config-DKJ-F0jc.d.ts} +458 -86
- package/dist/{wagmi-DRctYEk6.js → create-config-fQ-jbJD1.js} +33 -16
- package/dist/create-config-fQ-jbJD1.js.map +1 -0
- package/dist/{element-b77CyXIZ.js → element-Cx6uJu5N.js} +1 -1
- package/dist/{element-b77CyXIZ.js.map → element-Cx6uJu5N.js.map} +1 -1
- package/dist/{foundation-DbOrKP9Y.js → foundation-D6U4aRLN.js} +1 -1
- package/dist/{foundation-DbOrKP9Y.js.map → foundation-D6U4aRLN.js.map} +1 -1
- package/dist/get-provider-CYYHfrlg.js +10 -0
- package/dist/get-provider-CYYHfrlg.js.map +1 -0
- package/dist/get-query-client-D19vvfJo.js +23 -0
- package/dist/get-query-client-D19vvfJo.js.map +1 -0
- package/dist/hooks-4pxIbLbM.js +4044 -0
- package/dist/hooks-4pxIbLbM.js.map +1 -0
- package/dist/{index-1bezgsFq.d.ts → index-136YrWDH.d.ts} +929 -255
- package/dist/{index-D5v5iluA.d.ts → index-BAhaEfqY.d.ts} +1 -1
- package/dist/index-BKBin-rq.d.ts +979 -0
- package/dist/index-BUWB_RXp.d.ts +3144 -0
- package/dist/{index-Cl7PQOGu.d.ts → index-BhVFc2rX.d.ts} +28 -25
- package/dist/{index-DXMfTZ1F.d.ts → index-C5aqo8xu.d.ts} +1 -1
- package/dist/{index-BIMIpDiI.d.ts → index-CKrYP7ot.d.ts} +74 -103
- package/dist/{index-BEYefG1G.d.ts → index-CUwMH7Ht.d.ts} +5 -5
- package/dist/{index-BjIwVzc4.d.ts → index-Cu70Lw-w.d.ts} +238 -238
- package/dist/index.css +427 -1
- package/dist/index.d.ts +8 -10
- package/dist/index.js +15 -11
- package/dist/{looks-rare-C1VqNcSM.js → looks-rare-ChBRBY-p.js} +1 -1
- package/dist/{looks-rare-C1VqNcSM.js.map → looks-rare-ChBRBY-p.js.map} +1 -1
- package/dist/{magic-eden-ea_AGCZr.js → magic-eden-D5U7N1xL.js} +1 -1
- package/dist/{magic-eden-ea_AGCZr.js.map → magic-eden-D5U7N1xL.js.map} +1 -1
- package/dist/{manifold-8y8J2sjT.js → manifold-CtLF52zU.js} +1 -1
- package/dist/{manifold-8y8J2sjT.js.map → manifold-CtLF52zU.js.map} +1 -1
- package/dist/{marketplace-nwnZv9Cb.js → marketplace-DmFiyBoS.js} +1 -1
- package/dist/{marketplace-nwnZv9Cb.js.map → marketplace-DmFiyBoS.js.map} +1 -1
- package/dist/{marketplace-logos-CSeGcPW4.js → marketplace-logos-Cd6W-qOq.js} +21 -21
- package/dist/{marketplace-logos-CSeGcPW4.js.map → marketplace-logos-Cd6W-qOq.js.map} +1 -1
- package/dist/{marketplace.gen-Dqk8vRmD.js → marketplace.gen-HpnpL5xU.js} +12 -3
- package/dist/marketplace.gen-HpnpL5xU.js.map +1 -0
- package/dist/{marketplaceConfig-D2MYFqll.js → marketplaceConfig-GQTTmihy.js} +3 -3
- package/dist/marketplaceConfig-GQTTmihy.js.map +1 -0
- package/dist/{mintify-LA68TzWg.js → mintify-Bi3Bce68.js} +1 -1
- package/dist/{mintify-LA68TzWg.js.map → mintify-Bi3Bce68.js.map} +1 -1
- package/dist/network-CGD0oKtS.js +15 -0
- package/dist/network-CGD0oKtS.js.map +1 -0
- package/dist/{nftx-D3Tc8nzd.js → nftx-BDQZjtkX.js} +1 -1
- package/dist/{nftx-D3Tc8nzd.js.map → nftx-BDQZjtkX.js.map} +1 -1
- package/dist/{okx-hbqg6oIJ.js → okx-D4meadLe.js} +1 -1
- package/dist/{okx-hbqg6oIJ.js.map → okx-D4meadLe.js.map} +1 -1
- package/dist/{open-sea-BccuK8-t.js → open-sea-DN0hgfVw.js} +1 -1
- package/dist/{open-sea-BccuK8-t.js.map → open-sea-DN0hgfVw.js.map} +1 -1
- package/dist/options-BBBR8u_4.js +0 -0
- package/dist/{primary-sale-Cw95phYC.js → primary-sale-CmWxSfFQ.js} +279 -279
- package/dist/primary-sale-CmWxSfFQ.js.map +1 -0
- package/dist/provider-DPGUA10G.js +125 -0
- package/dist/provider-DPGUA10G.js.map +1 -0
- package/dist/queries-Ce_2othB.js +757 -0
- package/dist/queries-Ce_2othB.js.map +1 -0
- package/dist/{rarible-BgTwwj9g.js → rarible-B0xlD88A.js} +1 -1
- package/dist/{rarible-BgTwwj9g.js.map → rarible-B0xlD88A.js.map} +1 -1
- package/dist/react/_internal/api/index.d.ts +2 -4
- package/dist/react/_internal/api/index.js +9 -6
- package/dist/react/_internal/databeat/index.d.ts +2 -73
- package/dist/react/_internal/databeat/index.js +4 -21
- package/dist/react/_internal/index.d.ts +2 -7
- package/dist/react/_internal/index.js +13 -8
- package/dist/react/_internal/wagmi/index.d.ts +2 -4
- package/dist/react/_internal/wagmi/index.js +6 -4
- package/dist/react/hooks/index.d.ts +13 -17
- package/dist/react/hooks/index.js +25 -21
- package/dist/react/hooks/options/index.d.ts +3 -5
- package/dist/react/hooks/options/index.js +15 -10
- package/dist/react/index.d.ts +13 -40
- package/dist/react/index.js +30 -21
- package/dist/react/queries/index.d.ts +9 -8
- package/dist/react/queries/index.js +22 -17
- package/dist/react/ssr/index.d.ts +7 -9
- package/dist/react/ssr/index.js +13 -8
- package/dist/react/ssr/index.js.map +1 -1
- package/dist/react/ui/components/marketplace-collectible-card/index.d.ts +3 -9
- package/dist/react/ui/components/marketplace-collectible-card/index.js +29 -20
- package/dist/react/ui/components/marketplace-collectible-card/utils/index.d.ts +2 -7
- package/dist/react/ui/components/marketplace-collectible-card/utils/index.js +13 -8
- package/dist/react/ui/components/marketplace-logos/index.d.ts +21 -21
- package/dist/react/ui/components/marketplace-logos/index.js +1 -1
- package/dist/react/ui/icons/index.js +14 -10
- package/dist/react/ui/index.d.ts +3 -9
- package/dist/react/ui/index.js +29 -20
- package/dist/react/ui/modals/_internal/components/actionModal/index.d.ts +5 -5
- package/dist/react/ui/modals/_internal/components/actionModal/index.js +25 -20
- package/dist/{react-BG7o4PId.js → react-DP0M2Wfm.js} +4919 -7839
- package/dist/react-DP0M2Wfm.js.map +1 -0
- package/dist/{react-BbHBl6gg.css → react-DeDyTgo7.css} +1 -1
- package/dist/{react-BbHBl6gg.css.map → react-DeDyTgo7.css.map} +1 -1
- package/dist/{sequence-Do3kzb4J.js → sequence-BIrOVRXO.js} +1 -1
- package/dist/{sequence-Do3kzb4J.js.map → sequence-BIrOVRXO.js.map} +1 -1
- package/dist/{sudo-swap-B6vPKxBz.js → sudo-swap-BPMon-M5.js} +1 -1
- package/dist/{sudo-swap-B6vPKxBz.js.map → sudo-swap-BPMon-M5.js.map} +1 -1
- package/dist/{super-rare-eCm1SE6O.js → super-rare-kPN6Ua8i.js} +1 -1
- package/dist/{super-rare-eCm1SE6O.js.map → super-rare-kPN6Ua8i.js.map} +1 -1
- package/dist/{token-CO5llIla.js → token-CHSBPYVG.js} +1540 -761
- package/dist/token-CHSBPYVG.js.map +1 -0
- package/dist/{transaction-CcVViHEL.js → transaction-CnctdNzS.js} +3 -21
- package/dist/transaction-CnctdNzS.js.map +1 -0
- package/dist/types/index.d.ts +2 -3
- package/dist/types/index.js +3 -3
- package/dist/{types-DwWE6xOF.js → types-Yw2ywj6j.js} +1 -1
- package/dist/types-Yw2ywj6j.js.map +1 -0
- package/dist/utils/abi/index.d.ts +5 -5
- package/dist/utils/abi/index.js +5 -5
- package/dist/utils/abi/marketplace/index.d.ts +1 -1
- package/dist/utils/abi/marketplace/index.js +1 -1
- package/dist/utils/abi/primary-sale/index.d.ts +1 -1
- package/dist/utils/abi/primary-sale/index.js +1 -1
- package/dist/utils/abi/token/index.d.ts +2 -2
- package/dist/utils/abi/token/index.js +2 -2
- package/dist/utils/index.d.ts +7 -8
- package/dist/utils/index.js +13 -10
- package/dist/{utils-BFdxaToy.js → utils-9RXDgcBl.js} +86 -93
- package/dist/utils-9RXDgcBl.js.map +1 -0
- package/dist/{utils-Cat9_pef.js → utils-DjVJ9tov.js} +5 -6
- package/dist/utils-DjVJ9tov.js.map +1 -0
- package/dist/wagmi-Do_KW5ke.js +0 -0
- package/dist/{x2y2-DD17tT91.js → x2y2-BLz-_Q2O.js} +1 -1
- package/dist/{x2y2-DD17tT91.js.map → x2y2-BLz-_Q2O.js.map} +1 -1
- package/dist/{zora-BpSG9UzS.js → zora-UGhKs-aL.js} +1 -1
- package/dist/{zora-BpSG9UzS.js.map → zora-UGhKs-aL.js.map} +1 -1
- package/eslint/use-client.js +0 -6
- package/eslint.config.mjs +4 -0
- package/package.json +47 -35
- package/postcss.config.mjs +6 -0
- package/src/index.css +5 -4
- package/src/index.ts +2 -1
- package/src/react/__tests__/provider.test.tsx +4 -3
- package/src/react/_internal/api/__mocks__/builder.msw.ts +5 -3
- package/src/react/_internal/api/__mocks__/indexer.msw.ts +24 -8
- package/src/react/_internal/api/__mocks__/laos.msw.ts +387 -0
- package/src/react/_internal/api/__mocks__/marketplace.msw.ts +6 -6
- package/src/react/_internal/api/__mocks__/metadata.msw.ts +1 -1
- package/src/react/_internal/api/__tests__/laos-api.test.ts +756 -0
- package/src/react/_internal/api/builder.gen.ts +6 -6
- package/src/react/_internal/api/get-query-client.ts +2 -2
- package/src/react/_internal/api/index.ts +2 -2
- package/src/react/_internal/api/laos-api.ts +3 -0
- package/src/react/_internal/api/marketplace.gen.ts +43 -3
- package/src/react/_internal/api/query-keys.ts +21 -6
- package/src/react/_internal/api/services.ts +30 -45
- package/src/react/_internal/databeat/index.ts +15 -14
- package/src/react/_internal/databeat/types.ts +22 -0
- package/src/react/_internal/databeat/utils.ts +26 -0
- package/src/react/_internal/index.ts +1 -1
- package/src/react/_internal/types.ts +10 -23
- package/src/react/_internal/utils.ts +4 -5
- package/src/react/_internal/wagmi/create-config.ts +43 -19
- package/src/react/_internal/wagmi/get-connectors.ts +9 -7
- package/src/react/_internal/wallet/__tests__/wallet.test.ts +1 -1
- package/src/react/_internal/wallet/wallet.ts +22 -22
- package/src/react/hooks/__tests__/__snapshots__/useListCollections.test.tsx.snap +20 -0
- package/src/react/hooks/__tests__/__snapshots__/useMarketplaceConfig.test.tsx.snap +12 -2
- package/src/react/hooks/__tests__/useAutoSelectFeeOption.test.tsx +1 -1
- package/src/react/hooks/__tests__/useBalanceOfCollectible.laos.test.tsx +367 -0
- package/src/react/hooks/__tests__/useBalanceOfCollectible.test.tsx +1 -1
- package/src/react/hooks/__tests__/useCancelOrder.test.tsx +4 -4
- package/src/react/hooks/__tests__/useCancelTransactionSteps.test.tsx +1 -1
- package/src/react/hooks/__tests__/useCheckoutOptions.test.tsx +158 -0
- package/src/react/hooks/__tests__/useCheckoutOptionsSalesContract.test.tsx +42 -65
- package/src/react/hooks/__tests__/useCollectible.test.tsx +14 -16
- package/src/react/hooks/__tests__/useCollection.test.tsx +4 -4
- package/src/react/hooks/__tests__/useCollectionBalanceDetails.test.tsx +16 -25
- package/src/react/hooks/__tests__/useCollectionDetails.test.tsx +1 -1
- package/src/react/hooks/__tests__/useCollectionDetailsPolling.test.tsx +12 -4
- package/src/react/hooks/__tests__/useComparePrices.test.tsx +7 -6
- package/src/react/hooks/__tests__/useConvertPriceToUSD.test.tsx +4 -4
- package/src/react/hooks/__tests__/useCountListingsForCollectible.test.tsx +2 -2
- package/src/react/hooks/__tests__/useCountOfCollectables.test.tsx +5 -5
- package/src/react/hooks/__tests__/useCountOffersForCollectible.test.tsx +2 -2
- package/src/react/hooks/__tests__/useCurrency.test.tsx +5 -3
- package/src/react/hooks/__tests__/useCurrencyBalance.test.tsx +7 -3
- package/src/react/hooks/__tests__/useFilters.test.tsx +3 -3
- package/src/react/hooks/__tests__/useFloorOrder.test.tsx +4 -4
- package/src/react/hooks/__tests__/useGenerateCancelTransaction.test.tsx +3 -3
- package/src/react/hooks/__tests__/useGenerateListingTransaction.test.tsx +1 -1
- package/src/react/hooks/__tests__/useGenerateOfferTransaction.test.tsx +1 -1
- package/src/react/hooks/__tests__/useGenerateSellTransaction.test.tsx +1 -1
- package/src/react/hooks/__tests__/useGetTokenRanges.test.tsx +111 -0
- package/src/react/hooks/__tests__/useHighestOffer.test.tsx +4 -4
- package/src/react/hooks/__tests__/useInventory.test.tsx +1 -1
- package/src/react/hooks/__tests__/useListCollectibleActivities.test.tsx +11 -13
- package/src/react/hooks/__tests__/useListCollectibles.test.tsx +5 -5
- package/src/react/hooks/__tests__/useListCollectiblesPaginated.test.tsx +10 -15
- package/src/react/hooks/__tests__/useListCollectionActivities.test.tsx +13 -15
- package/src/react/hooks/__tests__/useListCollections.test.tsx +3 -3
- package/src/react/hooks/__tests__/useListListingsForCollectible.test.tsx +3 -2
- package/src/react/hooks/__tests__/useListMarketCardData.test.tsx +301 -0
- package/src/react/hooks/__tests__/useListOffersForCollectible.test.tsx +1 -1
- package/src/react/hooks/__tests__/useListTokenMetadata.test.tsx +137 -0
- package/src/react/hooks/__tests__/useLowestListing.test.tsx +1 -1
- package/src/react/hooks/__tests__/useMarketCurrencies.test.tsx +1 -1
- package/src/react/hooks/__tests__/useRoyalty.test.tsx +0 -23
- package/src/react/hooks/__tests__/useTransferTokens.test.tsx +469 -0
- package/src/react/hooks/index.ts +29 -24
- package/src/react/hooks/options/index.ts +0 -1
- package/src/react/hooks/useAutoSelectFeeOption.tsx +1 -1
- package/src/react/hooks/useBalanceOfCollectible.tsx +1 -1
- package/src/react/hooks/useCancelTransactionSteps.tsx +2 -2
- package/src/react/hooks/useCheckoutOptions.tsx +84 -54
- package/src/react/hooks/useCheckoutOptionsSalesContract.tsx +98 -57
- package/src/react/hooks/useCollectible.tsx +64 -49
- package/src/react/hooks/useCollection.tsx +60 -11
- package/src/react/hooks/useCollectionBalanceDetails.tsx +93 -73
- package/src/react/hooks/useCollectionDetails.ts +69 -0
- package/src/react/hooks/useCollectionDetailsPolling.tsx +7 -3
- package/src/react/hooks/useComparePrices.tsx +91 -86
- package/src/react/hooks/useConvertPriceToUSD.tsx +83 -86
- package/src/react/hooks/useCountListingsForCollectible.tsx +64 -53
- package/src/react/hooks/useCountOfCollectables.tsx +60 -69
- package/src/react/hooks/useCountOfPrimarySaleItems.tsx +13 -0
- package/src/react/hooks/useCountOffersForCollectible.tsx +64 -53
- package/src/react/hooks/useCurrency.tsx +56 -64
- package/src/react/hooks/useCurrencyBalance.tsx +132 -46
- package/src/react/hooks/useERC721SaleMintedTokens.tsx +8 -5
- package/src/react/hooks/useFilterState.tsx +1 -2
- package/src/react/hooks/useFilters.tsx +154 -111
- package/src/react/hooks/useFloorOrder.tsx +65 -40
- package/src/react/hooks/useGenerateCancelTransaction.tsx +5 -10
- package/src/react/hooks/useGenerateListingTransaction.tsx +1 -1
- package/src/react/hooks/useGenerateOfferTransaction.tsx +1 -1
- package/src/react/hooks/useGenerateSellTransaction.tsx +5 -10
- package/src/react/hooks/useGetCountOfPrimarySaleItems.tsx +48 -0
- package/src/react/hooks/useGetReceiptFromHash.tsx +32 -3
- package/src/react/hooks/useGetTokenRanges.tsx +92 -0
- package/src/react/hooks/useHighestOffer.tsx +68 -4
- package/src/react/hooks/useInventory.tsx +1 -1
- package/src/react/hooks/useList1155ShopCardData.tsx +57 -82
- package/src/react/hooks/useList721ShopCardData.tsx +98 -63
- package/src/react/hooks/useListBalances.tsx +1 -1
- package/src/react/hooks/useListCollectibleActivities.tsx +89 -50
- package/src/react/hooks/useListCollectibles.tsx +81 -16
- package/src/react/hooks/useListCollectiblesPaginated.tsx +96 -66
- package/src/react/hooks/useListCollectionActivities.tsx +84 -50
- package/src/react/hooks/useListCollections.tsx +71 -17
- package/src/react/hooks/useListListingsForCollectible.tsx +90 -50
- package/src/react/hooks/useListMarketCardData.tsx +3 -2
- package/src/react/hooks/useListOffersForCollectible.tsx +9 -14
- package/src/react/hooks/useListPrimarySaleItems.tsx +66 -0
- package/src/react/hooks/useListShopCardData.tsx +70 -0
- package/src/react/hooks/useListTokenMetadata.ts +64 -12
- package/src/react/hooks/useListTokenMetadata.tsx +73 -0
- package/src/react/hooks/useLowestListing.tsx +68 -4
- package/src/react/hooks/useMarketCurrencies.tsx +62 -5
- package/src/react/hooks/useOpenConnectModal.tsx +9 -0
- package/src/react/hooks/useRoyalty.tsx +57 -13
- package/src/react/hooks/useShopCollectibleSaleData.tsx +349 -0
- package/src/react/hooks/useTokenSaleDetailsBatch.tsx +3 -7
- package/src/react/hooks/useTokenSupplies.ts +81 -0
- package/src/react/hooks/useTransferTokens.tsx +2 -2
- package/src/react/hooks/util/optimisticCancelUpdates.ts +5 -7
- package/src/react/index.ts +5 -3
- package/src/react/provider.tsx +73 -9
- package/src/react/queries/__tests__/balanceOfCollectible.laos.test.ts +123 -0
- package/src/react/queries/__tests__/inventory.laos.test.ts +496 -0
- package/src/react/queries/balanceOfCollectible.ts +8 -5
- package/src/react/queries/checkoutOptions.ts +85 -0
- package/src/react/queries/checkoutOptionsSalesContract.ts +89 -0
- package/src/react/queries/collectible.ts +66 -0
- package/src/react/queries/collection.ts +55 -0
- package/src/react/queries/collectionBalanceDetails.ts +92 -0
- package/src/react/queries/collectionDetails.ts +64 -0
- package/src/react/queries/comparePrices.ts +108 -0
- package/src/react/queries/convertPriceToUSD.ts +92 -0
- package/src/react/queries/countListingsForCollectible.ts +73 -0
- package/src/react/queries/countOfCollectables.ts +83 -0
- package/src/react/queries/countOfPrimarySaleItems.ts +48 -0
- package/src/react/queries/countOffersForCollectible.ts +73 -0
- package/src/react/queries/currency.ts +83 -0
- package/src/react/queries/filters.ts +138 -0
- package/src/react/queries/floorOrder.ts +63 -0
- package/src/react/queries/getTokenRanges.ts +62 -0
- package/src/react/queries/highestOffer.ts +46 -40
- package/src/react/queries/index.ts +10 -4
- package/src/react/queries/inventory.ts +10 -4
- package/src/react/queries/listBalances.ts +5 -4
- package/src/react/queries/listCollectibleActivities.ts +97 -0
- package/src/react/queries/listCollectibles.ts +67 -50
- package/src/react/queries/listCollectiblesPaginated.ts +87 -0
- package/src/react/queries/listCollectionActivities.ts +95 -0
- package/src/react/queries/listCollections.ts +53 -10
- package/src/react/queries/listListingsForCollectible.ts +82 -0
- package/src/react/queries/listTokenMetadata.ts +47 -23
- package/src/react/queries/lowestListing.ts +46 -31
- package/src/react/queries/marketCurrencies.ts +42 -29
- package/src/react/queries/marketplaceConfig.ts +4 -4
- package/src/react/queries/primarySaleItems.ts +85 -0
- package/src/react/queries/primarySaleItemsCount.ts +64 -0
- package/src/react/queries/tokenSupplies.ts +93 -0
- package/src/react/ssr/__tests__/__snapshots__/create-ssr-client.test.ts.snap +12 -2
- package/src/react/ssr/create-ssr-client.ts +1 -1
- package/src/react/types/query.ts +34 -0
- package/src/react/ui/components/ModelViewer.tsx +1 -1
- package/src/react/ui/components/_internals/action-button/ActionButton.tsx +66 -66
- package/src/react/ui/components/_internals/action-button/__tests__/ActionButtonBody.test.tsx +22 -4
- package/src/react/ui/components/_internals/action-button/__tests__/useActionButtonLogic.test.tsx +14 -8
- package/src/react/ui/components/_internals/action-button/components/ActionButtonBody.tsx +5 -4
- package/src/react/ui/components/_internals/action-button/components/NonOwnerActions.tsx +3 -0
- package/src/react/ui/components/_internals/action-button/components/OwnerActions.tsx +4 -4
- package/src/react/ui/components/_internals/action-button/hooks/useActionButtonLogic.ts +20 -18
- package/src/react/ui/components/_internals/action-button/store.ts +72 -34
- package/src/react/ui/components/_internals/custom-select/CustomSelect.stories.tsx +582 -0
- package/src/react/ui/components/_internals/pill/Pill.stories.tsx +83 -0
- package/src/react/ui/components/marketplace-collectible-card/CollectibleCard.tsx +1 -1
- package/src/react/ui/components/marketplace-collectible-card/Footer.tsx +12 -5
- package/src/react/ui/components/marketplace-collectible-card/components/ActionButtonWrapper.tsx +7 -4
- package/src/react/ui/components/marketplace-collectible-card/components/BaseCard.tsx +3 -0
- package/src/react/ui/components/marketplace-collectible-card/index.ts +1 -1
- package/src/react/ui/components/marketplace-collectible-card/types.ts +11 -7
- package/src/react/ui/components/marketplace-collectible-card/utils/supplyStatus.ts +4 -7
- package/src/react/ui/components/marketplace-collectible-card/variants/MarketCard.tsx +3 -2
- package/src/react/ui/components/marketplace-collectible-card/variants/ShopCard.tsx +7 -6
- package/src/react/ui/components/marketplace-logos/marketplace-logos.stories.tsx +199 -0
- package/src/react/ui/components/marketplace-logos/marketplace-logos.tsx +1 -1
- package/src/react/ui/components/media/Media.stories.tsx +642 -0
- package/src/react/ui/components/media/Media.tsx +29 -20
- package/src/react/ui/components/media/types.ts +6 -0
- package/src/react/ui/index.ts +8 -10
- package/src/react/ui/modals/BuyModal/__tests__/BuyModalRouter.test.tsx +15 -0
- package/src/react/ui/modals/BuyModal/__tests__/ERC1155ShopModal.test.tsx +100 -87
- package/src/react/ui/modals/BuyModal/__tests__/Modal1155.test.tsx +11 -5
- package/src/react/ui/modals/BuyModal/__tests__/store.test.ts +10 -2
- package/src/react/ui/modals/BuyModal/components/ERC1155QuantityModal.tsx +17 -11
- package/src/react/ui/modals/BuyModal/components/ERC1155ShopModal.tsx +4 -1
- package/src/react/ui/modals/BuyModal/hooks/__tests__/useCheckoutOptions.test.tsx +1 -1
- package/src/react/ui/modals/BuyModal/hooks/__tests__/useERC1155Checkout.test.tsx +30 -27
- package/src/react/ui/modals/BuyModal/hooks/useCheckoutOptions.ts +3 -3
- package/src/react/ui/modals/BuyModal/hooks/useERC1155Checkout.ts +11 -2
- package/src/react/ui/modals/BuyModal/hooks/useERC721SalePaymentParams.ts +2 -2
- package/src/react/ui/modals/BuyModal/hooks/usePaymentModalParams.ts +10 -3
- package/src/react/ui/modals/BuyModal/index.tsx +9 -1
- package/src/react/ui/modals/BuyModal/store.ts +26 -0
- package/src/react/ui/modals/CreateListingModal/Modal.tsx +28 -11
- package/src/react/ui/modals/CreateListingModal/__tests__/Modal.test.tsx +2 -2
- package/src/react/ui/modals/CreateListingModal/hooks/useCreateListing.tsx +0 -1
- package/src/react/ui/modals/CreateListingModal/hooks/useGetTokenApproval.ts +2 -2
- package/src/react/ui/modals/CreateListingModal/hooks/useTransactionSteps.tsx +7 -6
- package/src/react/ui/modals/CreateListingModal/index.tsx +1 -1
- package/src/react/ui/modals/CreateListingModal/store.ts +3 -3
- package/src/react/ui/modals/MakeOfferModal/Modal.tsx +31 -14
- package/src/react/ui/modals/MakeOfferModal/__tests__/Modal.test.tsx +1 -1
- package/src/react/ui/modals/MakeOfferModal/hooks/useGetTokenApproval.tsx +1 -1
- package/src/react/ui/modals/MakeOfferModal/hooks/useMakeOffer.tsx +0 -1
- package/src/react/ui/modals/MakeOfferModal/hooks/useTransactionSteps.tsx +7 -7
- package/src/react/ui/modals/MakeOfferModal/index.tsx +1 -1
- package/src/react/ui/modals/MakeOfferModal/store.ts +3 -3
- package/src/react/ui/modals/SellModal/Modal.tsx +14 -11
- package/src/react/ui/modals/SellModal/__tests__/Modal.test.tsx +6 -4
- package/src/react/ui/modals/SellModal/hooks/useGetTokenApproval.tsx +1 -1
- package/src/react/ui/modals/SellModal/hooks/useSell.tsx +0 -1
- package/src/react/ui/modals/SellModal/hooks/useTransactionSteps.tsx +6 -6
- package/src/react/ui/modals/SellModal/store.ts +3 -3
- package/src/react/ui/modals/SuccessfulPurchaseModal/__tests__/Modal.test.tsx +1 -1
- package/src/react/ui/modals/TransferModal/__tests__/__snapshots__/store.test.ts.snap +17 -0
- package/src/react/ui/modals/TransferModal/__tests__/store.test.ts +366 -0
- package/src/react/ui/modals/TransferModal/_views/enterWalletAddress/__tests__/useHandleTransfer.test.tsx +402 -0
- package/src/react/ui/modals/TransferModal/_views/enterWalletAddress/_components/TokenQuantityInput.tsx +52 -50
- package/src/react/ui/modals/TransferModal/_views/enterWalletAddress/_components/TransferButton.tsx +39 -47
- package/src/react/ui/modals/TransferModal/_views/enterWalletAddress/_components/WalletAddressInput.tsx +9 -8
- package/src/react/ui/modals/TransferModal/_views/enterWalletAddress/index.tsx +33 -37
- package/src/react/ui/modals/TransferModal/_views/enterWalletAddress/useHandleTransfer.tsx +19 -10
- package/src/react/ui/modals/TransferModal/index.tsx +28 -31
- package/src/react/ui/modals/TransferModal/messages.ts +1 -1
- package/src/react/ui/modals/TransferModal/store.ts +122 -0
- package/src/react/ui/modals/_internal/components/actionModal/ActionModal.test.tsx +1 -1
- package/src/react/ui/modals/_internal/components/actionModal/ActionModal.tsx +2 -4
- package/src/react/ui/modals/_internal/components/calendar/index.tsx +0 -1
- package/src/react/ui/modals/_internal/components/currencyImage/index.tsx +10 -14
- package/src/react/ui/modals/_internal/components/currencyOptionsSelect/__tests__/index.test.tsx +6 -3
- package/src/react/ui/modals/_internal/components/currencyOptionsSelect/index.tsx +23 -18
- package/src/react/ui/modals/_internal/components/expirationDateSelect/index.tsx +10 -10
- package/src/react/ui/modals/_internal/components/floorPriceText/__tests__/FloorPriceText.test.tsx +6 -6
- package/src/react/ui/modals/_internal/components/floorPriceText/index.tsx +4 -4
- package/src/react/ui/modals/_internal/components/priceInput/__tests__/PriceInput.test.tsx +13 -5
- package/src/react/ui/modals/_internal/components/priceInput/index.tsx +41 -26
- package/src/react/ui/modals/_internal/components/quantityInput/__tests__/index.test.tsx +68 -59
- package/src/react/ui/modals/_internal/components/quantityInput/index.tsx +23 -17
- package/src/react/ui/modals/_internal/components/selectWaasFeeOptions/__tests__/SelectWaasFeeOptions.test.tsx +340 -41
- package/src/react/ui/modals/_internal/components/selectWaasFeeOptions/_components/BalanceIndicator.tsx +1 -2
- package/src/react/ui/modals/_internal/components/selectWaasFeeOptions/index.tsx +95 -101
- package/src/react/ui/modals/_internal/components/selectWaasFeeOptions/store.ts +72 -14
- package/src/react/ui/modals/_internal/components/selectWaasFeeOptions/useWaasFeeOptionManager.tsx +29 -14
- package/src/react/ui/modals/_internal/components/tokenPreview/index.tsx +2 -2
- package/src/react/ui/modals/_internal/components/transactionDetails/index.tsx +2 -2
- package/src/react/ui/modals/_internal/components/transactionPreview/index.tsx +88 -89
- package/src/react/ui/modals/_internal/components/transactionStatusModal/__tests__/TransactionStatusModal.test.tsx +37 -11
- package/src/react/ui/modals/_internal/components/transactionStatusModal/hooks/useTransactionStatus.ts +0 -1
- package/src/react/ui/modals/_internal/components/transactionStatusModal/index.tsx +32 -20
- package/src/react/ui/modals/_internal/components/transactionStatusModal/store.ts +92 -63
- package/src/react/ui/modals/_internal/components/waasFeeOptionsSelect/WaasFeeOptionsSelect.tsx +44 -45
- package/src/react/ui/modals/_internal/types.ts +2 -2
- package/src/react/ui/modals/modal-provider.tsx +2 -3
- package/src/types/api-types.ts +36 -36
- package/src/types/buyModalErrors.ts +1 -1
- package/src/types/index.ts +5 -5
- package/src/types/new-marketplace-types.ts +1 -1
- package/src/types/sdk-config.ts +8 -2
- package/src/types/types.ts +1 -0
- package/src/types/waas-types.ts +1 -1
- package/src/utils/abi/index.ts +1 -1
- package/src/utils/abi/primary-sale/index.ts +1 -1
- package/src/utils/abi/token/index.ts +2 -1
- package/src/utils/decode/erc20.ts +1 -1
- package/src/utils/index.ts +3 -3
- package/src/utils/network.ts +15 -0
- package/test/const.ts +3 -1
- package/test/mocks/wallet.ts +1 -1
- package/test/test-utils.tsx +5 -4
- package/vitest.shims.d.ts +2 -0
- package/vitest.storybook.config.js +33 -0
- package/.changeset/fluffy-jokes-lay.md +0 -5
- package/.changeset/wise-bugs-boil.md +0 -8
- package/dist/CartIcon-Bll1rbxv.js.map +0 -1
- package/dist/CollectibleCard-CLQTl0_6.d.ts +0 -8
- package/dist/_internal-69NEWNUE.js +0 -34
- package/dist/_internal-69NEWNUE.js.map +0 -1
- package/dist/api-1KFxYh7o.js.map +0 -1
- package/dist/builder-api-DoK3907S.d.ts +0 -12
- package/dist/builder.gen-CxP9NT1p.js.map +0 -1
- package/dist/index-4-kfOFdx.d.ts +0 -22
- package/dist/index-BHiSG-Yi.d.ts +0 -312
- package/dist/index-BQW0PUkQ.d.ts +0 -3973
- package/dist/index-BfH21xmk.d.ts +0 -117
- package/dist/index-CN8puQQJ.d.ts +0 -24
- package/dist/index-DafWjEb4.d.ts +0 -65
- package/dist/marketplace.gen-Dqk8vRmD.js.map +0 -1
- package/dist/marketplaceConfig-D2MYFqll.js.map +0 -1
- package/dist/options-DCi6_23w.js +0 -34
- package/dist/options-DCi6_23w.js.map +0 -1
- package/dist/primary-sale-Cw95phYC.js.map +0 -1
- package/dist/queries-DPvwtnO7.js +0 -486
- package/dist/queries-DPvwtnO7.js.map +0 -1
- package/dist/react-BG7o4PId.js.map +0 -1
- package/dist/token-CO5llIla.js.map +0 -1
- package/dist/transaction-CcVViHEL.js.map +0 -1
- package/dist/types-DwWE6xOF.js.map +0 -1
- package/dist/useCollection-C-mclKU0.d.ts +0 -66
- package/dist/utils-BFdxaToy.js.map +0 -1
- package/dist/utils-Cat9_pef.js.map +0 -1
- package/dist/wagmi-DRctYEk6.js.map +0 -1
- package/src/react/_internal/api/zod-schema.ts +0 -678
- package/src/react/hooks/options/collectionOptions.ts +0 -41
- package/src/react/hooks/useCollectionDetails.tsx +0 -50
- package/src/react/hooks/useGetTokenSuppliesMap.ts +0 -33
- package/src/react/hooks/useListPrimarySaleItems.ts +0 -42
- package/src/react/queries/getTokenSupplies.ts +0 -38
- package/src/react/ui/modals/TransferModal/_store.ts +0 -72
- package/src/react/ui/modals/_internal/stores/accountModal.ts +0 -3
- package/tsconfig.tsbuildinfo +0 -1
- /package/dist/{abi-BKyRjVcZ.js → abi-BMvgNbKQ.js} +0 -0
- /package/dist/{index-C39K_8SG.d.ts → index-CD2bj_xW.d.ts} +0 -0
- /package/dist/{index-ij9f8GAA.d.ts → index-DvpBZgor.d.ts} +0 -0
|
@@ -5,12 +5,17 @@ import {
|
|
|
5
5
|
screen,
|
|
6
6
|
waitForElementToBeRemoved,
|
|
7
7
|
} from '@test';
|
|
8
|
-
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
8
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
9
9
|
import type { Order } from '../../../../_internal';
|
|
10
10
|
import { MarketplaceKind, OrderSide, OrderStatus } from '../../../../_internal';
|
|
11
|
+
import type { DatabeatAnalytics } from '../../../../_internal/databeat';
|
|
11
12
|
import { ERC1155QuantityModal } from '../components/ERC1155QuantityModal';
|
|
12
13
|
import { buyModalStore } from '../store';
|
|
13
14
|
|
|
15
|
+
const analyticsFn = {
|
|
16
|
+
trackBuyModalOpened: vi.fn(),
|
|
17
|
+
} as unknown as DatabeatAnalytics;
|
|
18
|
+
|
|
14
19
|
const testOrder: Order = {
|
|
15
20
|
chainId: 1,
|
|
16
21
|
orderId: '1',
|
|
@@ -57,6 +62,7 @@ describe('ERC1155QuantityModal', () => {
|
|
|
57
62
|
marketplace: MarketplaceKind.sequence_marketplace_v2,
|
|
58
63
|
marketplaceType: 'market',
|
|
59
64
|
},
|
|
65
|
+
analyticsFn,
|
|
60
66
|
});
|
|
61
67
|
});
|
|
62
68
|
|
|
@@ -82,7 +88,7 @@ describe('ERC1155QuantityModal', () => {
|
|
|
82
88
|
// Wait for spinner to disappear if it exists
|
|
83
89
|
try {
|
|
84
90
|
await waitForElementToBeRemoved(() => screen.queryByTestId('spinner'));
|
|
85
|
-
} catch (
|
|
91
|
+
} catch (_error) {
|
|
86
92
|
// If no spinner or already gone, continue
|
|
87
93
|
}
|
|
88
94
|
|
|
@@ -123,7 +129,7 @@ describe('ERC1155QuantityModal', () => {
|
|
|
123
129
|
// Wait for spinner to disappear if it exists
|
|
124
130
|
try {
|
|
125
131
|
await waitForElementToBeRemoved(() => screen.queryByTestId('spinner'));
|
|
126
|
-
} catch (
|
|
132
|
+
} catch (_error) {
|
|
127
133
|
// If no spinner or already gone, continue
|
|
128
134
|
}
|
|
129
135
|
|
|
@@ -166,7 +172,7 @@ describe('ERC1155QuantityModal', () => {
|
|
|
166
172
|
// Wait for spinner to disappear if it exists
|
|
167
173
|
try {
|
|
168
174
|
await waitForElementToBeRemoved(() => screen.queryByTestId('spinner'));
|
|
169
|
-
} catch (
|
|
175
|
+
} catch (_error) {
|
|
170
176
|
// If no spinner or already gone, continue
|
|
171
177
|
}
|
|
172
178
|
|
|
@@ -214,7 +220,7 @@ describe('ERC1155QuantityModal', () => {
|
|
|
214
220
|
// Wait for spinner to disappear if it exists
|
|
215
221
|
try {
|
|
216
222
|
await waitForElementToBeRemoved(() => screen.queryByTestId('spinner'));
|
|
217
|
-
} catch (
|
|
223
|
+
} catch (_error) {
|
|
218
224
|
// If no spinner or already gone, continue
|
|
219
225
|
}
|
|
220
226
|
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, it } from 'vitest';
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
2
|
import { MarketplaceKind } from '../../../../_internal';
|
|
3
|
-
import
|
|
3
|
+
import type { DatabeatAnalytics } from '../../../../_internal/databeat';
|
|
4
|
+
import { buyModalStore, type MarketplaceBuyModalProps } from '../store';
|
|
5
|
+
|
|
6
|
+
const analyticsFn = {
|
|
7
|
+
trackBuyModalOpened: vi.fn(),
|
|
8
|
+
} as unknown as DatabeatAnalytics;
|
|
4
9
|
|
|
5
10
|
describe('BuyModal Store', () => {
|
|
6
11
|
beforeEach(() => {
|
|
@@ -29,6 +34,7 @@ describe('BuyModal Store', () => {
|
|
|
29
34
|
props: mockProps,
|
|
30
35
|
onSuccess: () => {},
|
|
31
36
|
onError: () => {},
|
|
37
|
+
analyticsFn,
|
|
32
38
|
});
|
|
33
39
|
|
|
34
40
|
const state = buyModalStore.getSnapshot();
|
|
@@ -51,6 +57,7 @@ describe('BuyModal Store', () => {
|
|
|
51
57
|
props: mockProps,
|
|
52
58
|
onSuccess: () => {},
|
|
53
59
|
onError: () => {},
|
|
60
|
+
analyticsFn,
|
|
54
61
|
});
|
|
55
62
|
|
|
56
63
|
const openState = buyModalStore.getSnapshot();
|
|
@@ -75,6 +82,7 @@ describe('BuyModal Store', () => {
|
|
|
75
82
|
buyModalStore.send({
|
|
76
83
|
type: 'open',
|
|
77
84
|
props: mockProps,
|
|
85
|
+
analyticsFn,
|
|
78
86
|
});
|
|
79
87
|
|
|
80
88
|
const state1 = buyModalStore.getSnapshot();
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
|
-
import { use$, useObservable } from '@legendapp/state/react';
|
|
4
|
-
|
|
5
3
|
import { Text, TokenImage } from '@0xsequence/design-system';
|
|
4
|
+
import { useState } from 'react';
|
|
6
5
|
import type { Address } from 'viem';
|
|
6
|
+
import { maxUint256 } from 'viem';
|
|
7
7
|
import { DEFAULT_MARKETPLACE_FEE_PERCENTAGE } from '../../../../../consts';
|
|
8
8
|
import type { MarketplaceType } from '../../../../../types';
|
|
9
9
|
import { formatPriceWithFee } from '../../../../../utils/price';
|
|
@@ -13,11 +13,14 @@ import { ActionModal } from '../../_internal/components/actionModal';
|
|
|
13
13
|
import QuantityInput from '../../_internal/components/quantityInput';
|
|
14
14
|
import { buyModalStore, useIsOpen } from '../store';
|
|
15
15
|
|
|
16
|
+
const INFINITY_STRING = maxUint256.toString();
|
|
17
|
+
|
|
16
18
|
type ERC1155QuantityModalProps = {
|
|
17
19
|
order?: Order;
|
|
18
20
|
marketplaceType: MarketplaceType;
|
|
19
21
|
quantityDecimals: number;
|
|
20
22
|
quantityRemaining: string;
|
|
23
|
+
unlimitedSupply?: boolean;
|
|
21
24
|
salePrice?: {
|
|
22
25
|
amount: string;
|
|
23
26
|
currencyAddress: Address;
|
|
@@ -29,16 +32,17 @@ export const ERC1155QuantityModal = ({
|
|
|
29
32
|
order,
|
|
30
33
|
quantityDecimals,
|
|
31
34
|
quantityRemaining,
|
|
35
|
+
unlimitedSupply,
|
|
32
36
|
salePrice,
|
|
33
37
|
chainId,
|
|
34
38
|
marketplaceType,
|
|
35
39
|
}: ERC1155QuantityModalProps) => {
|
|
36
40
|
const isOpen = useIsOpen();
|
|
37
41
|
|
|
38
|
-
const localQuantity
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
const
|
|
42
|
+
const [localQuantity, setLocalQuantity] = useState('1');
|
|
43
|
+
const [invalidQuantity, setInvalidQuantity] = useState(false);
|
|
44
|
+
|
|
45
|
+
const maxQuantity = unlimitedSupply ? INFINITY_STRING : quantityRemaining;
|
|
42
46
|
|
|
43
47
|
return (
|
|
44
48
|
<ActionModal
|
|
@@ -62,10 +66,12 @@ export const ERC1155QuantityModal = ({
|
|
|
62
66
|
>
|
|
63
67
|
<div className="flex w-full flex-col gap-4">
|
|
64
68
|
<QuantityInput
|
|
65
|
-
|
|
66
|
-
|
|
69
|
+
quantity={localQuantity}
|
|
70
|
+
invalidQuantity={invalidQuantity}
|
|
71
|
+
onQuantityChange={setLocalQuantity}
|
|
72
|
+
onInvalidQuantityChange={setInvalidQuantity}
|
|
67
73
|
decimals={quantityDecimals}
|
|
68
|
-
maxQuantity={
|
|
74
|
+
maxQuantity={maxQuantity}
|
|
69
75
|
/>
|
|
70
76
|
|
|
71
77
|
<TotalPrice
|
|
@@ -103,9 +109,9 @@ const TotalPrice = ({
|
|
|
103
109
|
const { data: marketplaceConfig } = useMarketplaceConfig();
|
|
104
110
|
const { data: currency, isLoading: isCurrencyLoading } = useCurrency({
|
|
105
111
|
chainId,
|
|
106
|
-
currencyAddress: order
|
|
112
|
+
currencyAddress: (order
|
|
107
113
|
? order.priceCurrencyAddress
|
|
108
|
-
: salePrice?.currencyAddress,
|
|
114
|
+
: salePrice?.currencyAddress) as Address,
|
|
109
115
|
});
|
|
110
116
|
|
|
111
117
|
let error: null | string = null;
|
|
@@ -7,8 +7,8 @@ import type { CheckoutOptions } from '../../../../_internal';
|
|
|
7
7
|
import { LoadingModal } from '../../_internal/components/actionModal/LoadingModal';
|
|
8
8
|
import { useERC1155Checkout } from '../hooks/useERC1155Checkout';
|
|
9
9
|
import {
|
|
10
|
-
type CheckoutOptionsSalesContractProps,
|
|
11
10
|
buyModalStore,
|
|
11
|
+
type CheckoutOptionsSalesContractProps,
|
|
12
12
|
isShopProps,
|
|
13
13
|
useBuyModalProps,
|
|
14
14
|
useCheckoutModalState,
|
|
@@ -37,6 +37,8 @@ export const ERC1155ShopModal = ({
|
|
|
37
37
|
isShop && modalProps.quantityRemaining
|
|
38
38
|
? modalProps.quantityRemaining.toString()
|
|
39
39
|
: '0';
|
|
40
|
+
const unlimitedSupply =
|
|
41
|
+
isShop && modalProps.unlimitedSupply ? modalProps.unlimitedSupply : false;
|
|
40
42
|
|
|
41
43
|
if (!quantity) {
|
|
42
44
|
return (
|
|
@@ -49,6 +51,7 @@ export const ERC1155ShopModal = ({
|
|
|
49
51
|
marketplaceType="shop"
|
|
50
52
|
quantityDecimals={quantityDecimals}
|
|
51
53
|
quantityRemaining={quantityRemaining}
|
|
54
|
+
unlimitedSupply={unlimitedSupply}
|
|
52
55
|
chainId={chainId}
|
|
53
56
|
/>
|
|
54
57
|
);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { renderHook, server, waitFor } from '@test';
|
|
2
|
-
import {
|
|
2
|
+
import { HttpResponse, http } from 'msw';
|
|
3
3
|
import { zeroAddress } from 'viem';
|
|
4
4
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
5
|
import { createMockWallet } from '../../../../../../../test/mocks/wallet';
|
|
@@ -32,6 +32,7 @@ vi.mock('../../store', () => ({
|
|
|
32
32
|
useQuantity: vi.fn(() => 2),
|
|
33
33
|
useOnSuccess: vi.fn(() => vi.fn()),
|
|
34
34
|
useOnError: vi.fn(() => vi.fn()),
|
|
35
|
+
useBuyAnalyticsId: vi.fn(() => '123'),
|
|
35
36
|
buyModalStore: {
|
|
36
37
|
send: vi.fn(),
|
|
37
38
|
},
|
|
@@ -87,36 +88,38 @@ describe('useERC1155Checkout', () => {
|
|
|
87
88
|
expect(
|
|
88
89
|
mockUseERC1155SaleContractCheckout.mock.calls,
|
|
89
90
|
).toMatchInlineSnapshot(`
|
|
90
|
-
[
|
|
91
91
|
[
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
"
|
|
96
|
-
"
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
92
|
+
[
|
|
93
|
+
{
|
|
94
|
+
"chain": 1,
|
|
95
|
+
"chainId": "1",
|
|
96
|
+
"checkoutOptions": {
|
|
97
|
+
"crypto": "all",
|
|
98
|
+
"nftCheckout": [],
|
|
99
|
+
"onRamp": [],
|
|
100
|
+
"swap": [],
|
|
101
|
+
},
|
|
102
|
+
"collectionAddress": "0x123",
|
|
103
|
+
"contractAddress": "0x456",
|
|
104
|
+
"customProviderCallback": undefined,
|
|
105
|
+
"items": [
|
|
106
|
+
{
|
|
107
|
+
"quantity": "2",
|
|
108
|
+
"tokenId": "1",
|
|
109
|
+
},
|
|
110
|
+
],
|
|
111
|
+
"onClose": [Function],
|
|
112
|
+
"onError": [Function],
|
|
113
|
+
"onSuccess": [Function],
|
|
114
|
+
"supplementaryAnalyticsInfo": {
|
|
115
|
+
"marketplaceType": "shop",
|
|
116
|
+
"saleAnalyticsId": "123",
|
|
107
117
|
},
|
|
108
|
-
|
|
109
|
-
"onClose": [Function],
|
|
110
|
-
"onError": [Function],
|
|
111
|
-
"onSuccess": [Function],
|
|
112
|
-
"supplementaryAnalyticsInfo": {
|
|
113
|
-
"type": "mint_shop",
|
|
118
|
+
"wallet": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
|
|
114
119
|
},
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
]
|
|
119
|
-
`);
|
|
120
|
+
],
|
|
121
|
+
]
|
|
122
|
+
`);
|
|
120
123
|
|
|
121
124
|
expect(result.current.isEnabled).toBe(true);
|
|
122
125
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { skipToken, useQuery } from '@tanstack/react-query';
|
|
2
|
-
import type {
|
|
2
|
+
import type { Address } from 'viem';
|
|
3
3
|
import {
|
|
4
|
-
type MarketplaceKind,
|
|
5
4
|
getMarketplaceClient,
|
|
5
|
+
type MarketplaceKind,
|
|
6
6
|
} from '../../../../_internal';
|
|
7
7
|
import { useWallet } from '../../../../_internal/wallet/useWallet';
|
|
8
8
|
import { useConfig } from '../../../../hooks';
|
|
@@ -10,7 +10,7 @@ import { useMarketPlatformFee } from './useMarketPlatformFee';
|
|
|
10
10
|
|
|
11
11
|
export type CheckoutOptionsParams = {
|
|
12
12
|
chainId: number;
|
|
13
|
-
collectionAddress:
|
|
13
|
+
collectionAddress: Address;
|
|
14
14
|
orderId: string;
|
|
15
15
|
marketplace: MarketplaceKind;
|
|
16
16
|
};
|
|
@@ -6,7 +6,13 @@ import type {
|
|
|
6
6
|
CheckoutOptionsItem,
|
|
7
7
|
} from '../../../../_internal';
|
|
8
8
|
import { getQueryClient } from '../../../../_internal';
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
buyModalStore,
|
|
11
|
+
useBuyAnalyticsId,
|
|
12
|
+
useOnError,
|
|
13
|
+
useOnSuccess,
|
|
14
|
+
useQuantity,
|
|
15
|
+
} from '../store';
|
|
10
16
|
|
|
11
17
|
interface UseERC1155CheckoutParams {
|
|
12
18
|
chainId: number;
|
|
@@ -35,9 +41,11 @@ export const useERC1155Checkout = ({
|
|
|
35
41
|
const quantity = useQuantity();
|
|
36
42
|
const onSuccess = useOnSuccess();
|
|
37
43
|
const onError = useOnError();
|
|
44
|
+
const saleAnalyticsId = useBuyAnalyticsId();
|
|
38
45
|
|
|
39
46
|
const checkout = useERC1155SaleContractCheckout({
|
|
40
47
|
chain: chainId,
|
|
48
|
+
chainId: chainId.toString(),
|
|
41
49
|
contractAddress: salesContractAddress,
|
|
42
50
|
collectionAddress,
|
|
43
51
|
items: [
|
|
@@ -62,7 +70,8 @@ export const useERC1155Checkout = ({
|
|
|
62
70
|
},
|
|
63
71
|
customProviderCallback,
|
|
64
72
|
supplementaryAnalyticsInfo: {
|
|
65
|
-
|
|
73
|
+
marketplaceType: 'shop',
|
|
74
|
+
saleAnalyticsId,
|
|
66
75
|
},
|
|
67
76
|
});
|
|
68
77
|
|
|
@@ -2,9 +2,9 @@ import type { SelectPaymentSettings } from '@0xsequence/checkout';
|
|
|
2
2
|
import { skipToken, useQuery } from '@tanstack/react-query';
|
|
3
3
|
import {
|
|
4
4
|
type Address,
|
|
5
|
+
encodeFunctionData,
|
|
5
6
|
type Hash,
|
|
6
7
|
type Hex,
|
|
7
|
-
encodeFunctionData,
|
|
8
8
|
toHex,
|
|
9
9
|
} from 'viem';
|
|
10
10
|
import { useAccount } from 'wagmi';
|
|
@@ -112,7 +112,7 @@ export const getERC721SalePaymentParams = async ({
|
|
|
112
112
|
},
|
|
113
113
|
skipNativeBalanceCheck,
|
|
114
114
|
supplementaryAnalyticsInfo: {
|
|
115
|
-
|
|
115
|
+
marketplaceType: 'shop',
|
|
116
116
|
},
|
|
117
117
|
nativeTokenAddress,
|
|
118
118
|
...(customCreditCardProviderCallback && {
|
|
@@ -7,12 +7,12 @@ import { decodeERC20Approval } from '../../../../../utils/decode/erc20';
|
|
|
7
7
|
import {
|
|
8
8
|
type AdditionalFee,
|
|
9
9
|
type CheckoutOptions,
|
|
10
|
-
type MarketplaceKind,
|
|
11
|
-
StepType,
|
|
12
|
-
WalletKind,
|
|
13
10
|
getMarketplaceClient,
|
|
14
11
|
getQueryClient,
|
|
15
12
|
getSequenceApiClient,
|
|
13
|
+
type MarketplaceKind,
|
|
14
|
+
StepType,
|
|
15
|
+
WalletKind,
|
|
16
16
|
} from '../../../../_internal';
|
|
17
17
|
import type { WalletInstance } from '../../../../_internal/wallet/wallet';
|
|
18
18
|
import { useConfig } from '../../../../hooks';
|
|
@@ -20,6 +20,7 @@ import type { ModalCallbacks } from '../../_internal/types';
|
|
|
20
20
|
import {
|
|
21
21
|
buyModalStore,
|
|
22
22
|
isMarketProps,
|
|
23
|
+
useBuyAnalyticsId,
|
|
23
24
|
useBuyModalProps,
|
|
24
25
|
useOnError,
|
|
25
26
|
useOnSuccess,
|
|
@@ -43,6 +44,7 @@ interface GetBuyCollectableParams {
|
|
|
43
44
|
customCreditCardProviderCallback: ((buyStep: Step) => void) | undefined;
|
|
44
45
|
skipNativeBalanceCheck: boolean | undefined;
|
|
45
46
|
nativeTokenAddress: string | undefined;
|
|
47
|
+
buyAnalyticsId: string;
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
export const getBuyCollectableParams = async ({
|
|
@@ -62,6 +64,7 @@ export const getBuyCollectableParams = async ({
|
|
|
62
64
|
fee,
|
|
63
65
|
skipNativeBalanceCheck,
|
|
64
66
|
nativeTokenAddress,
|
|
67
|
+
buyAnalyticsId,
|
|
65
68
|
}: GetBuyCollectableParams) => {
|
|
66
69
|
const marketplaceClient = getMarketplaceClient(config);
|
|
67
70
|
const { steps } = await marketplaceClient.generateBuyTransaction({
|
|
@@ -137,6 +140,8 @@ export const getBuyCollectableParams = async ({
|
|
|
137
140
|
supplementaryAnalyticsInfo: {
|
|
138
141
|
requestId: orderId,
|
|
139
142
|
marketplaceKind: marketplace,
|
|
143
|
+
buyAnalyticsId,
|
|
144
|
+
marketplaceType: 'market',
|
|
140
145
|
},
|
|
141
146
|
onError: callbacks?.onError,
|
|
142
147
|
onClose: () => {
|
|
@@ -209,6 +214,7 @@ export const usePaymentModalParams = (args: usePaymentModalParams) => {
|
|
|
209
214
|
);
|
|
210
215
|
const onSuccess = useOnSuccess();
|
|
211
216
|
const onError = useOnError();
|
|
217
|
+
const buyAnalyticsId = useBuyAnalyticsId();
|
|
212
218
|
|
|
213
219
|
const queryEnabled =
|
|
214
220
|
!!wallet &&
|
|
@@ -243,6 +249,7 @@ export const usePaymentModalParams = (args: usePaymentModalParams) => {
|
|
|
243
249
|
customCreditCardProviderCallback,
|
|
244
250
|
skipNativeBalanceCheck,
|
|
245
251
|
nativeTokenAddress,
|
|
252
|
+
buyAnalyticsId,
|
|
246
253
|
})
|
|
247
254
|
: skipToken,
|
|
248
255
|
});
|
|
@@ -1,10 +1,18 @@
|
|
|
1
|
+
import { useAnalytics } from '../../../_internal/databeat';
|
|
1
2
|
import type { ModalCallbacks } from '../_internal/types';
|
|
2
3
|
import { type BuyModalProps, buyModalStore } from './store';
|
|
3
4
|
|
|
4
5
|
export const useBuyModal = (callbacks?: ModalCallbacks) => {
|
|
6
|
+
const analyticsFn = useAnalytics();
|
|
7
|
+
|
|
5
8
|
return {
|
|
6
9
|
show: (args: BuyModalProps) =>
|
|
7
|
-
buyModalStore.send({
|
|
10
|
+
buyModalStore.send({
|
|
11
|
+
type: 'open',
|
|
12
|
+
props: args,
|
|
13
|
+
...callbacks,
|
|
14
|
+
analyticsFn,
|
|
15
|
+
}),
|
|
8
16
|
close: () => buyModalStore.send({ type: 'close' }),
|
|
9
17
|
};
|
|
10
18
|
};
|
|
@@ -7,6 +7,8 @@ import type {
|
|
|
7
7
|
MarketplaceKind,
|
|
8
8
|
Step,
|
|
9
9
|
} from '../../../_internal';
|
|
10
|
+
import type { useAnalytics } from '../../../_internal/databeat';
|
|
11
|
+
import { flattenAnalyticsArgs } from '../../../_internal/databeat/utils';
|
|
10
12
|
|
|
11
13
|
export type CheckoutOptionsSalesContractProps = {
|
|
12
14
|
chainId: number;
|
|
@@ -47,6 +49,7 @@ export type ShopBuyModalProps = BuyModalBaseProps & {
|
|
|
47
49
|
amount: string;
|
|
48
50
|
currencyAddress: Address;
|
|
49
51
|
};
|
|
52
|
+
unlimitedSupply?: boolean;
|
|
50
53
|
};
|
|
51
54
|
|
|
52
55
|
// Marketplace type modal props
|
|
@@ -86,6 +89,7 @@ type SubModalState = 'idle' | 'opening' | 'open' | 'closed';
|
|
|
86
89
|
const initialContext = {
|
|
87
90
|
isOpen: false,
|
|
88
91
|
props: null as BuyModalProps | null,
|
|
92
|
+
buyAnalyticsId: '',
|
|
89
93
|
onError: (() => {}) as onErrorCallback,
|
|
90
94
|
onSuccess: (() => {}) as onSuccessCallback,
|
|
91
95
|
quantity: null as number | null,
|
|
@@ -103,15 +107,34 @@ export const buyModalStore = createStore({
|
|
|
103
107
|
props: BuyModalProps;
|
|
104
108
|
onError?: onErrorCallback;
|
|
105
109
|
onSuccess?: onSuccessCallback;
|
|
110
|
+
analyticsFn: ReturnType<typeof useAnalytics>;
|
|
106
111
|
},
|
|
107
112
|
) => {
|
|
108
113
|
// Prevent duplicate opens
|
|
109
114
|
if (context.modalState !== 'idle') {
|
|
110
115
|
return context;
|
|
111
116
|
}
|
|
117
|
+
const buyAnalyticsId = crypto.randomUUID();
|
|
118
|
+
|
|
119
|
+
const { analyticsProps, analyticsNums } = flattenAnalyticsArgs(
|
|
120
|
+
event.props,
|
|
121
|
+
);
|
|
122
|
+
|
|
123
|
+
event.analyticsFn.trackBuyModalOpened({
|
|
124
|
+
props: {
|
|
125
|
+
buyAnalyticsId,
|
|
126
|
+
collectionAddress: event.props.collectionAddress,
|
|
127
|
+
...analyticsProps,
|
|
128
|
+
},
|
|
129
|
+
nums: {
|
|
130
|
+
chainId: event.props.chainId,
|
|
131
|
+
...analyticsNums,
|
|
132
|
+
},
|
|
133
|
+
});
|
|
112
134
|
return {
|
|
113
135
|
...context,
|
|
114
136
|
props: event.props,
|
|
137
|
+
buyAnalyticsId,
|
|
115
138
|
onError: event.onError ?? context.onError,
|
|
116
139
|
onSuccess: event.onSuccess ?? context.onSuccess,
|
|
117
140
|
isOpen: true,
|
|
@@ -210,3 +233,6 @@ export const usePaymentModalState = () =>
|
|
|
210
233
|
|
|
211
234
|
export const useCheckoutModalState = () =>
|
|
212
235
|
useSelector(buyModalStore, (state) => state.context.checkoutModalState);
|
|
236
|
+
|
|
237
|
+
export const useBuyAnalyticsId = () =>
|
|
238
|
+
useSelector(buyModalStore, (state) => state.context.buyAnalyticsId);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
|
-
import { Show,
|
|
3
|
+
import { observer, Show, use$ } from '@legendapp/state/react';
|
|
4
4
|
import { parseUnits } from 'viem';
|
|
5
5
|
import { useAccount } from 'wagmi';
|
|
6
6
|
import type { FeeOption } from '../../../../types/waas-types';
|
|
@@ -23,7 +23,10 @@ import FloorPriceText from '../_internal/components/floorPriceText';
|
|
|
23
23
|
import PriceInput from '../_internal/components/priceInput';
|
|
24
24
|
import QuantityInput from '../_internal/components/quantityInput';
|
|
25
25
|
import SelectWaasFeeOptions from '../_internal/components/selectWaasFeeOptions';
|
|
26
|
-
import {
|
|
26
|
+
import {
|
|
27
|
+
selectWaasFeeOptionsStore,
|
|
28
|
+
useSelectWaasFeeOptionsStore,
|
|
29
|
+
} from '../_internal/components/selectWaasFeeOptions/store';
|
|
27
30
|
import TokenPreview from '../_internal/components/tokenPreview';
|
|
28
31
|
import TransactionDetails from '../_internal/components/transactionDetails';
|
|
29
32
|
import { useSelectWaasFeeOptions } from '../_internal/hooks/useSelectWaasFeeOptions';
|
|
@@ -47,6 +50,8 @@ const Modal = observer(() => {
|
|
|
47
50
|
} = state;
|
|
48
51
|
const steps$ = createListingModal$.steps;
|
|
49
52
|
const { wallet } = useWallet();
|
|
53
|
+
const { isVisible: feeOptionsVisible, selectedFeeOption } =
|
|
54
|
+
useSelectWaasFeeOptionsStore();
|
|
50
55
|
|
|
51
56
|
const {
|
|
52
57
|
shouldHideActionButton: shouldHideListButton,
|
|
@@ -54,9 +59,8 @@ const Modal = observer(() => {
|
|
|
54
59
|
getActionLabel,
|
|
55
60
|
} = useSelectWaasFeeOptions({
|
|
56
61
|
isProcessing: listingIsBeingProcessed,
|
|
57
|
-
feeOptionsVisible
|
|
58
|
-
selectedFeeOption:
|
|
59
|
-
selectWaasFeeOptions$.selectedFeeOption.get() as FeeOption,
|
|
62
|
+
feeOptionsVisible,
|
|
63
|
+
selectedFeeOption: selectedFeeOption as FeeOption,
|
|
60
64
|
});
|
|
61
65
|
|
|
62
66
|
const {
|
|
@@ -148,7 +152,7 @@ const Modal = observer(() => {
|
|
|
148
152
|
|
|
149
153
|
try {
|
|
150
154
|
if (wallet?.isWaaS) {
|
|
151
|
-
|
|
155
|
+
selectWaasFeeOptionsStore.send({ type: 'show' });
|
|
152
156
|
}
|
|
153
157
|
|
|
154
158
|
await createListing({
|
|
@@ -201,7 +205,7 @@ const Modal = observer(() => {
|
|
|
201
205
|
chainId={Number(chainId)}
|
|
202
206
|
onClose={() => {
|
|
203
207
|
createListingModal$.close();
|
|
204
|
-
|
|
208
|
+
selectWaasFeeOptionsStore.send({ type: 'hide' });
|
|
205
209
|
}}
|
|
206
210
|
title="List item for sale"
|
|
207
211
|
ctas={ctas}
|
|
@@ -219,7 +223,13 @@ const Modal = observer(() => {
|
|
|
219
223
|
<PriceInput
|
|
220
224
|
chainId={chainId}
|
|
221
225
|
collectionAddress={collectionAddress}
|
|
222
|
-
|
|
226
|
+
price={listingPrice}
|
|
227
|
+
onPriceChange={(newPrice) => {
|
|
228
|
+
createListingModal$.listingPrice.set(newPrice);
|
|
229
|
+
}}
|
|
230
|
+
onCurrencyChange={(newCurrency) => {
|
|
231
|
+
createListingModal$.listingPrice.currency.set(newCurrency);
|
|
232
|
+
}}
|
|
223
233
|
disabled={shouldHideListButton}
|
|
224
234
|
/>
|
|
225
235
|
|
|
@@ -234,15 +244,22 @@ const Modal = observer(() => {
|
|
|
234
244
|
</div>
|
|
235
245
|
{collection?.type === 'ERC1155' && balance && (
|
|
236
246
|
<QuantityInput
|
|
237
|
-
|
|
238
|
-
|
|
247
|
+
quantity={use$(createListingModal$.quantity)}
|
|
248
|
+
invalidQuantity={use$(createListingModal$.invalidQuantity)}
|
|
249
|
+
onQuantityChange={(quantity) =>
|
|
250
|
+
createListingModal$.quantity.set(quantity)
|
|
251
|
+
}
|
|
252
|
+
onInvalidQuantityChange={(invalid) =>
|
|
253
|
+
createListingModal$.invalidQuantity.set(invalid)
|
|
254
|
+
}
|
|
239
255
|
decimals={collectible?.decimals || 0}
|
|
240
256
|
maxQuantity={balance?.balance}
|
|
241
257
|
disabled={shouldHideListButton}
|
|
242
258
|
/>
|
|
243
259
|
)}
|
|
244
260
|
<ExpirationDateSelect
|
|
245
|
-
|
|
261
|
+
date={createListingModal$.expiry.get()}
|
|
262
|
+
onDateChange={(date) => createListingModal$.expiry.set(date)}
|
|
246
263
|
disabled={shouldHideListButton}
|
|
247
264
|
/>
|
|
248
265
|
<TransactionDetails
|
|
@@ -2,12 +2,12 @@ import { cleanup, render, renderHook, screen, waitFor } from '@test';
|
|
|
2
2
|
import { TEST_COLLECTIBLE } from '@test/const';
|
|
3
3
|
import { createMockWallet } from '@test/mocks/wallet';
|
|
4
4
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
|
-
import { useCreateListingModal } from '..';
|
|
6
5
|
import { StepType, WalletKind } from '../../../../_internal';
|
|
7
6
|
import { createMockStep } from '../../../../_internal/api/__mocks__/marketplace.msw';
|
|
8
7
|
import * as walletModule from '../../../../_internal/wallet/useWallet';
|
|
9
|
-
import {
|
|
8
|
+
import { useCreateListingModal } from '..';
|
|
10
9
|
import * as useGetTokenApprovalDataModule from '../hooks/useGetTokenApproval';
|
|
10
|
+
import { CreateListingModal } from '../Modal';
|
|
11
11
|
|
|
12
12
|
const defaultArgs = {
|
|
13
13
|
collectionAddress: TEST_COLLECTIBLE.collectionAddress,
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { skipToken, useQuery } from '@tanstack/react-query';
|
|
2
2
|
import { useAccount } from 'wagmi';
|
|
3
|
-
import { useConfig } from '../../../..';
|
|
4
3
|
import { dateToUnixTime } from '../../../../../utils/date';
|
|
4
|
+
import { useConfig } from '../../../..';
|
|
5
5
|
import {
|
|
6
6
|
type ContractType,
|
|
7
7
|
type CreateReq,
|
|
8
8
|
type GenerateListingTransactionArgs,
|
|
9
|
+
getMarketplaceClient,
|
|
9
10
|
type OrderbookKind,
|
|
10
11
|
type QueryArg,
|
|
11
12
|
StepType,
|
|
12
|
-
getMarketplaceClient,
|
|
13
13
|
} from '../../../../_internal';
|
|
14
14
|
import { useWallet } from '../../../../_internal/wallet/useWallet';
|
|
15
15
|
|