Merge branch 'develop' into gregs/app-1382-prompt-user-to-choose-wall…

…et-group-when-creating-a-wallet

.github/workflows/comments-watchdog.yml

@@ -65,7 +65,7 @@ jobs:
           fi
 
       - name: Upload deleted comments log as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deleted-comments-log
           path: deleted_comments_log.txt

.github/workflows/macstadium-tests.yml

@@ -17,9 +17,6 @@ jobs:
       - name: Set up github keys
         run: git config core.sshCommand "ssh -i ~/.ssh/id_ed25519 -F /dev/null"
 
-      - name: Clean iOS app
-        run: yarn cache clean && yarn clean:ios > /dev/null 2>&1 || true
-
       - name: Set up ENV vars & scripts
         env:
           CI_SCRIPTS: ${{ secrets.CI_SCRIPTS }}
@@ -168,6 +165,10 @@ jobs:
           sed -i'' -e "s/IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e 
           yarn detox build --configuration ios.sim.release
 
-      - name: Detox iOS e2e tests
+      - name: Detox iOS e2e tests parallel
+        run: |
+          ./scripts/run-parallel-e2e.sh 3
+
+      - name: Detox iOS e2e tests serial
         run: |
-          ./scripts/run-retry-tests.sh 3
+          ./scripts/run-serial-e2e.sh 3

CHANGELOG.md

@@ -15,6 +15,40 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ### Fixed
 
