@0xsequence/marketplace-sdk 0.5.6 → 0.6.0

package/src/react/hooks/__tests__/useCancelOrder.test.tsx

@@ -1,59 +1,19 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { useCancelOrder } from '../useCancelOrder';
-import { MarketplaceKind } from '../../../types';
-import { server } from '../../_internal/test/setup';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
-import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
-import { useWallet } from '../../_internal/wallet/useWallet';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import {
-	createMockWallet,
 	commonWalletMocks,
-} from '../../_internal/test/mocks/wallet';
+	createMockWallet,
+} from '../../../../test/mocks/wallet';
+import { MarketplaceKind } from '../../../types';
+import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
 import { StepType } from '../../_internal/api/marketplace.gen';
+import { useWallet } from '../../_internal/wallet/useWallet';
+import { useCancelOrder } from '../useCancelOrder';
 
 // Mock useWallet hook
 vi.mock('../../_internal/wallet/useWallet');
 
-// Mock @0xsequence/kit
-vi.mock('@0xsequence/kit', () => ({
-	useWaasFeeOptions: () => [null, vi.fn()],
-	useChain: () => ({
-		id: 1,
-		name: 'Ethereum',
-		nativeCurrency: {
-			name: 'Ether',
-			symbol: 'ETH',
-			decimals: 18,
-		},
-	}),
-}));
-
-// Mock wagmi
-vi.mock('wagmi', () => ({
-	useAccount: () => ({
-		address: '0x1234567890123456789012345678901234567890',
-		isConnected: true,
-	}),
-	createConfig: () => ({
-		chains: [
-			{
-				id: 1,
-				name: 'Ethereum',
-				nativeCurrency: {
-					name: 'Ether',
-					symbol: 'ETH',
-					decimals: 18,
-				},
-			},
-		],
-		connectors: [],
-		transports: {},
-	}),
-	http: () => ({}),
-	WagmiProvider: ({ children }: { children: React.ReactNode }) => children,
-}));
-
 describe('useCancelOrder', () => {
 	const defaultProps = {
 		collectionAddress: '0x1234567890123456789012345678901234567890',
@@ -76,56 +36,21 @@ describe('useCancelOrder', () => {
 		switchChain: vi.fn().mockResolvedValue(undefined),
 	});
 
-	beforeEach(() => {
-		vi.clearAllMocks();
+	vi.mock(import('@0xsequence/kit'), async (importOriginal) => {
+		const actual = await importOriginal();
+		return {
+			...actual,
+			useWaasFeeOptions: vi.fn().mockReturnValue([]),
+		};
+	});
 
+	beforeEach(() => {
 		// Set up the mock implementation for useWallet
 		vi.mocked(useWallet).mockReturnValue({
 			wallet: mockWallet,
 			isLoading: false,
 			isError: false,
 		});
-
-		// Mock default steps response
-		server.use(
-			http.post(mockMarketplaceEndpoint('GenerateCancelTransaction'), () => {
-				return HttpResponse.json({
-					steps: [
-						{
-							id: StepType.cancel,
-							data: '0x...',
-							to: defaultProps.collectionAddress,
-							value: '0',
-							executeType: 'order',
-						},
-					],
-				});
-			}),
-			http.post(mockMarketplaceEndpoint('Execute'), () => {
-				return HttpResponse.json({
-					orderId: mockOrderId,
-					hash: mockTxHash,
-				});
-			}),
-			http.post('*/GetTokenBalancesDetails', () => {
-				return HttpResponse.json({
-					page: { page: 1, pageSize: 10, more: false },
-					balances: [],
-					nativeBalances: [
-						{
-							balance: '2000000000000000000', // 2 ETH
-							blockHash: '0x1234',
-							blockNumber: 1234567,
-						},
-					],
-				});
-			}),
-		);
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-		vi.clearAllMocks();
 	});
 
 	it('should initialize with default state', () => {
@@ -263,15 +188,32 @@ describe('useCancelOrder', () => {
 	it('should handle transaction confirmation failure', async () => {
 		const onError = vi.fn();
 
+		// Mock the GenerateCancelTransaction endpoint to return a valid transaction step
+		server.use(
+			http.post(mockMarketplaceEndpoint('GenerateCancelTransaction'), () => {
+				return HttpResponse.json({
+					steps: [
+						{
+							id: StepType.cancel,
+							data: '0x1234',
+							to: defaultProps.collectionAddress,
+							value: '0',
+							executeType: 'order',
+						},
+					],
+				});
+			}),
+		);
+
 		// Mock wallet with failed transaction confirmation
 		const mockWalletWithFailedConfirmation = createMockWallet({
 			...commonWalletMocks,
 			getChainId: vi.fn().mockResolvedValue(1),
-			handleSendTransactionStep: vi.fn().mockResolvedValue(mockTxHash),
-			handleSignMessageStep: vi.fn().mockResolvedValue('0xsignature'),
-			handleConfirmTransactionStep: vi
+			handleSendTransactionStep: vi
 				.fn()
-				.mockRejectedValue(new Error('Transaction confirmation failed')),
+				.mockRejectedValue(new Error('Transaction sending failed')),
+			handleSignMessageStep: vi.fn().mockResolvedValue('0xsignature'),
+			handleConfirmTransactionStep: vi.fn().mockResolvedValue(undefined),
 			isWaaS: true,
 		});
 
@@ -300,7 +242,7 @@ describe('useCancelOrder', () => {
 		await waitFor(() => {
 			expect(onError).toHaveBeenCalledWith(expect.any(Error));
 			expect(
-				mockWalletWithFailedConfirmation.handleConfirmTransactionStep,
+				mockWalletWithFailedConfirmation.handleSendTransactionStep,
 			).toHaveBeenCalled();
 			expect(result.current.cancellingOrderId).toBeNull();
 			expect(result.current.isExecuting).toBe(false);
@@ -310,28 +252,20 @@ describe('useCancelOrder', () => {
 	it('should successfully cancel an order', async () => {
 		const onSuccess = vi.fn();
 
-		// Mock successful responses for all steps
+		// Mock successful responses for all steps - make the response immediate
 		server.use(
 			http.post(mockMarketplaceEndpoint('GenerateCancelTransaction'), () => {
-				return new Promise((resolve) =>
-					setTimeout(
-						() =>
-							resolve(
-								HttpResponse.json({
-									steps: [
-										{
-											id: StepType.cancel,
-											data: '0x1234',
-											to: defaultProps.collectionAddress,
-											value: '0',
-											executeType: 'order',
-										},
-									],
-								}),
-							),
-						50,
-					),
-				);
+				return HttpResponse.json({
+					steps: [
+						{
+							id: StepType.cancel,
+							data: '0x1234',
+							to: defaultProps.collectionAddress,
+							value: '0',
+							executeType: 'order',
+						},
+					],
+				});
 			}),
 			http.post(mockMarketplaceEndpoint('Execute'), () => {
 				return HttpResponse.json({
@@ -362,49 +296,19 @@ describe('useCancelOrder', () => {
 			}),
 		);
 
-		// Start the cancellation
-		result.current.cancelOrder({
+		// Start the cancellation and wait for it to complete
+		await result.current.cancelOrder({
 			orderId: mockOrderId,
 			marketplace: MarketplaceKind.sequence_marketplace_v2,
 		});
 
-		// First, wait for the orderId to be set
-		await waitFor(
-			() => {
-				expect(result.current.cancellingOrderId).toBe(mockOrderId);
-			},
-			{ timeout: 1000 },
-		);
-
-		// Then wait for execution to start
-		await waitFor(
-			() => {
-				expect(result.current.isExecuting).toBe(true);
-			},
-			{ timeout: 1000 },
-		);
-
-		// Wait for the success callback to be called
-		await waitFor(
-			() => {
-				expect(onSuccess).toHaveBeenCalledWith({
-					hash: mockTxHash,
-				});
-			},
-			{ timeout: 1000 },
-		);
+		// After cancellation is complete, verify the success callback was called
+		expect(onSuccess).toHaveBeenCalledWith({
+			hash: mockTxHash,
+		});
 
-		// Finally verify the states are reset
-		await waitFor(
-			() => {
-				expect(mockSuccessWallet.handleSendTransactionStep).toHaveBeenCalled();
-				expect(
-					mockSuccessWallet.handleConfirmTransactionStep,
-				).toHaveBeenCalled();
-				expect(result.current.cancellingOrderId).toBeNull();
-				expect(result.current.isExecuting).toBe(false);
-			},
-			{ timeout: 1000 },
-		);
+		// Verify final state
+		expect(result.current.cancellingOrderId).toBeNull();
+		expect(result.current.isExecuting).toBe(false);
 	});
 });

package/src/react/hooks/__tests__/useCancelTransactionSteps.test.tsx

@@ -1,23 +1,27 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
-import { useCancelTransactionSteps } from '../useCancelTransactionSteps';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
+import { zeroAddress } from 'viem';
+import type { Mock } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import {
-	mockSteps,
-	mockMarketplaceEndpoint,
-} from '../../_internal/api/__mocks__/marketplace.msw';
-import { server } from '../../_internal/test/setup';
-import { MarketplaceKind, StepType } from '../../_internal/api/marketplace.gen';
+	commonWalletMocks,
+	createMockWallet,
+} from '../../../../test/mocks/wallet';
 import {
 	ChainSwitchUserRejectedError,
 	WalletInstanceNotFoundError,
 } from '../../../utils/_internal/error/transaction';
-import { useWallet } from '../../_internal/wallet/useWallet';
 import {
-	createMockWallet,
-	commonWalletMocks,
-} from '../../_internal/test/mocks/wallet';
+	mockMarketplaceEndpoint,
+	mockSteps,
+} from '../../_internal/api/__mocks__/marketplace.msw';
+import { MarketplaceKind, StepType } from '../../_internal/api/marketplace.gen';
+import { useWallet } from '../../_internal/wallet/useWallet';
+import { useCancelTransactionSteps } from '../useCancelTransactionSteps';
+
+vi.mock('../../_internal/wallet/useWallet', () => ({
+	useWallet: vi.fn(),
+}));
 
 // Create mock wallet instance with default successful implementations
 const mockWallet = createMockWallet({
@@ -28,9 +32,6 @@ const mockWallet = createMockWallet({
 	handleConfirmTransactionStep: commonWalletMocks.successfulConfirmation,
 });
 
-// Mock useWallet hook
-vi.mock('../../_internal/wallet/useWallet');
-
 // Mock switch chain modal
 vi.mock('../../ui/modals/_internal/components/switchChainModal', () => ({
 	useSwitchChainModal: () => ({
@@ -55,7 +56,7 @@ describe('useCancelTransactionSteps', () => {
 		vi.clearAllMocks();
 
 		// Set up the mock implementation for useWallet in beforeEach
-		vi.mocked(useWallet).mockReturnValue({
+		(useWallet as Mock).mockReturnValue({
 			wallet: mockWallet,
 			isLoading: false,
 			isError: false,
@@ -148,7 +149,7 @@ describe('useCancelTransactionSteps', () => {
 
 	it('should handle wallet not initialized error', async () => {
 		// Override the mock for this specific test
-		vi.mocked(useWallet).mockReturnValue({
+		(useWallet as Mock).mockReturnValue({
 			wallet: null,
 			isLoading: false,
 			isError: false,
@@ -177,7 +178,7 @@ describe('useCancelTransactionSteps', () => {
 		});
 
 		// Override the mock for this specific test
-		vi.mocked(useWallet).mockReturnValue({
+		(useWallet as Mock).mockReturnValue({
 			wallet: mockWalletWithRejection,
 			isLoading: false,
 			isError: false,
@@ -218,7 +219,7 @@ describe('useCancelTransactionSteps', () => {
 		});
 
 		// Override the mock for this specific test
-		vi.mocked(useWallet).mockReturnValue({
+		(useWallet as Mock).mockReturnValue({
 			wallet: mockWalletWithFailure,
 			isLoading: false,
 			isError: false,

package/src/react/hooks/__tests__/useCollectible.test.tsx

@@ -1,14 +1,13 @@
-import { describe, expect, it } from 'vitest';
-import { useCollectible } from '../useCollectible';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
-import type { UseCollectibleArgs } from '../useCollectible';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
+import { zeroAddress } from 'viem';
+import { describe, expect, it } from 'vitest';
 import {
-	mockTokenMetadata,
 	mockMetadataEndpoint,
+	mockTokenMetadata,
 } from '../../_internal/api/__mocks__/metadata.msw';
-import { server } from '../../_internal/test/setup';
+import type { UseCollectibleArgs } from '../useCollectible';
+import { useCollectible } from '../useCollectible';
 
 describe('useCollectible', () => {
 	const defaultArgs: UseCollectibleArgs = {

package/src/react/hooks/__tests__/useCollection.test.tsx

@@ -1,14 +1,13 @@
-import { describe, expect, it } from 'vitest';
-import { useCollection } from '../useCollection';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
-import type { UseCollectionArgs } from '../useCollection';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
+import { zeroAddress } from 'viem';
+import { describe, expect, it } from 'vitest';
 import {
 	mockContractInfo,
 	mockMetadataEndpoint,
 } from '../../_internal/api/__mocks__/metadata.msw';
-import { server } from '../../_internal/test/setup';
+import type { UseCollectionArgs } from '../useCollection';
+import { useCollection } from '../useCollection';
 
 describe('useCollection', () => {
 	const defaultArgs: UseCollectionArgs = {

package/src/react/hooks/__tests__/useCollectionBalanceDetails.test.tsx

@@ -1,23 +1,15 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { renderHook, server } from '@test';
 import { waitFor } from '@testing-library/react';
-import { useCollectionBalanceDetails } from '../useCollectionBalanceDetails';
-import { mockTokenBalance } from '../../_internal/api/__mocks__/indexer.msw';
-import { zeroAddress } from 'viem';
-import { renderHook } from '../../_internal/test-utils';
 import { http, HttpResponse } from 'msw';
-import { server } from '../../_internal/test/setup';
-import { mockIndexerEndpoint } from '../../_internal/api/__mocks__/indexer.msw';
+import { zeroAddress } from 'viem';
+import { describe, expect, it } from 'vitest';
+import {
+	mockIndexerEndpoint,
+	mockTokenBalance,
+} from '../../_internal/api/__mocks__/indexer.msw';
+import { useCollectionBalanceDetails } from '../useCollectionBalanceDetails';
 
 describe('useCollectionBalanceDetails', () => {
-	beforeEach(() => {
-		vi.clearAllMocks();
-		server.resetHandlers();
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
 	const defaultArgs = {
 		chainId: 1,
 		filter: {

package/src/react/hooks/__tests__/useCollectionDetails.test.tsx

@@ -1,11 +1,12 @@
+import { renderHook, server, waitFor } from '@test';
+import { http, HttpResponse } from 'msw';
+import { zeroAddress } from 'viem';
 import { describe, expect, it } from 'vitest';
+import {
+	mockCollection,
+	mockMarketplaceEndpoint,
+} from '../../_internal/api/__mocks__/marketplace.msw';
 import { useCollectionDetails } from '../useCollectionDetails';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
-import { http, HttpResponse } from 'msw';
-import { mockCollection } from '../../_internal/api/__mocks__/marketplace.msw';
-import { server } from '../../_internal/test/setup';
-import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
 
 describe('useCollectionDetails', () => {
 	const defaultArgs = {

package/src/react/hooks/__tests__/useCollectionDetailsPolling.test.tsx

@@ -1,12 +1,13 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
-import { useCollectionDetailsPolling } from '../useCollectionDetailsPolling';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
-import { mockCollection } from '../../_internal/api/__mocks__/marketplace.msw';
-import { server } from '../../_internal/test/setup';
-import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
+import { zeroAddress } from 'viem';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+	mockCollection,
+	mockMarketplaceEndpoint,
+} from '../../_internal/api/__mocks__/marketplace.msw';
 import { CollectionStatus } from '../../_internal/api/marketplace.gen';
+import { useCollectionDetailsPolling } from '../useCollectionDetailsPolling';
 
 describe('useCollectionDetailsPolling', () => {
 	const defaultArgs = {
@@ -18,11 +19,6 @@ describe('useCollectionDetailsPolling', () => {
 		vi.useFakeTimers({ shouldAdvanceTime: true });
 	});
 
-	afterEach(() => {
-		vi.useRealTimers();
-		server.resetHandlers();
-	});
-
 	it('should poll collection details until terminal state is reached', async () => {
 		// Mock initial syncing state
 		const syncingCollection = {

package/src/react/hooks/__tests__/useComparePrices.test.tsx

@@ -1,3 +1,4 @@
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
 import { zeroAddress } from 'viem';
 import { describe, expect, it } from 'vitest';
@@ -5,8 +6,6 @@ import {
 	mockCurrencies,
 	mockMarketplaceEndpoint,
 } from '../../_internal/api/__mocks__/marketplace.msw';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { server } from '../../_internal/test/setup';
 import { useComparePrices } from '../useComparePrices';
 
 describe('useComparePrices', () => {

package/src/react/hooks/__tests__/useConvertPriceToUSD.test.tsx

@@ -1,3 +1,4 @@
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
 import { zeroAddress } from 'viem';
 import { describe, expect, it } from 'vitest';
@@ -5,10 +6,8 @@ import {
 	mockCurrencies,
 	mockMarketplaceEndpoint,
 } from '../../_internal/api/__mocks__/marketplace.msw';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { server } from '../../_internal/test/setup';
-import { useConvertPriceToUSD } from '../useConvertPriceToUSD';
 import type { UseConvertPriceToUSDArgs } from '../useConvertPriceToUSD';
+import { useConvertPriceToUSD } from '../useConvertPriceToUSD';
 
 describe('useConvertPriceToUSD', () => {
 	const defaultArgs: UseConvertPriceToUSDArgs = {

package/src/react/hooks/__tests__/useCountListingsForCollectible.test.tsx

@@ -1,10 +1,9 @@
-import { describe, expect, it } from 'vitest';
-import { useCountListingsForCollectible } from '../useCountListingsForCollectible';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
-import { server } from '../../_internal/test/setup';
+import { zeroAddress } from 'viem';
+import { describe, expect, it } from 'vitest';
 import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
+import { useCountListingsForCollectible } from '../useCountListingsForCollectible';
 
 describe('useCountListingsForCollectible', () => {
 	const defaultArgs = {

package/src/react/hooks/__tests__/useCountOfCollectables.test.tsx

@@ -1,12 +1,11 @@
-import { describe, expect, it } from 'vitest';
-import { useCountOfCollectables } from '../useCountOfCollectables';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
-import type { UseCountOfCollectablesArgs } from '../useCountOfCollectables';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
-import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
+import { zeroAddress } from 'viem';
+import { describe, expect, it } from 'vitest';
 import { OrderSide } from '../../_internal';
-import { server } from '../../_internal/test/setup';
+import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
+import type { UseCountOfCollectablesArgs } from '../useCountOfCollectables';
+import { useCountOfCollectables } from '../useCountOfCollectables';
 
 describe('useCountOfCollectables', () => {
 	const defaultArgs: UseCountOfCollectablesArgs = {

package/src/react/hooks/__tests__/useCountOffersForCollectible.test.tsx

@@ -1,10 +1,9 @@
-import { describe, expect, it } from 'vitest';
-import { useCountOffersForCollectible } from '../useCountOffersForCollectible';
-import { renderHook, waitFor } from '../../_internal/test-utils';
-import { zeroAddress } from 'viem';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
-import { server } from '../../_internal/test/setup';
+import { zeroAddress } from 'viem';
+import { describe, expect, it } from 'vitest';
 import { mockMarketplaceEndpoint } from '../../_internal/api/__mocks__/marketplace.msw';
+import { useCountOffersForCollectible } from '../useCountOffersForCollectible';
 
 describe('useCountOffersForCollectible', () => {
 	const defaultArgs = {

package/src/react/hooks/__tests__/useCurrencies.test.tsx

@@ -1,13 +1,12 @@
-import { describe, expect, it } from 'vitest';
-import { useCurrencies } from '../useCurrencies';
-import { renderHook, waitFor } from '../../_internal/test-utils';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
-import { server } from '../../_internal/test/setup';
+import { describe, expect, it } from 'vitest';
 import {
 	mockCurrencies,
 	mockMarketplaceEndpoint,
 } from '../../_internal/api/__mocks__/marketplace.msw';
 import { mockConfig } from '../options/__mocks__/marketplaceConfig.msw';
+import { useCurrencies } from '../useCurrencies';
 
 describe('useCurrencies', () => {
 	const defaultArgs = {

package/src/react/hooks/__tests__/useCurrency.test.tsx

@@ -1,14 +1,12 @@
-import { beforeEach, describe, expect, it } from 'vitest';
-import { useCurrency } from '../useCurrency';
-import { renderHook, waitFor } from '../../_internal/test-utils';
+import { renderHook, server, waitFor } from '@test';
 import { http, HttpResponse } from 'msw';
-import { server } from '../../_internal/test/setup';
+import { beforeEach, describe, expect, it } from 'vitest';
+import { currencyKeys, getQueryClient } from '../../_internal';
 import {
 	mockCurrencies,
 	mockMarketplaceEndpoint,
 } from '../../_internal/api/__mocks__/marketplace.msw';
-import { getQueryClient } from '../../_internal';
-import { currencyKeys } from '../../_internal';
+import { useCurrency } from '../useCurrency';
 
 describe('useCurrency', () => {
 	const defaultArgs = {