Merge branch 'main' into chore/create-build-branch-workflow

Author: tommasini

.github/workflows/ci.yml

@@ -214,7 +214,7 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=12288
 
       - name: Check bundle size
-        run: ./scripts/js-bundle-stats.sh ios/main.jsbundle 54
+        run: ./scripts/js-bundle-stats.sh ios/main.jsbundle 53
 
       - name: Upload iOS bundle
         uses: actions/upload-artifact@v4

.js.env.example

@@ -22,15 +22,7 @@ export SENTRY_DISABLE_AUTO_UPLOAD="true"
 # ENV vars for e2e tests
 # Only enable it for e2e tests
 export IS_TEST="false"
-# Performance E2E (Appwright): set on the bundle step in CI so seedless/OAuth Metro mocks are explicitly opted in.
-# Optional locally when pairing with METAMASK_ENVIRONMENT=e2e.
-# export PERFORMANCE_TEST_JOB="true"
-# Force-disable seedless + OAuth Metro redirects while keeping other E2E behavior (Sentry mocks, etc.):
-# export E2E_USE_SEEDLESS_OAUTH_METRO_MOCK="false"
-# Finer control: disable OAuth handler Metro mock for non-seedless
-# onboarding perf builds; keep seedless perf on default (unset) so seedless-*.spec.js use mocks.
-# export E2E_USE_OAUTH_LOGIN_HANDLERS_METRO_MOCK="false"
-# export E2E_USE_SEEDLESS_CONTROLLER_METRO_MOCK="false"
+# Seedless + OAuthLoginHandlers Metro mocks: on when IS_TEST/e2e OR E2E_MOCK_OAUTH=true at bundle time.
 # defined as secrets to run on Bitrise CI
 # but have to be defined here for local tests
 export MM_TEST_ACCOUNT_SRP=""

app/components/Nav/Main/MainNavigator.js

@@ -117,6 +117,8 @@ import {
   selectMarketInsightsEnabled,
 } from '../../UI/MarketInsights';
 import { selectMarketInsightsPerpsEnabled } from '../../../selectors/featureFlagController/marketInsights';
+import { TopTradersView } from '../../Views/SocialLeaderboard';
+import { selectSocialLeaderboardEnabled } from '../../../selectors/featureFlagController/socialLeaderboard';
 import PerpsPositionTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsPositionTransactionView';
 import PerpsOrderTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsOrderTransactionView';
 import PerpsFundingTransactionView from '../../UI/Perps/Views/PerpsTransactionsView/PerpsFundingTransactionView';
