Merge branch 'main' into test/remove-list-notifications

MetaMask · Nov 14, 2024 · aad2e74 · aad2e74
2 parents 47616d5 + 40d2353
commit aad2e74
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 99 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,6 @@ jobs:
       - uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 #v1
         with:
           ruby-version: '3.1.6'
-          bundler-cache: true
         env:
           BUNDLE_GEMFILE: ios/Gemfile
       - run: yarn setup
@@ -181,7 +180,6 @@ jobs:
           name: ios-bundle
           path: ios/main.jsbundle
 
-
       - name: Push bundle size to mobile_bundlesize_stats repo
         run: ./scripts/push-bundle-size.sh
         env:

diff --git a/ios/Gemfile b/ios/Gemfile
@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 # Recommended to use http://rbenv.org/ to install and use this version
-ruby '>= 3.1.6'
+ruby '3.1.6'
 
 # Allow minor version updates up to but excluding 2.0.0
-gem 'cocoapods', '~> 1.12'
+gem 'cocoapods', '1.16.2'
 
 # Allow all version updates up to but excluding 7.1.0
 gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
@@ -10,18 +10,18 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.2.0)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.16.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.16.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -35,8 +35,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -60,36 +60,36 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.16.3)
+    ffi (1.17.0)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.8.1)
     minitest (5.22.3)
     molinillo (0.8.0)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     netrc (0.11.0)
     nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     ruby-macho (2.5.1)
-    strscan (3.1.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
 
 PLATFORMS
   arm64-darwin-22
@@ -98,7 +98,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 6.1.7.3, < 7.1.0)
-  cocoapods (~> 1.12)
+  cocoapods (= 1.16.2)
 
 RUBY VERSION
    ruby 3.1.6p260

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -200,9 +200,9 @@ PODS:
   - lottie-react-native (5.1.5):
     - lottie-ios (~> 3.4.0)
     - React-Core
-  - MMKV (1.3.9):
-    - MMKVCore (~> 1.3.9)
-  - MMKVCore (1.3.9)
+  - MMKV (2.0.0):
+    - MMKVCore (~> 2.0.0)
+  - MMKVCore (2.0.0)
   - MultiplatformBleAdapter (0.2.0)
   - nanopb (2.30910.0):
     - nanopb/decode (= 2.30910.0)
@@ -1165,7 +1165,7 @@ SPEC CHECKSUMS:
   BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
   boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0
-  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
+  BVLinearGradient: 44fd36b87f318e7933c4c91a6991442a5e3f5bcf
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 25cbffbaec517695d376ab4bc428948cd0f08088
@@ -1194,63 +1194,63 @@ SPEC CHECKSUMS:
   GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   lottie-ios: 016449b5d8be0c3dcbcfa0a9988469999cd04c5d
-  lottie-react-native: 3e722c63015fdb9c27638b0a77969fc412067c18
-  MMKV: 817ba1eea17421547e01e087285606eb270a8dcb
-  MMKVCore: af055b00e27d88cd92fad301c5fecd1ff9b26dd9
+  lottie-react-native: b6776287d7fd31be4fd865059cd890f744242ffd
+  MMKV: f7d1d5945c8765f97f39c3d121f353d46735d801
+  MMKVCore: c04b296010fcb1d1638f2c69405096aac12f6390
   MultiplatformBleAdapter: b1fddd0d499b96b607e00f0faa8e60648343dc1d
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
-  Permission-BluetoothPeripheral: 247e379c9ecb4b1af2b87f73e4a15a00a5bc0c1f
+  Permission-BluetoothPeripheral: 34ab829f159c6cf400c57bac05f5ba1b0af7a86e
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
+  RCT-Folly: 8dc08ca5a393b48b1c523ab6220dfdcc0fe000ad
   RCTRequired: fb207f74935626041e7308c9e88dcdda680f1073
-  RCTSearchApi: d2d38a5a7bffbfb144e2c770fbb30f51b1053067
+  RCTSearchApi: 5fc36140c598a74fd831dca924a28ed53bc7aa18
   RCTTypeSafety: 146fd11361680250b7580dd1f7f601995cfad1b1
   React: f3712351445cc96ba507425675a0cd8d31321d0c
   React-callinvoker: dcc51a66e02d20a70aeca2abbb1388d4d3011bf8
