Merge branch 'develop' into @christian/upgrade-rn

.github/actions/clear-cache/action.yml

@@ -1,5 +1,3 @@
-# This is a basic workflow to help you get started with Actions
-
 name: "clear-cache"
 description: 'Clear macstadium cache on a specific instance'
 runs:

.github/workflows/codeqml.yml

@@ -7,7 +7,7 @@ on:
     # The branches below must be a subset of the branches above
     branches: [ "develop" ]
   schedule:
-    - cron: '42 14 * * 6'
+    - cron: '42 14 * * 6' # Runs every Saturday at 14:42 UTC
 
 jobs:
   analyze:
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
@@ -59,3 +59,4 @@ jobs:
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
+

.github/workflows/macstadium-clear-cache-all-instances.yml

@@ -1,40 +1,18 @@
 name: Clear macstadium cache (All instances)
-on: [ workflow_dispatch]
+
+on: 
+  workflow_dispatch:
+
 jobs:
-  clear-cache-ci-1:
-    runs-on: ["CI-1"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/clear-cache
-  clear-cache-ci-2:
-    runs-on: ["CI-2"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/clear-cache
-  clear-cache-ci-3:
-    runs-on: ["CI-3"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/clear-cache
-  clear-cache-ci-4:
-    runs-on: ["CI-4"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/clear-cache
-  clear-cache-ci-5:
-    runs-on: ["CI-5"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/clear-cache
-  clear-cache-ci-6:
-    runs-on: ["CI-6"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/clear-cache
-  clear-cache-ci-7:
-    runs-on: ["CI-7"]
+  clear-cache:
+    runs-on: ["CI-7", "CI-8", "CI-9"]
+    strategy:
+      matrix:
+        instance: [CI-7, CI-8, CI-9]
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/clear-cache
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-
+      - name: Clear cache
+        uses: ./.github/actions/clear-cache

.github/workflows/macstadium-e2e.yml

@@ -4,64 +4,64 @@ on: [pull_request, workflow_dispatch]
 jobs:
   ios-e2e:
     runs-on: ["self-hosted"]
-    # Cancel current builds if there's a newer commit on the same branch
     concurrency: 
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
 
+    permissions:
+      contents: read
+
     steps:
-      - uses: actions/checkout@v4
+      - 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 ios app step
-        run: yarn clean:ios  > /dev/null 2>&1 || true
+        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
 
       - name: Set up ENV vars & scripts
+        env:
+          CI_SCRIPTS: ${{ secrets.CI_SCRIPTS }}
         run: |
-          # read local env vars
           source ~/.bashrc
-          # fetch env vars
           git clone [email protected]:rainbow-me/rainbow-env.git
-          # unpack dotenv
-          mv rainbow-env/dotenv .env && rm -rf rainbow-env 
-          # run CI scripts
+          mv rainbow-env/dotenv .env && rm -rf rainbow-env
           eval $CI_SCRIPTS
-          # tweak dotenv for e2e 
-          sed -i''-e "s/\IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e
-      - name: Install deps via Yarn
+          sed -i'' -e "s/IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e
+
+      - name: Cache Yarn dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/yarn
+            node_modules
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies
         run: yarn setup-ci
 
       - name: Check for frozen lockfile
         run: yarn check-lockfile
 
       - name: Audit CI
-        run:  yarn audit-ci --config audit-ci.jsonc
+        run: yarn audit-ci --config audit-ci.jsonc
 
       - name: Lint
         run: yarn lint:ci
 
-      - name: Install Pods
-        run: yarn install-pods
-
       - name: Rebuild detox cache
         run: ./node_modules/.bin/detox clean-framework-cache && ./node_modules/.bin/detox build-framework-cache
 
-      - name: Remove old Detox artifacts
-        run: rm -rf ./artifacts/
+      - name: Install pods
+        run: yarn install-pods
 
       - name: Build the app in release mode
         run: ./node_modules/.bin/detox build --configuration ios.sim.release | xcpretty --color
-
-      - name: Run iOS e2e tests with retry
-      # change the '5' here to how many times you want the tests to rerun on failure
-        run: ./scripts/run-retry-tests.sh 3
-
-      - name: Upload Test Artifacts
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: detox-artifacts
-          path: artifacts/**
 
+      # 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/rebase.yml

@@ -5,15 +5,19 @@ on:
 jobs:
   rebase:
     name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && github.event.comment.author_association == 'MEMBER'
+    if: >
+      github.event.issue.pull_request != null &&
+      contains(github.event.comment.body, '/rebase') &&
+      github.event.comment.author_association == 'MEMBER'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the latest code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
       - name: Automatic Rebase
         uses: cirrus-actions/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/stale.yml

@@ -2,7 +2,7 @@ name: Mark stale issues and pull requests
 
 on:
   schedule:
-  - cron: '30 20 * * 1'
+    - cron: '30 20 * * 1' # Runs every Monday at 20:30 UTC
 
 jobs:
   stale:
@@ -12,8 +12,11 @@ jobs:
       issues: write
 
     steps:
-    - uses: actions/stale@v3
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'Stale issue message'
-        stale-issue-label: 'no-issue-activity'
+      - name: Mark stale issues
+        uses: actions/stale@v8
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.'
+          stale-issue-label: 'stale'
+          days-before-stale: 30  
+          days-before-close: 7  

CHANGELOG.md

@@ -15,6 +15,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed
 
+## [1.9.25] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.25)
+
+### Added
+
+- Added IDFA check on app launch (#5653)
+- Added parallel tests for e2e (#5786)
+
+### Changed
+
+- Changed the size of the coin icon (#5771)
+- Updates to Swaps v2 (#5768, #5765, #5772, #5766, #5757, #5776, #5775, #5780, #5778, #5779, #5784, #5782, #5754, #5783, #5791, #5795)
+- Bumped reanimated (#5683)
+
+### Fixed
+
+- Fixed a bug where incorrect data would show in pending transactions (#5777)
+- Fixed a bug where the swap warning flashes when typing a larger number (#5769)
+- Fixed UX on receive sheet QR Code (#5672)
+
 ## [1.9.24] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.24)
 
 ### Added

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         applicationId "me.rainbow"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 214
-        versionName "1.9.25"
+        versionCode 215
+        versionName "1.9.26"
         missingDimensionStrategy 'react-native-camera', 'general'
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true

audit-ci.jsonc

@@ -17,5 +17,6 @@
     "GHSA-m95q-7qp3-xv42", // https://github.com/advisories/GHSA-m95q-7qp3-xv42
     "GHSA-gxpj-cx7g-858c", // https://github.com/advisories/GHSA-gxpj-cx7g-858c
     "GHSA-78xj-cgh5-2h22", // https://github.com/advisories/GHSA-78xj-cgh5-2h22
+    "GHSA-2p57-rm9w-gvfp", // https://github.com/advisories/GHSA-2p57-rm9w-gvfp
   ],
 }

ios/Rainbow.xcodeproj/project.pbxproj

@@ -1672,7 +1672,7 @@
 					"$(PROJECT_DIR)",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.9.25;
+				MARKETING_VERSION = 1.9.26;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
@@ -1734,7 +1734,7 @@
 					"$(PROJECT_DIR)",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.9.25;
+				MARKETING_VERSION = 1.9.26;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
@@ -1845,7 +1845,7 @@
 					"$(PROJECT_DIR)",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.9.25;
+				MARKETING_VERSION = 1.9.26;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
@@ -1956,7 +1956,7 @@
 					"$(PROJECT_DIR)",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.9.25;
+				MARKETING_VERSION = 1.9.26;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Rainbow",
-  "version": "1.9.25-1",
+  "version": "1.9.26-1",
   "private": true,
   "scripts": {
     "setup": "yarn install && yarn graphql-codegen:install && yarn ds:install && yarn allow-scripts && yarn postinstall && yarn graphql-codegen",
@@ -375,6 +375,7 @@
   },
   "resolutions": {
     "**/async": "2.6.4",
+    "**/zod": "3.22.3",
     "**/file-type": "16.5.4",
     "**/got": "11.8.5",
     "**/jpeg-js": "0.4.4",