+## [1.9.50] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.50)
+
+### Fixed
+
+- Fixed an issue with unlocking app icons (#6342, #6345)
+
+## [1.9.49] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.49)
+
+### Added
+
+- Claim as X (#6193)
+- NFT checker 2.0 (#6293)
+- Added support for inkchain (#6323)
+
+### Changed
+
+- Improved nonce management logic for private mempool handling (#6277)
+- Split e2e into parallel and serial flows to improve CI runs (#6317)
+- Browser animation code cleanup (#6306)
+- Converted network accessors to functions (#6219)
+- Bumped nanoid from 3.3.7 to 3.3.8 in /src/design-system/docs (#6320)
+- Updated default currentNonce value to -1 (#6324)
+- Updated trending tokens query to support backend changes (#6312)
+- Replaced node ack retires with a small delay (#6326)
+- Updated swaps sdk (#6327)
+
+### Fixed
+
+- Fixed an issue with SignTransactionSheet not disabling button on authorization (#6242)
+- Fixed an issue where the sticky header on the wallet screen couldn’t be tapped when scrolled down the page (#6309)
+- Fixed a duplicate wallet initialization issue where initializeWallet was being called multiple times (#6310)
+- Fixed an issue where the wallet height calculation caused a break in the wallet switcher list with wallets up to two accounts (#6315)
+- Fixed a crash on develop regarding TextShadow (#6329)
+
 ## [1.9.48] (https://github.com/rainbow-me/rainbow/releases/tag/v1.9.48)
 
 ### Fixed

android/app/build.gradle

@@ -135,8 +135,8 @@ android {
         applicationId "me.rainbow"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 242
-        versionName "1.9.49"
+        versionCode 244
+        versionName "1.9.51"
         missingDimensionStrategy 'react-native-camera', 'general'
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true

android/app/src/main/AndroidManifest.xml

@@ -259,6 +259,19 @@
               <category android:name="android.intent.category.LAUNCHER" />
           </intent-filter>
       </activity-alias>
+      <activity-alias
+          android:name="me.rainbow.MainActivityRedacted"
+          android:enabled="false"
+          android:icon="@mipmap/redacted"
+          android:roundIcon="@mipmap/redacted_round"
+          android:targetActivity=".MainActivity"
+          android:exported="true"
+          >
+          <intent-filter>
+              <action android:name="android.intent.action.MAIN" />
+              <category android:name="android.intent.category.LAUNCHER" />
+          </intent-filter>
+      </activity-alias>
 
       <!-- Branch init -->
       <meta-data android:name="io.branch.sdk.BranchKey" android:value="${BRANCH_KEY}" />

android/app/src/main/res/mipmap-anydpi-v26/redacted.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/redacted_background"/>
+    <foreground android:drawable="@mipmap/redacted_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/redacted_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/redacted_background"/>
+    <foreground android:drawable="@mipmap/redacted_foreground"/>
+</adaptive-icon>

e2e/1_importAndWatchWalletsFlow.spec.ts → e2e/parallel/1_importAndWatchWalletsFlow.spec.ts

@@ -9,8 +9,8 @@ import {
   authenticatePin,
   delayTime,
   afterAllcleanApp,
-} from './helpers';
-import { WALLET_VARS } from './testVariables';
+} from '../helpers';
+import { WALLET_VARS } from '../testVariables';
 
 const android = device.getPlatform() === 'android';
 

e2e/2_newWalletFlow.spec.ts → e2e/parallel/2_newWalletFlow.spec.ts

@@ -1,5 +1,5 @@
 import { device } from 'detox';
-import { beforeAllcleanApp, checkIfVisible, waitAndTap, authenticatePin, delayTime, afterAllcleanApp } from './helpers';
+import { beforeAllcleanApp, checkIfVisible, waitAndTap, authenticatePin, delayTime, afterAllcleanApp } from '../helpers';
 
 const android = device.getPlatform() === 'android';
 

e2e/3_homeScreen.spec.ts → e2e/parallel/3_homeScreen.spec.ts

@@ -8,7 +8,7 @@ import {
   afterAllcleanApp,
   tap,
   delayTime,
-} from './helpers';
+} from '../helpers';
 
 const RAINBOW_TEST_WALLET = 'rainbowtestwallet.eth';
 

e2e/4_discoverSheetFlow.spec.ts → e2e/parallel/4_discoverSheetFlow.spec.ts

@@ -11,7 +11,7 @@ import {
   delayTime,
   importWalletFlow,
   afterAllcleanApp,
-} from './helpers';
+} from '../helpers';
 
 const ios = device.getPlatform() === 'ios';
 

e2e/6_watchedWalletCollectionActionsFlow.spec.ts → e2e/parallel/5_watchedWalletCollectionActionsFlow.spec.ts

@@ -9,7 +9,7 @@ import {
   checkIfDoesntExist,
   delayTime,
   afterAllcleanApp,
-} from './helpers';
+} from '../helpers';
 
 describe('Watched showcase and hidden actions flow', () => {
   beforeAll(async () => {

e2e/7_maliciousDappConnection.spec.ts → e2e/parallel/6_maliciousDappConnection.spec.ts

@@ -10,8 +10,8 @@ import {
   delayTime,
   tapAtPoint,
   checkIfExists,
-} from './helpers';
-import { WALLET_VARS } from './testVariables';
+} from '../helpers';
+import { WALLET_VARS } from '../testVariables';
 
 describe('Check malicious dapp warning', () => {
   beforeAll(async () => {

e2e/8_manualBackup.spec.ts → e2e/parallel/7_manualBackup.spec.ts

@@ -6,12 +6,11 @@ import {
   tap,
   tapByText,
   delayTime,
-  tapAtPoint,
   checkIfExistsByText,
   checkIfExists,
   waitAndTap,
   checkIfDoesntExist,
-} from './helpers';
+} from '../helpers';
 
 describe('Backups', () => {
   beforeAll(async () => {

e2e/5_sendSheetFlowContacts.spec.ts → e2e/serial/1_sendSheetFlowContacts.spec.ts

@@ -12,7 +12,7 @@ import {
   tapByText,
   delayTime,
   afterAllcleanApp,
-} from './helpers';
+} from '../helpers';
 
 const android = device.getPlatform() === 'android';
 

e2e/9_swaps.spec.ts → e2e/serial/2_swaps.spec.ts

@@ -23,11 +23,10 @@ import {
   delayTime,
   swipeUntilVisible,
   tapAndLongPress,
-  swipe,
-} from './helpers';
+} from '../helpers';
 
 import { expect } from '@jest/globals';
-import { WALLET_VARS } from './testVariables';
+import { WALLET_VARS } from '../testVariables';
 
 describe('Swap Sheet Interaction Flow', () => {
   beforeAll(async () => {

ios/Images.xcassets/badges/ethereumBadgeDark.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ethereumBadgeDark-1.png",
+      "filename" : "ethereumBadgeDark.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

ios/Images.xcassets/badges/ethereumBadgeLarge.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ethereumBadgeLarge.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Images.xcassets/badges/ethereumBadgeLargeDark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ethereumBadgeLargeDark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Images.xcassets/badges/ethereumBadgeNoShadow.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ethereumBadgeNoShadow.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Images.xcassets/badges/ink.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "ink.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Images.xcassets/badges/inkBadge.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "inkBadge.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Images.xcassets/badges/inkBadgeDark.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "inkBadgeDark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Images.xcassets/badges/inkBadgeLarge.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "inkBadgeLarge.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}