feat: STAKE-914 Remove MM_POOLED_STAKING_UI_ENABLED feature flag

app/components/UI/AssetOverview/Balance/Balance.tsx

@@ -29,7 +29,6 @@ import Text, {
 } from '../../../../component-library/components/Texts/Text';
 import { TokenI } from '../../Tokens/types';
 import { useNavigation } from '@react-navigation/native';
-import { isPooledStakingFeatureEnabled } from '../../Stake/constants';
 import StakingBalance from '../../Stake/components/StakingBalance/StakingBalance';
 import {
   PopularList,
@@ -167,9 +166,7 @@ const Balance = ({ asset, mainBalance, secondaryBalance }: BalanceProps) => {
           {asset.name || asset.symbol}
         </Text>
       </AssetElement>
-      {isPooledStakingFeatureEnabled() && asset?.isETH && (
-        <StakingBalance asset={asset} />
-      )}
+      {asset?.isETH && <StakingBalance asset={asset} />}
     </View>
   );
 };

app/components/UI/AssetOverview/Balance/index.test.tsx

@@ -58,11 +58,21 @@ const mockETH = {
   isNative: true,
 };
 
-const mockInitialState = {
-  engine: {
-    backgroundState,
+jest.mock('../../../../core/Engine', () => ({
+  context: {
+    NetworkController: {
+      getNetworkClientById: () => ({
+        configuration: {
+          chainId: '0x1',
+          rpcUrl: 'https://mainnet.infura.io/v3',
+          ticker: 'ETH',
+          type: 'custom',
+        },
+      }),
+      findNetworkClientIdByChainId: () => 'mainnet',
+    },
   },
-};
+}));
 
 jest.mock('../../../../util/networks', () => ({
   ...jest.requireActual('../../../../util/networks'),
@@ -74,6 +84,48 @@ jest.mock('../../../../util/networks', () => ({
   isPortfolioViewEnabled: jest.fn(),
 }));
 
+jest.mock('../../Stake/hooks/usePooledStakes', () => ({
+  __esModule: true,
+  default: () => ({
+    pooledStakesData: {
+      account: '0xabc',
+      assets: '10000000000000000',
+      exitRequests: [],
+      lifetimeRewards: '100000000000000',
+    },
+    exchangeRate: 1.018,
+    hasStakedPositions: true,
+    hasEthToUnstake: true,
+    isLoadingPooledStakesData: false,
+  }),
+}));
+
+jest.mock('../../Stake/hooks/useVaultData', () => ({
+  __esModule: true,
+  default: () => ({
+    vaultData: {
+      apy: '2.437033146840025387168141592920355',
+      capacity: '1000000000000000000000000000000000000000000000000000000000000',
+      feePercent: 1500,
+      totalAssets: '10000000000000000000000',
+      vaultAddress: '0xdef',
+    },
+  }),
+}));
+
+jest.mock('../../Stake/hooks/useStakingEligibility', () => ({
+  __esModule: true,
+  default: () => ({
+    isEligible: true,
+  }),
+}));
+
+const mockInitialState = {
+  engine: {
+    backgroundState,
+  },
+};
+
 describe('Balance', () => {
   const mockStore = configureMockStore();
   const store = mockStore(mockInitialState);
@@ -131,13 +183,19 @@ describe('Balance', () => {
   });
 
   it('should not fire navigation event for native tokens', () => {
-    const { queryByTestId } = render(
+    const { queryAllByTestId } = render(
       <Provider store={store}>
-        <Balance asset={mockETH} mainBalance="100" secondaryBalance="200" />
+        <Balance asset={mockETH} mainBalance="100" secondaryBalance="200" />,
       </Provider>,
     );
-    const assetElement = queryByTestId('asset-ETH');
-    fireEvent.press(assetElement);
+
+    // Includes native ETH and staked ETH
+    const ethElements = queryAllByTestId('asset-ETH');
+
+    ethElements.forEach((ethElement) => {
+      fireEvent.press(ethElement);
+    });
+
     expect(mockNavigate).toHaveBeenCalledTimes(0);
   });
 

app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx

@@ -28,7 +28,6 @@ import Logger from '../../../../util/Logger';
 import TokenDetailsList from './TokenDetailsList';
 import MarketDetailsList from './MarketDetailsList';
 import { TokenI } from '../../Tokens/types';
-import { isPooledStakingFeatureEnabled } from '../../Stake/constants';
 import StakingEarnings from '../../Stake/components/StakingEarnings';
 import { isPortfolioViewEnabled } from '../../../../util/networks';
 
@@ -147,7 +146,7 @@ const TokenDetails: React.FC<TokenDetailsProps> = ({ asset }) => {
 
   return (
     <View style={styles.tokenDetailsContainer}>
-      {asset.isETH && isPooledStakingFeatureEnabled() && <StakingEarnings />}
+      {asset.isETH && <StakingEarnings />}
       {(asset.isETH || tokenMetadata) && (
         <TokenDetailsList tokenDetails={tokenDetails} />
       )}

app/components/UI/Stake/components/StakeButton/StakeButton.test.tsx

@@ -21,10 +21,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('../../constants', () => ({
-  isPooledStakingFeatureEnabled: jest.fn().mockReturnValue(true),
-}));
-
 jest.mock('../../../../hooks/useMetrics');
 
 (useMetrics as jest.MockedFn<typeof useMetrics>).mockReturnValue({

app/components/UI/Stake/components/StakeButton/index.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { TokenI, BrowserTab } from '../../../Tokens/types';
 import { useNavigation } from '@react-navigation/native';
-import { isPooledStakingFeatureEnabled } from '../../constants';
 import Routes from '../../../../../constants/navigation/Routes';
 import { useSelector } from 'react-redux';
 import AppConstants from '../../../../../core/AppConstants';
@@ -42,7 +41,7 @@ const StakeButtonContent = ({ asset }: StakeButtonProps) => {
 
   const onStakeButtonPress = async () => {
     const { isEligible } = await refreshPooledStakingEligibility();
-    if (isPooledStakingFeatureEnabled() && isEligible) {
+    if (isEligible) {
       navigation.navigate('StakeScreens', { screen: Routes.STAKING.STAKE });
     } else {
       const existingStakeTab = browserTabs.find((tab: BrowserTab) =>
@@ -87,9 +86,7 @@ const StakeButtonContent = ({ asset }: StakeButtonProps) => {
       <Text variant={TextVariant.BodyLGMedium}>
         {' • '}
         <Text color={TextColor.Primary} variant={TextVariant.BodyLGMedium}>
-          {isPooledStakingFeatureEnabled()
-            ? `${strings('stake.earn')} `
-            : `${strings('stake.stake')} `}
+          {`${strings('stake.earn')} `}
         </Text>
       </Text>
       <Icon

app/components/UI/Stake/components/StakingBalance/StakingBalance.tsx

@@ -166,7 +166,7 @@ const StakingBalanceContent = ({ asset }: StakingBalanceProps) => {
 
   return (
     <View>
-      {hasEthToUnstake && (
+      {hasEthToUnstake && !isLoadingPooledStakesData && (
         <AssetElement
           asset={asset}
           mainBalance={stakedBalanceETH}

app/components/UI/Stake/components/StakingEarnings/StakingEarnings.test.tsx

@@ -4,10 +4,6 @@ import renderWithProvider from '../../../../../util/test/renderWithProvider';
 import { strings } from '../../../../../../locales/i18n';
 import { mockNetworkState } from '../../../../../util/test/network';
 
-jest.mock('../../constants', () => ({
-  isPooledStakingFeatureEnabled: jest.fn().mockReturnValue(true),
-}));
-
 const mockNavigate = jest.fn();
 
 const STATE_MOCK = {

app/components/UI/Stake/components/StakingEarnings/index.tsx

@@ -15,7 +15,6 @@ import ButtonIcon, {
 } from '../../../../../component-library/components/Buttons/ButtonIcon';
 import useTooltipModal from '../../../../../components/hooks/useTooltipModal';
 import { strings } from '../../../../../../locales/i18n';
-import { isPooledStakingFeatureEnabled } from '../../../Stake/constants';
 import useStakingChain from '../../hooks/useStakingChain';
 import { StakeSDKProvider } from '../../sdk/stakeSdkProvider';
 import useStakingEarnings from '../../hooks/useStakingEarnings';
@@ -47,12 +46,7 @@ const StakingEarningsContent = () => {
 
   const { isStakingSupportedChain } = useStakingChain();
 
-  if (
-    !isPooledStakingFeatureEnabled() ||
-    !isStakingSupportedChain ||
-    !hasStakedPositions
-  )
-    return <></>;
+  if (!isStakingSupportedChain || !hasStakedPositions) return <></>;
 
   return (
     <View style={styles.stakingEarningsContainer}>

app/components/UI/Stake/constants/index.ts

@@ -1,6 +1,2 @@
-/* eslint-disable import/prefer-default-export */
-export const isPooledStakingFeatureEnabled = () =>
-  process.env.MM_POOLED_STAKING_UI_ENABLED === 'true';
-
 export const POOLED_STAKING_FAQ_URL =
   'https://support.metamask.io/metamask-portfolio/move-crypto/stake/staking-pool/';

app/components/UI/Stake/sdk/stakeSdkProvider.test.tsx

@@ -8,10 +8,6 @@ import { View } from 'react-native';
 import Text from '../../../../component-library/components/Texts/Text';
 import { MOCK_POOL_STAKING_SDK } from '../__mocks__/mockData';
 
-jest.mock('../../Stake/constants', () => ({
-  isPooledStakingFeatureEnabled: jest.fn().mockReturnValue(true),
-}));
-
 jest.mock('../../../../core/Engine', () => ({
   context: {
     NetworkController: {

app/components/UI/Tokens/index.test.tsx

@@ -236,10 +236,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('../../UI/Stake/constants', () => ({
-  isPooledStakingFeatureEnabled: jest.fn().mockReturnValue(true),
-}));
-
 jest.mock('../../UI/Stake/hooks/useStakingEligibility', () => ({
   __esModule: true,
   default: jest.fn(() => ({

app/core/Engine/Engine.ts

@@ -197,7 +197,6 @@
 import { trace } from '../../util/trace';
 import { MetricsEventBuilder } from '../Analytics/MetricsEventBuilder';
 import { JsonMap } from '../Analytics/MetaMetrics.types';
-import { isPooledStakingFeatureEnabled } from '../../components/UI/Stake/constants';
 import {
   ControllerMessenger,
   EngineState,
@@ -735,7 +734,7 @@
         assetsContractController.getStakedBalanceForChain.bind(
           assetsContractController,
         ),
-      includeStakedAssets: isPooledStakingFeatureEnabled(),
+      includeStakedAssets: true,
     });
     const permissionController = new PermissionController({
       messenger: this.controllerMessenger.getRestricted({
@@ -971,8 +970,8 @@
         disableSnaps: !isBasicFunctionalityToggleEnabled(),
       }),
       clientCryptography: {
-        pbkdf2Sha512: pbkdf2
-      }
+        pbkdf2Sha512: pbkdf2,
+      },
     });
 
     const authenticationController = new AuthenticationController.Controller({
@@ -1173,7 +1172,7 @@
 
           return Boolean(
             hasProperty(showIncomingTransactions, currentChainId) &&
-            showIncomingTransactions?.[currentHexChainId],
+              showIncomingTransactions?.[currentHexChainId],
           );
         },
         updateTransactions: true,
@@ -1302,7 +1301,9 @@
               .addProperties({
                 token_standard: 'ERC20',
                 asset_type: 'token',
-                chain_id: getDecimalChainId(getGlobalChainId(networkController)),
+                chain_id: getDecimalChainId(
+                  getGlobalChainId(networkController),
+                ),
               })
               .build(),
           ),
@@ -1518,7 +1519,7 @@
         if (
           state.networksMetadata[state.selectedNetworkClientId].status ===
             NetworkStatus.Available &&
-            getGlobalChainId(networkController) !== currentChainId
+          getGlobalChainId(networkController) !== currentChainId
         ) {
           // We should add a state or event emitter saying the provider changed
           setTimeout(() => {
@@ -1538,7 +1539,9 @@
         } catch (error) {
           console.error(
             error,
-            `Network ID not changed, current chainId: ${getGlobalChainId(networkController)}`,
+            `Network ID not changed, current chainId: ${getGlobalChainId(
+              networkController,
+            )}`,
           );
         }
       },
@@ -1780,7 +1783,7 @@
 
         const tokenBalances =
           allTokenBalances?.[selectedInternalAccount.address as Hex]?.[
-          chainId
+            chainId
           ] ?? {};
         tokens.forEach(
           (item: { address: string; balance?: string; decimals: number }) => {
@@ -1791,9 +1794,9 @@
               item.balance ||
               (item.address in tokenBalances
                 ? renderFromTokenMinimalUnit(
-                  tokenBalances[item.address as Hex],
-                  item.decimals,
-                )
+                    tokenBalances[item.address as Hex],
+                    item.decimals,
+                  )
                 : undefined);
             const tokenBalanceFiat = balanceToFiatNumber(
               // TODO: Fix this by handling or eliminating the undefined case
@@ -1868,12 +1871,12 @@
     try {
       const {
         engine: { backgroundState },
       } = store.getState();
       // TODO: Check `allNfts[currentChainId]` property instead
       // @ts-expect-error This property does not exist
       const nfts = backgroundState.NftController.nfts;
 
       const { tokenBalances } = backgroundState.TokenBalancesController;
 
       let tokenFound = false;
       tokenLoop: for (const chains of Object.values(tokenBalances)) {