Merge branch 'main' into feat/tat-2906-update-latest-hyperliquid-sdk

Author: abretonc7s

.github/workflows/build-rc-auto.yml

@@ -4,6 +4,10 @@
 # It runs on every commit pushed to a release branch, but only when the release PR
 # has the 'auto-rc-builds' label.
 #
+# Rolling builds: when a new run starts for the same release branch, any queued or
+# in-progress run of this workflow for that branch is cancelled (same behavior as
+# Bitrise “Rolling builds” / “Abort running builds” for one branch + one workflow).
+#
 # Builds are triggered via the Runway OTA/build pipeline (runway-ota-build-core.yml):
 # - iOS runs first and performs the version bump.
 # - Android runs after, skipping the version bump (already done by iOS).
@@ -16,6 +20,10 @@ on:
     branches:
       - 'release/*'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: write
   pull-requests: write

.github/workflows/build.yml

@@ -396,6 +396,8 @@ jobs:
       # Build with retry logic. Timeouts: 55min per attempt, 115min total for step, 120min job
       - name: Build ${{ matrix.platform }}
         timeout-minutes: 115
+        env:
+          GIT_BRANCH: ${{ inputs.source_branch || github.ref_name }}
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
           timeout_minutes: 55

.github/workflows/slack-rc-notification.yml

@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.source_branch }}
-          fetch-depth: 1
+          fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'

app/components/Nav/App/App.tsx

