Merge branch 'main' into price-alerts-price-percent

Author: bergarces

.eslintrc.js

@@ -93,15 +93,12 @@ const utilNumberImportBurndownFiles = [
   'app/components/UI/Stake/hooks/useBalance.ts',
   'app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.test.ts',
   'app/components/UI/Tokens/util/deriveBalanceFromAssetMarketDetails.ts',
-  'app/components/UI/TransactionElement/utils-gas.js',
-  'app/components/UI/TransactionElement/utils.js',
   'app/components/UI/UrlAutocomplete/Result.tsx',
   'app/components/Views/GasEducationCarousel/index.js',
   'app/components/Views/NetworksManagement/NetworkDetailsView/hooks/useNetworkValidation.ts',
   'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyBottomSheet.ts',
   'app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuyBottomSheet/useQuickBuyQuotes.ts',
   'app/components/Views/SocialLeaderboard/utils/formatters.ts',
-  'app/components/Views/UnifiedTransactionsView/useUnifiedTxActions.test.ts',
   'app/components/Views/confirmations/components/gas/max-base-fee-input/max-base-fee-input.tsx',
   'app/components/Views/confirmations/components/gas/priority-fee-input/priority-fee-input.tsx',
   'app/components/Views/confirmations/components/info/typed-sign-v3v4/simulation/components/native-value-display/native-value-display.tsx',
@@ -133,10 +130,9 @@ const utilNumberImportBurndownFiles = [
   // `../number/bigint` (or `./number/bigint` from `app/util/`).
   'app/util/confirm-tx.js',
   'app/util/conversions.js',
-  'app/util/confirmation/gas.ts',
+
   'app/util/confirmation/transactions.ts',
   'app/util/custom-gas/index.js',
-  'app/util/networks/index.js',
   'app/util/transactions/index.js',
   'app/util/transactions/index.test.ts',
 ];

.github/workflows/run-appium-smoke-tests-android.yml

@@ -219,3 +219,27 @@ jobs:
       metamask_environment: ${{ inputs.metamask_environment }}
       runner_provider: ${{ inputs.runner_provider }}
     secrets: inherit
+
+  appium-money-android-smoke:
+    if: >-
+      ${{
+        !cancelled() &&
+        (contains(fromJson(inputs.selected_tags), 'ALL') ||
+         contains(fromJson(inputs.selected_tags), 'SmokeMoney'))
+      }}
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-appium-e2e-workflow.yml
+    with:
+      test-suite-name: appium-money-android-smoke-${{ matrix.split }}
+      platform: android
+      test_suite_tag: SmokeMoney
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      test-timeout-minutes: 60
+      build_type: ${{ inputs.build_type }}
+      metamask_environment: ${{ inputs.metamask_environment }}
+      runner_provider: ${{ inputs.runner_provider }}
+    secrets: inherit

.github/workflows/run-appium-smoke-tests-ios.yml

@@ -198,3 +198,27 @@ jobs:
       metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
       runner_provider: ${{ inputs.runner_provider || 'current' }}
     secrets: inherit
+
+  appium-money-ios-smoke:
+    if: >-
+      ${{
+        !cancelled() &&
+        (contains(fromJson(inputs.selected_tags || '["ALL"]'), 'ALL') ||
+         contains(fromJson(inputs.selected_tags || '["ALL"]'), 'SmokeMoney'))
+      }}
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
+    uses: ./.github/workflows/run-appium-e2e-workflow.yml
+    with:
+      test-suite-name: appium-money-ios-smoke-${{ matrix.split }}
+      platform: ios
+      test_suite_tag: SmokeMoney
+      split_number: ${{ matrix.split }}
+      total_splits: 1
+      test-timeout-minutes: 60
+      build_type: ${{ inputs.build_type || 'main' }}
+      metamask_environment: ${{ inputs.metamask_environment || 'e2e' }}
+      runner_provider: ${{ inputs.runner_provider || 'current' }}
+    secrets: inherit

app/components/UI/ActionModal/index.js

@@ -14,6 +14,11 @@ const styles = StyleSheet.create({
 });
 
 /**
+ * @deprecated Please update your code to use `BottomSheet` from `@metamask/design-system-react-native`.
+ * The API may have changed — compare props before migrating.
+ * @see {@link https://github.com/MetaMask/metamask-design-system/blob/main/packages/design-system-react-native/src/components/BottomSheet/README.md}
+ * @since @metamask/design-system-react-native@0.11.0
+ *
  * View that renders an action modal
  *
  * @param {object} props

app/components/UI/Bridge/utils/transaction-history.ts

@@ -16,13 +16,15 @@ import { TransactionMeta } from '@metamask/transaction-controller';
 import { TRANSACTION_TYPES } from '../../../../util/transactions';
 import { calculateTotalGas } from '../../TransactionElement/utils-gas';
 import {
-  renderFromWei,
   addCurrencySymbol,
   balanceToFiatNumber,
-  weiToFiatNumber,
-  weiToFiat,
   formatAmountWithThreshold,
 } from '../../../../util/number';
+import {
+  renderFromWei,
+  weiToFiatNumber,
+  weiToFiat,
+} from '../../../../util/number/bigint';
 import { Hex } from '@metamask/utils';
 import { ethers } from 'ethers';
 import { toFormattedAddress } from '../../../../util/address';
@@ -229,7 +231,11 @@ export const decodeSwapsTx = (args: {
             sourceAmountFiatNumber,
             currentCurrency,
           ),
-          summaryFee: weiToFiat(totalGas, conversionRate, currentCurrency),
+          summaryFee: weiToFiat(
+            totalGas,
+            conversionRate,
+            currentCurrency as Parameters<typeof weiToFiat>[2],
+          ),
           summaryTotalAmount: summaryTotalAmountNativeTokenFiat,
           summarySecondaryTotalAmount: summaryTotalAmountNativeToken,
         };

app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.test.tsx

@@ -2691,8 +2691,6 @@ describe('MoneyHomeView', () => {
     } as unknown as ReturnType<typeof useMoneyAccountCardLinkage>;
 
     // EUR/ETH = 900, USD/ETH = 1000 -> fiat->USD factor is 1000/900 = 10/9.
-    // 90 EUR raw fiat converts to exactly 100 USD, proving the conversion (not
-    // a pass-through of balanceFiat) drives the rendered value.
     const eurCurrencyRatesState = {
       engine: {
         backgroundState: {
@@ -2716,14 +2714,37 @@ describe('MoneyHomeView', () => {
       );
     });
 
-    it('converts the primary token raw fiat number from the preferred currency to USD', () => {
+    it('converts a non-Money primary token raw fiat number to USD', () => {
       mockSelectIsCardholder.mockReturnValue(true);
       mockUseMoneyAccountCardLinkage.mockReturnValue(linkedCardLinkage);
       mockUseCardHomeData.mockReturnValue({
         ...baseCardHomeData,
         primaryToken: {
           balanceFiat: '€90.00',
           rawFiatNumber: 90,
+          isMoneyAccountEntry: false,
+        } as unknown as ReturnType<
+          typeof useMoneyAccountCardLinkage
+        >['primaryMoneyAccount'],
+      });
+
+      const { getByTestId } = renderWithProvider(<MoneyHomeView />, {
+        state: eurCurrencyRatesState,
+      });
+
+      expect(
+        getByTestId(MoneyMetaMaskCardTestIds.MANAGE_BALANCE),
+      ).toHaveTextContent('$100.00');
+    });
+
+    it('renders the Money Account USD raw fiat number without reconverting it', () => {
+      mockSelectIsCardholder.mockReturnValue(true);
+      mockUseMoneyAccountCardLinkage.mockReturnValue(linkedCardLinkage);
+      mockUseCardHomeData.mockReturnValue({
+        ...baseCardHomeData,
+        primaryToken: {
+          balanceFiat: '$100.00',
+          rawFiatNumber: 100,
           isMoneyAccountEntry: true,
         } as unknown as ReturnType<
           typeof useMoneyAccountCardLinkage
@@ -2754,15 +2775,13 @@ describe('MoneyHomeView', () => {
       ).toHaveTextContent('$0.00');
     });
 
-    it('falls back to formatted zero when the fiat→USD rate is unavailable', () => {
-      // rawFiatNumber is present, but currency rates haven't loaded — must not
-      // render an unconverted (wrong-currency) balance.
+    it('renders the Money Account USD balance when currency rates are unavailable', () => {
       mockSelectIsCardholder.mockReturnValue(true);
       mockUseMoneyAccountCardLinkage.mockReturnValue(linkedCardLinkage);
       mockUseCardHomeData.mockReturnValue({
         ...baseCardHomeData,
         primaryToken: {
-          balanceFiat: '€90.00',
+          balanceFiat: '$90.00',
           rawFiatNumber: 90,
           isMoneyAccountEntry: true,
         } as unknown as ReturnType<
@@ -2774,7 +2793,7 @@ describe('MoneyHomeView', () => {
 
       expect(
         getByTestId(MoneyMetaMaskCardTestIds.MANAGE_BALANCE),
-      ).toHaveTextContent('$0.00');
+      ).toHaveTextContent('$90.00');
     });
 
     it('masks the Card manage balance when privacy mode is on', () => {

app/components/UI/Money/Views/MoneyHomeView/MoneyHomeView.tsx

@@ -660,17 +660,22 @@ const MoneyHomeView = () => {
 
   const { primaryToken: cardPrimaryToken } = useCardHomeData();
   const currencyRates = useSelector(selectCurrencyRates);
-  // The Card pipeline reports balanceFiat in the user's selected currency, but
-  // we want to show USD fiat values in this view.
+  // Money Account entries are already valued in USD. Other Card tokens report
+  // their fiat value in the user's selected currency.
   const cardBalanceUsd = useMemo(() => {
-    const usd = convertSelectedFiatToUsd(
-      cardPrimaryToken?.rawFiatNumber,
-      currencyRates,
-    );
+    const rawFiat = cardPrimaryToken?.rawFiatNumber;
+    const usd = cardPrimaryToken?.isMoneyAccountEntry
+      ? rawFiat
+      : convertSelectedFiatToUsd(rawFiat, currencyRates);
     return usd === undefined
       ? formattedZero
       : moneyFormatUsd(new BigNumber(usd));
-  }, [cardPrimaryToken?.rawFiatNumber, currencyRates, formattedZero]);
+  }, [
+    cardPrimaryToken?.isMoneyAccountEntry,
+    cardPrimaryToken?.rawFiatNumber,
+    currencyRates,
+    formattedZero,
+  ]);
 
   const cardState = deriveCardState({
     isCardholder,

app/components/UI/Predict/constants/feedConfig.ts

@@ -227,7 +227,10 @@ export const PREDICT_FEED_REGISTRY: Record<PredictFeedId, PredictFeedConfig> = {
             createAllFilter({
               status: 'open',
               order: 'volume24hr',
-              limit: 5,
+              // Fetch 10 (not the ~5 shown) so the home Trending section still
+              // fills its display cap after standalone/staleness filtering, and
+              // so the "See all" feed loads 10 per infinite-scroll page.
+              limit: 10,
             }),
           ],
           dynamic: {
@@ -236,7 +239,7 @@ export const PREDICT_FEED_REGISTRY: Record<PredictFeedId, PredictFeedConfig> = {
             baseParams: {
               status: 'open',
               order: 'volume24hr',
-              limit: 5,
+              limit: 10,
             },
           },
         },

app/components/UI/Predict/views/PredictHome/components/PredictTrendingSection/usePredictTrendingSection.test.ts

@@ -49,7 +49,10 @@ describe('usePredictTrendingSection', () => {
       expect.objectContaining({
         order: 'volume24hr',
         status: 'open',
-        limit: TRENDING_DISPLAY_LIMIT,
+        // Fetch limit is intentionally larger than the display cap so the
+        // section fills after filtering; keep it decoupled from
+        // TRENDING_DISPLAY_LIMIT.
+        limit: 10,
       }),
     );
   });

app/components/UI/Predict/views/PredictHome/components/PredictTrendingSection/usePredictTrendingSection.ts

@@ -9,6 +9,13 @@ import { usePredictMarketList } from '../../../../hooks/usePredictMarketList';
  */
 export const TRENDING_DISPLAY_LIMIT = 5;
 
+/**
+ * How many markets we fetch. Deliberately larger than {@link TRENDING_DISPLAY_LIMIT}
+ * so that after standalone/staleness filtering the home section still has enough
+ * survivors to fill its display cap. Mirrors the feed registry's trending limit.
+ */
+const TRENDING_FETCH_LIMIT = 10;
+
 /**
  * Query params derived from the feed registry so the home section and the
  * full "See all" feed share the same React Query cache key.
@@ -18,7 +25,7 @@ const TRENDING_PARAMS: PredictMarketListParams =
   resolvePredictFeedDefaultFilter('trending')?.params ?? {
     order: 'volume24hr',
     status: 'open',
-    limit: TRENDING_DISPLAY_LIMIT,
+    limit: TRENDING_FETCH_LIMIT,
   };
 
 export interface UsePredictTrendingSectionResult {