diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8aad3797..4220116d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.kotlin.compose)
 }
 
 android {
@@ -40,9 +41,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/app/src/main/java/com/bitchat/android/MainActivity.kt b/app/src/main/java/com/bitchat/android/MainActivity.kt
index a1f5390c..5ac59bb5 100644
--- a/app/src/main/java/com/bitchat/android/MainActivity.kt
+++ b/app/src/main/java/com/bitchat/android/MainActivity.kt
@@ -318,11 +318,11 @@ class MainActivity : ComponentActivity() {
         }
     }
     
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         // Handle notification intents when app is already running
         if (onboardingState == OnboardingState.COMPLETE) {
-            intent?.let { handleNotificationIntent(it) }
+            handleNotificationIntent(intent)
         }
     }
     
diff --git a/build.gradle.kts b/build.gradle.kts
index 38d6e783..daf86da9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,4 +3,5 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.compose) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 282370a4..eb1422bc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,36 +1,35 @@
 [versions]
 # Android and Kotlin
-agp = "8.2.0"
-kotlin = "1.9.20"
-compileSdk = "34"
+agp = "8.10.1"
+kotlin = "2.2.0"
+compileSdk = "35"
 minSdk = "26" # API 26 for proper BLE support
 targetSdk = "34"
 
 # AndroidX Core
-core-ktx = "1.12.0"
-lifecycle-runtime = "2.7.0"
-activity-compose = "1.8.2"
-appcompat = "1.6.1"
+core-ktx = "1.16.0"
+lifecycle-runtime = "2.9.1"
+activity-compose = "1.10.1"
+appcompat = "1.7.1"
 
 # Compose
-compose-bom = "2023.10.01"
-compose-compiler = "1.5.5"
+compose-bom = "2025.06.01"
 
 # Navigation
-navigation-compose = "2.7.6"
+navigation-compose = "2.9.1"
 
 # Accompanist
-accompanist-permissions = "0.32.0"
+accompanist-permissions = "0.37.3"
 
 # Cryptography
 bouncycastle = "1.70"
 tink-android = "1.10.0"
 
 # JSON
-gson = "2.10.1"
+gson = "2.13.1"
 
 # Coroutines
-kotlinx-coroutines = "1.7.3"
+kotlinx-coroutines = "1.10.2"
 
 # Bluetooth
 nordic-ble = "2.6.1"
@@ -39,12 +38,12 @@ nordic-ble = "2.6.1"
 lz4-java = "1.8.0"
 
 # Security
-security-crypto = "1.1.0-alpha06"
+security-crypto = "1.1.0-beta01"
 
 # Testing
 junit = "4.13.2"
-androidx-test-ext = "1.1.5"
-espresso = "3.5.1"
+androidx-test-ext = "1.2.1"
+espresso = "3.6.1"
 
 [libraries]
 # AndroidX Core
@@ -104,6 +103,7 @@ android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "kotlin-parcelize" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [bundles]
 compose = [