Merge branch 'main' into fix/backup-vault-try-catch

Author: tommasini

app/components/Nav/App/App.tsx

@@ -318,7 +318,7 @@ const OnboardingNav = () => {
  * child OnboardingNav navigator to push modals on top of it
  */
 const SimpleWebviewScreen = () => (
-  <Stack.Navigator>
+  <Stack.Navigator screenOptions={{ headerShown: false }}>
     <Stack.Screen name={Routes.WEBVIEW.SIMPLE} component={SimpleWebview} />
   </Stack.Navigator>
 );

app/components/Nav/Main/MainNavigator.js

@@ -891,7 +891,7 @@ const HomeTabs = () => {
 };
 
 const Webview = () => (
-  <Stack.Navigator>
+  <Stack.Navigator screenOptions={{ headerShown: false }}>
     <Stack.Screen name="SimpleWebview" component={SimpleWebview} />
   </Stack.Navigator>
 );

app/components/Views/SimpleWebview/index.test.tsx

@@ -4,30 +4,20 @@ import SimpleWebview from './';
 import { useNavigation } from '@react-navigation/native';
 import Share from 'react-native-share';
 import Logger from '../../../util/Logger';
-import getHeaderCompactStandardNavbarOptions from '../../../component-library/components-temp/HeaderCompactStandard/getHeaderCompactStandardNavbarOptions';
-import Device from '../../../util/device';
+import HeaderCompactStandard from '../../../component-library/components-temp/HeaderCompactStandard';
 
 jest.mock(
-  '../../../component-library/components-temp/HeaderCompactStandard/getHeaderCompactStandardNavbarOptions',
+  '../../../component-library/components-temp/HeaderCompactStandard',
   () => ({
     __esModule: true,
-    default: jest.fn(() => ({
-      header: () => null,
-    })),
+    default: jest.fn(() => null),
   }),
 );
 
-jest.mock('../../../util/device', () => ({
-  __esModule: true,
-  default: {
-    isAndroid: jest.fn(() => false),
-  },
-}));
-
-const mockSetOptions = jest.fn();
+const mockGoBack = jest.fn();
 const mockNavigation = {
-  goBack: jest.fn(),
-  setOptions: mockSetOptions,
+  goBack: mockGoBack,
+  setOptions: jest.fn(),
 };
 
 jest.mock('@react-navigation/native', () => ({
@@ -48,64 +38,38 @@ describe('SimpleWebview', () => {
     (Share.open as jest.Mock).mockImplementation(() => Promise.resolve());
   });
 
-  it('renders correctly', () => {
+  it('renders the HeaderCompactStandard with safe area top inset', () => {
     render(<SimpleWebview />);
 
-    expect(getHeaderCompactStandardNavbarOptions).toHaveBeenCalled();
-  });
-
-  it('sets header options from HeaderCompactStandard and Device.isAndroid() for includesTopInset', () => {
-    render(<SimpleWebview />);
-
-    expect(getHeaderCompactStandardNavbarOptions).toHaveBeenCalledWith(
+    expect(HeaderCompactStandard).toHaveBeenCalledWith(
       expect.objectContaining({
         title: '',
-        includesTopInset: false,
-        twClassName: 'bg-default rounded-t-2xl',
+        includesTopInset: true,
         onBack: expect.any(Function),
         endButtonIconProps: expect.arrayContaining([
           expect.objectContaining({ onPress: expect.any(Function) }),
         ]),
       }),
-    );
-    expect(mockSetOptions).toHaveBeenCalledWith(
-      expect.objectContaining({
-        header: expect.any(Function),
-      }),
-    );
-    expect(mockSetOptions.mock.calls[0][0]).not.toHaveProperty('headerStyle');
-  });
-
-  it('passes includesTopInset true when Device.isAndroid() is true', () => {
-    jest.mocked(Device.isAndroid).mockReturnValueOnce(true);
-    render(<SimpleWebview />);
-
-    expect(getHeaderCompactStandardNavbarOptions).toHaveBeenCalledWith(
-      expect.objectContaining({
-        includesTopInset: true,
-      }),
+      expect.anything(),
     );
   });
 
   it('calls navigation.goBack when header onBack is invoked', () => {
     render(<SimpleWebview />);
 
-    const { onBack } = (getHeaderCompactStandardNavbarOptions as jest.Mock).mock
+    const headerProps = (HeaderCompactStandard as unknown as jest.Mock).mock
       .calls[0][0] as { onBack: () => void };
-    onBack();
+    headerProps.onBack();
 
-    expect(mockNavigation.goBack).toHaveBeenCalled();
+    expect(mockGoBack).toHaveBeenCalled();
   });
 
   it('calls Share.open when share button onPress is invoked', () => {
     render(<SimpleWebview />);
 
-    const { endButtonIconProps } = (
-      getHeaderCompactStandardNavbarOptions as jest.Mock
-    ).mock.calls[0][0] as {
-      endButtonIconProps: { onPress: () => void }[];
-    };
-    endButtonIconProps[0].onPress();
+    const headerProps = (HeaderCompactStandard as unknown as jest.Mock).mock
+      .calls[0][0] as { endButtonIconProps: { onPress: () => void }[] };
+    headerProps.endButtonIconProps[0].onPress();
 
     expect(Share.open).toHaveBeenCalledWith({ url: 'https://etherscan.io' });
   });
@@ -116,12 +80,9 @@ describe('SimpleWebview', () => {
 
     render(<SimpleWebview />);
 
-    const { endButtonIconProps } = (
-      getHeaderCompactStandardNavbarOptions as jest.Mock
-    ).mock.calls[0][0] as {
-      endButtonIconProps: { onPress: () => void }[];
-    };
-    endButtonIconProps[0].onPress();
+    const headerProps = (HeaderCompactStandard as unknown as jest.Mock).mock
+      .calls[0][0] as { endButtonIconProps: { onPress: () => void }[] };
+    headerProps.endButtonIconProps[0].onPress();
 
     await waitFor(() => {
       expect(log).toHaveBeenCalledWith(

app/components/Views/SimpleWebview/index.tsx

@@ -1,22 +1,25 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback } from 'react';
+import { View } from 'react-native';
 import { WebView } from '@metamask/react-native-webview';
-import getHeaderCompactStandardNavbarOptions from '../../../component-library/components-temp/HeaderCompactStandard/getHeaderCompactStandardNavbarOptions';
+import HeaderCompactStandard from '../../../component-library/components-temp/HeaderCompactStandard';
 import { IconName } from '@metamask/design-system-react-native';
+import { useTailwind } from '@metamask/design-system-twrnc-preset';
 import Share from 'react-native-share'; // eslint-disable-line  import-x/default
 import Logger from '../../../util/Logger';
 import { baseStyles } from '../../../styles/common';
-import Device from '../../../util/device';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 
 // TODO: This will be replaced with the actual route params type once navigation is refactored
 type RouteParams = {
   SimpleWebView: {
     url: string;
+    title?: string;
   };
 };
 
 const SimpleWebView = () => {
+  const tw = useTailwind();
   const navigation = useNavigation();
   const route = useRoute<RouteProp<RouteParams, 'SimpleWebView'>>();
   const url = route.params.url;
@@ -32,19 +35,17 @@ const SimpleWebView = () => {
     }
   }, [url]);
 
-  useEffect(() => {
-    navigation.setOptions({
-      ...getHeaderCompactStandardNavbarOptions({
-        title,
-        onBack: () => navigation.goBack(),
-        includesTopInset: Device.isAndroid(),
-        twClassName: 'bg-default rounded-t-2xl',
-        endButtonIconProps: [{ iconName: IconName.Share, onPress: share }],
-      }),
-    });
-  }, [navigation, share, title]);
-
-  return <WebView containerStyle={baseStyles.flexGrow} source={{ uri: url }} />;
+  return (
+    <View style={tw.style('flex-1 bg-default')}>
+      <HeaderCompactStandard
+        title={title}
+        onBack={() => navigation.goBack()}
+        includesTopInset
+        endButtonIconProps={[{ iconName: IconName.Share, onPress: share }]}
+      />
+      <WebView containerStyle={baseStyles.flexGrow} source={{ uri: url }} />
+    </View>
+  );
 };
 
 export default SimpleWebView;

app/core/SDKConnectV2/services/connection-registry.test.ts

@@ -442,6 +442,8 @@ describe('ConnectionRegistry', () => {
           transport_type: TransportType.MWP,
           sdk_version: '2.0.0',
           sdk_platform: 'JavaScript',
+          dapp_name: 'Test DApp',
+          dapp_url: 'https://test.dapp',
         }),
       );
     });
@@ -583,6 +585,10 @@ describe('ConnectionRegistry', () => {
         expect.objectContaining({
           remote_session_id: mockConnectionRequest.sessionRequest.id,
           transport_type: TransportType.MWP,
+          sdk_version: '2.0.0',
+          sdk_platform: 'JavaScript',
+          dapp_name: 'Test DApp',
+          dapp_url: 'https://test.dapp',
           failure_reason: 'Connection failed',
         }),
       );

app/core/SDKConnectV2/services/connection-registry.ts

@@ -258,6 +258,8 @@ export class ConnectionRegistry {
         transport_type: TransportType.MWP,
         sdk_version: connReq.metadata.sdk.version,
         sdk_platform: connReq.metadata.sdk.platform,
+        dapp_name: connReq.metadata.dapp.name,
+        dapp_url: connReq.metadata.dapp.url,
       });
 
       // Defense-in-depth: block connections whose self-reported dapp metadata
@@ -305,6 +307,8 @@ export class ConnectionRegistry {
         transport_type: TransportType.MWP,
         sdk_version: connReq?.metadata?.sdk?.version,
         sdk_platform: connReq?.metadata?.sdk?.platform,
+        dapp_name: connReq?.metadata?.dapp?.name,
+        dapp_url: connReq?.metadata?.dapp?.url,
         failure_reason: error instanceof Error ? error.message : String(error),
       });