@@ -181,7 +181,14 @@ const OnboardingSuccessFlow = () => {
   const { colors } = useTheme();
 
   return (
-    <Stack.Navigator initialRouteName={Routes.ONBOARDING.SUCCESS}>
+    <Stack.Navigator
+      initialRouteName={Routes.ONBOARDING.SUCCESS}
+      screenOptions={{
+        cardStyle: { backgroundColor: colors.background.default },
+        headerStyle: { backgroundColor: colors.background.default },
+        headerShadowVisible: false,
+      }}
+    >
       <Stack.Screen
         name={Routes.ONBOARDING.SUCCESS}
         component={OnboardingSuccess}
@@ -192,10 +199,6 @@ const OnboardingSuccessFlow = () => {
       <Stack.Screen
         name={Routes.ONBOARDING.DEFAULT_SETTINGS}
         component={DefaultSettings}
-        options={{
-          headerStyle: { backgroundColor: colors.background.default },
-          cardStyle: { backgroundColor: colors.background.default },
-        }}
       />
       <Stack.Screen
         name={Routes.ONBOARDING.GENERAL_SETTINGS}
@@ -221,7 +224,12 @@ const OnboardingNav = () => {
   const { colors } = useTheme();
 
   return (
-    <Stack.Navigator initialRouteName={'Onboarding'}>
+    <Stack.Navigator
+      initialRouteName={'Onboarding'}
+      screenOptions={{
+        cardStyle: { backgroundColor: colors.background.default },
+      }}
+    >
       <Stack.Screen name="Onboarding" component={Onboarding} />
       <Stack.Screen
         name={Routes.ONBOARDING.SOCIAL_LOGIN_SUCCESS_NEW_USER}
@@ -253,7 +261,6 @@ const OnboardingNav = () => {
         component={DefaultSettings}
         options={{
           headerStyle: { backgroundColor: colors.background.default },
-          cardStyle: { backgroundColor: colors.background.default },
         }}
       />
       <Stack.Screen name="ManualBackupStep1" component={ManualBackupStep1} />
@@ -669,6 +676,7 @@ const ImportSRPView = () => (
   <Stack.Navigator
     screenOptions={{
       headerShown: false,
+      presentation: 'transparentModal',
     }}
   >
     <Stack.Screen
@@ -684,7 +692,6 @@ const ImportSRPView = () => (
       name={Routes.SHEET.SEEDPHRASE_MODAL}
       component={SeedphraseModal}
       options={{
-        presentation: 'modal',
         cardStyle: { backgroundColor: 'transparent' },
         cardStyleInterpolator: () => ({
           overlayStyle: {

app/components/Nav/Main/index.js

@@ -94,6 +94,7 @@ import {
 } from '../../hooks/useNetworksByNamespace/useNetworksByNamespace';
 import { useNetworkSelection } from '../../hooks/useNetworkSelection/useNetworkSelection';
 import { useIsOnBridgeRoute } from '../../UI/Bridge/hooks/useIsOnBridgeRoute';
+import { shouldShowNetworkListToast } from './utils';
 
 const Stack = createStackNavigator();
 
@@ -298,11 +299,9 @@ const Main = (props) => {
     );
 
     // Emit network addition/deletion toast if network list changes
-    // Bridge routes are skipped as they interfere with bridge UI
     if (
       previousNetworkValues.length &&
-      currentNetworkValues.length !== previousNetworkValues.length &&
-      !isOnBridgeRoute
+      currentNetworkValues.length !== previousNetworkValues.length
     ) {
       // Find the newly added network by comparing chainIds
       const newNetwork = currentNetworkValues.find(
@@ -318,27 +317,33 @@ const Main = (props) => {
           ),
       );
 
-      toastRef?.current?.showToast({
-        variant: ToastVariants.Plain,
-        labelOptions: [
-          {
-            label: `${
-              (newNetwork?.name || deletedNetwork?.name) ??
-              strings('asset_details.network')
-            } `,
-            isBold: true,
-          },
-          {
-            label: deletedNetwork
-              ? strings('toast.network_removed')
-              : strings('toast.network_added'),
-          },
-        ],
-        networkImageSource: networkImage,
+      const shouldShowToast = shouldShowNetworkListToast({
+        newNetworkChainId: newNetwork?.chainId,
+        hasDeletedNetwork: Boolean(deletedNetwork),
       });
+      if (shouldShowToast) {
+        toastRef?.current?.showToast({
+          variant: ToastVariants.Plain,
+          labelOptions: [
+            {
+              label: `${
+                (deletedNetwork?.name || newNetwork?.name) ??
+                strings('asset_details.network')
+              } `,
+              isBold: true,
+            },
+            {
+              label: deletedNetwork
+                ? strings('toast.network_removed')
+                : strings('toast.network_added'),
+            },
+          ],
+          networkImageSource: networkImage,
+        });
+      }
     }
     previousNetworkConfigurations.current = networkConfigurations;
-  }, [isOnBridgeRoute, networkConfigurations, networkImage, toastRef]);
+  }, [networkConfigurations, networkImage, toastRef]);
 
   useEffect(() => {
     if (locale.current !== I18n.locale) {

app/components/Nav/Main/utils.test.ts

@@ -1,7 +1,16 @@
 import { ImageSourcePropType } from 'react-native';
-import { handleShowNetworkActiveToast } from './utils';
+import {
+  handleShowNetworkActiveToast,
+  shouldShowNetworkListToast,
+} from './utils';
 import { ToastVariants } from '../../../component-library/components/Toast';
 import { strings } from '../../../../locales/i18n';
+import {
+  clearSuppressedNetworkAddedToast,
+  consumeSuppressedNetworkAddedToast,
+  resetSuppressedNetworkAddedToasts,
+  suppressNextNetworkAddedToast,
+} from '../../../util/networks/networkToastSuppression';
 
 describe('handleShowNetworkActiveToast', () => {
   const mockToastRef = {
@@ -16,6 +25,7 @@ describe('handleShowNetworkActiveToast', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    resetSuppressedNetworkAddedToasts();
   });
 
   it('shows toast when not on bridge route', () => {
@@ -134,3 +144,39 @@ describe('handleShowNetworkActiveToast', () => {
     expect(calledWith.networkImageSource).toBe(customNetworkImage);
   });
 });
+
+describe('shouldShowNetworkListToast', () => {
+  beforeEach(() => {
+    resetSuppressedNetworkAddedToasts();
+  });
+
+  it('suppresses an added-network toast only once', () => {
+    suppressNextNetworkAddedToast('0xa');
+
+    expect(
+      shouldShowNetworkListToast({
+        newNetworkChainId: '0xa',
+        hasDeletedNetwork: false,
+      }),
+    ).toBe(false);
+
+    expect(
+      shouldShowNetworkListToast({
+        newNetworkChainId: '0xa',
+        hasDeletedNetwork: false,
+      }),
+    ).toBe(true);
+  });
+
+  it('clears suppressed added-network toasts explicitly', () => {
+    suppressNextNetworkAddedToast('0xa');
+
+    clearSuppressedNetworkAddedToast('0xa');
+
+    expect(consumeSuppressedNetworkAddedToast('0xa')).toBe(false);
+  });
+
+  it('returns false when consuming without a chain id', () => {
+    expect(consumeSuppressedNetworkAddedToast()).toBe(false);
+  });
+});

app/components/Nav/Main/utils.ts

@@ -1,6 +1,7 @@
 import { ImageSourcePropType } from 'react-native';
 import { ToastVariants } from '../../../component-library/components/Toast';
 import { strings } from '../../../../locales/i18n';
+import { consumeSuppressedNetworkAddedToast } from '../../../util/networks/networkToastSuppression';
 
 export const handleShowNetworkActiveToast = (
   isOnBridgeRoute: boolean,
@@ -23,3 +24,17 @@ export const handleShowNetworkActiveToast = (
     });
   }
 };
+
+export const shouldShowNetworkListToast = ({
+  newNetworkChainId,
+  hasDeletedNetwork,
+}: {
+  newNetworkChainId?: string;
+  hasDeletedNetwork: boolean;
+}) => {
+  const shouldShowNetworkAddedToast =
+    Boolean(newNetworkChainId) &&
+    !consumeSuppressedNetworkAddedToast(newNetworkChainId);
+
+  return shouldShowNetworkAddedToast || hasDeletedNetwork;
+};

app/components/UI/Bridge/hooks/useTokenSelection.test.ts

@@ -13,6 +13,10 @@ import { createMockToken } from '../testUtils/fixtures';
 import Routes from '../../../../constants/navigation/Routes';
 import { BridgeToken, TokenSelectorType } from '../types';
 import { selectNetworkConfigurations } from '../../../../selectors/networkController';
+import {
+  consumeSuppressedNetworkAddedToast,
+  resetSuppressedNetworkAddedToasts,
+} from '../../../../util/networks/networkToastSuppression';
 
 const mockDispatch = jest.fn();
 const mockHandleSwitchTokensInner = jest.fn().mockResolvedValue(undefined);
@@ -176,6 +180,7 @@ const renderTokenSelectionHook = (
 describe('useTokenSelection', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    resetSuppressedNetworkAddedToasts();
     // Non-stock token behavior
     mockIsStockToken.mockReturnValue(false);
     mockIsTokenTradingOpen.mockReturnValue(true);
@@ -312,6 +317,7 @@ describe('useTokenSelection', () => {
       expect(mockDispatch).not.toHaveBeenCalled();
       expect(mockAutoUpdateDestToken).not.toHaveBeenCalled();
       expect(mockGoBack).toHaveBeenCalledTimes(1);
+      expect(consumeSuppressedNetworkAddedToast('0xa')).toBe(false);
     });
 
     it('continues dest selection when addNetwork rejects', async () => {

app/components/UI/Bridge/hooks/useTokenSelection.ts

@@ -22,6 +22,10 @@ import { Hex } from '@metamask/utils';
 import Engine from '../../../../core/Engine';
 import { selectNetworkConfigurations } from '../../../../selectors/networkController';
 import { PopularList } from '../../../../util/networks/customNetworks';
+import {
+  clearSuppressedNetworkAddedToast,
+  suppressNextNetworkAddedToast,
+} from '../../../../util/networks/networkToastSuppression';
 
 /**
  * Hook to manage token selection logic for Bridge token selector
@@ -69,6 +73,7 @@ export const useTokenSelection = (type: TokenSelectorType) => {
           try {
             const hexChainId = toHex(popularNetwork.chainId) as Hex;
             const { blockExplorerUrl } = popularNetwork.rpcPrefs;
+            suppressNextNetworkAddedToast(popularNetwork.chainId);
             await Engine.context.NetworkController.addNetwork({
               chainId: hexChainId,
               blockExplorerUrls: blockExplorerUrl ? [blockExplorerUrl] : [],
@@ -86,6 +91,7 @@ export const useTokenSelection = (type: TokenSelectorType) => {
               ],
             });
           } catch {
+            clearSuppressedNetworkAddedToast(popularNetwork.chainId);
             if (isSourcePicker) {
               // Source requires a configured network to sign transactions.
               // Abort selection if the network couldn't be added.

app/components/UI/Card/Views/CardAuthentication/CardAuthentication.test.tsx

@@ -198,12 +198,6 @@ describe('CardAuthentication Component', () => {
         screen.getByTestId(CardAuthenticationSelectors.VERIFY_ACCOUNT_BUTTON),
       ).toBeOnTheScreen();
     });
-
-    it('matches login step snapshot', () => {
-      const { toJSON } = render();
-
-      expect(toJSON()).toMatchSnapshot();
-    });
   });
 
   describe('Login Step - Location Selection', () => {