merge latest approved rc to master

.github/workflows/macstadium-android-e2e.yml

@@ -1,56 +1,82 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Android e2e tests
 
-# Controls when the workflow will run
-on: [pull_request, workflow_dispatch]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+on: []
 jobs:
-  # This workflow contains a single job called "android-e2e"
   android-e2e:
-    if: startsWith(github.head_ref, 'android-ci')
-    # The type of runner that the job will run on
-    runs-on: ["self-hosted", "ci-5"]
-    # Cancel current builds if there's a newer commit on the same branch
-    concurrency:
+    runs-on: ["self-hosted"]
+    concurrency: 
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+    permissions:
+      contents: read
+
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - name: Checkout repo
+        uses: actions/checkout@v4
 
       - name: Set up github keys
         run: git config core.sshCommand "ssh -i ~/.ssh/id_ed25519 -F /dev/null"
 
+      - name: Clean Android app
+        run: yarn clean:android > /dev/null 2>&1 || true
+
       - name: Set up ENV vars & scripts
+        env:
+          CI_SCRIPTS_RN_UPGRADE: ${{ secrets.CI_SCRIPTS_RN_UPGRADE }}
         run: |
-          # read local env vars
-          source ~/.bashrc
-          # fetch env vars
+          source ~/.zshrc
           git clone [email protected]:rainbow-me/rainbow-env.git
-          # unpack dotenv
-          mv rainbow-env/android/app/google-services.json android/app
           mv rainbow-env/dotenv .env && rm -rf rainbow-env
-          # run CI scripts
-          eval $CI_SCRIPTS
-          # tweak dotenv for e2e
-          sed -i''-e "s/\IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e
-          # set up password
-          cp android/keystores/debug.keystore android/keystores/rainbow-key.keystore
-          sed -i -e "s:rainbow-alias:androiddebugkey:g" android/app/build.gradle
-          export RAINBOW_KEY_ANDROID_PASSWORD=android
-      - name: Install deps via Yarn
-        run: yarn setup-ci
+          eval $CI_SCRIPTS_RN_UPGRADE
+          sed -i'' -e "s/IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e 
+
+      - name: Get Yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: Cache Yarn dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ steps.yarn-cache-dir-path.outputs.dir }}
+            .yarn/cache
+            .yarn/install-state.gz
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies
+        run: |
+          yarn cache clean --all && yarn install && yarn setup
+
+      - name: Check for frozen lockfile
+        run: ./scripts/check-lockfile.sh
+
+      - name: Audit CI
+        run: yarn audit-ci --config audit-ci.jsonc
+
+      - name: Lint
+        run: yarn lint:ci
+
+      - name: Unit tests
+        run: yarn test
 
       - name: Rebuild detox cache
         run: ./node_modules/.bin/detox clean-framework-cache && ./node_modules/.bin/detox build-framework-cache
+
+      - name: Version debug
+        run: |
+          npx react-native info
 
-      - name: Build the app in Release mode
-        run: ./node_modules/.bin/detox build --configuration android.emu.release
+      - name: Fix permissions
+        run: |
+          chmod -R +x node_modules/react-native/scripts
+          chmod -R +x node_modules/@sentry/react-native/scripts
 
-      - name: Run Android e2e tests
-        run: ./node_modules/.bin/detox test -R 5 --configuration android.emu.release --forceExit
+      - name: Build the app in Release mode
+        run: yarn detox build --configuration android.emu.release
 
+      # change the '3' here to how many times you want the tests to rerun on failure
+      - name: Run iOS e2e tests with retry
+        run: ./scripts/run-retry-tests.sh 3

.github/workflows/macstadium-e2e.yml

@@ -23,12 +23,12 @@ jobs:
 
       - name: Set up ENV vars & scripts
         env:
-          CI_SCRIPTS_RN_UPGRADE: ${{ secrets.CI_SCRIPTS_RN_UPGRADE }}
+          CI_SCRIPTS: ${{ secrets.CI_SCRIPTS }}
         run: |
           source ~/.zshrc
           git clone [email protected]:rainbow-me/rainbow-env.git
           mv rainbow-env/dotenv .env && rm -rf rainbow-env
-          eval $CI_SCRIPTS_RN_UPGRADE
+          eval $CI_SCRIPTS
           sed -i'' -e "s/IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e 
 
       - name: Get Yarn cache directory path

CHANGELOG.md

@@ -15,6 +15,77 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed
 
+## [1.9.36] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.36)
+
+### Fixed
+
+- Fixed Sentry logging issues (#6012, #6018, #6019)
+- Fixed issue in swaps where certain errors were not being handled (#6017)
+- Fixed a bug with wrapping and unwrapping ETH (#6022, #6026)
+- Fixed a crash that was happening on asset balance (#6025)
+- Fixed missing pricing on swaps (#6023)
+
+## [1.9.35] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.35)
+
+### Added
+
+- Added translations for swaps v2, gas, backups and ETH rewards (#5980)
+- Added a popular tokens section in swaps token search list (#5990)
+
+### Changed
+
+- Bump fast-xml-parser from 4.4.0 to 4.4.1 (#5965)
+- Convert App.js => App.tsx (#5792)
+- No longer have the restricted codeowners for reviews (#5991)
+- Changed the trending Dapps section to backend endpoint (#5974)
+- The default swap input currency is now the network with the most ETH (#5994)
+- Design system improvements (#5984)
+- Dapp browser improvements (#5978)
+- Updated swaps SDK (#5996)
+- Changed the fee domination from USD to actual payment token (#6000)
+- Sentry bot resilience updates (#5995)
+
+### Fixed
+
+- Fixed a crash on an empty profile screen along with adding a placeholder for no transactions on activity screen (#5975)
+- Fixed a bug where some tokens had a missing asset balance (#5998)
+- Fixed account balance discrepancies in different places (#5959)
+
+## [1.9.34] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.34)
+
+### Added
+
+- Added the ability to copy/paste swap inputs (#5938)
+- Added tracking of critical errors to sentry (#5936)
+- Added ability to open in Rainbow from mobile browsers (#5939)
+- Added Degen mode to skip review sheet for swaps (#5933, #5963, #5969)
+- Added ability to set max on a balance when tapping on badge (#5947)
+- Added e2e coverage for manual wallet backups (#5913)
+- Added a hold to swap button on swaps flow (#5920, #5976)
+- Added a new section that shows the last three user swaps per chain (#5956)
+- Added performance tracking on TimeToSign (#5962)
+
+### Changed
+
+- Disabled location APIs in VisionCamera since we don’t use location features (#5942)
+- Removed FULL_SCREEN_INTENT permission from the manifest (#5955)
+- App is now using different referrer for ETH rewards claims (#5954)
+- Bumped Android dependencies (#5960)
+- Updated Degen mode copy and enabled tracking (#5979)
+
+### Fixed
+
+- Fixed a crash on explainer sheet when there wasn’t a read more link (#5945)
+- Fixed a bug where some bridges couldn’t be made due to gas (#5949)
+- Fixed bugs around flipping logic in swap flow (#5948)
+- Fixed issue where there would be a tab swipe from dapp browser on Android devices (#5964)
+- Fixed a bug where one could proceed to review on a swap when they shouldn’t (#5967)
+- Fixed favorites bugs on search list (#5972)
+- Fixed bugs around copy and pasting (#5953)
+- Fixed an old route that led to Swaps v1 (#5971)
+- Fixed a bug that showed an empty space on token to buy list (#5983, #5989)
+- Fixed issues when saving assets as favorites (#5972, #5982)
+
 ## [1.9.33] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.33)
 
 ## Fixed