[pull] main from MetaMask:main

.github/workflows/create-release-pr-v2.yml → .github/workflows/create-release-pr-legacy.yml

@@ -1,4 +1,4 @@
-name: Create Release Pull Request V2
+name: Create Release Pull Request (Legacy)
 
 on:
   workflow_dispatch:

.github/workflows/create-release-pr-v3.yml → .github/workflows/create-release-pr.yml

@@ -1,4 +1,4 @@
-name: Create Release Pull Request V3
+name: Create Release Pull Request
 
 on:
   workflow_dispatch:

.github/workflows/trigger-performance-e2e.yml

@@ -10,11 +10,6 @@ on:
         required: false
         default: 'Info: Visit the link above for device and OS options'
         type: string
-      branch_name:
-        description: 'Branch name to run tests on'
-        required: true
-        default: 'main'
-        type: string
       device:
         description: 'Device to run tests on (e.g., Xiaomi Redmi Note 11)'
         required: false
@@ -41,36 +36,34 @@ jobs:
       BROWSERSTACK_OS_VERSION: ${{ github.event.inputs.os_version || '11.0' }}
       BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
       BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+      BROWSERSTACK_ANDROID_APP_URL: ${{ github.event.inputs.browserstack_app_url }}
       MM_TEST_ACCOUNT_SRP: ${{ secrets.MM_TEST_ACCOUNT_SRP }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.branch_name || 'main' }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
       - name: Install dependencies
-        run: yarn --immutable
-        working-directory: '.github/scripts'
-
+        run: yarn setup
+
       - name: BrowserStack Env Setup
         uses: browserstack/github-actions/setup-env@4478e16186f38e5be07721931642e65a028713c3
         with:
           username: ${{ secrets.BROWSERSTACK_USERNAME }}
           access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-          build-name: ${{ github.repository }}-${{ github.event.inputs.branch_name || 'main' }}-${{ github.event.inputs.device || 'Xiaomi Redmi Note 11' }}-run-${{ github.run_number }}
+          build-name: ${{ github.repository }}-${{ github.ref_name }}-${{ github.event.inputs.device || 'Xiaomi Redmi Note 11' }}-run-${{ github.run_number }}
           project-name: ${{ github.repository }}
 
       - name: Run Android Performance Tests
         env:
           BROWSERSTACK_LOCAL: true
           BROWSERSTACK_LOCAL_IDENTIFIER: ${{ github.run_id }}
         run: |
-          echo "Running tests on branch: ${{ github.event.inputs.branch_name || 'main' }}"
+          echo "Running tests on branch: ${{ github.ref_name }}"
           echo "Device: ${{ env.BROWSERSTACK_DEVICE }}"
           echo "OS Version: ${{ env.BROWSERSTACK_OS_VERSION }}"
           yarn test:wdio:android:browserstack --performance

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- feat: implement privacy screen when app is inactive ([#17303](https://github.com/MetaMask/metamask-mobile/pull/17303)) 
+
 ## [7.51.1]
 
 ### Added

app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap

@@ -58,7 +58,7 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
             style={
               {
                 "backgroundColor": "#ffffff",
-                "borderRadius": 16,
+                "borderRadius": 8,
                 "height": 32,
                 "marginRight": 16,
                 "overflow": "hidden",
@@ -79,7 +79,9 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
                     "height": 32,
                     "width": 32,
                   },
-                  undefined,
+                  {
+                    "borderRadius": 8,
+                  },
                 ]
               }
             >

app/component-library/components/Avatars/Avatar/variants/AvatarAccount/AvatarAccount.constants.ts

@@ -3,7 +3,20 @@
 import { AvatarSize } from '../../Avatar.types';
 
 // Internal dependencies.
-import { AvatarAccountType, AvatarAccountProps } from './AvatarAccount.types';
+import {
+  AvatarAccountType,
+  AvatarAccountProps,
+  BorderRadiusByAvatarSize,
+} from './AvatarAccount.types';
+
+// Mappings
+export const BORDERRADIUS_BY_AVATARSIZE: BorderRadiusByAvatarSize = {
+  [AvatarSize.Xs]: 4,
+  [AvatarSize.Sm]: 6,
+  [AvatarSize.Md]: 8,
+  [AvatarSize.Lg]: 10,
+  [AvatarSize.Xl]: 12,
+};
 
 // Defaults
 export const DEFAULT_AVATARACCOUNT_TYPE = AvatarAccountType.JazzIcon;

app/component-library/components/Avatars/Avatar/variants/AvatarAccount/AvatarAccount.styles.ts

@@ -1,6 +1,41 @@
 // Third party dependencies.
-import { StyleSheet } from 'react-native';
+import { ViewStyle } from 'react-native';
 
-const styleSheet = StyleSheet.create({ imageStyle: { flex: 1 } });
+// External dependencies.
+import { Theme } from '../../../../../../util/theme/models';
+
+// Internal dependencies.
+import { AvatarAccountStyleSheetVars } from './AvatarAccount.types';
+import {
+  BORDERRADIUS_BY_AVATARSIZE,
+  DEFAULT_AVATARACCOUNT_SIZE,
+} from './AvatarAccount.constants';
+
+/**
+ * Style sheet function for AvatarAccount component.
+ *
+ * @param params Style sheet params.
+ * @param params.vars Inputs that the style sheet depends on.
+ * @returns StyleSheet object.
+ */
+const styleSheet = (params: {
+  theme: Theme;
+  vars: AvatarAccountStyleSheetVars;
+}) => {
+  const { vars } = params;
+  const { style, size = DEFAULT_AVATARACCOUNT_SIZE } = vars;
+  const borderRadius = BORDERRADIUS_BY_AVATARSIZE[size];
+
+  return {
+    imageStyle: { flex: 1 },
+    artStyle: { borderRadius },
+    avatarBase: Object.assign(
+      {
+        borderRadius,
+      } as ViewStyle,
+      style,
+    ) as ViewStyle,
+  };
+};
 
 export default styleSheet;