Merge branch 'main' into fix/qr-connect-view

Author: montelaidev

CHANGELOG.md

@@ -7,9 +7,56 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.76.0]
+
+### Added
+
+- Added the Tempo chain to the additional networks list. (#29515)
+- Added security trust badges in the token list. (#29509)
+- Added a new "Add money" bottom sheet to the Money Account homepage with Convert crypto, Deposit funds, Move mUSD, and Receive from external wallet options. (#29336)
+- Added a developer options button to clear dismissed mUSD conversion asset details CTAs. (#29510)
+- Added a quickbuy smart default. (#29472)
+- Added SOL as a "Pay with" option on Quickbuy. (#29424)
+- Added a transaction fees expandable section to Quickbuy. (#29321)
+- Added a General Settings toggle for haptic feedback and centralized in-app haptics behind a single module, with an optional remote kill switch. (#28975)
+- Added haptic feedback across Top Traders surfaces (Follow, Buy, notification preferences, per-trader notifications). (#29467)
+- Added support for additional sports market types (spreads, totals, halftime result, exact score, player props) on prediction market event detail screens. (#29216)
+- Added inline error banners in the Predict buy bottom sheet for price-changed and order-failed scenarios, replacing the secondary retry sheet and failure toast when the predictBottomSheet flag is enabled. (#29184)
+- Added a Quickbuy half sheet. (#28863)
+- Added a warning flow in bridge quotes when token price data is unavailable. (#29250)
+
 ### Changed
 
-- Aligned previously base-enabled custom network logos (Stable, Flow, XDC, Fraxtal, Hemi, Plasma, Lukso, Rootstock, MSU, Lens, Plume) to a square format consistent with Popular networks (#29943)
+- Enabled Suspicious and Malicious security badges on tokens in the Swaps/Bridge asset picker. (#29570)
+- Updated the description under the "Smart account requests from dapps" setting to clarify that MetaMask will only upgrade to our audited smart account. (#29211)
+- Updated Predict confirmations to display pUSD as the Predict token. (#29450)
+- Updated the token details security trust designs. (#29230)
+- Polished the social leaderboard with podium decorations on the top 3 traders, a tighter loading skeleton, and a chain icon overlay on token avatars in the trader position and quick buy views. (#29408)
+- QR wallet now shares the signing flow with Ledger. (#29087)
+- In-app browser sessions opened from MetaMask Card (manage card and travel) now return to Card Home on close instead of the Explore tab. (#29218)
+- Updated the Bridge/Swaps token warning modal to match the new design and fixed swapped warning/malicious icons in the token selector. (#29197)
+- Updated the account selector to use the full-page list for all users and removed the dropdown arrow from the wallet account picker. (#28701)
+- Refined section and header styles for Perps. (#29009)
+- Refined explore page design patterns. (#29396)
+- Adjusted spacing for money activity filters. (#29463)
+
+### Fixed
+
+- Fixed a bug where the -1%/-2% limit price preset buttons only applied on the first press. (#29373)
+- Fixed Card Home flickering during refresh and kept Add funds available for frozen cards. (#29513)
+- Fixed a bug that caused the MetaMask Card spending limit screen to default to full access when a custom limit was already set. (#29517)
+- Fixed cashback redemption to require an approved Linea funding source. (#29489)
+- Fixed UB2 Transak order details to hide interim provider messages during processing states. (#29131)
+- Fixed a bug where a stale secondary minimum purchase message could briefly appear after entering a valid buy amount. (#29365)
+- Fixed a bug that caused live Predict sports scores to appear in reverse order for some leagues. (#29453)
+- Fixed Ledger BLE transport that prevented reconnecting to a Ledger device after a timeout or completed signing flow. (#29367)
+- Fixed chart re-rendering and flickering. (#29344)
+- Fixed excessive red flashing while entering buy amounts near minimum and maximum provider limits. (#29360)
+- Fixed stale unauthenticated MetaMask Card data after login by refetching when card feature flags change. (#29350)
+- Prevented invalid bridge transaction hashes from being persisted in transaction history. (#29136)
+- Fixed WalletConnect sign requests occasionally displaying a garbled string in the "Request from" field instead of the dapp's domain. (#29102)
+- Fixed Perps Withdraw Max so users actually withdraw their full HyperLiquid balance; replaced 90% with a Max button and aligned Perps home and Withdraw to show the same balance. (#29257)
+- Hid the sponsored label on cross-chain bridge with insufficient balance. (#29490)
 
 ## [7.75.1]
 
@@ -11375,7 +11422,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#957](https://github.com/MetaMask/metamask-mobile/pull/957): fix timeouts (#957)
 - [#954](https://github.com/MetaMask/metamask-mobile/pull/954): Bugfix: onboarding navigation (#954)
 
-[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.75.1...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.76.0...HEAD
+[7.76.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.75.1...v7.76.0
 [7.75.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.75.0...v7.75.1
 [7.75.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.74.3...v7.75.0
 [7.74.3]: https://github.com/MetaMask/metamask-mobile/compare/v7.74.2...v7.74.3

app/components/UI/Perps/adapters/mobileInfrastructure.test.ts

@@ -215,12 +215,14 @@ describe('createMobileInfrastructure', () => {
       const caipAccountId =
         'eip155:42161:0x1234' as `${string}:${string}:${string}`;
 
-      const result =
-        await infra.rewards.getPerpsDiscountForAccount(caipAccountId);
+      const result = await infra.rewards.getPerpsDiscountForAccount(
+        caipAccountId,
+        10,
+      );
 
       expect(
         Engine.context.RewardsController.getPerpsDiscountForAccount,
-      ).toHaveBeenCalledWith(caipAccountId);
+      ).toHaveBeenCalledWith(caipAccountId, 10);
       expect(result).toBe(5);
     });
   });

app/components/UI/Perps/adapters/mobileInfrastructure.ts

@@ -302,9 +302,11 @@ export function createMobileInfrastructure(): PerpsPlatformDependencies {
     rewards: {
       getPerpsDiscountForAccount(
         caipAccountId: `${string}:${string}:${string}`,
+        baseFeeBips: number,
       ) {
         return Engine.context.RewardsController.getPerpsDiscountForAccount(
           caipAccountId,
+          baseFeeBips,
         );
       },
     },

app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.test.ts

@@ -490,6 +490,47 @@ describe('usePerpsCloseAllCalculations', () => {
       expect(result.current.avgFeeDiscountPercentage).toBe(65);
     });
 
+    it('does not apply a discount and allows retry when controller returns null (unhydrated)', async () => {
+      // Arrange: subscription state not hydrated yet
+      mockGetPerpsDiscount.mockResolvedValue(null);
+
+      const positions = [createMockPosition({ symbol: 'BTC' })];
+      const priceData = { BTC: { price: '51000' } };
+
+      mockCalculateFees.mockResolvedValue(
+        createMockFeeResult({
+          feeAmount: 275,
+          metamaskFeeRate: 0.01,
+          metamaskFeeAmount: 250,
+          protocolFeeRate: 0.001,
+          protocolFeeAmount: 25,
+        }),
+      );
+
+      // Act
+      const { result, rerender } = renderHook(
+        ({ pos }: { pos: Position[] }) =>
+          usePerpsCloseAllCalculations({ positions: pos, priceData }),
+        { initialProps: { pos: positions } },
+      );
+
+      await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+      // No discount applied; original rate matches base rate
+      expect(result.current.avgFeeDiscountPercentage).toBeUndefined();
+      expect(result.current.avgMetamaskFeeRate).toBeCloseTo(0.01, 4);
+      expect(result.current.totalFees).toBe(275);
+
+      // Hydration completes and a positions change retries the fetch
+      mockGetPerpsDiscount.mockResolvedValueOnce(6500);
+      rerender({ pos: [...positions] });
+
+      await waitFor(() =>
+        expect(result.current.avgFeeDiscountPercentage).toBe(65),
+      );
+      expect(mockGetPerpsDiscount).toHaveBeenCalledTimes(2);
+    });
+
     it('handles discount fetch errors gracefully', async () => {
       // Arrange: Discount API fails
       mockGetPerpsDiscount.mockRejectedValue(new Error('API error'));

app/components/UI/Perps/hooks/usePerpsCloseAllCalculations.ts

@@ -1,6 +1,8 @@
 import { useMemo, useState, useEffect, useRef } from 'react';
 import { useSelector } from 'react-redux';
 import {
+  BASIS_POINTS_DIVISOR,
+  BUILDER_FEE_CONFIG,
   formatAccountToCaipAccountId,
   type Position,
   type FeeCalculationResult,
@@ -12,6 +14,7 @@ import type {
 import Engine from '../../../../core/Engine';
 import { selectSelectedAccountGroupEvmInternalAccount } from '../../../../selectors/multichainAccounts/accountTreeController';
 import { selectChainId } from '../../../../selectors/networkController';
+import { DevLogger } from '../../../../core/SDKConnect/utils/DevLogger';
 
 /**
  * Aggregated calculations result for closing all positions
@@ -105,6 +108,9 @@ export function usePerpsCloseAllCalculations({
   const isComponentMountedRef = useRef(true);
   const discountFetchCounterRef = useRef(0);
   const calculationCounterRef = useRef(0);
+  // Tracks the account the freeze was set for, so position changes don't
+  // spuriously reset it but account switches do.
+  const discountAccountKeyRef = useRef<string | undefined>(undefined);
 
   // State for per-position calculations
   const [perPositionResults, setPerPositionResults] = useState<
@@ -143,12 +149,19 @@ export function usePerpsCloseAllCalculations({
   );
 
   // Fetch account-level fee discount (applies uniformly to all positions)
-  // Freeze mechanism prevents refetching when only positions change
+  // Freeze mechanism prevents refetching once we have a hydrated answer.
+  // Positions are included in deps so an unhydrated result (null) gets a
+  // retry on the next positions change instead of locking in no-discount.
   useEffect(() => {
     // Increment counter to invalidate any in-flight requests
     const currentFetchId = ++discountFetchCounterRef.current;
-    // Reset freeze when account changes (allow refetch for new account)
-    hasValidDiscountRef.current = false;
+    // Only reset freeze when the account actually changes — keep it across
+    // positions changes so a successful fetch isn't re-run on every tick.
+    const accountKey = `${selectedAddress ?? ''}-${currentChainId ?? ''}`;
+    if (discountAccountKeyRef.current !== accountKey) {
+      hasValidDiscountRef.current = false;
+      discountAccountKeyRef.current = accountKey;
+    }
 
     async function fetchFeeDiscount() {
       // Skip if already have valid discount for this account (freeze guard)
@@ -188,15 +201,28 @@ export function usePerpsCloseAllCalculations({
         const discountBips =
           await Engine.context.RewardsController.getPerpsDiscountForAccount(
             caipAccountId,
+            BUILDER_FEE_CONFIG.MaxFeeDecimal * BASIS_POINTS_DIVISOR,
           );
 
         // Only update state if this is still the latest fetch and component is mounted
         if (
           discountFetchCounterRef.current === currentFetchId &&
           isComponentMountedRef.current
         ) {
-          setFeeDiscountBips(discountBips);
-          hasValidDiscountRef.current = true;
+          if (discountBips === null) {
+            // Subscription state hasn't hydrated yet — don't cache the
+            // no-discount value. Freeze stays off so the next positions
+            // change retries the fetch.
+            DevLogger.log(
+              'Rewards: fee discount unhydrated for close-all flow, will retry on next positions change',
+              { selectedAddress, currentChainId },
+            );
+            setFeeDiscountBips(0);
+            hasValidDiscountRef.current = false;
+          } else {
+            setFeeDiscountBips(discountBips);
+            hasValidDiscountRef.current = true;
+          }
         }
       } catch (error) {
         console.warn('Failed to fetch fee discount:', error);
@@ -214,7 +240,7 @@ export function usePerpsCloseAllCalculations({
     fetchFeeDiscount().catch((error) => {
       console.error('Unhandled error in fetchFeeDiscount:', error);
     });
-  }, [selectedAddress, currentChainId]);
+  }, [selectedAddress, currentChainId, positions]);
 
   // Per-position fee and rewards calculation
   // This ensures accurate coin-specific rewards calculation

app/components/UI/Perps/hooks/usePerpsOrderFees.test.ts

@@ -497,6 +497,38 @@ describe('usePerpsOrderFees', () => {
       expect(result.current.originalMetamaskFeeRate).toBe(0.01);
       // The hook should apply discount internally
     });
+
+    it('does not apply a discount when controller returns null discountBips', async () => {
+      mockEngineContext.RewardsController.getPerpsDiscountForAccount.mockResolvedValueOnce(
+        null,
+      );
+
+      const mockFeeResult: FeeCalculationResult = {
+        feeRate: 0.01045,
+        feeAmount: 1045,
+        protocolFeeRate: 0.00045,
+        metamaskFeeRate: 0.01,
+      };
+      mockCalculateFees.mockResolvedValue(mockFeeResult);
+
+      const { result } = renderHook(
+        () =>
+          usePerpsOrderFees({
+            orderType: 'market',
+            amount: '100000',
+          }),
+        { wrapper: createWrapper() },
+      );
+
+      await waitFor(() => {
+        expect(result.current.isLoadingMetamaskFee).toBe(false);
+      });
+
+      expect(result.current.feeDiscountPercentage).toBeUndefined();
+      expect(result.current.metamaskFeeRate).toBe(0.01);
+      expect(result.current.originalMetamaskFeeRate).toBe(0.01);
+      expect(result.current.metamaskFee).toBe(1000); // 100000 * 0.01, undiscounted
+    });
   });
 
   describe('Loading states', () => {

app/components/UI/Perps/hooks/usePerpsOrderFees.ts

@@ -12,6 +12,8 @@ import {
   EstimatedPointsDto,
 } from '../../../../core/Engine/controllers/rewards-controller/types';
 import {
+  BASIS_POINTS_DIVISOR,
+  BUILDER_FEE_CONFIG,
   PerpsMeasurementName,
   PERFORMANCE_CONFIG,
   formatAccountToCaipAccountId,
@@ -182,8 +184,17 @@ export function usePerpsOrderFees({
 
         const { RewardsController } = Engine.context;
         const feeDiscountStartTime = performance.now();
-        const discountBips =
-          await RewardsController.getPerpsDiscountForAccount(caipAccountId);
+        const discountBips = await RewardsController.getPerpsDiscountForAccount(
+          caipAccountId,
+          BUILDER_FEE_CONFIG.MaxFeeDecimal * BASIS_POINTS_DIVISOR,
+        );
+        if (discountBips === null) {
+          DevLogger.log('Rewards: No fee discount available', {
+            address,
+            caipAccountId,
+          });
+          return { discountBips: undefined };
+        }
         const feeDiscountDuration = performance.now() - feeDiscountStartTime;
 
         // Measure fee discount API call performance

app/components/Views/Homepage/Sections/DeFi/DeFiSection.tsx

@@ -126,9 +126,9 @@ const DeFiSection = forwardRef<SectionRefreshHandle, DeFiSectionProps>(
 
     useSectionPerformance({
       sectionId: HomeSectionNames.DEFI,
-      // Align with other sections: loading finished without error = ready (empty is success + content_state empty).
-      contentReady: !isLoading && !hasError,
-      isEmpty: isEmpty || hasError,
+      contentReady: !isLoading,
+      isEmpty: isEmpty && !hasError,
+      contentStateForTrace: hasError ? 'error' : undefined,
       isLoading,
       enabled: isDeFiEnabled,
     });

app/components/Views/Homepage/Sections/Perpetuals/PerpsSection.tsx

@@ -412,9 +412,10 @@ const PerpsSectionMain = forwardRef<SectionRefreshHandle, PerpsSectionProps>(
     });
 
     useSectionPerformance({
-      sectionId: HomeSectionNames.PERPS,
-      contentReady: !isLoadingSection && !connectionError,
+      sectionId: analyticsName,
+      contentReady: !isLoadingSection,
       isEmpty: !hasItems,
+      contentStateForTrace: connectionError ? 'error' : undefined,
       isLoading: isLoadingSection,
     });
 

app/components/Views/Homepage/Sections/Predictions/PredictionsSection.tsx

@@ -454,7 +454,25 @@ const PredictionsSectionDefault = forwardRef<
       (positionsError || marketsError);
     const isEmpty =
       !isLoading && !hasAnyPositions && markets.length === 0 && !hasError;
-    const willRender = isPredictEnabled && !isLoading && !isEmpty && !hasError;
+    const showTrendingAbove =
+      !hasPositions &&
+      !isLoadingPositions &&
+      (isLoadingMarkets || markets.length > 0);
+    const inPositionsLayout =
+      hasAnyPositions || isLoadingPositions || isLoadingClaimable;
+    /** TTC: no Predict position-row or market-card skeleton; claimable / other fetch may continue. */
+    const predictTimeToContentReady = Boolean(
+      isPredictEnabled &&
+        (hasError ||
+          (inPositionsLayout
+            ? !isLoadingPositions && (hasPositions || !isLoadingMarkets)
+            : !isLoadingMarkets)),
+    );
+    const willRender =
+      isPredictEnabled &&
+      !hasError &&
+      !isLoading &&
+      (hasAnyPositions || markets.length > 0);
     const itemCount = hasPositions
       ? positions.length
       : hasClaimablePositions
@@ -472,9 +490,10 @@ const PredictionsSectionDefault = forwardRef<
     });
 
     useSectionPerformance({
-      sectionId: HomeSectionNames.PREDICT,
-      contentReady: willRender,
-      isEmpty: isEmpty || !!hasError,
+      sectionId: analyticsName,
+      contentReady: predictTimeToContentReady,
+      isEmpty: isEmpty && !hasError,
+      contentStateForTrace: hasError ? 'error' : undefined,
       isLoading,
       enabled: isPredictEnabled,
     });
@@ -495,11 +514,6 @@ const PredictionsSectionDefault = forwardRef<
     }
 
     if (hasAnyPositions || isLoadingPositions || isLoadingClaimable) {
-      const showTrendingAbove =
-        !hasPositions &&
-        !isLoadingPositions &&
-        (isLoadingMarkets || markets.length > 0);
-
       return (
         <View ref={sectionViewRef} onLayout={onLayout}>
           {showTrendingAbove && (