@@ -942,6 +944,9 @@ const MainNavigator = () => {
   const isMarketInsightsPerpsEnabled = useSelector(
     selectMarketInsightsPerpsEnabled,
   );
+  const isSocialLeaderboardEnabled = useSelector(
+    selectSocialLeaderboardEnabled,
+  );
 
   return (
     <Stack.Navigator
@@ -1162,6 +1167,13 @@ const MainNavigator = () => {
           options={{ headerShown: false, ...slideFromRightAnimation }}
         />
       )}
+      {isSocialLeaderboardEnabled && (
+        <Stack.Screen
+          name={Routes.SOCIAL_LEADERBOARD.VIEW}
+          component={TopTradersView}
+          options={{ headerShown: false, ...slideFromRightAnimation }}
+        />
+      )}
       <>
         <Stack.Screen
           name={Routes.EXPLORE_SEARCH}

app/components/Nav/Main/MainNavigator.test.tsx

@@ -5,6 +5,10 @@ import initialRootState from '../../../util/test/initial-root-state';
 import Routes from '../../../constants/navigation/Routes';
 import { ReactTestInstance } from 'react-test-renderer';
 
+jest.mock('react-native-device-info', () => ({
+  getVersion: jest.fn(() => '7.72.0'),
+}));
+
 jest.mock('@react-navigation/stack', () => ({
   createStackNavigator: jest.fn().mockReturnValue({
     Navigator: 'Navigator',
@@ -145,4 +149,56 @@ describe('MainNavigator', () => {
       'FeatureFlagOverride',
     );
   });
+
+  it('includes TopTradersView screen when Social Leaderboard remote flag is enabled', () => {
+    const stateWithSocialLeaderboard = {
+      ...initialRootState,
+      engine: {
+        ...initialRootState.engine,
+        backgroundState: {
+          ...initialRootState.engine.backgroundState,
+          RemoteFeatureFlagController: {
+            ...initialRootState.engine.backgroundState
+              .RemoteFeatureFlagController,
+            remoteFeatureFlags: {
+              ...initialRootState.engine.backgroundState
+                .RemoteFeatureFlagController.remoteFeatureFlags,
+              aiSocialLeaderboardEnabled: {
+                enabled: true,
+                minimumVersion: '0.0.1',
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const container = renderWithProvider(<MainNavigator />, {
+      state: stateWithSocialLeaderboard,
+    });
+
+    interface ScreenChild {
+      name: string;
+      component: { name: string };
+    }
+    const screenProps: ScreenChild[] = container.root.children
+      .filter(
+        (child): child is ReactTestInstance =>
+          typeof child === 'object' &&
+          'type' in child &&
+          'props' in child &&
+          child.type?.toString() === 'Screen',
+      )
+      .map((child) => ({
+        name: child.props.name,
+        component: child.props.component,
+      }));
+
+    const topTradersScreen = screenProps?.find(
+      (screen) => screen?.name === Routes.SOCIAL_LEADERBOARD.VIEW,
+    );
+
+    expect(topTradersScreen).toBeDefined();
+    expect(topTradersScreen?.component.name).toBe('TopTradersView');
+  });
 });

app/components/UI/Bridge/Views/BridgeView/BridgeView.view.test.tsx

@@ -197,6 +197,44 @@ describeForPlatforms('BridgeView', () => {
     expect(await findByText('dest')).toBeOnTheScreen();
   });
 
+  describe('Gasless swap', () => {
+    it('shows error banner when gasless swap quote fetch fails and dismisses it on close', async () => {
+      const now = Date.now();
+
+      const { findByText, queryByText, getByTestId } = defaultBridgeWithTokens({
+        engine: {
+          backgroundState: {
+            BridgeController: {
+              quotes: [],
+              recommendedQuote: null,
+              quotesLastFetched: now,
+              quotesLoadingStatus: RequestStatus.FETCHED,
+              quoteFetchError: 'GaslessSwapSubmissionFailed',
+            },
+            RemoteFeatureFlagController: {
+              remoteFeatureFlags: {
+                gasFeesSponsoredNetwork: { '0x1': true },
+              },
+            },
+          },
+        },
+      } as unknown as Record<string, unknown>);
+
+      // Error banner appears after the gasless swap quote fetch failure
+      expect(
+        await findByText(strings('bridge.error_banner_description')),
+      ).toBeOnTheScreen();
+
+      // User dismisses the error banner
+      fireEvent.press(getByTestId(CommonSelectorsIDs.BANNER_CLOSE_BUTTON_ICON));
+
+      // Banner is gone after dismissal
+      expect(
+        queryByText(strings('bridge.error_banner_description')),
+      ).not.toBeOnTheScreen();
+    });
+  });
+
   describe('Swap team regression (bug matrix team-swaps-and-bridge)', () => {
     /** Issues covered: #24744, #24865, #24802, #25256 */
     // eslint-disable-next-line @metamask/design-tokens/color-no-hex -- "#24744" style references are GitHub issue IDs (e.g. "#2342"), not color literals

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

@@ -408,7 +408,9 @@ const BridgeView = () => {
     <ScreenView contentContainerStyle={styles.screen}>
       <Box
         style={styles.content}
-        onStartShouldSetResponder={() => true}
+        onStartShouldSetResponder={() =>
+          !(contentMode === 'zero' && isSwapsTrendingTokensEnabled)
+        }
         onResponderRelease={() => {
           inputRef.current?.blur();
           keypadRef.current?.close();