Merge branch 'develop' into @benisgold/user-assets-migration-v2

.detoxrc.js

@@ -9,7 +9,7 @@ module.exports = {
   devices: {
     'ios.simulator': {
       type: 'ios.simulator',
-      device: { type: 'iPhone 15 Pro' },
+      device: { type: 'iPhone 16 Pro' },
     },
     'android.attached': {
       type: 'android.attached',

.github/workflows/macstadium-builds.yml

@@ -45,7 +45,8 @@ jobs:
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
             .yarn/cache
             .yarn/install-state.gz
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+            !.eslintcache # Exclude eslint cache
+          key: ${{ runner.os }}-yarn-${{ github.sha }}  # Cache per commit
           restore-keys: |
             ${{ runner.os }}-yarn-
 

.github/workflows/macstadium-tests.yml

@@ -18,7 +18,7 @@ jobs:
         run: git config core.sshCommand "ssh -i ~/.ssh/id_ed25519 -F /dev/null"
 
       - name: Clean iOS app
-        run: yarn clean:ios > /dev/null 2>&1 || true
+        run: yarn cache clean && yarn clean:ios > /dev/null 2>&1 || true
 
       - name: Set up ENV vars & scripts
         env:
@@ -40,7 +40,8 @@ jobs:
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
             .yarn/cache
             .yarn/install-state.gz
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+            !.eslintcache # Exclude eslint cache
+          key: ${{ runner.os }}-yarn-${{ github.sha }}  # Cache per commit
           restore-keys: |
             ${{ runner.os }}-yarn-
 
@@ -49,7 +50,7 @@ jobs:
           yarn install && yarn setup
 
       - name: Upload Yarn cache
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: yarn-cache
           path: |
@@ -62,7 +63,7 @@ jobs:
     needs: install-deps
     steps:
       - name: Download Yarn cache
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: yarn-cache
           path: .yarn
@@ -73,6 +74,9 @@ jobs:
       - name: Audit CI
         run: yarn audit-ci --config audit-ci.jsonc
 
+      - name: Remove ESLint cache
+        run: rm -f .eslintcache
+
       - name: Lint
         run: yarn lint:ci
 
@@ -86,7 +90,7 @@ jobs:
     needs: install-deps
     steps:
       - name: Download Yarn cache
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: yarn-cache
           path: .yarn

CHANGELOG.md

@@ -15,7 +15,46 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed
 
-## [1.9.38] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.36)
+## [1.9.40] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.40)
+
+### Fixed 
+
+- Fixed a bug with speed up and cancel (#6133)
+
+## [1.9.39] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.39)
+
+### Added
+
+- Added rc-push script for release tracking and cleanup (#6088)
+- Built the react query for addys claimables endpoint along with wallet screen UI (#6071)
+
+### Changed
+
+- Swaps performance improvements (#6050)
+- Improved CI jobs for build and tests for Tophat (#6043, #6089)
+- Removed some test env for some vars that aren’t needed anymore (#6077)
+- userAssetsStore refactor (#6015)
+- Bumped swaps sdk to 0.26 (#6098)
+- Final implementation for network to chainId migration (#6039)
+
+### Fixed
+
+- Fixed swaps spec in e2e so that all assets balances will update correctly (#6060)
+- Fixed an issue with charts where it was using USD for points instead of user’s selected currency (#6051)
+- Fixed an issue on Android nav bar where it was covered by the systems navigation bar (#6053)
+- Fixed e2e flakiness (#6084, #6090)
+- Fixed an issue with opacity on mwp sign txn sheet (#6083)
+- Fixed a crash that happened when searching input token in swaps (#6104)
+- Fixed and issue with degen native asset address, degen ↔ wdegen (#6087, #6091)
+- Fixed a crash on token details chart for cannot read property ‘y’ of undefined (#6009)
+- Fixed issues with remote promo sheets (#6085)
+- Fixed a bug on iOS 18 which caused context menu dismissals (#6112)
+- Fixed a crash that was happening on send flow (#6116)
+- Fixed a bug where the paste button was disabled on swaps flow for android devices (#6118)
+- Fixed an issue where deleting a contact would cause loading issues on send flow (#6119)
+- Fixed a bug where chainId wasn’t being passed in the dapp browser (#6121)
+
+## [1.9.38] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.38)
 
 ### Fixed
 

android/app/build.gradle

@@ -130,8 +130,8 @@ android {
         applicationId "me.rainbow"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 231
-        versionName "1.9.39"
+        versionCode 233
+        versionName "1.9.41"
         missingDimensionStrategy 'react-native-camera', 'general'
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true

e2e/9_swaps.spec.ts

@@ -62,9 +62,7 @@ describe('Swap Sheet Interaction Flow', () => {
     await tap('swap-button');
     await delayTime('very-long');
 
-    // flaky
-    // await swipeUntilVisible('token-to-buy-dai-1', 'token-to-buy-list', 'up', 100);
-    await swipe('token-to-buy-list', 'up', 'slow', 0.2);
+    await swipeUntilVisible('token-to-buy-dai-1', 'token-to-buy-list', 'up', 100);
 
     await tap('token-to-buy-dai-1');
     await delayTime('very-long');

e2e/helpers.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable no-await-in-loop */
 import { exec } from 'child_process';
 import { JsonRpcProvider } from '@ethersproject/providers';
@@ -201,6 +202,7 @@ export async function clearField(elementId: string | RegExp) {
 
 export async function tapAndLongPress(elementId: string | RegExp, duration?: number) {
   try {
+    // @ts-expect-error
     return await element(by.id(elementId)).longPress(duration);
   } catch (error) {
     throw new Error(`Error long-pressing element by id "${elementId}": ${error}`);
@@ -209,6 +211,7 @@ export async function tapAndLongPress(elementId: string | RegExp, duration?: num
 
 export async function tapAndLongPressByText(text: string | RegExp, duration?: number) {
   try {
+    // @ts-expect-error
     return await element(by.text(text)).longPress(duration);
   } catch (error) {
     throw new Error(`Error long-pressing element by text "${text}": ${error}`);

ios/Gemfile

@@ -4,8 +4,9 @@ source 'https://rubygems.org'
 ruby '>= 2.7.0'
 
 gem "fastlane"
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)

ios/Gemfile.lock

@@ -276,8 +276,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.5, < 7.1.0)
-  cocoapods (>= 1.13, < 1.15)
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
   fastlane
 
 RUBY VERSION

ios/Podfile

@@ -69,7 +69,7 @@ target 'Rainbow' do
   pod 'SRSRadialGradient', :path => '../node_modules/react-native-radial-gradient/ios'
   pod 'react-native-palette-full', :path => '../node_modules/react-native-palette-full'
   pod 'react-native-ble-plx', :path => '../node_modules/react-native-ble-plx'
-  pod 'TOCropViewController', '2.7.3'
+  pod 'TOCropViewController', '~> 2.7.4'
 
   use_native_modules!
 

ios/Podfile.lock

@@ -1651,15 +1651,15 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNImageCropPicker (0.41.0):
+  - RNImageCropPicker (0.41.2):
     - React-Core
     - React-RCTImage
-    - RNImageCropPicker/QBImagePickerController (= 0.41.0)
-    - TOCropViewController (~> 2.7.3)
-  - RNImageCropPicker/QBImagePickerController (0.41.0):
+    - RNImageCropPicker/QBImagePickerController (= 0.41.2)
+    - TOCropViewController (~> 2.7.4)
+  - RNImageCropPicker/QBImagePickerController (0.41.2):
     - React-Core
     - React-RCTImage
-    - TOCropViewController (~> 2.7.3)
+    - TOCropViewController (~> 2.7.4)
   - RNInputMask (4.1.0)
   - RNKeyboard (1.0.6):
     - React
@@ -1766,11 +1766,29 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNSentry (5.22.0):
+  - RNSentry (5.31.1):
+    - DoubleConversion
+    - glog
     - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
     - React-hermes
-    - Sentry/HybridSDK (= 8.24.0)
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Sentry/HybridSDK (= 8.36.0)
+    - Yoga
   - RNShare (8.2.1):
     - React-Core
   - RNSound (0.11.2):
@@ -1792,7 +1810,7 @@ PODS:
   - SDWebImageWebPCoder (0.14.6):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
-  - Sentry/HybridSDK (8.24.0)
+  - Sentry/HybridSDK (8.36.0)
   - Shimmer (1.0.2)
   - SocketRocket (0.7.0)
   - SRSRadialGradient (1.0.10):
@@ -1801,7 +1819,7 @@ PODS:
   - TcpSockets (3.3.2):
     - CocoaAsyncSocket
     - React
-  - TOCropViewController (2.7.3)
+  - TOCropViewController (2.7.4)
   - ToolTipMenu (5.2.1):
     - React
   - VisionCamera (4.4.2):
@@ -1954,7 +1972,7 @@ DEPENDENCIES:
   - SRSRadialGradient (from `../node_modules/react-native-radial-gradient/ios`)
   - swift-vibrant
   - TcpSockets (from `../node_modules/react-native-tcp`)
-  - TOCropViewController (= 2.7.3)
+  - TOCropViewController (~> 2.7.4)
   - ToolTipMenu (from `../node_modules/react-native-tooltip`)
   - VisionCamera (from `../node_modules/react-native-vision-camera`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
@@ -2395,7 +2413,7 @@ SPEC CHECKSUMS:
   RNFlashList: e9b57a5553639f9b528cc50ab53f25831722ed62
   RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
   RNGestureHandler: efed690b8493a00b99654043daeb1335276ac4a2
-  RNImageCropPicker: 13eab07a785c7a8f8047a1146f7e59d1911c7bb8
+  RNImageCropPicker: 771e2ca319d2cf92e04ebf334ece892ee9a6728f
   RNInputMask: 815461ebdf396beb62cf58916c35cf6930adb991
   RNKeyboard: 14793d75953d99c6d950090b8e9698b234c5d08c
   RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94
@@ -2406,7 +2424,7 @@ SPEC CHECKSUMS:
   RNReanimated: 45553a3ae29a75a76269595f8554d07d4090e392
   RNRudderSdk: 805d4b7064714f3295bf5f152d3812cc67f67a93
   RNScreens: aa943ad421c3ced3ef5a47ede02b0cbfc43a012e
-  RNSentry: 7ae2a06a5563de39ec09dcb1e751ac0c67f1883c
+  RNSentry: 2c78e72aaa6e55d61ce60d98a62f01b666f76513
   RNShare: eaee3dd5a06dad397c7d3b14762007035c5de405
   RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
   RNSVG: 5da7a24f31968ec74f0b091e3440080f347e279b
@@ -2416,17 +2434,17 @@ SPEC CHECKSUMS:
   RudderKit: f272f9872183946452ac94cd7bb2244a71e6ca8f
   SDWebImage: 2d6d229046fea284d62e36bfb8ebe8287dfc5b10
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
-  Sentry: 2f6baed15a3f8056b875fc903dc3dcb2903117f4
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
   Shimmer: c5374be1c2b0c9e292fb05b339a513cf291cac86
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   SRSRadialGradient: e5a34825dff88c9cf773b58bf39ed6a02e59a084
   swift-vibrant: 3def73c5c281db74f420ec386590d9c1c5b0995c
   TcpSockets: bd31674146c0931a064fc254a59812dfd1a73ae0
-  TOCropViewController: b9b2905938c0424f289ea2d9964993044913fac6
+  TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   ToolTipMenu: 8ac61aded0fbc4acfe7e84a7d0c9479d15a9a382
   VisionCamera: 2af28201c3de77245f8c58b7a5274d5979df70df
   Yoga: 04f1db30bb810187397fa4c37dd1868a27af229c
 
-PODFILE CHECKSUM: 0839e4141c8f26133bf9a961f5ded1ea3127af54
+PODFILE CHECKSUM: 40f081f682acbe2d1d2129eb3335352ea01aab70
 
 COCOAPODS: 1.14.3