Merge branch 'main' into refactor/ramp-use-metamask-env

Author: wachunei

.github/actionlint.yaml

@@ -2,6 +2,8 @@ self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
   labels: 
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl"
+    - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-xxl"
+    - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-l-kvm"
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-large"
     - "gha-mm-scale-set-ubuntu-22.04-amd64-large"
     - "gha-mm-scale-set-ubuntu-22.04-amd64-small"

.github/workflows/build-android-e2e.yml

@@ -19,7 +19,7 @@ on:
 jobs:
   build-android-apks:
     name: Build Android E2E APKs
-    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl
+    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xxl
     env:
       GRADLE_USER_HOME: /home/runner/_work/.gradle
     outputs:

.github/workflows/build-android-upload-to-browserstack.yml

@@ -71,7 +71,7 @@ jobs:
 
   build-android-dual:
     name: Build Android Dual Versions
-    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl
+    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xxl
     needs: [check-builds-needed]
     env:
       GRADLE_USER_HOME: /home/runner/_work/.gradle

.github/workflows/needs-e2e-build.yml

@@ -89,7 +89,7 @@ jobs:
               - 'wdio/**'                          # WebDriver test files
               - 'wdio.conf.js'                     # WebDriver config
               - 'appwright/**'                     # Appwright test files
-
+              - 'scripts/build.sh'                 # Build.sh
 
             ignore:
               - '**/*.md'                          # Documentation files
@@ -107,7 +107,9 @@ jobs:
               - 'crowdin.yml'                      # Translation config
               - 'bitrise.yml'                      # CI config (non-GitHub)
               - 'sonar-project.properties'         # SonarQube config
-              - 'scripts/**'                       # Build/utility scripts
+              - 'scripts/*'                        # Build/utility scripts
+              - 'scripts/*/**'                     # Subdirectories in scripts/   
+              - '!scripts/build.sh'                # But NOT build.sh
               - 'patches/**'                       # Dependency patches
               - 'ppom/**'                          # PPOM sub-project
 

.github/workflows/run-e2e-workflow.yml

@@ -42,7 +42,7 @@ on:
 jobs:
   test-e2e-mobile:
     name: ${{ inputs.test-suite-name }}
-    runs-on: ${{ inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:sequoia' || 'gha-mmsdk-scale-set-ubuntu-22.04-amd64-large' }}
+    runs-on: ${{ inputs.platform == 'ios' && 'ghcr.io/cirruslabs/macos-runner:sequoia' || 'gha-mmsdk-scale-set-ubuntu-22.04-amd64-l-kvm' }}
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.platform }}-${{ inputs.test-suite-name }}-${{ inputs.split_number }}
       cancel-in-progress: ${{ !(contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/stable')) }}

.github/workflows/test-android-build-app.yml

@@ -17,7 +17,7 @@ jobs:
   android-build:
     name: Test Android Build QA App
     #runs-on: gha-mm-scale-set-ubuntu-22.04-amd64-large
-    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl
+    runs-on: gha-mmsdk-scale-set-ubuntu-22.04-amd64-xxl
     outputs:
       artifacts-url: ${{ steps.set-artifacts-url.outputs.artifacts-url }}
       apk-uploaded: ${{ steps.upload-apk.outcome == 'success' }}

.yarn/patches/@metamask-bridge-status-controller-npm-47.2.0-1c8660e896.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/utils/swap-received-amount.cjs b/dist/utils/swap-received-amount.cjs
+index 4c01024e3ebba952b0bbded0aa7bb7e2690629f1..4809ec09ab2b94fc0dbb5160d464da4dab61c57e 100644
+--- a/dist/utils/swap-received-amount.cjs
++++ b/dist/utils/swap-received-amount.cjs
+@@ -28,7 +28,7 @@ const getReceivedERC20Amount = (historyItem, txMeta) => {
+     const TOKEN_TRANSFER_LOG_TOPIC_HASH = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef';
+     const tokenTransferLog = txReceipt.logs.find((txReceiptLog) => {
+         const isTokenTransfer = txReceiptLog.topics &&
+-            txReceiptLog.topics[0].startsWith(TOKEN_TRANSFER_LOG_TOPIC_HASH);
++            txReceiptLog.topics[0]?.startsWith(TOKEN_TRANSFER_LOG_TOPIC_HASH);
+         const isTransferFromGivenToken = txReceiptLog.address?.toLowerCase() ===
+             quote.destAsset.address?.toLowerCase();
+         const isTransferFromGivenAddress = txReceiptLog.topics &&

android/app/src/androidTest/java/com/metamask/DetoxTest.java

@@ -9,6 +9,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
+
 import com.wix.detox.config.DetoxConfig;
 @RunWith(AndroidJUnit4.class)
 @LargeTest
@@ -17,7 +18,6 @@ public class DetoxTest {
 	   @Rule
      public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false);
 
-    
      @Test
      public void runDetoxTests() {
          DetoxConfig detoxConfig = new DetoxConfig();

app/actions/networkConnectionBanner/index.test.ts

@@ -21,7 +21,7 @@ describe('networkConnectionBanner actions', () => {
     it.each([
       {
         chainId: '0x1',
-        status: 'slow' as const,
+        status: 'degraded' as const,
         networkName: 'Ethereum Mainnet',
         rpcUrl: 'https://mainnet.infura.io/v3/123',
       },
@@ -53,7 +53,7 @@ describe('networkConnectionBanner actions', () => {
 
     it('should require chainId, status, networkName and rpcUrl parameters', () => {
       const chainId = '0x1';
-      const status: NetworkConnectionBannerStatus = 'slow';
+      const status: NetworkConnectionBannerStatus = 'degraded';
       const networkName = 'Ethereum Mainnet';
       const rpcUrl = 'https://mainnet.infura.io/v3/123';
 

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

@@ -266,14 +266,12 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
             <View
               style={
                 {
-                  "backgroundColor": "#ffffff",
-                  "borderColor": "#b7bbc8",
-                  "borderRadius": 10,
-                  "borderWidth": 1,
+                  "backgroundColor": "#f3f5f9",
+                  "borderRadius": 4,
                   "height": 24,
                   "justifyContent": "center",
                   "marginTop": 4,
-                  "paddingHorizontal": 4,
+                  "paddingHorizontal": 8,
                 }
               }
               testID="celltag-label"
@@ -282,7 +280,7 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
                 accessibilityRole="text"
                 style={
                   {
-                    "color": "#121314",
+                    "color": "#686e7d",
                     "fontFamily": "Geist Regular",
                     "fontSize": 16,
                     "letterSpacing": 0,