fix: refactor lowercase sensitivity logic, simpflied fetching positions on homepage

Author: vinnyhoward

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

@@ -2434,6 +2434,41 @@ describe('PredictController', () => {
         },
       );
     });
+
+    it('succeeds when state key is checksummed but signer address is lowercase', async () => {
+      // Arrange - simulates the real-world case mismatch: selector returns
+      // checksummed EIP-55 address, but state was keyed by a differently-cased address
+      const checksummedAddress =
+        '0x1234567890123456789012345678901234567890'.toUpperCase() as `0x${string}`;
+      const mockBatchId = 'claim-batch-case';
+      await withController(async ({ controller }) => {
+        mockPolymarketProvider.getPositions = jest
+          .fn()
+          .mockResolvedValue([
+            createMockPosition({ id: 'pos-1', claimable: true }),
+          ]);
+        mockPolymarketProvider.prepareClaim = jest
+          .fn()
+          .mockResolvedValue(mockClaim);
+        (addTransactionBatch as jest.Mock).mockResolvedValue({
+          batchId: mockBatchId,
+        });
+
+        // Seed state with the checksummed key
+        controller.updateStateForTesting((state) => {
+          state.claimablePositions[checksummedAddress] = [
+            createMockPosition({ id: 'pos-1', claimable: true }),
+          ];
+        });
+
+        // Act - signer address comes back as lowercase (default mock)
+        const result = await controller.claimWithConfirmation({});
+
+        // Assert - should find the positions despite the case difference
+        expect(result.batchId).toBe(mockBatchId);
+        expect(result.status).toBe(PredictClaimStatus.PENDING);
+      });
+    });
   });
 
   describe('getUnrealizedPnL', () => {
@@ -4969,6 +5004,38 @@ describe('PredictController', () => {
         expect(controller.state.claimablePositions[testAddress]).toEqual([]);
       });
     });
