Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into @main/ftl
Browse files Browse the repository at this point in the history
  • Loading branch information
maxbbb committed Mar 11, 2025
2 parents de3e5d6 + 7676a3a commit 655906f
Show file tree
Hide file tree
Showing 52 changed files with 4,222 additions and 259 deletions.
46 changes: 23 additions & 23 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ PODS:
- BVLinearGradient (2.8.3):
- React-Core
- CocoaAsyncSocket (7.6.5)
- CoinbaseWalletSDK/Client (1.1.0)
- CoinbaseWalletSDK/Host (1.1.0):
- CoinbaseWalletSDK/Client (1.1.2)
- CoinbaseWalletSDK/Host (1.1.2):
- CoinbaseWalletSDK/Client
- DoubleConversion (1.1.6)
- EXConstants (16.0.2):
Expand Down Expand Up @@ -198,24 +198,24 @@ PODS:
- hermes-engine (0.74.3):
- hermes-engine/Pre-built (= 0.74.3)
- hermes-engine/Pre-built (0.74.3)
- libwebp (1.3.2):
- libwebp/demux (= 1.3.2)
- libwebp/mux (= 1.3.2)
- libwebp/sharpyuv (= 1.3.2)
- libwebp/webp (= 1.3.2)
- libwebp/demux (1.3.2):
- libwebp (1.5.0):
- libwebp/demux (= 1.5.0)
- libwebp/mux (= 1.5.0)
- libwebp/sharpyuv (= 1.5.0)
- libwebp/webp (= 1.5.0)
- libwebp/demux (1.5.0):
- libwebp/webp
- libwebp/mux (1.3.2):
- libwebp/mux (1.5.0):
- libwebp/demux
- libwebp/sharpyuv (1.3.2)
- libwebp/webp (1.3.2):
- libwebp/sharpyuv (1.5.0)
- libwebp/webp (1.5.0):
- libwebp/sharpyuv
- MetricsReporter (2.0.0):
- RSCrashReporter (= 1.0.1)
- RudderKit (= 1.4.0)
- MMKV (2.0.0):
- MMKVCore (~> 2.0.0)
- MMKVCore (2.0.0)
- MMKV (2.1.0):
- MMKVCore (~> 2.1.0)
- MMKVCore (2.1.1)
- mobile-wallet-protocol-host (0.1.7):
- CoinbaseWalletSDK/Host
- React-Core
Expand Down Expand Up @@ -1329,7 +1329,7 @@ PODS:
- React-Core
- react-native-screen-corner-radius (0.2.2):
- React
- react-native-skia (1.8.2):
- react-native-skia (1.9.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1919,7 +1919,7 @@ PODS:
- RNSound/Core (= 0.11.2)
- RNSound/Core (0.11.2):
- React-Core
- RNSVG (15.8.0):
- RNSVG (15.11.2):
- React-Core
- RNTextSize (4.0.0-rc.1):
- React
Expand Down Expand Up @@ -2465,7 +2465,7 @@ SPEC CHECKSUMS:
Branch: d99436c6f3d5b2529ba948d273e47e732830f207
BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
CoinbaseWalletSDK: bd6aa4f5a6460d4279e09e115969868e134126fb
CoinbaseWalletSDK: f8cef9d72e86d6ac4782e4d0054baf9302cf05bb
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
EXConstants: 409690fbfd5afea964e5e9d6c4eb2c2b59222c59
EXImageLoader: ab589d67d6c5f2c33572afea9917304418566334
Expand Down Expand Up @@ -2497,10 +2497,10 @@ SPEC CHECKSUMS:
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
hermes-engine: 1f547997900dd0752dc0cc0ae6dd16173c49e09b
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
MetricsReporter: 364b98791e868b10e9d512eb50af28d8c11e5cdb
MMKV: f7d1d5945c8765f97f39c3d121f353d46735d801
MMKVCore: c04b296010fcb1d1638f2c69405096aac12f6390
MMKV: ce484c1ac40bf76d5f09a0195d2ec5b3d3840d55
MMKVCore: 1eb661c6c498ab88e3df9ce5d8ff94d05fcc0567
mobile-wallet-protocol-host: 8ed897dcf4f846d39b35767540e6a695631cab73
MultiplatformBleAdapter: b1fddd0d499b96b607e00f0faa8e60648343dc1d
nanopb: 438bc412db1928dac798aa6fd75726007be04262
Expand Down Expand Up @@ -2558,7 +2558,7 @@ SPEC CHECKSUMS:
react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
react-native-safe-area-context: 4532f1a0c5d34a46b9324ccaaedcb5582a302b7d
react-native-screen-corner-radius: 67064efbb78f2d48f01626713ae8142f6a20f925
react-native-skia: 2bae63532997971033b297348f4156d6a012cbef
react-native-skia: 1ca5f1e3caf247b9c6836b5baa16c4202e97c30f
react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
react-native-text-input-mask: 07227297075f9653315f43b0424d596423a01736
react-native-udp: 96a517e5a121cfe69f4b05eeeafefe00c623debf
Expand Down Expand Up @@ -2618,7 +2618,7 @@ SPEC CHECKSUMS:
RNSentry: 6a5d9f48370070c1d4697dfe74044b7f45512420
RNShare: eaee3dd5a06dad397c7d3b14762007035c5de405
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d
RNSVG: e451741721b9fd3db71b06aafe9335d09a189692
RNTextSize: 21c94a67819fbf2c358a219bf6d251e3be9e5f29
RSCrashReporter: 6b8376ac729b0289ebe0908553e5f56d8171f313
Rudder: 04713668b0b7d46f214e6b7b46b60134849661aa
Expand All @@ -2635,7 +2635,7 @@ SPEC CHECKSUMS:
ToolTipMenu: 8ac61aded0fbc4acfe7e84a7d0c9479d15a9a382
TurboHaptics: 6381613d33ab97aeb30d9b15c3df94dc616a25e4
VisionCamera: 2af28201c3de77245f8c58b7a5274d5979df70df
Yoga: 04f1db30bb810187397fa4c37dd1868a27af229c
Yoga: 88480008ccacea6301ff7bf58726e27a72931c8d

PODFILE CHECKSUM: 98c3fc206d7041ac7388693bb0753109d1884b57

Expand Down
2 changes: 2 additions & 0 deletions ios/Rainbow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,7 @@
"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Rudder/Rudder.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
Expand All @@ -1280,6 +1281,7 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Rudder.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"@lavamoat/preinstall-always-fail": "2.0.0",
"@ledgerhq/hw-app-eth": "6.39.0",
"@ledgerhq/react-native-hw-transport-ble": "6.33.4",
"@legendapp/list": "1.0.0-beta.15",
"@metamask/eth-sig-util": "7.0.2",
"@notifee/react-native": "7.8.2",
"@rainbow-me/provider": "0.1.2",
Expand All @@ -129,7 +130,7 @@
"@rudderstack/rudder-sdk-react-native": "2.0.0",
"@sentry/react-native": "5.35.0",
"@shopify/flash-list": "1.7.2",
"@shopify/react-native-skia": "1.8.2",
"@shopify/react-native-skia": "1.9.0",
"@tanstack/react-query": "4.2.1",
"@tanstack/react-query-persist-client": "4.2.1",
"@tradle/react-native-http": "2.0.1",
Expand Down Expand Up @@ -178,6 +179,7 @@
"expo-image-picker": "15.1.0",
"expo-store-review": "7.0.2",
"fast-text-encoding": "1.0.4",
"figma-squircle": "1.1.0",
"global": "4.4.0",
"grapheme-splitter": "1.0.4",
"graphql-request": "5.0.0",
Expand Down Expand Up @@ -269,7 +271,7 @@
"react-native-sound": "0.11.2",
"react-native-splash-screen": "3.3.0",
"react-native-storage": "1.0.1",
"react-native-svg": "15.8.0",
"react-native-svg": "15.11.2",
"react-native-tab-view": "3.5.1",
"react-native-tcp": "3.3.2",
"react-native-text-input-mask": "2.0.0",
Expand Down
Loading

0 comments on commit 655906f

Please sign in to comment.