diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a6afd5c4cb..c6b659a262 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ jvm-target = "17"
 detekt = "1.23.6" # https://detekt.dev/docs/gettingstarted/gradle/
 
 [libraries]
-android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "8.3.1" }
+android-gradle-plugin = { module = "com.android.tools.build:gradle", version = "8.3.2" }
 
 # Kotlin
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -108,7 +108,7 @@ google-services-plugin = { module = "com.google.gms:google-services", version =
 google-playservices-auth = { module = "com.google.android.gms:play-services-auth", version = "21.0.0" }
 google-play-core = { module = "com.google.android.play:core", version = "1.10.3" }
 google-play-core-ktx = { module = "com.google.android.play:core-ktx", version = "1.8.1" }
-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version = "18.6.3" }
+firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version = "18.6.4" }
 firebase-crashlytics-gradle-plugin = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "2.9.9" }
 
 # AndroidX
@@ -135,7 +135,7 @@ opencsv-apache-commons = { module = "org.apache.commons:commons-lang3", version
 detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 detekt-ruleset-compiler = { module = "com.braisgabin.detekt:kotlin-compiler-wrapper", version = "0.0.4" }
 detekt-ruleset-ktlint = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
-detekt-ruleset-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.3.13" }
+detekt-ruleset-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.3.15" }
 detekt-ruleset-ivy-explicit = { module = "com.github.Ivy-Apps:detekt-explicit", version = "v0.0.8" }
 slack-lint-compose = { module = "com.slack.lint.compose:compose-lint-checks", version = "1.3.1" }
 
diff --git a/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt b/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt
index e9270a8829..5324f1abb7 100644
--- a/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt
+++ b/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -261,7 +262,7 @@ private fun BoxWithConstraintsScope.UI(
     val scrollState = rememberScrollState()
 
     // This is to scroll the column to the customExchangeCard composable when it is shown
-    var customExchangeRatePosition by remember { mutableStateOf(0F) }
+    var customExchangeRatePosition by remember { mutableFloatStateOf(0F) }
     LaunchedEffect(key1 = customExchangeRateState.showCard) {
         val scrollInt =
             if (customExchangeRateState.showCard) customExchangeRatePosition.roundToInt() else 0
diff --git a/screen/onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt b/screen/onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt
index b906d60cc4..1281b96e78 100644
--- a/screen/onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt
+++ b/screen/onboarding/src/main/java/com/ivy/onboarding/steps/archived/OnboardingPrivacyTC.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -204,7 +205,7 @@ private fun SwipeToAgree(
     val ivyContext = ivyWalletCtx()
 
     val maxOffsetX = ivyContext.screenWidth - 80.dp.toDensityPx() - 72.dp.toDensityPx()
-    var offsetX by remember { mutableStateOf(0f) }
+    var offsetX by remember { mutableFloatStateOf(0f) }
 
     val percentSwiped = offsetX / maxOffsetX
     val agreed = percentSwiped > 0.5f
diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt
index 3d5cfbe705..c10d2eb9b3 100644
--- a/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt
+++ b/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/IvyModal.kt
@@ -23,6 +23,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
@@ -130,7 +131,7 @@ fun BoxScope.IvyModal(
     }
 
     if (visible || modalPercentVisible > 0.01f) {
-        var actionsRowHeight by remember { mutableStateOf(0) }
+        var actionsRowHeight by remember { mutableIntStateOf(0) }
 
         Column(
             modifier = Modifier
diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt
index 556f887c44..b4d78f8657 100644
--- a/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt
+++ b/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/edit/core/EditBottomSheet.kt
@@ -24,6 +24,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -136,7 +137,7 @@ fun BoxWithConstraintsScope.EditBottomSheet(
         animationSpec = tween(DURATION_MODAL_ANIM)
     )
 
-    var bottomBarHeight by remember { mutableStateOf(0) }
+    var bottomBarHeight by remember { mutableIntStateOf(0) }
 
     var internalExpanded by remember { mutableStateOf(true) }
     val expanded = internalExpanded && !keyboardShown
diff --git a/temp/old-design/src/main/java/com/ivy/design/l2_components/InputField.kt b/temp/old-design/src/main/java/com/ivy/design/l2_components/InputField.kt
index 68abc7c010..c502715167 100644
--- a/temp/old-design/src/main/java/com/ivy/design/l2_components/InputField.kt
+++ b/temp/old-design/src/main/java/com/ivy/design/l2_components/InputField.kt
@@ -11,6 +11,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -245,7 +246,7 @@ enum class IvyImeAction {
 class InputFieldFocus {
     var requestFocus: Boolean by mutableStateOf(false)
         private set
-    var triggerRecomposition: Int by mutableStateOf(0)
+    var triggerRecomposition: Int by mutableIntStateOf(0)
         private set
 
     fun consumeFocus(): Boolean {