Merge branch 'main' into feat/stake-822-build-your-balance-component

MetaMask · Sep 25, 2024 · ba6634a · ba6634a
2 parents 2ffffec + 36eade5
commit ba6634a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ios/Podfile b/ios/Podfile
@@ -96,6 +96,9 @@ def common_target_logic
   # use_frameworks!
 	pod 'Permission-BluetoothPeripheral', :path => '../node_modules/react-native-permissions/ios/BluetoothPeripheral'
   pod 'GzipSwift'
+
+  # Pod for fixing react-native-quick-crypto issue: https://github.com/margelo/react-native-quick-crypto/issues/244
+  pod "OpenSSL-Universal", "= 1.1.1100"
 end
 
 target 'MetaMask' do

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1302,6 +1302,6 @@ SPEC CHECKSUMS:
   Yoga: 6f5ab94cd8b1ecd04b6e973d0bc583ede2a598cc
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 0e9407472193b5f7d5cfe4715c8f1f2c2fed42e5
+PODFILE CHECKSUM: 876298d4a106643492005466f7a314cd08711f4d
 
 COCOAPODS: 1.15.2