chore: 7.37.1 & main sync

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Current Main Branch
 
+## 7.37.1 - Dec 16, 2024
+### Fixed
+- [#12577](https://github.com/MetaMask/metamask-mobile/pull/12577): chore: bump {gas-fee,network,selected-network,notification-services,profile-sync,signature}-controller (#12577)
+- [#12694](https://github.com/MetaMask/metamask-mobile/pull/12694): fix: small refactoring of the latest migration script + add a new migration case (#12694)
+- [#12664](https://github.com/MetaMask/metamask-mobile/pull/12664): fix: mark transactions as failed for cancelled / unknown smart transactions (#12664)
+
 ## 7.37.0 - Nov 28, 2024
 ### Added
 - [#12091](https://github.com/MetaMask/metamask-mobile/pull/12091): feat: 2020 Add a performance test for iOS in Bitrise (#12091)

android/app/build.gradle

@@ -178,8 +178,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.37.0"
-        versionCode 1512
+        versionName "7.37.1"
+        versionCode 1520
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bitrise.yml

@@ -115,9 +115,11 @@ stages:
       - deploy_android_to_store: {}
   create_build_qa_and_expo:
       workflows:
-      - build_android_devbuild: {}
+      - build_android_expo_dev: {}
+      - build_android_expo_qa: {}
       - build_android_qa: {}
-      - build_ios_devbuild: {}
+      - build_ios_expo_dev: {}
+      - build_ios_expo_qa: {}
       - build_ios_qa: {}
   create_build_qa:
     workflows:
@@ -1204,7 +1206,7 @@ workflows:
       - SENTRY_DISABLE_AUTO_UPLOAD: 'false'
     after_run:
       - build_android_release
-  build_android_devbuild:
+  build_android_expo_dev:
     before_run:
       - code_setup
     after_run:
@@ -1225,7 +1227,7 @@ workflows:
             - content: |-
                 #!/usr/bin/env bash
                 node -v
-                GIT_BRANCH=$BITRISE_GIT_BRANCH METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='debug' yarn build:android:devbuild
+                GIT_BRANCH=$BITRISE_GIT_BRANCH METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='debug' yarn build:android:expo:dev
           title: Build Android Dev Build
           is_always_run: false
       - save-gradle-cache@1: {}
@@ -1319,6 +1321,56 @@ workflows:
       bitrise.io:
         stack: linux-docker-android-22.04
         machine_type_id: elite-xl
+build_android_expo_qa:
+    before_run:
+      - code_setup
+    after_run:
+      - notify_failure
+    steps:
+      - change-android-versioncode-and-versionname@1:
+          inputs:
+            - new_version_name: $VERSION_NAME
+            - new_version_code: $VERSION_NUMBER
+            - build_gradle_path: $PROJECT_LOCATION_ANDROID/app/build.gradle
+      - restore-gradle-cache@2: {}
+      - install-missing-android-tools@3:
+          inputs:
+            - ndk_version: $NDK_VERSION
+            - gradlew_path: $PROJECT_LOCATION/gradlew
+      - script@1:
+          inputs:
+            - content: |-
+                #!/usr/bin/env bash
+                node -v
+                GIT_BRANCH=$BITRISE_GIT_BRANCH METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='debug' yarn build:android:expo:qa
+          title: Build Android Dev Build
+          is_always_run: false
+      - save-gradle-cache@1: {}
+      - script:
+          title: Copy and Rename APK
+          inputs:
+            - content: |-
+                # Define the source path of the generated APK
+                SOURCE_APK_PATH="$PROJECT_LOCATION/app/build/outputs/apk/prod/debug/app-qa-debug.apk"
+
+                # Define the destination path with the new name
+                DEST_APK_PATH="$BITRISE_DEPLOY_DIR/android-expo-qa-build.apk"
+
+                # Copy and rename the APK
+                cp "$SOURCE_APK_PATH" "$DEST_APK_PATH"
+
+                # Optionally, print the new path for verification
+                echo "APK has been copied and renamed to: $DEST_APK_PATH"
+      - deploy-to-bitrise-io@2.2.3:
+          is_always_run: false
+          is_skippable: true
+          inputs:
+            - deploy_path: "$BITRISE_DEPLOY_DIR/android-expo-qa-build.apk"
+          title: Bitrise Deploy APK
+    meta:
+      bitrise.io:
+        stack: linux-docker-android-22.04
+        machine_type_id: elite-xl
   _upload_apk_to_browserstack:
     steps:
       - script@1:
@@ -1499,7 +1551,7 @@ workflows:
       - SENTRY_DISABLE_AUTO_UPLOAD: 'false'
     after_run:
       - build_ios_release
-  build_ios_devbuild:
+  build_ios_expo_dev:
     before_run:
       - code_setup
     after_run:
@@ -1516,7 +1568,7 @@ workflows:
             - content: |-
                 #!/usr/bin/env bash
                 node -v
-                GIT_BRANCH=$BITRISE_GIT_BRANCH METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='debug' yarn build:ios:devbuild
+                GIT_BRANCH=$BITRISE_GIT_BRANCH METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='debug' yarn build:ios:expo:dev
           title: iOS Sourcemaps & Build
           is_always_run: false
       - script:
@@ -1584,6 +1636,48 @@ workflows:
             - pipeline_intermediate_files: sourcemaps/ios/index.js.map:BITRISE_APP_STORE_SOURCEMAP_PATH
             - deploy_path: sourcemaps/ios/index.js.map
           title: Deploy Source Map
+build_ios_expo_qa:
+    before_run:
+      - code_setup
+    after_run:
+      - notify_failure
+    steps:
+      - certificate-and-profile-installer@1: {}
+      - set-xcode-build-number@1:
+          inputs:
+            - build_short_version_string: $VERSION_NAME
+            - build_version: $VERSION_NUMBER
+            - plist_path: $PROJECT_LOCATION_IOS/MetaMask/Info.plist
+      - script@1:
+          inputs:
+            - content: |-
+                #!/usr/bin/env bash
+                node -v
+                GIT_BRANCH=$BITRISE_GIT_BRANCH METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='debug' yarn build:ios:expo:qa
+          title: iOS Sourcemaps & Build
+          is_always_run: false
+      - script:
+          title: Copy and Rename IPA
+          inputs:
+            - content: |-
+                # Define the source path of the generated IPA
+                SOURCE_IPA_PATH="ios/build/output/MetaMask-QA.ipa"
+
+                # Define the destination path with the new name
+                DEST_IPA_PATH="$BITRISE_DEPLOY_DIR/ios-expo-qa-build.ipa"
+
+                # Copy and rename the IPA
+                cp "$SOURCE_IPA_PATH" "$DEST_IPA_PATH"
+
+                # Optionally, print the new path for verification
+                echo "IPA has been copied and renamed to: $DEST_IPA_PATH"
+      - deploy-to-bitrise-io@2.2.3:
+          is_always_run: false
+          is_skippable: true
+          inputs:
+            - pipeline_intermediate_files: ios/build/output/MetaMask.ipa:BITRISE_APP_STORE_IPA_PATH
+            - deploy_path: "$BITRISE_DEPLOY_DIR/ios-expo-dev-build.ipa"
+          title: Deploy iOS IPA
   _upload_ipa_to_browserstack:
     steps:
       - script@1:
@@ -1781,16 +1875,16 @@ app:
       PROJECT_LOCATION_IOS: ios
     - opts:
         is_expand: false
-      VERSION_NAME: 7.37.0
+      VERSION_NAME: 7.37.1
     - opts:
         is_expand: false
-      VERSION_NUMBER: 1512
+      VERSION_NUMBER: 1520
     - opts:
         is_expand: false
-      FLASK_VERSION_NAME: 7.37.0
+      FLASK_VERSION_NAME: 7.37.1
     - opts:
         is_expand: false
-      FLASK_VERSION_NUMBER: 1512
+      FLASK_VERSION_NUMBER: 1520
     - opts:
         is_expand: false
       ANDROID_APK_LINK: ''

ios/MetaMask.xcodeproj/project.pbxproj

@@ -1378,9 +1378,8 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1512;
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1520;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1418,7 +1417,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.37.0;
+				MARKETING_VERSION = 7.37.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1449,7 +1448,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1512;
+				CURRENT_PROJECT_VERSION = 1520;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1484,7 +1483,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.37.0;
+				MARKETING_VERSION = 7.37.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1514,7 +1513,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1512;
+				CURRENT_PROJECT_VERSION = 1520;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1547,7 +1546,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.37.0;
+				MARKETING_VERSION = 7.37.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1576,7 +1575,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1512;
+				CURRENT_PROJECT_VERSION = 1520;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1607,7 +1606,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.37.0;
+				MARKETING_VERSION = 7.37.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1731,7 +1730,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1512;
+				CURRENT_PROJECT_VERSION = 1520;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1768,7 +1767,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.37.0;
+				MARKETING_VERSION = 7.37.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -1800,7 +1799,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1512;
+				CURRENT_PROJECT_VERSION = 1520;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1835,7 +1834,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.37.0;
+				MARKETING_VERSION = 7.37.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metamask",
-  "version": "7.37.0",
+  "version": "7.37.1",
   "private": true,
   "scripts": {
     "audit:ci": "./scripts/yarn-audit.sh",
@@ -33,7 +33,8 @@
     "start:android:flask": "export METAMASK_BUILD_TYPE='flask' && ./scripts/build.sh android flaskDebug",
     "build:announce": "node ./scripts/metamask-bot-build-announce-bitrise.js",
     "build:android:release": "./scripts/build.sh android release",
-    "build:android:devbuild": "./scripts/build.sh android devBuild",
+    "build:android:expo:dev": "./scripts/build.sh android devBuild",
+    "build:android:expo:qa": "./scripts/build.sh android devBuild",
     "build:android:checksum": "./scripts/checksum.sh",
     "build:android:checksum:qa": "./scripts/checksum.sh QA",
     "build:android:checksum:flask": "export METAMASK_BUILD_TYPE='flask' && ./scripts/checksum.sh flask",
@@ -43,7 +44,8 @@
     "build:android:pre-release:bundle:qa": "GENERATE_BUNDLE=true ./scripts/build.sh android QA --pre",
     "build:android:pre-release:bundle:flask": "export METAMASK_BUILD_TYPE='flask' && GENERATE_BUNDLE=true ./scripts/build.sh android flask --pre",
     "build:ios:release": "./scripts/build.sh ios release",
-    "build:ios:devbuild": "./scripts/build.sh ios devbuild",
+    "build:ios:expo:dev": "./scripts/build.sh ios devbuild",
+    "build:ios:expo:qa": "./scripts/build.sh ios devbuild",
     "build:ios:pre-flask": "export METAMASK_BUILD_TYPE='flask' && ./scripts/build.sh ios flask --pre",
     "build:ios:pre-release": "./scripts/build.sh ios release --pre",
     "build:ios:pre-qa": "./scripts/build.sh ios QA --pre",