[pull] main from MetaMask:main

.github/workflows/run-e2e-regression-tests-android.yml

@@ -45,22 +45,6 @@ jobs:
       total_splits: 4
     secrets: inherit
 
-  regression-confirmations-redesigned-android:
-    name: 'Confirmations Redesigned Regression (Android) - ${{ matrix.split }}'
-    needs: [build-android-apks]
-    strategy:
-      matrix:
-        split: [1, 2]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: regression-confirmations-redesigned-android-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'RegressionConfirmationsRedesigned'
-      split_number: ${{ matrix.split }}
-      total_splits: 2
-    secrets: inherit
-
   regression-trade-android:
     name: 'Trade Regression (Android) - ${{ matrix.split }}'
     needs: [build-android-apks]
@@ -180,7 +164,6 @@ jobs:
     needs:
       - build-android-apks
       - regression-confirmations-android
-      - regression-confirmations-redesigned-android
       - regression-trade-android
       - regression-wallet-platform-android
       - regression-accounts-android

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

@@ -131,19 +131,19 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
-  confirmations-redesigned-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeConfirmationsRedesigned')
+  confirmations-android-smoke:
+    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeConfirmations')
     strategy:
       matrix:
-        split: [1, 2, 3]
+        split: [1, 2, 3, 4]
       fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: confirmations-redesigned-android-smoke-${{ matrix.split }}
+      test-suite-name: confirmations-android-smoke-${{ matrix.split }}
       platform: android
-      test_suite_tag: 'SmokeConfirmationsRedesigned'
+      test_suite_tag: 'SmokeConfirmations'
       split_number: ${{ matrix.split }}
-      total_splits: 3
+      total_splits: 4
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
@@ -163,22 +163,6 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
-  rewards-android-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeRewards')
-    strategy:
-      matrix:
-        split: [1]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: rewards-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokeRewards'
-      split_number: ${{ matrix.split }}
-      total_splits: 1
-      changed_files: ${{ inputs.changed_files }}
-    secrets: inherit
-
   card-android-smoke:
     if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeCard')
     strategy:
@@ -239,9 +223,8 @@ jobs:
       - accounts-android-smoke
       - network-abstraction-android-smoke
       - network-expansion-android-smoke
-      - confirmations-redesigned-android-smoke
+      - confirmations-android-smoke
       - prediction-market-android-smoke
-      - rewards-android-smoke
       - card-android-smoke
       - ramps-android-smoke
       - multichain-api-android-smoke

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

@@ -19,19 +19,19 @@ permissions:
   id-token: write
 
 jobs:
-  confirmations-redesigned-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeConfirmationsRedesigned')
+  confirmations-ios-smoke:
+    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeConfirmations')
     strategy:
       matrix:
-        split: [1, 2, 3]
+        split: [1, 2, 3, 4]
       fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: confirmations-redesigned-ios-smoke-${{ matrix.split }}
+      test-suite-name: confirmations-ios-smoke-${{ matrix.split }}
       platform: ios
-      test_suite_tag: 'SmokeConfirmationsRedesigned'
+      test_suite_tag: 'SmokeConfirmations'
       split_number: ${{ matrix.split }}
-      total_splits: 3
+      total_splits: 4
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
@@ -163,22 +163,6 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
-  rewards-ios-smoke:
-    if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeRewards')
-    strategy:
-      matrix:
-        split: [1]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: rewards-ios-smoke-${{ matrix.split }}
-      platform: ios
-      test_suite_tag: 'SmokeRewards'
-      split_number: ${{ matrix.split }}
-      total_splits: 1
-      changed_files: ${{ inputs.changed_files }}
-    secrets: inherit
-
   card-ios-smoke:
     if: contains(fromJson(inputs.selected_tags), 'ALL') || contains(fromJson(inputs.selected_tags), 'SmokeCard')
     strategy:
@@ -232,7 +216,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !cancelled() && inputs.selected_tags != '[]' && inputs.selected_tags != '["FlaskBuildTests"]' }}
     needs:
-      - confirmations-redesigned-ios-smoke
+      - confirmations-ios-smoke
       - trade-ios-smoke
       - perps-ios-smoke
       - wallet-platform-ios-smoke
@@ -241,7 +225,6 @@ jobs:
       - network-abstraction-ios-smoke
       - network-expansion-ios-smoke
       - prediction-market-ios-smoke
-      - rewards-ios-smoke
       - card-ios-smoke
       - ramps-ios-smoke
       - multichain-api-ios-smoke

app/component-library/components-temp/MultichainAccounts/MultichainAccountSelectorList/MultichainAccountSelectorList.styles.ts

@@ -33,7 +33,7 @@ const createStyles = (params: {
     searchTextField: {
       backgroundColor: theme.colors.background.muted,
       borderWidth: 0,
-      borderRadius: 16,
+      borderRadius: 9999,
       padding: 0,
     },
     listContainer: {

app/components/Nav/App/App.tsx

@@ -151,7 +151,6 @@ import { State2AccountConnectWrapper } from '../../Views/MultichainAccounts/Mult
 import { SmartAccountModal } from '../../Views/MultichainAccounts/AccountDetails/components/SmartAccountModal/SmartAccountModal';
 import TradeWalletActions from '../../Views/TradeWalletActions';
 import { BIP44AccountPermissionWrapper } from '../../Views/MultichainAccounts/MultichainPermissionsSummary/BIP44AccountPermissionWrapper';
-import { useEmptyNavHeaderForConfirmations } from '../../Views/confirmations/hooks/ui/useEmptyNavHeaderForConfirmations';
 import SocialLoginIosUser from '../../Views/SocialLoginIosUser';
 import { useOTAUpdates } from '../../hooks/useOTAUpdates';
 import MultichainTransactionDetailsSheet from '../../UI/MultichainTransactionDetailsModal/MultichainTransactionDetailsSheet';
@@ -887,7 +886,6 @@ const ModalSmartAccountOptIn = () => (
 
 const AppFlow = () => {
   const userLoggedIn = useSelector(selectUserLoggedIn);
-  const emptyNavHeaderOptions = useEmptyNavHeaderForConfirmations();
 
   return (
     <>
@@ -1071,7 +1069,7 @@ const AppFlow = () => {
         />
         <Stack.Screen
           name={Routes.CONFIRMATION_REQUEST_MODAL}
-          options={emptyNavHeaderOptions}
+          options={{ headerShown: false, gestureEnabled: true }}
           component={Confirm}
         />
         <Stack.Screen

app/components/Nav/Main/index.js

@@ -95,7 +95,6 @@ import {
 import { useNetworkSelection } from '../../hooks/useNetworkSelection/useNetworkSelection';
 import { useIsOnBridgeRoute } from '../../UI/Bridge/hooks/useIsOnBridgeRoute';
 import { CardVerification } from '../../UI/Card/sdk';
-import LegacySwapLiveness from '../../UI/Bridge/components/LegacySwapsLiveness';
 
 const Stack = createStackNavigator();
 
@@ -418,7 +417,6 @@ const Main = (props) => {
         <FadeOutOverlay />
         <Notification navigation={props.navigation} />
         <RampOrders />
-        <LegacySwapLiveness />
         <CardVerification />
         <EarnTransactionMonitor />
         {renderDeprecatedNetworkAlert(

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

@@ -52,7 +52,6 @@ jest.mock('../../../core/Engine', () => ({
           ],
         },
       },
-      preventPollingOnNetworkRestart: false,
     },
   },
 }));