Merge branch 'main' into jl/eip-5792-middleware-3-0-0

Author: jiexi

app/components/UI/Predict/hooks/useFeaturedCarouselData.test.ts

@@ -103,6 +103,26 @@ describe('useFeaturedCarouselData', () => {
     expect(result.current.error).toBeNull();
   });
 
+  it('filters child more-market cards', async () => {
+    const { Wrapper } = createWrapper();
+    const parentMarket = createMockMarket({ id: 'parent-market' });
+    const childMarket = createMockMarket({
+      id: 'child-market',
+      parentMarketId: 'parent-market',
+    });
+    mockGetCarouselMarkets.mockResolvedValue([parentMarket, childMarket]);
+
+    const { result } = renderHook(() => useFeaturedCarouselData(), {
+      wrapper: Wrapper,
+    });
+
+    await waitFor(() => {
+      expect(result.current.isLoading).toBe(false);
+    });
+
+    expect(result.current.markets).toEqual([parentMarket]);
+  });
+
   it('returns error when controller throws', async () => {
     const { Wrapper } = createWrapper();
     mockGetCarouselMarkets.mockRejectedValue(new Error('Network error'));

app/components/UI/Predict/hooks/useFeaturedCarouselData.ts

@@ -7,6 +7,7 @@ import { predictQueries } from '../queries';
 import { selectPredictUpDownEnabledFlag } from '../selectors/featureFlags';
 import type { PredictMarket } from '../types';
 import { isCryptoUpDown } from '../utils/cryptoUpDown';
+import { filterStandaloneMarkets } from '../utils/feed';
 import { ensureError } from '../utils/predictErrorHandler';
 
 export interface UseFeaturedCarouselDataResult {
@@ -40,7 +41,7 @@ export const useFeaturedCarouselData = (): UseFeaturedCarouselDataResult => {
   }, [query.error]);
 
   const markets = useMemo(() => {
-    const data = query.data ?? [];
+    const data = filterStandaloneMarkets(query.data ?? []);
     if (upDownEnabled) {
       return data;
     }

app/components/UI/Predict/hooks/usePredictMarketData.test.tsx

@@ -219,6 +219,63 @@ describe('usePredictMarketData', () => {
     );
   });
 
+  it('filters child more-market cards without disabling pagination', async () => {
+    const rawMarkets = Array.from({ length: 20 }, (_, index) => ({
+      ...mockMarketData[0],
+      id: `market-${index}`,
+      slug: `market-${index}`,
+      parentMarketId: index >= 18 ? 'parent-market' : undefined,
+    }));
+    mockGetMarkets.mockResolvedValue(rawMarkets);
+
+    const { result } = renderHook(() => usePredictMarketData({ pageSize: 20 }));
+
+    await waitFor(() => {
+      expect(result.current.isFetching).toBe(false);
+    });
+
+    expect(result.current.marketData).toHaveLength(18);
+    expect(result.current.marketData.map((market) => market.id)).toEqual(
+      rawMarkets.slice(0, 18).map((market) => market.id),
+    );
+    expect(result.current.hasMore).toBe(true);
+  });
+
+  it('uses raw page offsets when loading more after child cards are filtered', async () => {
+    const firstRawPage = Array.from({ length: 20 }, (_, index) => ({
+      ...mockMarketData[0],
+      id: `first-page-market-${index}`,
+      slug: `first-page-market-${index}`,
+      parentMarketId: index >= 18 ? 'parent-market' : undefined,
+    }));
+    const secondRawPage = Array.from({ length: 5 }, (_, index) => ({
+      ...mockMarketData[0],
+      id: `second-page-market-${index}`,
+      slug: `second-page-market-${index}`,
+    }));
+
+    mockGetMarkets
+      .mockResolvedValueOnce(firstRawPage)
+      .mockResolvedValueOnce(secondRawPage);
+
+    const { result } = renderHook(() => usePredictMarketData({ pageSize: 20 }));
+
+    await waitFor(() => {
+      expect(result.current.isFetching).toBe(false);
+    });
+
+    await act(async () => {
+      await result.current.fetchMore();
+    });
+
+    expect(mockGetMarkets).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({ limit: 20, offset: 20 }),
+    );
+    expect(result.current.marketData).toHaveLength(23);
+    expect(result.current.hasMore).toBe(false);
+  });
+
   it('handle null market data', async () => {
     mockGetMarkets.mockResolvedValue(null);
 

app/components/UI/Predict/hooks/usePredictMarketData.tsx

@@ -13,6 +13,7 @@ import Logger from '../../../../util/Logger';
 import { PREDICT_CONSTANTS } from '../constants/errors';
 import { ensureError } from '../utils/predictErrorHandler';
 import { PredictCategory, PredictMarket } from '../types';
+import { filterStandaloneMarkets } from '../utils/feed';
 
 export interface UsePredictMarketDataOptions {
   q?: string;
@@ -147,12 +148,13 @@ export const usePredictMarketData = (
 
             const hasMoreData = markets.length >= pageSize;
             setHasMore(hasMoreData);
+            const visibleMarkets = filterStandaloneMarkets(markets);
 
             if (isLoadMore) {
               setMarketData((prevData) => {
                 // Use a Set to efficiently deduplicate by ID
                 const existingIds = new Set(prevData.map((event) => event.id));
-                const newEvents = markets.filter(
+                const newEvents = visibleMarkets.filter(
                   (event) => !existingIds.has(event.id),
                 );
                 const accumulated = [...prevData, ...newEvents];
@@ -162,7 +164,7 @@ export const usePredictMarketData = (
               currentOffsetRef.current += pageSize;
             } else {
               // Replace data for initial load or refresh
-              setMarketData(refine ? refine(markets) : markets);
+              setMarketData(refine ? refine(visibleMarkets) : visibleMarkets);
               setCurrentOffset(pageSize);
               currentOffsetRef.current = pageSize;
             }

app/components/UI/Predict/providers/polymarket/depositWallet.test.ts

@@ -269,10 +269,10 @@ describe('depositWallet', () => {
 
   it('keeps polling when completion succeeds without a hash', async () => {
     mockFetch
-      .mockResolvedValueOnce(mockResponse({ state: 'STATE_MINED' }))
+      .mockResolvedValueOnce(mockResponse({ state: 'STATE_CONFIRMED' }))
       .mockResolvedValueOnce(
         mockResponse({
-          state: 'STATE_MINED',
+          state: 'STATE_CONFIRMED',
           transactionHash:
             '0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd',
         }),

app/components/UI/Predict/providers/polymarket/depositWallet.ts

@@ -26,7 +26,7 @@ const DEPOSIT_WALLET_DOMAIN_VERSION = '1';
 // allowed window to reduce intermittent "deadline too soon" failures.
 const DEPOSIT_WALLET_BATCH_DEADLINE_SECONDS = 300;
 
-const RELAYER_SUCCESS_STATES = new Set(['STATE_MINED', 'STATE_CONFIRMED']);
+const RELAYER_SUCCESS_STATES = new Set(['STATE_CONFIRMED']);
 const RELAYER_FAILURE_STATES = new Set(['STATE_FAILED', 'STATE_INVALID']);
 
 /**

app/components/UI/Predict/providers/polymarket/types.ts

@@ -124,7 +124,7 @@ export interface PolymarketApiEvent {
   period?: PredictGamePeriod;
   live?: boolean;
   ended?: boolean;
-  parentEventId?: string | number;
+  parentEventId?: string | number | null;
 }
 
 export interface PolymarketApiActivity {

app/components/UI/Predict/providers/polymarket/utils.test.ts

@@ -746,4 +746,28 @@ describe('polymarket utils', () => {
       }),
     ).resolves.toBe(false);
   });
+
+  it('preserves parent market id when parsing Polymarket events', () => {
+    const event: PolymarketApiEvent = {
+      id: 'child-event',
+      slug: 'child-event',
+      title: 'Child Event',
+      description: 'Child event description',
+      icon: '',
+      closed: false,
+      series: [],
+      markets: [],
+      tags: [],
+      liquidity: 0,
+      volume: 0,
+      parentEventId: 'parent-market',
+    };
+
+    expect(parsePolymarketEvents([event], 'trending')).toEqual([
+      expect.objectContaining({
+        id: 'child-event',
+        parentMarketId: 'parent-market',
+      }),
+    ]);
+  });
 });

app/components/UI/Predict/providers/polymarket/utils.ts

@@ -1112,6 +1112,9 @@ export const parsePolymarketEvents = (
         volume: event.volume,
         game,
         ...(seriesData && { series: seriesData }),
+        ...(event.parentEventId !== undefined && {
+          parentMarketId: event.parentEventId,
+        }),
       };
     },
   );

app/components/UI/Predict/types/index.ts

@@ -116,6 +116,7 @@ export type PredictMarket = {
   volume: number;
   game?: PredictMarketGame;
   series?: PredictSeries;
+  parentMarketId?: string | number | null;
   childMarketIds?: string[];
 };