fix: refactor and update unit tests

Author: vinnyhoward

app/components/UI/Predict/controllers/PredictController.ts

@@ -56,6 +56,7 @@ import {
   PredictTradeStatus,
   PredictTradeStatusValue,
 } from '../constants/eventNames';
+import { findAddressKey } from '../utils/accounts';
 import { validateDepositTransactions } from '../utils/validateTransactions';
 import { PolymarketProvider } from '../providers/polymarket/PolymarketProvider';
 import { Signer } from '../providers/types';
@@ -1569,10 +1570,7 @@ export class PredictController extends BaseController<
   private getClaimablePositionsByAddress(
     address: string,
   ): { positions: PredictPosition[]; matchedKey: string } | undefined {
-    const normalizedAddress = address.toLowerCase();
-    const matchedKey = Object.keys(this.state.claimablePositions).find(
-      (key) => key.toLowerCase() === normalizedAddress,
-    );
+    const matchedKey = findAddressKey(this.state.claimablePositions, address);
     if (!matchedKey) return undefined;
     return { positions: this.state.claimablePositions[matchedKey], matchedKey };
   }

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

@@ -21,7 +21,10 @@ export const usePredictClaim = () => {
   const { toastRef } = useContext(ToastContext);
   const navigation = useNavigation();
 
-  const claim = useCallback(async (): Promise<{ wasCancelled: boolean }> => {
+  const claim = useCallback(async (): Promise<{
+    wasCancelled: boolean;
+    succeeded: boolean;
+  }> => {
     try {
       navigateToConfirmation({
         headerShown: false,
@@ -30,7 +33,10 @@ export const usePredictClaim = () => {
         stack: Routes.PREDICT.ROOT,
       });
       const result = await claimWinnings({});
-      return { wasCancelled: result?.status === PredictClaimStatus.CANCELLED };
+      return {
+        wasCancelled: result?.status === PredictClaimStatus.CANCELLED,
+        succeeded: result?.status === PredictClaimStatus.PENDING,
+      };
     } catch (err) {
       // Log error with claim context
       Logger.error(ensureError(err), {
@@ -72,7 +78,7 @@ export const usePredictClaim = () => {
           },
         },
       });
-      return { wasCancelled: false };
+      return { wasCancelled: false, succeeded: false };
     }
   }, [
     claimWinnings,

app/components/UI/Predict/selectors/predictController/index.ts

@@ -1,6 +1,7 @@
 import { createSelector } from 'reselect';
 import { RootState } from '../../../../../reducers';
 import { PredictPositionStatus } from '../../types';
+import { findAddressKey } from '../../utils/accounts';
 
 const selectPredictControllerState = (state: RootState) =>
   state.engine.backgroundState.PredictController;
@@ -26,10 +27,7 @@ const selectPredictClaimablePositionsByAddress = ({
   address: string;
 }) =>
   createSelector(selectPredictClaimablePositions, (claimablePositions) => {
-    const normalizedAddress = address.toLowerCase();
-    const matchedKey = Object.keys(claimablePositions).find(
-      (key) => key.toLowerCase() === normalizedAddress,
-    );
+    const matchedKey = findAddressKey(claimablePositions, address);
     return matchedKey ? claimablePositions[matchedKey] : [];
   });
 

app/components/UI/Predict/utils/accounts.test.ts

@@ -58,9 +58,41 @@ export const createMockEngineContext = () => ({
 const mockEngineContext = createMockEngineContext();
 jest.mock('../../../../core/Engine', () => ({ context: mockEngineContext }));
 
-import { getEvmAccountFromSelectedAccountGroup } from './accounts';
+import {
+  findAddressKey,
+  getEvmAccountFromSelectedAccountGroup,
+} from './accounts';
 import Engine from '../../../../core/Engine';
 
+describe('findAddressKey', () => {
+  const CHECKSUMMED = '0xABCDEF1234567890ABCDeF1234567890ABCDEF12';
+  const LOWERCASE = CHECKSUMMED.toLowerCase();
+
+  it('finds a key when the map uses checksummed casing and query is lowercase', () => {
+    const map = { [CHECKSUMMED]: ['pos1'] };
+    expect(findAddressKey(map, LOWERCASE)).toBe(CHECKSUMMED);
+  });
+
+  it('finds a key when the map uses lowercase casing and query is checksummed', () => {
+    const map = { [LOWERCASE]: ['pos1'] };
+    expect(findAddressKey(map, CHECKSUMMED)).toBe(LOWERCASE);
+  });
+
+  it('finds a key when both casings match exactly', () => {
+    const map = { [CHECKSUMMED]: ['pos1'] };
+    expect(findAddressKey(map, CHECKSUMMED)).toBe(CHECKSUMMED);
+  });
+
+  it('returns undefined when address is not in the map', () => {
+    const map = { '0x1111111111111111111111111111111111111111': [] };
+    expect(findAddressKey(map, CHECKSUMMED)).toBeUndefined();
+  });
+
+  it('returns undefined for an empty map', () => {
+    expect(findAddressKey({}, CHECKSUMMED)).toBeUndefined();
+  });
+});
+
 describe('accountUtils', () => {
   beforeEach(() => {
     jest.clearAllMocks();

app/components/UI/Predict/utils/accounts.ts

@@ -5,6 +5,23 @@
 import { isEvmAccountType } from '@metamask/keyring-api';
 import Engine from '../../../../core/Engine';
 
+/**
+ * Finds the key in a map whose address matches the given address case-insensitively.
+ * Polymarket and EVM tooling can return addresses in checksummed or lowercase form,
+ * so direct key lookups may miss a valid entry.
+ *
+ * @param map - Object keyed by Ethereum addresses
+ * @param address - Address to match (any casing)
+ * @returns The matching key as stored in the map, or undefined if not found
+ */
+export const findAddressKey = (
+  map: Record<string, unknown>,
+  address: string,
+): string | undefined => {
+  const normalized = address.toLowerCase();
+  return Object.keys(map).find((key) => key.toLowerCase() === normalized);
+};
+
 /**
  * Gets the EVM account from the selected account group
  * Extracts the duplicated pattern used throughout PerpsController

app/components/Views/Homepage/Sections/Predictions/PredictionsSection.tsx

@@ -120,8 +120,8 @@ const PredictionsSection = forwardRef<
   const handleClaim = useCallback(async () => {
     setIsClaiming(true);
     try {
-      const { wasCancelled } = await claim();
-      if (!wasCancelled) {
+      const { succeeded } = await claim();
+      if (succeeded) {
         setHasClaimed(true);
       }
       await refreshPositions();

app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.test.ts

@@ -23,7 +23,8 @@ jest.mock('react-redux', () => ({
   useSelector: (selector: (...args: unknown[]) => unknown) => {
     if (
       selector ===
-      jest.requireMock('../../../../../UI/Predict').selectPredictEnabledFlag
+      jest.requireMock('../../../../../UI/Predict/selectors/featureFlags')
+        .selectPredictEnabledFlag
     ) {
       return mockIsPredictEnabled;
     }
@@ -38,7 +39,7 @@ jest.mock('react-redux', () => ({
   },
 }));
 
-jest.mock('../../../../../UI/Predict', () => ({
+jest.mock('../../../../../UI/Predict/selectors/featureFlags', () => ({
   selectPredictEnabledFlag: jest.fn(),
 }));
 

app/components/Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage.ts

@@ -2,7 +2,7 @@ import { useState, useEffect, useCallback, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import Engine from '../../../../../../core/Engine';
 import { selectSelectedInternalAccountFormattedAddress } from '../../../../../../selectors/accountsController';
-import { selectPredictEnabledFlag } from '../../../../../UI/Predict';
+import { selectPredictEnabledFlag } from '../../../../../UI/Predict/selectors/featureFlags';
 import type { PredictPosition } from '../../../../../UI/Predict/types';
 
 export interface UsePredictPositionsForHomepageResult {