Merge remote-tracking branch 'origin/main' into fix/mmmultisrp-208

Author: montelaidev

.github/workflows/check-pr-max-lines.yml

@@ -0,0 +1,12 @@
+name: "Check PR Max Lines"
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  check-pr-max-lines:
+    uses: metamask/github-tools/.github/workflows/pr-line-check.yml@main
+    with:
+      max_lines: 1000
+      ignore_patterns: '(\.lock$)'

app/components/UI/Bridge/Views/BridgeView/index.tsx

@@ -66,8 +66,7 @@ import { selectSelectedNetworkClientId } from '../../../../../selectors/networkC
 import { useMetrics, MetaMetricsEvents } from '../../../../hooks/useMetrics';
 import { BridgeToken, BridgeViewMode } from '../../types';
 import { useSwitchTokens } from '../../hooks/useSwitchTokens';
-import { parseUnits } from 'ethers/lib/utils';
-import { BigNumber } from 'ethers';
+import useIsInsufficientBalance from '../../hooks/useInsufficientBalance';
 
 export interface BridgeRouteParams {
   token?: BridgeToken;
@@ -113,7 +112,7 @@ const BridgeView = () => {
     isExpired,
     willRefresh,
   } = useBridgeQuoteData();
-  const { quoteRequest, quotesLastFetched } = useSelector(
+  const { quotesLastFetched } = useSelector(
     selectBridgeControllerState,
   );
   const { handleSwitchTokens } = useSwitchTokens();
@@ -156,13 +155,10 @@ const BridgeView = () => {
   const hasValidBridgeInputs =
     isValidSourceAmount && !!sourceToken && !!destToken;
 
-  // quoteRequest.insufficientBal is undefined for Solana quotes, so we need to manually check if the source amount is greater than the balance
-  const hasInsufficientBalance =
-    quoteRequest?.insufficientBal ||
-    (isValidSourceAmount &&
-      parseUnits(sourceAmount, sourceToken.decimals).gt(
-        latestSourceBalance?.atomicBalance ?? BigNumber.from(0),
-      ));
+  const hasInsufficientBalance = useIsInsufficientBalance({
+    amount: sourceAmount,
+    token: sourceToken,
+  });
 
   // Primary condition for keypad visibility - when input is focused or we don't have valid inputs
   const shouldDisplayKeypad =

app/components/UI/Bridge/components/TokenInputArea/index.tsx

@@ -15,7 +15,7 @@ import {
 import { renderNumber } from '../../../../../util/number';
 import { selectTokenMarketData } from '../../../../../selectors/tokenRatesController';
 import { selectNetworkConfigurations } from '../../../../../selectors/networkController';
-import { BigNumber, ethers } from 'ethers';
+import { ethers } from 'ethers';
 import { BridgeToken } from '../../types';
 import { Skeleton } from '../../../../../component-library/components/Skeleton';
 import Button, {
@@ -26,7 +26,6 @@ import Routes from '../../../../../constants/navigation/Routes';
 import { useNavigation } from '@react-navigation/native';
 import { BridgeDestNetworkSelectorRouteParams } from '../BridgeDestNetworkSelector';
 import {
-  selectBridgeControllerState,
   setDestTokenExchangeRate,
   setSourceTokenExchangeRate,
 } from '../../../../../core/redux/slices/bridge';
@@ -35,8 +34,7 @@ import { selectMultichainAssetsRates } from '../../../../../selectors/multichain
 ///: END:ONLY_INCLUDE_IF(keyring-snaps)
 import { getDisplayCurrencyValue } from '../../utils/exchange-rates';
 import { useBridgeExchangeRates } from '../../hooks/useBridgeExchangeRates';
-import { useLatestBalance } from '../../hooks/useLatestBalance';
-import { parseUnits } from 'ethers/lib/utils';
+import useIsInsufficientBalance from '../../hooks/useInsufficientBalance';
 import parseAmount from '../../../Ramp/utils/parseAmount';
 
 const MAX_DECIMALS = 5;
@@ -150,24 +148,8 @@ export const TokenInputArea = forwardRef<
     const networkConfigurationsByChainId = useSelector(
       selectNetworkConfigurations,
     );
-    const { quoteRequest } = useSelector(selectBridgeControllerState);
 
-    const latestBalance = useLatestBalance({
-      address: token?.address,
-      decimals: token?.decimals,
-      chainId: token?.chainId,
-      balance: token?.balance,
-    });
-    const isValidAmount =
-    amount !== undefined && amount !== '.' && token?.decimals;
-
-    // quoteRequest.insufficientBal is undefined for Solana quotes, so we need to manually check if the source amount is greater than the balance
-    const isInsufficientBalance =
-    quoteRequest?.insufficientBal ||
-    (isValidAmount &&
-      parseUnits(amount, token.decimals).gt(
-        latestBalance?.atomicBalance ?? BigNumber.from(0),
-      ));
+    const isInsufficientBalance = useIsInsufficientBalance({ amount, token });
 
     let nonEvmMultichainAssetRates = {};
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)

app/components/UI/Bridge/hooks/useBridgeQuoteData/index.ts

@@ -24,6 +24,7 @@ import { formatAmount } from '../../../SimulationDetails/formatAmount';
 import { BigNumber } from 'bignumber.js';
 import I18n from '../../../../../../locales/i18n';
 import useFiatFormatter from '../../../SimulationDetails/FiatDisplay/useFiatFormatter';
+import useIsInsufficientBalance from '../useInsufficientBalance';
 /**
  * Hook for getting bridge quote data without request logic
  */
@@ -46,12 +47,14 @@ export const useBridgeQuoteData = () => {
     quotesLoadingStatus,
     quotesLastFetched,
     quotesRefreshCount,
-    quoteRequest,
   } = bridgeControllerState;
 
   const refreshRate = getQuoteRefreshRate(bridgeFeatureFlags, sourceToken);
   const maxRefreshCount = bridgeFeatureFlags?.maxRefreshCount ?? 5; // Default to 5 refresh attempts
-  const { insufficientBal } = quoteRequest;
+  const insufficientBal = useIsInsufficientBalance({
+    amount: sourceAmount,
+    token: sourceToken,
+  });
 
   const willRefresh = shouldRefreshQuote(
     insufficientBal ?? false,

app/components/UI/Bridge/hooks/useBridgeQuoteData/useBridgeQuoteData.test.ts

@@ -31,6 +31,27 @@ jest.mock('@metamask/bridge-controller', () => {
   };
 });
 
+// Mock Engine context
+jest.mock('../../../../../core/Engine', () => ({
+  context: {
+    NetworkController: {
+      findNetworkClientIdByChainId: jest.fn(() => 'mainnet'),
+      getNetworkClientById: jest.fn(() => ({
+        configuration: {
+          chainId: '0x1',
+        },
+      })),
+    },
+  },
+}));
+
+// Mock getProviderByChainId
+jest.mock('../../../../../util/notifications/methods/common', () => ({
+  getProviderByChainId: jest.fn(() => ({
+    getBalance: jest.fn().mockResolvedValue('1000000000000000000'),
+  })),
+}));
+
 describe('useBridgeQuoteData', () => {
   beforeEach(() => {
     jest.clearAllMocks();

app/components/UI/Bridge/hooks/useInsufficientBalance/index.ts

@@ -0,0 +1,35 @@
+import { useSelector } from 'react-redux';
+import { selectBridgeControllerState } from '../../../../../selectors/bridgeController';
+import { useLatestBalance } from '../useLatestBalance';
+import { BigNumber } from 'ethers';
+import { parseUnits } from 'ethers/lib/utils';
+import { BridgeToken } from '../../types';
+
+interface UseIsInsufficientBalanceParams {
+  amount: string | undefined;
+  token: BridgeToken | undefined;
+}
+
+const useIsInsufficientBalance = ({ amount, token }: UseIsInsufficientBalanceParams): boolean => {
+  const { quoteRequest } = useSelector(selectBridgeControllerState);
+  const latestBalance = useLatestBalance({
+    address: token?.address,
+    decimals: token?.decimals,
+    chainId: token?.chainId,
+    balance: token?.balance,
+  });
+
+  const isValidAmount =
+    amount !== undefined && amount !== '.' && token?.decimals;
+
+  // quoteRequest.insufficientBal is undefined for Solana quotes, so we need to manually check if the source amount is greater than the balance
+  const isInsufficientBalance = quoteRequest?.insufficientBal ||
+    (isValidAmount &&
+      parseUnits(amount, token.decimals).gt(
+        latestBalance?.atomicBalance ?? BigNumber.from(0),
+      ));
+
+  return Boolean(isInsufficientBalance);
+};
+
+export default useIsInsufficientBalance;