-  React-Codegen: 04b7e88a7f5d3933d058ffb9cea7b0268666de79
-  React-Core: ed3aeebf41aeb621de2ab4b58216a2fd5a5fd141
-  React-CoreModules: 9d1e6f44bf658431a3b99561c8058b54b5959190
-  React-cxxreact: d2d14fc0c0782bd9ed7a556892769b4034ae027c
+  React-Codegen: ef431087b06572288cd0f789c9cf1d22b37c3019
+  React-Core: 88bf9e0d862195fda28723fd95aef3111025f300
+  React-CoreModules: 96a557c45f6be644a82d63066c4ac79173bba0ff
+  React-cxxreact: 3db957f2a0db039b95c1103ea2274e36815b8009
   React-debug: 4e90d08c78aa207c064a3860e1540ff252695585
   React-jsc: 9ffa4c837c5286366d27c892b6c7c34da3cd5f3d
-  React-jsi: 020729f637b93456de0018061d44ce36f33c2d8a
-  React-jsiexecutor: ce8ecfcd3b7dbc9cb65a661110be17f5afd18aa3
+  React-jsi: 08cb162e1d192bf197bc0693270ab65d8e9d4d5c
+  React-jsiexecutor: b71b576b4447d9fed6f2f1b146550de70d49a75a
   React-jsinspector: b86a8abae760c28d69366bbc1d991561e51341ed
-  React-logger: ed7c9e01e58529065e7da6bf8318baf15024283e
-  react-native-aes: 0143040f4e0cb19296b69b4acc7ddd8d3df9d62d
-  react-native-background-timer: 1b6e6b4e10f1b74c367a1fdc3c72b67c619b222b
-  react-native-ble-plx: f0557dbb6bd1f26cca75a67b5f33cfc7f7f9abed
-  react-native-blob-jsi-helper: 13c10135af4614dbc0712afba5960784cd44f043
-  react-native-blob-util: 18b510205c080a453574a7d2344d64673d0ad9af
-  react-native-blur: 507cf3dd4434eb9d5ca5f183e49d8bcccdd66826
-  react-native-branch: 4e42fda662d96893afbbd02839806931398e3d2e
-  react-native-camera: b8cc03e2feec0c04403d0998e37cf519d8fd4c6f
-  react-native-compat: 8b6a38155e778a20a008aea837efd00e099b6fe8
-  react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
-  react-native-fast-crypto: 5943c42466b86ad70be60d3a5f64bd22251e5d9e
-  react-native-flipper: 6cfd5991388121f7f96fc5171b93380f97ebb3c6
-  react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
-  react-native-gzip: c5e87ee9e359f02350e3a2ee52eb35eddc398868
-  react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
-  react-native-launch-arguments: 4e0fd58e56dcc7f52eedef9dc8eff81eb73ced7a
-  react-native-mmkv: e97c0c79403fb94577e5d902ab1ebd42b0715b43
-  react-native-netinfo: 48c5f79a84fbc3ba1d28a8b0d04adeda72885fa8
-  react-native-performance: ff93f8af3b2ee9519fd7879896aa9b8b8272691d
-  react-native-quick-base64: 777057ea4286f806b00259ede65dc79c7c706320
-  react-native-quick-crypto: 455c1b411db006dba1026a30681ececb19180187
-  react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
-  react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe
-  react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
-  react-native-slider: f266dd860064138a659a42714e6da47a52a51107
-  react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
-  react-native-view-shot: 4475fde003fe8a210053d1f98fb9e06c1d834e1c
-  react-native-webview-mm: c518409c962c1f0f95c08bb6a700b9f97aff131b
-  React-NativeModulesApple: 7bab439cb5de9a76299210ed1127698170777a7f
+  React-logger: 8c0f8173197ad28ac3212c18f8141690209dfe52
+  react-native-aes: e8b2e113d532b0efb6449754492aee9c218dd502
+  react-native-background-timer: 007ff829f79644caf2ed013e22f0563560336f86
+  react-native-ble-plx: c08c34c162509ec466c68a7cdc86b69c12e6efdd
+  react-native-blob-jsi-helper: bd7509e50b0f906044c53ad7ab767786054424c9
+  react-native-blob-util: 6560d6fc4b940ec140f9c3ebe21c8669b1df789b
+  react-native-blur: 7c03644c321696ccec9778447180e0f9339b3604
+  react-native-branch: 76e1f947b40597727e6faa5cba5824d7ecf6c6b0
+  react-native-camera: 1e6fefa515d3af8b4aeaca3a8bffa2925252c4ea
+  react-native-compat: 8050db8973090f2c764807e7fa74f163f78e4c32
+  react-native-cookies: d648ab7025833b977c0b19e142503034f5f29411
+  react-native-fast-crypto: 6b448866f5310cf203714a21147ef67f735bea8e
+  react-native-flipper: ca4382a2b6cfd319b6e212539bc1fe7aafe36879
+  react-native-get-random-values: 0fd2b6a3129988d701d10e30f0622d5f039531bc
+  react-native-gzip: 8d602277c2564591f04dd1cec4043acc8350dcc3
+  react-native-in-app-review: b3d1eed3d1596ebf6539804778272c4c65e4a400
+  react-native-launch-arguments: 7eb321ed3f3ef19b3ec4a2eca71c4f9baee76b41
+  react-native-mmkv: 5a46c73e3e12aa872c4485ae0e4414b4040af79a
+  react-native-netinfo: 26560022f28c06d8ef00a9ff1e03beefbbb60c2d
+  react-native-performance: 125a96c145e29918b55b45ce25cbba54f1e24dcd
+  react-native-quick-base64: daf67f19ee076b77f0755bf4056f3425f164e1d8
+  react-native-quick-crypto: eff065b704d3f1c6e336cfc612dce63228ab3482
+  react-native-randombytes: 3c8f3e89d12487fd03a2f966c288d495415fc116
+  react-native-render-html: 5afc4751f1a98621b3009432ef84c47019dcb2bd
+  react-native-safe-area-context: 667324e20fb3dd9c39c12d6036675ed90099bcd5
+  react-native-slider: 6a25a7398addb8478798315a58504efce744009d
+  react-native-video: 2aad0d963bf3952bd9ebb2f53fab799338e8e202
+  react-native-view-shot: bb8934cb93bf8ec740c81ed94f93244778797b6c
+  react-native-webview-mm: d5f16bf95d45db97b53851ab87c79b2e1d964a13
+  React-NativeModulesApple: ee6c836571c874dc879cf87603edff00d8dded46
   React-perflogger: 6acc671f527e69c0cd93b8e62821d33d3ddf25ca
   React-RCTActionSheet: 569bb9db46d85565d14697e15ecf2166e035eb07
   React-RCTAnimation: 0eea98143c2938a8751a33722623d3e8a38fe1e4
