0xsequence · AlexanderKolberg · Feb 18, 2025 · Feb 18, 2025 · Feb 18, 2025
@@ -1,8 +1,13 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { createWagmiConfig } from '../create-config';
 import { getWaasConnectors } from '../embedded';
-import type { MarketplaceConfig, SdkConfig } from '../../../../types';
-import { WalletOptions } from '../../../../types';
+import {
+	MarketplaceType,
+	MarketplaceWallet,
+	OrderbookKind,
+	type MarketplaceConfig,
+	type SdkConfig,
+} from '../../../../types';
 import { polygon } from 'viem/chains';
 import { MissingConfigError } from '../../../../utils/_internal/error/transaction';
 import { cookieStorage, type Config } from 'wagmi';
@@ -13,25 +18,48 @@ describe('createWagmiConfig', () => {
 
 	beforeEach(() => {
 		baseMarketplaceConfig = {
-			projectId: 1,
+			cssString: '',
+			manifestUrl: '',
 			publisherId: 'test-publisher',
 			title: 'Test Marketplace',
 			shortDescription: 'Test Description',
+			socials: {
+				twitter: '',
+				discord: '',
+				website: '',
+				tiktok: '',
+				instagram: '',
+				youtube: '',
+			},
 			faviconUrl: 'https://test.com/favicon.ico',
 			landingBannerUrl: 'https://test.com/banner.jpg',
-			titleTemplate: '%s | Test',
-			walletOptions: [WalletOptions.Sequence],
+			walletOptions: {
+				walletType: MarketplaceWallet.UNIVERSAL,
+				oidcIssuers: {},
+				connectors: [],
+				includeEIP6963Wallets: false,
+			},
 			collections: [
 				{
-					collectionAddress: '0x1234567890123456789012345678901234567890',
+					address: '0x1234567890123456789012345678901234567890',
 					chainId: polygon.id,
-					marketplaceFeePercentage: 2.5,
-					marketplaceType: 'orderbook',
+					marketplaceType: MarketplaceType.ORDERBOOK,
+					currencyOptions: [],
+					destinationMarketplace: OrderbookKind.sequence_marketplace_v2,
+					filterSettings: {
+						filterOrder: [],
+						exclusions: [],
+					},
+					exchanges: [],
+					bannerUrl: '',
+					feePercentage: 0,
 				},
 			],
 			landingPageLayout: 'default',
-			cssString: '',
-			manifestUrl: 'https://test.com/manifest.json',
+			logoUrl: '',
+			bannerUrl: '',
+			fontUrl: '',
+			ogImage: '',
 		};
 
 		baseSdkConfig = {
@@ -59,10 +87,11 @@ describe('createWagmiConfig', () => {
 		it('should create config with universal wallet setup', () => {
 			const marketplaceConfig: MarketplaceConfig = {
 				...baseMarketplaceConfig,
-				walletOptionsNew: {
+				walletOptions: {
 					connectors: ['walletconnect', 'coinbase'],
 					includeEIP6963Wallets: true,
-					walletType: 'universal',
+					walletType: MarketplaceWallet.UNIVERSAL,
+					oidcIssuers: {},
 				},
 			};
 
@@ -81,10 +110,11 @@ describe('createWagmiConfig', () => {
 		it('should create config with embedded wallet setup', () => {
 			const marketplaceConfig: MarketplaceConfig = {
 				...baseMarketplaceConfig,
-				walletOptionsNew: {
+				walletOptions: {
 					connectors: ['walletconnect'],
 					includeEIP6963Wallets: false,
-					walletType: 'embedded',
+					walletType: MarketplaceWallet.EMBEDDED,
+					oidcIssuers: {},
 				},
 			};
 
@@ -109,10 +139,11 @@ describe('createWagmiConfig', () => {
 		it('should respect EIP6963 wallet inclusion setting', () => {
 			const marketplaceConfig: MarketplaceConfig = {
 				...baseMarketplaceConfig,
-				walletOptionsNew: {
+				walletOptions: {
 					connectors: ['walletconnect'],
 					includeEIP6963Wallets: false,
-					walletType: 'universal',
+					walletType: MarketplaceWallet.UNIVERSAL,
+					oidcIssuers: {},
 				},
 			};
 
@@ -145,10 +176,11 @@ describe('createWagmiConfig', () => {
 		it('should throw error when trying to use embedded wallet without waasConfigKey', () => {
 			const marketplaceConfig: MarketplaceConfig = {
 				...baseMarketplaceConfig,
-				walletOptionsNew: {
+				walletOptions: {
 					connectors: ['walletconnect'],
 					includeEIP6963Wallets: false,
-					walletType: 'embedded',
+					walletType: MarketplaceWallet.EMBEDDED,
+					oidcIssuers: {},
 				},
 			};
 
@@ -181,10 +213,11 @@ describe('createWagmiConfig', () => {
 		it('should still create config when walletConnectProjectId is missing', () => {
 			const marketplaceConfig: MarketplaceConfig = {
 				...baseMarketplaceConfig,
-				walletOptionsNew: {
+				walletOptions: {
 					connectors: ['walletconnect'],
 					includeEIP6963Wallets: true,
-					walletType: 'universal',
+					walletType: MarketplaceWallet.UNIVERSAL,
+					oidcIssuers: {},
 				},
 			};
 

@@ -24,15 +24,14 @@ export const createWagmiConfig = (
 			? getUniversalConnectors(marketplaceConfig, sdkConfig)
 			: getWaasConnectors(marketplaceConfig, sdkConfig);
 
-	// The old config did not support disabling EIP-6963 wallets
-	const includeEIP6963Wallets =
-		marketplaceConfig.walletOptionsNew?.includeEIP6963Wallets ?? true;
+	const multiInjectedProviderDiscovery =
+		marketplaceConfig.walletOptions.includeEIP6963Wallets;
 
 	return createConfig({
 		connectors,
 		chains,
 		ssr,
-		multiInjectedProviderDiscovery: includeEIP6963Wallets,
+		multiInjectedProviderDiscovery,
 		storage: ssr
 			? createStorage({
 					storage: cookieStorage,

@@ -28,10 +28,7 @@ export function getWaasConnectors(
 
 	const { title: appName } = marketplaceConfig;
 
-	// Normalizing the wallet options, TODO: remove this after the marketplaceConfig is updated
-	const walletOptions = marketplaceConfig.walletOptionsNew || {
-		connectors: ['coinbase', 'walletconnect'],
-	};
+	const walletOptions = marketplaceConfig.walletOptions;
 
 	const wallets: Wallet[] = [
 		emailWaas({

@@ -48,10 +48,7 @@ function getWalletConfigs(
 ): Wallet[] {
 	const wallets: Wallet[] = [];
 
-	// Normalizing the wallet options, TODO: remove this after the marketplaceConfig is updated
-	const walletOptions = marketplaceConfig.walletOptionsNew || {
-		connectors: ['coinbase', 'walletconnect'],
-	};
+	const walletOptions = marketplaceConfig.walletOptions;
 
 	wallets.push(sequence(sequenceWalletOptions));
 

@@ -1,30 +1,50 @@
 import { http, HttpResponse } from 'msw';
-import { WalletOptions, type MarketplaceConfig } from '../../../../types';
+import {
+	MarketplaceType,
+	MarketplaceWallet,
+	OrderbookKind,
+	type MarketplaceConfig,
+} from '../../../../types';
 import { mockCurrencies } from '../../../_internal/api/__mocks__/marketplace.msw';
 
 // Mock data
 export const mockConfig: MarketplaceConfig = {
-	projectId: 123,
 	publisherId: 'test-publisher',
 	title: 'Test Marketplace',
 	shortDescription: 'A test marketplace',
+	socials: {
+		twitter: 'https://twitter.com/test',
+		discord: 'https://discord.com/test',
+		instagram: 'https://instagram.com/test',
+		website: '',
+		tiktok: '',
+		youtube: '',
+	},
 	faviconUrl: 'https://example.com/favicon.png',
 	landingBannerUrl: 'https://example.com/banner.png',
 	logoUrl: 'https://example.com/logo.png',
-	titleTemplate: '%s | Test Marketplace',
-	walletOptions: [WalletOptions.Sequence],
+	walletOptions: {
+		walletType: MarketplaceWallet.UNIVERSAL,
+		oidcIssuers: {},
+		connectors: ['coinbase', 'walletconnect'],
+		includeEIP6963Wallets: true,
+	},
 	collections: [
 		{
-			collectionAddress: '0x1234567890123456789012345678901234567890',
+			address: '0x1234567890123456789012345678901234567890',
 			chainId: 1,
-			marketplaceFeePercentage: 2.5,
-			marketplaceType: 'orderbook',
+			marketplaceType: MarketplaceType.ORDERBOOK,
 			currencyOptions: mockCurrencies.map((c) => c.contractAddress),
+			exchanges: [],
+			bannerUrl: '',
+			feePercentage: 3.5,
+			destinationMarketplace: OrderbookKind.sequence_marketplace_v2,
 		},
 	],
 	landingPageLayout: 'default',
 	cssString: '',
 	manifestUrl: '',
+	bannerUrl: '',
 };
 
 export const mockStyles = `

@@ -1,5 +1,10 @@
 import { queryOptions } from '@tanstack/react-query';
-import type { Env, MarketplaceConfig, SdkConfig } from '../../../types';
+import type {
+	Env,
+	MarketplaceConfig,
+	MarketplaceSettings,
+	SdkConfig,
+} from '../../../types';
 import {
 	MarketplaceConfigFetchError,
 	ProjectNotFoundError,
@@ -8,7 +13,7 @@
 
 const fetchBuilderConfig = async (projectId: string, env: Env) => {
 	const url = `${builderMarketplaceApi(projectId, env)}`;
-	const response = await fetch(`${url}/config.json`);
+	const response = await fetch(`${url}/settings.json`);
 
 	const json = await response.json();
 	if (!response.ok) {
@@ -22,7 +27,7 @@
 				throw new MarketplaceConfigFetchError(json.msg);
 		}
 	}
-	return json as MarketplaceConfig;
+	return json as MarketplaceSettings;
 };
 
 const fetchStyles = async (projectId: string, env: Env) => {

@@ -9,7 +9,7 @@ export const useCurrencyOptions = ({
 	const { data: marketplaceConfig } = useMarketplaceConfig();
 	const collections = marketplaceConfig?.collections;
 	const currencyOptions = collections?.find(
-		(collection) => collection.collectionAddress === collectionAddress,
+		(collection) => collection.address === collectionAddress,
 	)?.currencyOptions;
 
 	return currencyOptions;

@@ -38,11 +38,11 @@ const fetchListCollections = async (
 	const collectionsByChain = marketplaceConfig.collections.reduce<
 		Record<string, string[]>
 	>((acc, curr) => {
-		const { chainId, collectionAddress } = curr;
+		const { chainId, address } = curr;
 		if (!acc[chainId]) {
 			acc[chainId] = [];
 		}
-		acc[chainId].push(collectionAddress);
+		acc[chainId].push(address);
 		return acc;
 	}, {});
 

@@ -95,7 +95,7 @@ export function CollectibleCard({
 	onCannotPerformAction,
 }: CollectibleCardProps) {
 	const collectibleMetadata = lowestListing?.metadata;
-	const highestOffer = lowestListing?.offer
+	const highestOffer = lowestListing?.offer;
 	const [imageLoadingError, setImageLoadingError] = useState(false);
 
 	const { data: lowestListingCurrency } = useCurrency({

@@ -5,7 +5,10 @@
 export const useFees = ({
 	chainId,
 	collectionAddress,
-}: { chainId: number; collectionAddress: string }) => {
+}: {
+	chainId: number;
+	collectionAddress: string;
+}) => {
 	const defaultFee = 2.5;
 	const defaultPlatformFeeRecipient =
 		'0x858dB1cbF6D09D447C96A11603189b49B2D1C219';
@@ -15,8 +18,7 @@
 
 	const collection = marketplaceConfig?.collections.find(
 		(collection) =>
-			collection.collectionAddress.toLowerCase() ===
-				collectionAddress.toLowerCase() &&
+			collection.address.toLowerCase() === collectionAddress.toLowerCase() &&
 			chainId === Number(collection.chainId),
 	);
 
@@ -30,9 +32,7 @@
 		(Number(percentage) * 10000) / 100;
 
 	return {
-		amount: percentageToBPS(
-			collection?.marketplaceFeePercentage || defaultFee,
-		).toString(),
+		amount: percentageToBPS(collection?.feePercentage || defaultFee).toString(),
 		receiver,
 	} satisfies AdditionalFee;
 };
@@ -39,7 +39,7 @@ export const useCreateListing = ({
 		useMarketplaceConfig();
 
 	const collectionConfig = marketplaceConfig?.collections.find(
-		(c) => c.collectionAddress === collectionAddress,
+		(c) => c.address === collectionAddress,
 	);
 
 	orderbookKind =

@@ -31,7 +31,7 @@ export const useMakeOffer = ({
 		useMarketplaceConfig();
 
 	const collectionConfig = marketplaceConfig?.collections.find(
-		(c) => c.collectionAddress === collectionAddress,
+		(c) => c.address === collectionAddress,
 	);
 
 	orderbookKind =

@@ -31,8 +31,8 @@ export default function TransactionDetails({
 
 	const marketplaceFeePercentage =
 		data?.collections.find(
-			(collection) => collection.collectionAddress === collectionAddress,
-		)?.marketplaceFeePercentage || DEFAULT_MARKETPLACE_FEE_PERCENTAGE;
+			(collection) => collection.address === collectionAddress,
+		)?.feePercentage || DEFAULT_MARKETPLACE_FEE_PERCENTAGE;
 	const { data: royaltyPercentage, isLoading: royaltyPercentageLoading } =
 		useRoyaltyPercentage({
 			chainId,