+
+    it('matches state key case-insensitively when address casing differs', async () => {
+      // Arrange - state keyed by checksummed address, but confirmClaim called with lowercase
+      await withController(async ({ controller }) => {
+        const checksummedKey = '0xABCDEF1234567890ABCDEF1234567890ABCDEF12';
+        const lowercaseArg = checksummedKey.toLowerCase() as `0x${string}`;
+        const mockPositions = [
+          createMockPosition({
+            id: 'position-1',
+            status: PredictPositionStatus.WON,
+          }),
+        ];
+
+        controller.updateStateForTesting((state) => {
+          state.claimablePositions[checksummedKey] = mockPositions;
+        });
+
+        mockPolymarketProvider.confirmClaim = jest.fn();
+
+        // Act
+        controller.confirmClaim({ address: lowercaseArg });
+
+        // Assert - found the positions despite case mismatch; state cleared.
+        // getSigner is called with matchedKey (the checksummed state key),
+        // so the signer address reflects that casing.
+        expect(mockPolymarketProvider.confirmClaim).toHaveBeenCalledWith({
+          positions: mockPositions,
+          signer: expect.objectContaining({ address: checksummedKey }),
+        });
+        expect(controller.state.claimablePositions[checksummedKey]).toEqual([]);
+      });
+    });
   });
 
   describe('getPositions', () => {

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

@@ -1566,6 +1566,17 @@ 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,
+    );
+    if (!matchedKey) return undefined;
+    return { positions: this.state.claimablePositions[matchedKey], matchedKey };
+  }
+
   async claimWithConfirmation(
     _params: ClaimParams = {},
   ): Promise<PredictClaim> {
@@ -1596,13 +1607,9 @@ export class PredictController extends BaseController<
       const signer = this.getSigner();
 
       // Get claimable positions from state (case-insensitive address match)
-      const normalizedSignerAddress = signer.address.toLowerCase();
-      const matchedAddress = Object.keys(this.state.claimablePositions).find(
-        (addressKey) => addressKey.toLowerCase() === normalizedSignerAddress,
-      );
-      const claimablePositions = matchedAddress
-        ? this.state.claimablePositions[matchedAddress]
-        : undefined;
+      const claimablePositions = this.getClaimablePositionsByAddress(
+        signer.address,
+      )?.positions;
 
       if (!claimablePositions || claimablePositions.length === 0) {
         throw new Error('No claimable positions found');
@@ -1729,30 +1736,23 @@ export class PredictController extends BaseController<
   public confirmClaim({ address }: { address?: string }): void {
     const provider = this.provider;
 
-    const normalizedAddress = (
-      address ?? this.getSigner().address
-    ).toLowerCase();
-    const matchedAddress = Object.keys(this.state.claimablePositions).find(
-      (addressKey) => addressKey.toLowerCase() === normalizedAddress,
-    );
+    const resolvedAddress = address ?? this.getSigner().address;
+    const claimResult = this.getClaimablePositionsByAddress(resolvedAddress);
 
-    if (!matchedAddress) {
+    if (!claimResult || claimResult.positions.length === 0) {
       return;
     }
 
-    const signer = this.getSigner(matchedAddress);
-    const claimedPositions = this.state.claimablePositions[matchedAddress];
-    if (!claimedPositions || claimedPositions.length === 0) {
-      return;
-    }
+    const { positions: claimedPositions, matchedKey } = claimResult;
+    const signer = this.getSigner(matchedKey);
 
     provider.confirmClaim?.({
       positions: claimedPositions,
       signer,
     });
 
     this.update((state) => {
-      state.claimablePositions[matchedAddress] = [];
+      state.claimablePositions[matchedKey] = [];
     });
   }
 

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

@@ -12,6 +12,7 @@ import { ensureError } from '../utils/predictErrorHandler';
 import { usePredictTrading } from './usePredictTrading';
 import { ConfirmationLoader } from '../../../Views/confirmations/components/confirm/confirm-component';
 import Routes from '../../../../constants/navigation/Routes';
+import { PredictClaimStatus } from '../types';
 
 export const usePredictClaim = () => {
   const { navigateToConfirmation } = useConfirmNavigation();
@@ -20,15 +21,16 @@ export const usePredictClaim = () => {
   const { toastRef } = useContext(ToastContext);
   const navigation = useNavigation();
 
-  const claim = useCallback(async () => {
+  const claim = useCallback(async (): Promise<{ wasCancelled: boolean }> => {
     try {
       navigateToConfirmation({
         headerShown: false,
         loader: ConfirmationLoader.PredictClaim,
         // TODO: remove once navigation stack is fixed properly
         stack: Routes.PREDICT.ROOT,
       });
-      await claimWinnings({});
+      const result = await claimWinnings({});
+      return { wasCancelled: result?.status === PredictClaimStatus.CANCELLED };
     } catch (err) {
       // Log error with claim context
       Logger.error(ensureError(err), {
@@ -70,6 +72,7 @@ export const usePredictClaim = () => {
           },
         },
       });
+      return { wasCancelled: false };
     }
   }, [
     claimWinnings,

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

@@ -24,6 +24,7 @@ import { selectSelectedAccountGroupId } from '../../../../selectors/multichainAc
 import type { Hex } from '@metamask/utils';
 import { usePredictClaim } from './usePredictClaim';
 import { usePredictDeposit } from './usePredictDeposit';
+import { _clearPositionsCache } from '../../../Views/Homepage/Sections/Predictions/hooks/usePredictPositionsForHomepage';
 import { usePredictWithdraw } from './usePredictWithdraw';
 import { store } from '../../../../store';
 import { selectTransactionMetadataById } from '../../../../selectors/transactionController';
@@ -254,6 +255,9 @@ export const usePredictToastRegistrations = (): ToastRegistration[] => {
             queryKey: predictQueries.positions.keys.all(),
           });
 
+          // Clear homepage positions cache so next visit fetches fresh data
+          _clearPositionsCache();
+
           showSuccessToast({
             showToast,
             title: strings('predict.deposit.account_ready'),