Merge branch 'main' into feature/add-attribution-workflow

cryptodev-2s · Jun 5, 2024 · 4732cfd · 4732cfd
2 parents 3bca5bd + b9bfc7c
commit 4732cfd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/app/core/WalletConnect/WalletConnectV2.ts b/app/core/WalletConnect/WalletConnectV2.ts
@@ -373,13 +373,7 @@ class WalletConnect2Session {
     let method = requestEvent.params.request.method;
     const chainId = parseInt(requestEvent.params.chainId);
 
-    const beforeMethodParams = requestEvent.params.request.params as any;
-    // Replace blockExplorerUrls with blockExplorerUrl
-    const methodParams = {
-      ...beforeMethodParams,
-      // blockExplorerUrl: beforeMethodParams.blockExplorerUrls,
-      // test: 'test',
-    };
+    const methodParams = requestEvent.params.request.params as any;
 
     DevLogger.log(
       `WalletConnect2Session::handleRequest chainId=${chainId} method=${method}`,

diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -1487,7 +1487,11 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -1529,7 +1533,11 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_LDFLAGS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-Wl",
+					"-ld_classic",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;