rainbow-me · janicduplessis · Apr 20, 2026 · Apr 20, 2026 · Apr 20, 2026 · Apr 20, 2026
diff --git a/.github/workflows/android-e2e.yml b/.github/workflows/android-e2e.yml
@@ -97,6 +97,7 @@ jobs:
       - name: Install dependencies
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent_sandbox.sock
+          SANDBOX_BRANCH: '@janic/rn-0.81'
         run: |
           yarn install && yarn setup
 

diff --git a/.github/workflows/ios-builds.yml b/.github/workflows/ios-builds.yml
@@ -85,6 +85,7 @@ jobs:
       - name: Install dependencies
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent_sandbox.sock
+          SANDBOX_BRANCH: '@janic/rn-0.81'
         run: yarn install && yarn setup
 
       - name: Rock Build - iOS simulator
@@ -186,6 +187,7 @@ jobs:
       - name: Install dependencies
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent_sandbox.sock
+          SANDBOX_BRANCH: '@janic/rn-0.81'
         run: yarn install && yarn setup
 
       - name: Set up Ruby

diff --git a/.github/workflows/ios-e2e.yml b/.github/workflows/ios-e2e.yml
@@ -96,6 +96,7 @@ jobs:
       - name: Install dependencies
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent_sandbox.sock
+          SANDBOX_BRANCH: '@janic/rn-0.81'
         run: yarn install && yarn setup
 
       - name: Rock Remote Build - iOS simulator

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -73,6 +73,7 @@ jobs:
       - name: Install dependencies
         env:
           SSH_AUTH_SOCK: /tmp/ssh_agent_sandbox.sock
+          SANDBOX_BRANCH: '@janic/rn-0.81'
         run: |
           yarn install && yarn setup
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
       android:roundIcon="@mipmap/og_round"
       android:allowBackup="false"
       android:theme="@style/BootTheme"
+      android:usesCleartextTraffic="${usesCleartextTraffic}"
       android:networkSecurityConfig="@xml/network_security_config"
       android:requestLegacyExternalStorage="true"
       android:resizeableActivity="false"

diff --git a/android/app/src/main/java/me/rainbow/MainApplication.kt b/android/app/src/main/java/me/rainbow/MainApplication.kt
@@ -7,12 +7,10 @@ import android.app.Application
 import android.content.Context
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
 import io.branch.rnbranch.RNBranchModule
 import me.rainbow.NativeModules.Haptics.RNHapticsPackage
 import me.rainbow.NativeModules.Internals.InternalPackage
@@ -56,11 +54,7 @@ class MainApplication : Application(), ReactApplication {
         ReactNativePerformance.onAppStarted();
         super.onCreate()
         appContext = this
-        SoLoader.init(this, OpenSourceMergedSoMapping)
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // If you opted-in for the New Architecture, we load the native entry point for this app.
-            load()
-        }
+        loadReactNative(this)
         // Branch logging for debugging
         RNBranchModule.enableLogging()
         RNBranchModule.getAutoInstance(this)

diff --git a/android/build.gradle b/android/build.gradle
@@ -5,10 +5,10 @@ import org.apache.tools.ant.taskdefs.condition.Os
 buildscript {
 
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 26
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
         kotlin_version = "2.1.20"
         kotlinVersion = "2.1.20"

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -35,6 +35,10 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # are providing them.
 newArchEnabled=false
 
+# Use this property to enable or disable edge-to-edge display.
+# Mandatory on Android 16 (API 36), opt-in on older versions.
+edgeToEdgeEnabled=false
+
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/ios/ImageNotification/Info.plist b/ios/ImageNotification/Info.plist
@@ -9,5 +9,7 @@
 		<key>NSExtensionPrincipalClass</key>
 		<string>NotificationService</string>
 	</dict>
+	<key>RCTNewArchEnabled</key>
+	<false/>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -65,8 +65,6 @@ target 'Rainbow' do
   use_react_native!(
     privacy_file_aggregation_enabled: false,
     :path => config[:reactNativePath],
-    # to enable hermes on iOS, change `false` to `true` and then install pods
-    :hermes_enabled => ENV['USE_HERMES'] != 'NO',
     :new_arch_enabled => false,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."