chore: merge

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>

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
+  }
+}

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

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "inkBadgeLargeDark.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/inkBadgeNoShadow.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "inkBadgeNoShadow.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/Podfile.lock

@@ -2597,7 +2597,7 @@ SPEC CHECKSUMS:
   ToolTipMenu: 8ac61aded0fbc4acfe7e84a7d0c9479d15a9a382
   TurboHaptics: 6381613d33ab97aeb30d9b15c3df94dc616a25e4
   VisionCamera: 2af28201c3de77245f8c58b7a5274d5979df70df
-  Yoga: 88480008ccacea6301ff7bf58726e27a72931c8d
+  Yoga: 04f1db30bb810187397fa4c37dd1868a27af229c
 
 PODFILE CHECKSUM: 98c3fc206d7041ac7388693bb0753109d1884b57