Merge branch 'main' into universal-dev-mode-feature-flag

Author: Jwhiles

.github/workflows/build-ios-upload-to-browserstack.yml

@@ -165,8 +165,13 @@ jobs:
           WITHOUT_SRP_ERROR=""
 
           # Find the IPA files (build.yml renames them; find the single .ipa in each directory)
-          WITH_SRP_IPA=$(find artifacts/with-srp -name "*.ipa" | head -1)
-          WITHOUT_SRP_IPA=$(find artifacts/without-srp -name "*.ipa" | head -1)
+          WITH_SRP_IPA=$(find artifacts/with-srp -iname '*.ipa' -type f 2>/dev/null | head -1)
+          WITHOUT_SRP_IPA=$(find artifacts/without-srp -iname '*.ipa' -type f 2>/dev/null | head -1)
+
+          if [ -z "$WITH_SRP_IPA" ] || [ -z "$WITHOUT_SRP_IPA" ]; then
+            echo "IPA search (artifact layout debug):"
+            find artifacts/with-srp artifacts/without-srp -type f 2>/dev/null | head -80 || true
+          fi
 
           # Upload with-SRP IPA
           if [ -n "$WITH_SRP_IPA" ]; then

.github/workflows/build.yml

@@ -461,6 +461,9 @@ jobs:
       - name: Build ${{ matrix.platform }}
         timeout-minutes: 115
         env:
+          # Must match Apply build config / artifact naming so build.sh loads the same
+          # builds.yml entry (e.g. main-e2e-bs-with-srp), not generic main-e2e (sim-only).
+          BUILD_CONFIG_NAME: ${{ inputs.build_name }}
           GIT_BRANCH: ${{ inputs.source_branch || github.ref_name }}
           # React Native 0.81's ReactAndroid/build.gradle.kts requests CMake 3.30.5
           # via `System.getenv("CMAKE_VERSION") ?: "3.30.5"`. The self-hosted runner

CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.77.1]
+
+### Added
+
+- Added support for cross-chain withdrawals through MetaMask Pay in Predict for users with a Polymarket Deposit Wallet, while keeping the existing "withdrawals unavailable" sheet for users who do not have the feature enabled. (#29953)
+
+### Fixed
+
+- Fixed a bug that caused a user's first Predict deposit to fail while their Polymarket Deposit Wallet was still being registered. (#30267)
+
 ## [7.77.0]
 
 ### Added
@@ -11494,7 +11504,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.77.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.77.1...HEAD
+[7.77.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.77.0...v7.77.1
 [7.77.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.76.3...v7.77.0
 [7.76.3]: https://github.com/MetaMask/metamask-mobile/compare/v7.76.0...v7.76.3
 [7.76.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.75.1...v7.76.0

app/component-library/components-temp/SectionHeader/SectionHeader.tsx

@@ -77,7 +77,7 @@ const SectionHeader: React.FC<SectionHeaderProps> = ({
         <Icon
           testID="section-header-arrow-icon"
           name={endIconName}
-          size={IconSize.Sm}
+          size={IconSize.Md}
           color={endIconColor}
           style={tw.style('ml-1')}
         />

app/components/Nav/App/App.tsx

@@ -55,7 +55,6 @@ import ConnectionDetails from '../../../components/Views/AccountPermissions/Conn
 import { SRPQuiz } from '../../Views/Quiz';
 import { TurnOffRememberMeModal } from '../../../components/UI/TurnOffRememberMeModal';
 import AssetHideConfirmation from '../../Views/AssetHideConfirmation';
-import AssetOptions from '../../Views/AssetOptions';
 import ImportPrivateKey from '../../Views/ImportPrivateKey';
 import ImportPrivateKeySuccess from '../../Views/ImportPrivateKeySuccess';
 import ConnectQRHardware from '../../Views/ConnectQRHardware';
@@ -580,7 +579,6 @@ const RootModalFlow = (props: RootModalFlowProps) => (
       name={'AssetHideConfirmation'}
       component={AssetHideConfirmation}
     />
-    <Stack.Screen name={'AssetOptions'} component={AssetOptions} />
     <Stack.Screen name={'NftOptions'} component={NftOptions} />
     <Stack.Screen name={Routes.MODAL.UPDATE_NEEDED} component={UpdateNeeded} />
     <Stack.Screen

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

@@ -118,6 +118,7 @@ import {
   ButtonSize,
   ButtonVariants,
 } from '../../../../../component-library/components/Buttons/Button/Button.types.ts';
+import { useIsNetworkFeeUnavailable } from '../../hooks/useIsNetworkFeeUnavailable/index.ts';
 
 const SCROLL_NEAR_BOTTOM_PX = 160;
 
@@ -271,7 +272,9 @@ const BridgeViewContent = ({ latestSourceBalance }: BridgeViewContentProps) => {
     // Destination address is only needed for EVM <> Non-EVM bridges, or Non-EVM <> Non-EVM bridges (when different)
     (!hasDestinationPicker || (hasDestinationPicker && Boolean(destAddress)));
 
+  const isNetworkFeeUnavailable = useIsNetworkFeeUnavailable(activeQuote);
   const hasSufficientGas = useHasSufficientGas({ quote: activeQuote });
+  const hasInsufficientGas = !isNetworkFeeUnavailable && !hasSufficientGas;
   const hasInsufficientBalance = useIsInsufficientBalance({
     amount: sourceAmount,
     token: sourceToken,
@@ -310,18 +313,20 @@ const BridgeViewContent = ({ latestSourceBalance }: BridgeViewContentProps) => {
     (isLoading && !activeQuote) ||
     hasInsufficientBalance ||
     hasInsufficientNativeReserveError ||
+    isNetworkFeeUnavailable ||
     isSubmittingTx ||
     (isHardwareAddress && isSolanaSourced) ||
     !!blockaidError ||
-    !hasSufficientGas ||
+    hasInsufficientGas ||
     !walletAddress;
 
   useBridgeQuoteEvents({
     hasInsufficientBalance,
     hasInsufficientNativeReserveError,
     hasNoQuotesAvailable: isNoQuotesAvailable,
-    hasInsufficientGas: !hasSufficientGas,
+    hasInsufficientGas,
     hasTxAlert: Boolean(blockaidError),
+    isNetworkFeeUnavailable,
     isSubmitDisabled,
     isPriceImpactWarningVisible: shouldShowPriceImpactWarning,
   });

app/components/UI/Bridge/components/BridgeTrendingTokensSection/BridgeTrendingTokensSection.tsx

@@ -146,9 +146,9 @@ const BridgeTrendingTokensSection = ({
         testID={BridgeTrendingTokensSectionTestIds.SECTION}
       >
         <Text
-          variant={TextVariant.HeadingLg}
+          variant={TextVariant.HeadingMd}
           fontWeight={FontWeight.Bold}
-          twClassName="mb-3"
+          twClassName="mt-1 mb-3"
         >
           {strings('trending.trending_tokens')}
         </Text>

app/components/UI/Bridge/components/SwapsConfirmButton/SwapsConfirmButton.test.tsx

@@ -21,7 +21,10 @@ import { MOCK_ENTROPY_SOURCE as mockEntropySource } from '../../../../../util/te
 import { BigNumber } from 'ethers';
 import Engine from '../../../../../core/Engine';
 import { setSourceAmount } from '../../../../../core/redux/slices/bridge';
-import { MetaMetricsSwapsEventSource } from '@metamask/bridge-controller';
+import {
+  ChainId,
+  MetaMetricsSwapsEventSource,
+} from '@metamask/bridge-controller';
 import { PriceImpactModalType } from '../PriceImpactModal/constants';
 import { TokenWarningModalMode } from '../TokenWarningModal/constants';
 import { SecurityDataType } from '../../types';
@@ -133,6 +136,18 @@ const mockActiveQuote = {
   },
 };
 
+const mockBtcQuoteWithUnavailableNetworkFee = {
+  ...mockActiveQuote,
+  quote: {
+    ...mockActiveQuote.quote,
+    srcChainId: ChainId.BTC,
+  },
+  totalNetworkFee: {
+    ...mockActiveQuote.totalNetworkFee,
+    amount: '0',
+  },
+};
+
 // Mock useBridgeQuoteData
 jest.mock('../../hooks/useBridgeQuoteData', () => ({
   useBridgeQuoteData: jest
@@ -337,6 +352,30 @@ describe('SwapsConfirmButton', () => {
       expect(getByText(strings('bridge.insufficient_gas'))).toBeTruthy();
     });
 
+    it('displays "Insufficient funds" when BTC network fee is unavailable', () => {
+      jest
+        .mocked(useBridgeQuoteData as unknown as jest.Mock)
+        .mockImplementation(() => ({
+          ...mockUseBridgeQuoteData,
+          activeQuote: mockBtcQuoteWithUnavailableNetworkFee,
+        }));
+
+      const { getByText } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        {
+          state: mockState,
+        },
+      );
+
+      expect(getByText(strings('bridge.insufficient_funds'))).toBeTruthy();
+      expect(useHasSufficientGas).toHaveBeenCalledWith({
+        quote: mockBtcQuoteWithUnavailableNetworkFee,
+      });
+    });
+
     it('hides label behind loading indicator when submitting', () => {
       const submittingState = {
         ...mockState,
@@ -773,6 +812,30 @@ describe('SwapsConfirmButton', () => {
       // Label visible because not loading/submitting
       expect(getByText(strings('bridge.insufficient_gas'))).toBeTruthy();
     });
+
+    it('does not show loading when disabled due to unavailable BTC network fee', () => {
+      jest
+        .mocked(useBridgeQuoteData as unknown as jest.Mock)
+        .mockImplementation(() => ({
+          ...mockUseBridgeQuoteData,
+          activeQuote: mockBtcQuoteWithUnavailableNetworkFee,
+        }));
+
+      const { getByText, getByTestId, queryByTestId } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        {
+          state: mockState,
+        },
+      );
+
+      const button = getByTestId(BridgeViewSelectorsIDs.CONFIRM_BUTTON);
+      expect(button.props.accessibilityState?.disabled).toBe(true);
+      expect(queryByTestId('spinner-container')).toBeNull();
+      expect(getByText(strings('bridge.insufficient_funds'))).toBeTruthy();
+    });
   });
 
   describe('Stale Quote (isQuoteStale)', () => {
@@ -868,6 +931,33 @@ describe('SwapsConfirmButton', () => {
       ).toBeTruthy();
     });
 
+    it('keeps "Get new quote" enabled when BTC network fee is unavailable', () => {
+      jest
+        .mocked(useBridgeQuoteData as unknown as jest.Mock)
+        .mockImplementation(() => ({
+          ...mockUseBridgeQuoteData,
+          activeQuote: mockBtcQuoteWithUnavailableNetworkFee,
+          needsNewQuote: true,
+          isLoading: false,
+        }));
+
+      const { getByText, getByTestId } = renderWithProvider(
+        <SwapsConfirmButton
+          latestSourceBalance={mockLatestSourceBalance}
+          location={MetaMetricsSwapsEventSource.MainView}
+        />,
+        {
+          state: mockState,
+        },
+      );
+
+      const button = getByTestId(BridgeViewSelectorsIDs.CONFIRM_BUTTON);
+      expect(button.props.accessibilityState?.disabled).toBe(false);
+      expect(
+        getByText(strings('quote_expired_modal.get_new_quote')),
+      ).toBeTruthy();
+    });
+
     it('button is not disabled when quote is expired', () => {
       jest
         .mocked(useBridgeQuoteData as unknown as jest.Mock)

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

@@ -40,6 +40,7 @@ import type { TokenWarningModalParams } from '../TokenWarningModal';
 import { TokenWarningModalMode } from '../TokenWarningModal/constants';
 import type { TransactionActiveAbTestEntry } from '../../../../../util/transactions/transaction-active-ab-test-attribution-registry';
 import { useInsufficientNativeReserveError } from '../../hooks/useInsufficientNativeReserveError';
+import { useIsNetworkFeeUnavailable } from '../../hooks/useIsNetworkFeeUnavailable';
 
 interface Props {
   latestSourceBalance: ReturnType<typeof useLatestBalance>;
@@ -105,7 +106,9 @@ export const SwapsConfirmButton = ({
     transactionActiveAbTests,
   });
 
+  const isNetworkFeeUnavailable = useIsNetworkFeeUnavailable(activeQuote);
   const hasSufficientGas = useHasSufficientGas({ quote: activeQuote });
+  const hasInsufficientGas = !isNetworkFeeUnavailable && !hasSufficientGas;
 
   // Check both the display amount and the atomic amount are non-zero.
   // An amount like 0.000000001 BTC (8 decimals) is non-zero as a number but
@@ -166,10 +169,11 @@ export const SwapsConfirmButton = ({
     (isLoading && !activeQuote) ||
     hasInsufficientBalance ||
     hasInsufficientNativeReserveError ||
+    isNetworkFeeUnavailable ||
     isSubmittingTx ||
     (isHardwareAddress && isSolanaSourced) ||
     hasError ||
-    !hasSufficientGas ||
+    hasInsufficientGas ||
     !walletAddress;
 
   const handleContinue = async () => {
@@ -248,9 +252,13 @@ export const SwapsConfirmButton = ({
       return strings('bridge.confirm_swap');
     }
 
-    if (hasInsufficientBalance || hasInsufficientNativeReserveError)
+    if (
+      hasInsufficientBalance ||
+      hasInsufficientNativeReserveError ||
+      isNetworkFeeUnavailable
+    )
       return strings('bridge.insufficient_funds');
-    if (!hasSufficientGas) return strings('bridge.insufficient_gas');
+    if (hasInsufficientGas) return strings('bridge.insufficient_gas');
     if (isSubmittingTx) return strings('bridge.submitting_transaction');
 
     return strings('bridge.confirm_swap');
@@ -260,7 +268,8 @@ export const SwapsConfirmButton = ({
     sourceAmount,
     hasInsufficientBalance,
     hasInsufficientNativeReserveError,
-    hasSufficientGas,
+    isNetworkFeeUnavailable,
+    hasInsufficientGas,
     isSubmittingTx,
     needsNewQuote,
   ]);

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

@@ -22,6 +22,7 @@ export const useBridgeQuoteEvents = ({
   hasInsufficientNativeReserveError,
   hasNoQuotesAvailable,
   hasInsufficientGas,
+  isNetworkFeeUnavailable,
   hasTxAlert,
   isSubmitDisabled,
   isPriceImpactWarningVisible,
@@ -30,6 +31,7 @@ export const useBridgeQuoteEvents = ({
   hasInsufficientNativeReserveError: boolean;
   hasNoQuotesAvailable: boolean;
   hasInsufficientGas: boolean;
+  isNetworkFeeUnavailable: boolean;
   hasTxAlert: boolean;
   isSubmitDisabled: boolean;
   isPriceImpactWarningVisible: boolean;
@@ -47,8 +49,11 @@ export const useBridgeQuoteEvents = ({
     const latestWarnings: QuoteWarning[] = [];
 
     hasNoQuotesAvailable && latestWarnings.push('no_quotes');
-    hasInsufficientGas &&
+    if (isNetworkFeeUnavailable) {
+      latestWarnings.push('network_fee_unavailable' as QuoteWarning);
+    } else if (hasInsufficientGas) {
       latestWarnings.push('insufficient_gas_for_selected_quote');
+    }
     hasInsufficientBalance && latestWarnings.push('insufficient_balance');
     hasInsufficientNativeReserveError &&
       // @ts-expect-error - 'insufficient_native_reserve' is a valid QuoteWarning
@@ -60,6 +65,7 @@ export const useBridgeQuoteEvents = ({
   }, [
     hasNoQuotesAvailable,
     hasInsufficientGas,
+    isNetworkFeeUnavailable,
     hasInsufficientBalance,
     hasInsufficientNativeReserveError,
     hasTxAlert,