-  React-RCTAppDelegate: 74d38dbb3d8691f72e6dda670006e85d9ea21c91
+  React-RCTAppDelegate: 11e6d38c00a34e1025b9ef26bb13968f6d9ed902
   React-RCTBlob: 9b3b60e806ce5c9fe5a8ee449f3e41087617441c
   React-RCTImage: 0220975422a367e784dfd794adfc6454fab23c1f
   React-RCTLinking: 1abf9834017e080ecbd5b6a28b4fb15eb843a3dd
@@ -1261,42 +1261,42 @@ SPEC CHECKSUMS:
   React-RCTVibration: 372a12b697a170aaee792f8a9999c40e1f2692d0
   React-rncore: d1ccbd5adaf4a67703790838b7c62f140e72d32a
   React-runtimeexecutor: d4f7ff5073fcf87e14dbf89541d434218630246e
-  React-runtimescheduler: b360635f6f804ec42fa875500620882a6b97d2f5
-  React-utils: 8eb3c12fd4a4da6df3824f7d9a961d73a6ed6e5d
-  ReactCommon: 317bddf4a70fca9e542343e942a504285282971c
-  ReactNativePayments: db62ee22a825e9e9c3e19c276d8d020881dd0630
-  RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
-  RNCCheckbox: a3ca9978cb0846b981d28da4e9914bd437403d77
-  RNCClipboard: ddd4d291537f1667209c9c405aaa4307297e252e
-  RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
-  RNDateTimePicker: 4f3c4dbd4f908be32ec8c93f086e8924bd4a2e07
-  RNDefaultPreference: 2f8d6d54230edbd78708ada8d63bb275e5a8415b
-  RNDeviceInfo: 1e3f62b9ec32f7754fac60bd06b8f8a27124e7f0
-  RNFBApp: 5f87753a8d8b37d229adf85cd0ff37709ffdf008
-  RNFBMessaging: 3fa1114c0868dd21f20dfe186adf42297ea316b1
-  RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
-  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
-  RNI18n: e2f7e76389fcc6e84f2c8733ea89b92502351fd8
-  RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364
-  RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94
-  RNNotifee: 2b7df6e32a9cc24b9af6b410fa7db1cd2f411d6d
-  RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027
-  RNPermissions: 4e3714e18afe7141d000beae3755e5b5fb2f5e05
-  RNReanimated: f8379347f71248607d530a21e31e4140c5910c25
-  RNScreens: 68fd1060f57dd1023880bf4c05d74784b5392789
-  RNSensors: c363d486c879e181905dea84a2535e49af1c2d25
-  RNSentry: ae79ba7d46cfdf501be85ef72af1b7c8b1d80a79
-  RNShare: f116bbb04f310c665ca483d0bd1e88cf59b3b334
-  RNSVG: a48668fd382115bc89761ce291a81c4ca5f2fd2e
-  RNVectorIcons: 6607bd3a30291d0edb56f9bbe7ae411ee2b928b0
-  segment-analytics-react-native: dbdd08d96fec78132e96bda092562e41c2ce0ce0
+  React-runtimescheduler: 06b060b5b022f4cdb6bd9fd3405396372179cd9b
+  React-utils: e50991349b1b749744f35ff93d943343886deb24
+  ReactCommon: 394d4d2b27d88bb8ae15fa7f864a4a7525f467f0
+  ReactNativePayments: 47056cd9f1dc32dbdd716974de5df700c44f12db
+  RNCAsyncStorage: aa75595c1aefa18f868452091fa0c411a516ce11
+  RNCCheckbox: 450ce156f3e29e25efa0315c96cfbabe5a39ded1
+  RNCClipboard: ba13782f62310ffd4377332497241a1051f6870b
+  RNCMaskedView: de80352547bd4f0d607bf6bab363d826822bd126
+  RNDateTimePicker: 590f2000e4272050b98689cee6c8abc66c25bb22
+  RNDefaultPreference: 36fe31684af1f2d14e0664aa9a816d0ec6149cc1
+  RNDeviceInfo: e5219d380b51ddb7f97e650ab99a518476b90203
+  RNFBApp: 0e66b9f844efdf2ac3fa2b30e64c9db41a263b3d
+  RNFBMessaging: 70b12c9f22c7c9d5011ac9b12ac2bafbfb081267
+  RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
+  RNGestureHandler: 6572a5f44759900730562b418da289c373de8d06
+  RNI18n: 11ec5086508673ef71b5b567da3e8bcca8a926e1
+  RNInAppBrowser: 6d3eb68d471b9834335c664704719b8be1bfdb20
+  RNKeychain: 3194f1c9d8599f39e570b4b5ecbcdd8cd610e771
+  RNNotifee: 5165d37aaf980031837be3caece2eae5a6d73ae8
+  RNOS: d07e5090b5060c6f2b83116d740a32cfdb33afe3
+  RNPermissions: bd0d9ca7969ff7b999aa605ee2e5919c12522bfe
+  RNReanimated: 7a85cf61cf3849efb530a9de2204a119f426636a
+  RNScreens: f112bc5442a9a0e468809c107a43f55882d6cd98
+  RNSensors: 4690be00931bc60be7c7bd457701edefaff965e3
+  RNSentry: 984bb0495abef6c419697bef208c581f127891d1
+  RNShare: d03cdc71e750246a48b81dcd62bd792bf57a758e
+  RNSVG: e77adf5edb2302f0f10dd03a09e92bb9420d914e
+  RNVectorIcons: 24be0b504ce32d5bea38bde6c645f08b9c736392
+  segment-analytics-react-native: 885c1703579dc7964b97e7ae11d857669aa9b015
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  sovran-react-native: 791f2f726b4d57ece59676eda58d6da9dc95ad4e
-  TcpSockets: a8eb6b5867fe643e6cfed5db2e4de62f4d1e8fd0
+  sovran-react-native: e4721a564ee6ef5b5a0d901bc677018cf371ea01
+  TcpSockets: 48866ffcb39d7114741919d21069fc90189e474a
   Yoga: 6f5ab94cd8b1ecd04b6e973d0bc583ede2a598cc
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: e0bcc4eb12d48746028cd4f4161a292fa9ddc627
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2