Merge branch 'main' into fix/ramps/buildquote-flickering

Author: AxelGes

.detoxrc.js

@@ -22,7 +22,7 @@ module.exports = {
       $0: 'jest',
       config: 'e2e/jest.e2e.config.js',
     },
-    detached: true,
+    detached: process.env.CI ? true : false,
     jest: {
       setupTimeout: 220000,
       teardownTimeout: 60000, // Increase teardown timeout from default 30s to 60s

android/app/build.gradle

@@ -187,7 +187,7 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.59.0"
+        versionName "7.60.0"
         versionCode 2818
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/core/Snaps/SnapsMethodMiddleware.ts

@@ -36,6 +36,7 @@ import { MetricsEventBuilder } from '../Analytics/MetricsEventBuilder';
 import { Json } from '@metamask/utils';
 import { SchedulableBackgroundEvent } from '@metamask/snaps-controllers';
 import { endTrace, trace } from '../../util/trace';
+import { AppState } from 'react-native';
 
 export function getSnapIdFromRequest(
   request: Record<string, unknown>,
@@ -190,7 +191,9 @@ const snapMethodMiddlewareBuilder = (
       engineContext.ApprovalController.addAndShowApprovalRequest.bind(
         engineContext.ApprovalController,
       ),
-    getIsActive: () => true, // For now we consider the app to be always active.
+    getIsActive: () =>
+      AppState.currentState === 'active' &&
+      engineContext.KeyringController.isUnlocked(),
     getIsLocked: () => !engineContext.KeyringController.isUnlocked(),
     getEntropySources: () => {
       const state = controllerMessenger.call('KeyringController:getState');

bitrise.yml

@@ -3574,13 +3574,13 @@ app:
       PROJECT_LOCATION_IOS: ios
     - opts:
         is_expand: false
-      VERSION_NAME: 7.59.0
+      VERSION_NAME: 7.60.0
     - opts:
         is_expand: false
       VERSION_NUMBER: 2818
     - opts:
         is_expand: false
-      FLASK_VERSION_NAME: 7.59.0
+      FLASK_VERSION_NAME: 7.60.0
     - opts:
         is_expand: false
       FLASK_VERSION_NUMBER: 2818

ios/MetaMask.xcodeproj/project.pbxproj

@@ -1311,7 +1311,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.59.0;
+				MARKETING_VERSION = 7.60.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1377,7 +1377,7 @@
 					"${inherited}",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.59.0;
+				MARKETING_VERSION = 7.60.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1446,7 +1446,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.59.0;
+				MARKETING_VERSION = 7.60.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1510,7 +1510,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.59.0;
+				MARKETING_VERSION = 7.60.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -1676,7 +1676,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.59.0;
+				MARKETING_VERSION = 7.60.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",
@@ -1743,7 +1743,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 7.59.0;
+				MARKETING_VERSION = 7.60.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"$(inherited)",