Merge branch 'main' into feat/ramp-non-evm-balance

Author: wachunei

.github/CODEOWNERS

@@ -96,6 +96,9 @@ app/components/UI/TemplateRenderer   @MetaMask/confirmations @MetaMask/snaps-dev
 
 # Staking Team
 app/components/UI/Stake              @MetaMask/metamask-staking
+app/core/Engine/controllers/earn-controller @MetaMask/metamask-staking
+app/core/Engine/messengers/earn-controller-messenger @MetaMask/metamask-staking
+app/selectors/earnController         @MetaMask/metamask-staking
 
 # Assets Team
 app/components/hooks/useIsOriginalNativeTokenSymbol @MetaMask/metamask-assets

app/components/Approvals/AddChainApproval/AddChainApproval.test.tsx

@@ -27,6 +27,7 @@ describe('AddChainApproval', () => {
   it('renders', () => {
     mockApprovalRequest({
       type: ApprovalTypes.ADD_ETHEREUM_CHAIN,
+      requestData: {},
       // TODO: Replace "any" with type
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } as any);

app/components/Approvals/AddChainApproval/AddChainApproval.tsx

@@ -15,13 +15,17 @@ const AddChainApproval = () => {
 
   if (approvalRequest?.type !== ApprovalTypes.ADD_ETHEREUM_CHAIN) return null;
 
+  const { isNetworkRpcUpdate, ...customNetworkInformation } =
+    approvalRequest.requestData;
+
   return (
     <BottomSheet onClose={onReject} shouldNavigateBack={false}>
       <View style={styles.actionsContainer}>
         <NetworkVerificationInfo
-          customNetworkInformation={approvalRequest?.requestData}
+          customNetworkInformation={customNetworkInformation}
           onReject={onReject}
           onConfirm={onConfirm}
+          isNetworkRpcUpdate={isNetworkRpcUpdate}
         />
       </View>
     </BottomSheet>

app/components/Approvals/AddChainApproval/__snapshots__/AddChainApproval.test.tsx.snap

@@ -12,7 +12,9 @@ exports[`AddChainApproval renders 1`] = `
       }
     }
   >
-    <NetworkVerificationInfo />
+    <NetworkVerificationInfo
+      customNetworkInformation={{}}
+    />
   </View>
 </ForwardRef>
 `;

app/components/Nav/App/index.js

@@ -145,6 +145,7 @@ import {
 } from '../../../util/trace';
 import getUIStartupSpan from '../../../core/Performance/UIStartup';
 import { Confirm } from '../../Views/confirmations/Confirm';
+import { BridgeTokenSelector } from '../../UI/Bridge/BridgeTokenSelector';
 
 const clearStackNavigatorOptions = {
   headerShown: false,
@@ -523,6 +524,10 @@ const RootModalFlow = () => (
       component={ChangeInSimulationModal}
     />
     <Stack.Screen name={Routes.SHEET.TOOLTIP_MODAL} component={TooltipModal} />
+    <Stack.Screen
+      name={Routes.SHEET.BRIDGE_TOKEN_SELECTOR}
+      component={BridgeTokenSelector}
+    />
   </Stack.Navigator>
 );
 

app/components/Nav/Main/MainNavigator.js

@@ -828,7 +828,7 @@ const MainNavigator = () => (
       {() => <RampRoutes rampType={RampType.SELL} />}
     </Stack.Screen>
     <Stack.Screen name="Swaps" component={Swaps} />
-    <Stack.Screen name="Bridge" component={Bridge} />
+    <Stack.Screen name={Routes.BRIDGE} component={Bridge} />
     <Stack.Screen name="StakeScreens" component={StakeScreenStack} />
     <Stack.Screen
       name="StakeModals"

app/components/Snaps/SnapUILink/SnapUILink.test.tsx

@@ -25,9 +25,7 @@ describe('SnapUILink', () => {
   };
 
   it('renders correctly with valid props', () => {
-    const { UNSAFE_getByType } = render(
-      <SnapUILink {...validProps} />,
-    );
+    const { UNSAFE_getByType } = render(<SnapUILink {...validProps} />);
 
     const button = UNSAFE_getByType(ButtonLink);
     const icon = UNSAFE_getByType(Icon);
@@ -38,12 +36,6 @@ describe('SnapUILink', () => {
     expect(icon.props.name).toBe(IconName.Export);
     expect(icon.props.color).toBe(IconColor.Primary);
     expect(icon.props.size).toBe(IconSize.Sm);
-    expect(icon.props.style).toEqual({
-      marginLeft: 2,
-      justifyContent: 'center',
-      alignItems: 'center',
-      alignSelf: 'center',
-    });
   });
 
   it('opens URL when pressed with valid https URL', () => {

app/components/Snaps/SnapUILink/SnapUILink.tsx

@@ -1,7 +1,7 @@
 ///: BEGIN:ONLY_INCLUDE_IF(preinstalled-snaps,external-snaps)
 import { LinkChildren } from '@metamask/snaps-sdk/jsx';
 import React from 'react';
-import { Linking } from 'react-native';
+import { Linking, View } from 'react-native';
 import ButtonLink from '../../../component-library/components/Buttons/Button/variants/ButtonLink';
 import { TextColor } from '../../../component-library/components/Texts/Text';
 import Icon, {
@@ -31,13 +31,18 @@ export const SnapUILink: React.FC<SnapUILinkProps> = ({ href, children }) => {
   const label = (
     <>
       {children}
+      <View
+        /* eslint-disable-next-line react-native/no-inline-styles */
+        style={{
+          width: 4,
+        }}
+      />
       <Icon
         name={IconName.Export}
         color={IconColor.Primary}
         size={IconSize.Sm}
         /* eslint-disable-next-line react-native/no-inline-styles */
         style={{
-          marginLeft: 2,
           justifyContent: 'center',
           alignItems: 'center',
           alignSelf: 'center',

app/components/UI/AssetOverview/AssetOverview.test.tsx

@@ -348,6 +348,26 @@ describe('AssetOverview', () => {
     expect(buyButton).toBeNull();
   });
 
+  it('should render native balances even if there are no accounts for the asset chain in the state', async () => {
+    jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);
+
+    const container = renderWithProvider(
+      <AssetOverview
+        asset={{
+          ...asset,
+          chainId: '0x2',
+          isNative: true,
+        }}
+        displayBuyButton
+        displaySwapsButton
+        swapsIsLive
+      />,
+      { state: mockInitialState },
+    );
+
+    expect(container).toMatchSnapshot();
+  });
+
   describe('Portfolio view network switching', () => {
     beforeEach(() => {
       jest.spyOn(networks, 'isPortfolioViewEnabled').mockReturnValue(true);

app/components/UI/AssetOverview/AssetOverview.tsx

@@ -364,12 +364,12 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
   if (asset.isETH || asset.isNative) {
     balance = renderFromWei(
       //@ts-expect-error - This should be fixed at the accountsController selector level, ongoing discussion
-      accountsByChainId[toHexadecimal(chainId)][selectedAddress]?.balance,
+      accountsByChainId[toHexadecimal(chainId)]?.[selectedAddress]?.balance,
     );
     balanceFiat = weiToFiat(
       hexToBN(
         //@ts-expect-error - This should be fixed at the accountsController selector level, ongoing discussion
-        accountsByChainId[toHexadecimal(chainId)][selectedAddress]?.balance,
+        accountsByChainId[toHexadecimal(chainId)]?.[selectedAddress]?.balance,
       ),
       conversionRate,
       currentCurrency,