Merge branch 'release/7.63.1' into release/7.63.1-Changelog

Author: joaoloureirop

android/app/build.gradle

@@ -188,7 +188,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionName "7.63.1"
-        versionCode 3604
+        versionCode 3625
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"

android/app/src/main/AndroidManifest.xml

@@ -184,5 +184,12 @@
 				android:resource="@xml/filepaths"
 			/>
 		</provider>
+
+		<!-- Disable Notifee's BlockStateBroadcastReceiver to prevent crash during cold start -->
+		<!-- This receiver tries to access React Native before it's initialized -->
+		<receiver
+			android:name="app.notifee.core.BlockStateBroadcastReceiver"
+			android:enabled="false"
+			tools:node="remove" />
 	</application>
 </manifest>

app/components/UI/DeepLinkModal/DeepLinkModal.test.tsx

@@ -143,7 +143,7 @@ describe('DeepLinkModal', () => {
           }),
           build: jest.fn().mockImplementation(function (this: MockBuilder) {
             return {
-              name: 'Deep link Used',
+              name: 'Deep Link Used',
               properties: {
                 route: 'invalid',
                 was_app_installed: true,

app/core/Analytics/MetaMetrics.events.ts

@@ -514,7 +514,7 @@ enum EVENT_NAME {
   NetworkConnectionBannerRpcUpdated = 'Network Connection Banner RPC Updated',
 
   // Deep Link Analytics - Consolidated Event
-  DEEP_LINK_USED = 'Deep link Used',
+  DEEP_LINK_USED = 'Deep Link Used',
 
   // What's New Link Clicked
   WHATS_NEW_LINK_CLICKED = "What's New Link Clicked",

bitrise.yml

@@ -3472,13 +3472,13 @@ app:
       VERSION_NAME: 7.63.1
     - opts:
         is_expand: false
-      VERSION_NUMBER: 3604
+      VERSION_NUMBER: 3625
     - opts:
         is_expand: false
       FLASK_VERSION_NAME: 7.63.1
     - opts:
         is_expand: false
-      FLASK_VERSION_NUMBER: 3604
+      FLASK_VERSION_NUMBER: 3625
     - opts:
         is_expand: false
       ANDROID_APK_LINK: ''

ios/MetaMask.xcodeproj/project.pbxproj

@@ -1281,7 +1281,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3604;
+				CURRENT_PROJECT_VERSION = 3625;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1350,7 +1350,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3604;
+				CURRENT_PROJECT_VERSION = 3625;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1416,7 +1416,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3604;
+				CURRENT_PROJECT_VERSION = 3625;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1483,7 +1483,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3604;
+				CURRENT_PROJECT_VERSION = 3625;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;
@@ -1646,7 +1646,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3604;
+				CURRENT_PROJECT_VERSION = 3625;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -1716,7 +1716,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3604;
+				CURRENT_PROJECT_VERSION = 3625;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 48XVW22RCG;