Merge branch 'main' of github.com:MetaMask/metamask-mobile into chore/respect-js-env-build-variants

Author: Cal-L

app/components/UI/Predict/components/PredictBalance/PredictBalance.test.tsx

@@ -26,12 +26,6 @@ jest.mock('../../hooks/usePredictBalance', () => ({
 const mockUsePredictDeposit = jest.fn();
 jest.mock('../../hooks/usePredictDeposit', () => ({
   usePredictDeposit: () => mockUsePredictDeposit(),
-  PredictDepositStatus: {
-    IDLE: 'idle',
-    PENDING: 'pending',
-    CONFIRMED: 'confirmed',
-    FAILED: 'failed',
-  },
 }));
 
 // Mock usePredictActionGuard hook
@@ -77,7 +71,7 @@ describe('PredictBalance', () => {
 
     mockUsePredictDeposit.mockReturnValue({
       deposit: jest.fn(),
-      status: 'idle',
+      isDepositPending: false,
     });
 
     mockUsePredictWithdraw.mockReturnValue({
@@ -313,7 +307,7 @@ describe('PredictBalance', () => {
       });
       mockUsePredictDeposit.mockReturnValue({
         deposit: mockDeposit,
-        status: 'idle',
+        isDepositPending: false,
       });
 
       // Act
@@ -340,7 +334,7 @@ describe('PredictBalance', () => {
       });
       mockUsePredictDeposit.mockReturnValue({
         deposit: mockDeposit,
-        status: 'idle',
+        isDepositPending: false,
       });
 
       // Act
@@ -383,10 +377,10 @@ describe('PredictBalance', () => {
 
   describe('balance refresh', () => {
     it('component renders with adding funds state when deposit is pending', () => {
-      // Arrange - set up CONFIRMED status to test the adding funds UI
+      // Arrange - set up pending deposit to test the adding funds UI
       mockUsePredictDeposit.mockReturnValue({
         deposit: jest.fn(),
-        status: 'pending',
+        isDepositPending: true,
       });
 
       // Act
@@ -400,11 +394,11 @@ describe('PredictBalance', () => {
       ).toBeOnTheScreen();
     });
 
-    it('component renders normally when deposit status is idle', () => {
-      // Arrange - set up IDLE status
+    it('component renders normally when deposit is not pending', () => {
+      // Arrange - set up no pending deposit
       mockUsePredictDeposit.mockReturnValue({
         deposit: jest.fn(),
-        status: 'idle',
+        isDepositPending: false,
       });
 
       // Act
@@ -525,7 +519,7 @@ describe('PredictBalance', () => {
       });
       mockUsePredictDeposit.mockReturnValue({
         deposit: jest.fn(),
-        status: 'pending',
+        isDepositPending: true,
       });
 
       // Act

app/components/UI/Predict/components/PredictBalance/PredictBalance.tsx

@@ -30,7 +30,6 @@ import {
 } from '../../../Perps/constants/hyperLiquidConfig';
 import { usePredictBalance } from '../../hooks/usePredictBalance';
 import { usePredictDeposit } from '../../hooks/usePredictDeposit';
-import { PredictDepositStatus } from '../../types';
 import { formatPrice } from '../../utils/format';
 import { usePredictActionGuard } from '../../hooks/usePredictActionGuard';
 import { NavigationProp, useNavigation } from '@react-navigation/native';
@@ -52,21 +51,21 @@ const PredictBalance: React.FC<PredictBalanceProps> = ({ onLayout }) => {
     loadOnMount: true,
     refreshOnFocus: true,
   });
-  const { deposit, status } = usePredictDeposit();
+  const { deposit, isDepositPending } = usePredictDeposit();
   const { withdraw } = usePredictWithdraw();
   const { executeGuardedAction } = usePredictActionGuard({
     providerId: 'polymarket',
     navigation,
   });
 
-  const isAddingFunds = status === PredictDepositStatus.PENDING;
+  const isAddingFunds = isDepositPending;
   const hasBalance = balance > 0;
 
   useEffect(() => {
-    if (status === PredictDepositStatus.CONFIRMED) {
+    if (!isDepositPending) {
       loadBalance({ isRefresh: true });
     }
-  }, [status, loadBalance]);
+  }, [isDepositPending, loadBalance]);
 
   const handleAddFunds = useCallback(() => {
     executeGuardedAction(() => {

app/components/UI/Predict/components/PredictPositionsHeader/PredictPositionsHeader.tsx

@@ -33,11 +33,7 @@ import { useUnrealizedPnL } from '../../hooks/useUnrealizedPnL';
 import { usePredictActionGuard } from '../../hooks/usePredictActionGuard';
 import { POLYMARKET_PROVIDER_ID } from '../../providers/polymarket/constants';
 import { selectPredictClaimablePositions } from '../../selectors/predictController';
-import {
-  PredictDepositStatus,
-  PredictPosition,
-  PredictPositionStatus,
-} from '../../types';
+import { PredictPosition, PredictPositionStatus } from '../../types';
 import { PredictNavigationParamList } from '../../types/navigation';
 import { formatPrice } from '../../utils/format';
 
@@ -77,7 +73,7 @@ const PredictPositionsHeader = forwardRef<
     loadOnMount: true,
     refreshOnFocus: true,
   });
-  const { status } = usePredictDeposit();
+  const { isDepositPending } = usePredictDeposit();
   const claimablePositions = useSelector(selectPredictClaimablePositions);
 
   const {
@@ -96,10 +92,10 @@ const PredictPositionsHeader = forwardRef<
   }, [balanceError, pnlError, onError]);
 
   useEffect(() => {
-    if (status === PredictDepositStatus.CONFIRMED) {
+    if (!isDepositPending) {
       loadBalance({ isRefresh: true });
     }
-  }, [status, loadBalance]);
+  }, [isDepositPending, loadBalance]);
 
   const handleBalanceTouch = () => {
     navigation.navigate(Routes.PREDICT.ROOT, {