Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:rainbow-me/rainbow into brody/ma…
Browse files Browse the repository at this point in the history
…licious-dapp-warning-e2e

* 'develop' of github.com:rainbow-me/rainbow:
  Swaps: package upgrades, fix SwapBackground and AnimatedSwapSpinner (#5775)
  Swaps: fix safe math negative number support, add comparison functions (#5776)
  Reanimated v3.11.0 (#5683)
  Gas (#5757)
  add degen chain to network selector (#5766)
  prefer local chain image over custom (#5772)
  add safe math fns (#5765)
  filter out assets from curated assets with no icon_url (#5768)
  fix isQuoteStale lag (#5769)
  fix icon sizing (#5771)
  Preliminary work: Update formatter functions to take in object params (#5760)
  APP-1500 (#5763)
  chore: i18n updates (#5762)
  • Loading branch information
BrodyHughes committed May 28, 2024
2 parents 133e5cd + 9fae6e7 commit 763f9ac
Show file tree
Hide file tree
Showing 61 changed files with 6,962 additions and 105,918 deletions.
22 changes: 12 additions & 10 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,8 @@ PODS:
- react-native-ble-plx (2.0.3):
- MultiplatformBleAdapter (= 0.1.9)
- React-Core
- react-native-blur (4.3.2):
- react-native-blur (4.4.0):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-branch (5.3.1):
- Branch (= 1.40.2)
Expand Down Expand Up @@ -576,7 +577,8 @@ PODS:
- ReactCommon/turbomodule/core
- react-native-screen-corner-radius (0.2.0):
- React
- react-native-skia (0.1.200):
- react-native-skia (1.3.0):
- RCT-Folly (= 2021.07.22.00)
- React
- React-callinvoker
- React-Core
Expand Down Expand Up @@ -722,7 +724,7 @@ PODS:
- React-Core
- RNCClipboard (1.13.2):
- React-Core
- RNCMaskedView (0.2.9):
- RNCMaskedView (0.3.1):
- React-Core
- RNDeviceInfo (5.3.1):
- React
Expand Down Expand Up @@ -780,7 +782,7 @@ PODS:
- React-Core
- RNReactNativeHapticFeedback (1.11.0):
- React-Core
- RNReanimated (3.8.0):
- RNReanimated (3.11.0):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- ReactCommon/turbomodule/core
Expand All @@ -802,7 +804,7 @@ PODS:
- RNSound/Core (= 0.11.2)
- RNSound/Core (0.11.2):
- React-Core
- RNSVG (13.9.0):
- RNSVG (15.3.0):
- React-Core
- RNTextSize (4.0.0-rc.1):
- React
Expand Down Expand Up @@ -1312,7 +1314,7 @@ SPEC CHECKSUMS:
react-native-aes-crypto: d7e87fd02cee7285983c00957a34063dfc4c94b3
react-native-animateable-text: 5f5a6e96f6c075aa943ce52ea7fd3fbb3e56d725
react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
react-native-blur: cfdad7b3c01d725ab62a8a729f42ea463998afa2
react-native-blur: 69ecfe61d81b32ee7baae10f5d17aeb4e2594b10
react-native-branch: 960c897d57b9f4912b08b9d06a25284b6e9879da
react-native-cameraroll: aff50ec1df9d054626dceca9336e6644e153d32f
react-native-change-icon: ea9bb7255b09e89f41cbf282df16eade91ab1833
Expand All @@ -1333,7 +1335,7 @@ SPEC CHECKSUMS:
react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
react-native-safe-area-context: b8979f5eda6ed5903d4dbc885be3846ea3daa753
react-native-screen-corner-radius: d526152dc1b5816bf298cc7093fcf4af853c17c7
react-native-skia: d0b0aab6bb1f146eb6f379fb671b719deabd20fb
react-native-skia: 44fed982cf3f26f27b11ba22194b1f967ab8f468
react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
react-native-text-input-mask: 07227297075f9653315f43b0424d596423a01736
react-native-udp: 96a517e5a121cfe69f4b05eeeafefe00c623debf
Expand Down Expand Up @@ -1364,7 +1366,7 @@ SPEC CHECKSUMS:
RNBootSplash: 5f346163977573d6b2aeba1b25df9d2245c0d73c
RNCAsyncStorage: ddc4ee162bfd41b0d2c68bf2d95acd81dd7f1f93
RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
RNCMaskedView: 949696f25ec596bfc697fc88e6f95cf0c79669b6
RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
RNDeviceInfo: 6f20764111df002b4484f90cbe0a861be29bcc6c
RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
RNFastImage: 4ce7636223e71615774b99004103e946a73e7c32
Expand All @@ -1383,13 +1385,13 @@ SPEC CHECKSUMS:
RNOS: 31db6fa4a197d179afbba9e6b4d28d450a7f250b
RNPermissions: 4e3714e18afe7141d000beae3755e5b5fb2f5e05
RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285
RNReanimated: 5afba582037b0dae040a5f927dec7fdd18e430c3
RNReanimated: 9d4971e437f38c11fd2c43344ac9d40c330058b1
RNRudderSdk: 805d4b7064714f3295bf5f152d3812cc67f67a93
RNScreens: 6a8a3c6b808aa48dca1780df7b73ea524f602c63
RNSentry: 468d45dc823258945fb1ee04dcd3f252cb57415f
RNShare: eaee3dd5a06dad397c7d3b14762007035c5de405
RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
RNSVG: 7c3f3fac9de6d67eee5525a8bafffafaaf022991
RNTextSize: 21c94a67819fbf2c358a219bf6d251e3be9e5f29
RSCrashReporter: 6b8376ac729b0289ebe0908553e5f56d8171f313
Rudder: 2cb1d3feabeb46cf0b34921e99d464cd8a5dbc5f
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@
"@react-native-async-storage/async-storage": "1.18.2",
"@react-native-camera-roll/camera-roll": "5.7.1",
"@react-native-clipboard/clipboard": "1.13.2",
"@react-native-community/blur": "4.3.2",
"@react-native-community/blur": "4.4.0",
"@react-native-community/netinfo": "9.0.0",
"@react-native-firebase/app": "19.2.2",
"@react-native-firebase/crashlytics": "19.2.2",
"@react-native-firebase/messaging": "19.2.2",
"@react-native-firebase/remote-config": "19.2.2",
"@react-native-masked-view/masked-view": "0.2.9",
"@react-native-masked-view/masked-view": "0.3.1",
"@react-native-menu/menu": "0.8.0",
"@react-native/metro-config": "0.72.9",
"@react-navigation/core": "6.4.8",
Expand All @@ -120,7 +120,7 @@
"@rudderstack/rudder-sdk-react-native": "1.12.1",
"@sentry/react-native": "5.22.0",
"@shopify/flash-list": "1.5.0",
"@shopify/react-native-skia": "0.1.200",
"@shopify/react-native-skia": "1.3.0",
"@tanstack/query-async-storage-persister": "4.2.1",
"@tanstack/react-query": "4.2.1",
"@tanstack/react-query-persist-client": "4.2.1",
Expand Down Expand Up @@ -248,7 +248,7 @@
"react-native-quick-md5": "3.0.3",
"react-native-radial-gradient": "rainbow-me/react-native-radial-gradient#b99ab59d27dba70364ef516bd5193c37657ba95c",
"react-native-randombytes": "3.5.3",
"react-native-reanimated": "3.8.0",
"react-native-reanimated": "3.11.0",
"react-native-redash": "16.3.0",
"react-native-restart": "0.0.22",
"react-native-safe-area-context": "4.5.3",
Expand All @@ -260,7 +260,7 @@
"react-native-sound": "0.11.2",
"react-native-splash-screen": "3.2.0",
"react-native-storage": "1.0.1",
"react-native-svg": "13.9.0",
"react-native-svg": "15.3.0",
"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 763f9ac

Please sign in to comment.