From f976851205c4e007c3500dc2f73184115beb60a2 Mon Sep 17 00:00:00 2001
From: Hekmatullah <hekmatullah.aminullah2@gmail.com>
Date: Mon, 4 Aug 2025 22:13:19 +0100
Subject: [PATCH] refactor: fix multiplatform targets for iOS, desktop, and JS
 by and updating versions (#1900)

---
 ...ay-android.run.xml => cmp-android.run.xml} |   4 +-
 ...ay-desktop.run.xml => cmp-desktop.run.xml} |  13 +-
 .run/cmp-ios.run.xml                          |   8 +
 ...spay-web-js.run.xml => cmp-web-js.run.xml} |  11 +-
 ...-web-wasm.run.xml => cmp-web-wasm.run.xml} |   6 +-
 .run/mifospay-ios.run.xml                     |  12 -
 .../main/kotlin/CMPFeatureConventionPlugin.kt |   1 +
 .../prodReleaseRuntimeClasspath.tree.txt      | 289 ++++++++++--------
 .../prodReleaseRuntimeClasspath.txt           |  31 +-
 cmp-android/prodRelease-badging.txt           |   2 +-
 cmp-ios/iosApp.xcodeproj/project.pbxproj      |  24 +-
 cmp-web/build.gradle.kts                      |   8 +-
 cmp-web/src/jsMain/resources/index.html       |   2 +-
 cmp-web/src/wasmJsMain/resources/index.html   |   2 +-
 core/ui/build.gradle.kts                      |   1 +
 .../setup/navigation/SetupUpiPinNavigation.kt |  19 +-
 gradle/libs.versions.toml                     |   6 +-
 17 files changed, 223 insertions(+), 216 deletions(-)
 rename .run/{mifospay-android.run.xml => cmp-android.run.xml} (94%)
 rename .run/{mifospay-desktop.run.xml => cmp-desktop.run.xml} (58%)
 create mode 100644 .run/cmp-ios.run.xml
 rename .run/{mifospay-web-js.run.xml => cmp-web-js.run.xml} (64%)
 rename .run/{mifospay-web-wasm.run.xml => cmp-web-wasm.run.xml} (74%)
 delete mode 100644 .run/mifospay-ios.run.xml

diff --git a/.run/mifospay-android.run.xml b/.run/cmp-android.run.xml
similarity index 94%
rename from .run/mifospay-android.run.xml
rename to .run/cmp-android.run.xml
index 6a085d20..90d22450 100644
--- a/.run/mifospay-android.run.xml
+++ b/.run/cmp-android.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="mifospay-android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="mobile-wallet.mifospay-android" />
+  <configuration default="false" name="cmp-android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+    <module name="mobile-wallet.cmp-android" />
     <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
diff --git a/.run/mifospay-desktop.run.xml b/.run/cmp-desktop.run.xml
similarity index 58%
rename from .run/mifospay-desktop.run.xml
rename to .run/cmp-desktop.run.xml
index 6044007f..09325578 100644
--- a/.run/mifospay-desktop.run.xml
+++ b/.run/cmp-desktop.run.xml
@@ -1,8 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="mifospay-desktop" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="cmp-desktop" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="DEVELOPER_DIR" value="/Applications/Xcode.app/Contents/Developer" />
+        </map>
+      </option>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/cmp-desktop" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="-DmainClass=MainKt --quiet" />
       <option name="taskDescriptions">
@@ -10,12 +15,12 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":mifospay-desktop:desktopRun" />
+          <option value="desktopRun" />
         </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>false</RunAsTest>
diff --git a/.run/cmp-ios.run.xml b/.run/cmp-ios.run.xml
new file mode 100644
index 00000000..3cfa69a5
--- /dev/null
+++ b/.run/cmp-ios.run.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="cmp-ios" type="AppleRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="iosApp" TARGET_NAME="iosApp" CONFIG_NAME="Debug" IS_LOCATION_SIMULATION_SUPPORTED="true" SCHEME_NAME="cmp-ios" IS_LOCATION_SIMULATION_ALLOWED="true" LOCATION_SCENARIO_ID="com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier" LOCATION_SCENARIO_TYPE="1" APPLICATION_LANGUAGE="IDELaunchSchemeLanguageUseSystemLanguage" APPLICATION_REGION="" RUN_TARGET_PROJECT_NAME="iosApp" RUN_TARGET_NAME="iosApp" MAKE_ACTIVE="TRUE" SHOULD_DEBUG_EXTENSIONS="false">
+    <embedded_app_extension_list />
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/mifospay-web-js.run.xml b/.run/cmp-web-js.run.xml
similarity index 64%
rename from .run/mifospay-web-js.run.xml
rename to .run/cmp-web-js.run.xml
index d6b90250..e9fe0665 100644
--- a/.run/mifospay-web-js.run.xml
+++ b/.run/cmp-web-js.run.xml
@@ -1,8 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="mifospay-web-js" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="cmp-web-js" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="DEVELOPER_DIR" value="/Applications/Xcode.app/Contents/Developer" />
+        </map>
+      </option>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/cmp-web" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
@@ -10,7 +15,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":mifospay-web:jsBrowserRun" />
+          <option value="jsBrowserDevelopmentRun" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/.run/mifospay-web-wasm.run.xml b/.run/cmp-web-wasm.run.xml
similarity index 74%
rename from .run/mifospay-web-wasm.run.xml
rename to .run/cmp-web-wasm.run.xml
index 6bdae484..a1400a3a 100644
--- a/.run/mifospay-web-wasm.run.xml
+++ b/.run/cmp-web-wasm.run.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="mifospay-web-wasm" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="cmp-web-wasm" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/cmp-web" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":mifospay-web:wasmJsBrowserRun" />
+          <option value="wasmJsBrowserDevelopmentRun" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/.run/mifospay-ios.run.xml b/.run/mifospay-ios.run.xml
deleted file mode 100644
index 7d40bc00..00000000
--- a/.run/mifospay-ios.run.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="mifospay-ios" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" XCODE_PROJECT="$PROJECT_DIR$/mifospay-ios/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
-    <method v="2">
-      <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
-    </method>
-  </configuration>
-  <configuration default="false" name="mifospay-ios" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" XCODE_PROJECT="$PROJECT_DIR$/mifospay-ios/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
-    <method v="2">
-      <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt
index 8885f673..f05222ca 100644
--- a/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt
@@ -24,6 +24,7 @@ class CMPFeatureConventionPlugin : Plugin<Project> {
                 add("commonMainImplementation", libs.findLibrary("koin.compose.viewmodel").get())
 
                 add("commonMainImplementation", libs.findLibrary("jb.composeRuntime").get())
+                add("commonMainImplementation", libs.findLibrary("jb.lifecycle.compose").get())
                 add("commonMainImplementation", libs.findLibrary("jb.composeViewmodel").get())
                 add("commonMainImplementation", libs.findLibrary("jb.lifecycleViewmodel").get())
                 add("commonMainImplementation", libs.findLibrary("jb.lifecycleViewmodelSavedState").get())
diff --git a/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt
index 9a58b39b..f666a361 100644
--- a/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt
+++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt
@@ -1,18 +1,18 @@
-+--- androidx.databinding:databinding-common:8.11.1
-+--- androidx.databinding:databinding-runtime:8.11.1
++--- androidx.databinding:databinding-common:8.10.0
++--- androidx.databinding:databinding-runtime:8.10.0
 |    +--- androidx.collection:collection:1.0.0 -> 1.5.0
 |    |    \--- androidx.collection:collection-jvm:1.5.0
 |    |         +--- androidx.annotation:annotation:1.9.1
 |    |         |    \--- androidx.annotation:annotation-jvm:1.9.1
 |    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21
 |    |         |              +--- org.jetbrains:annotations:13.0 -> 23.0.0
-|    |         |              +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 -> 1.9.0 (c)
-|    |         |              \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.22 (c)
+|    |         |              +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 -> 2.1.0 (c)
+|    |         |              \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 2.1.0 (c)
 |    |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
 |    |         +--- androidx.collection:collection-ktx:1.5.0 (c)
 |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21 (c)
-|    +--- androidx.databinding:databinding-common:8.11.1
-|    +--- androidx.databinding:viewbinding:8.11.1
+|    +--- androidx.databinding:databinding-common:8.10.0
+|    +--- androidx.databinding:viewbinding:8.10.0
 |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.9.1 (*)
 |    \--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.9.2
 |         \--- androidx.lifecycle:lifecycle-runtime-android:2.9.2
@@ -88,12 +88,15 @@
 |              +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2 (c)
 |              +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.1.21 (c)
 |              \--- androidx.lifecycle:lifecycle-common-java8:2.9.2 (c)
-+--- androidx.databinding:databinding-adapters:8.11.1
-|    +--- androidx.databinding:databinding-runtime:8.11.1 (*)
-|    \--- androidx.databinding:databinding-common:8.11.1
-+--- androidx.databinding:databinding-ktx:8.11.1
-|    +--- androidx.databinding:databinding-runtime:8.11.1 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.1.21 (*)
++--- androidx.databinding:databinding-adapters:8.10.0
+|    +--- androidx.databinding:databinding-runtime:8.10.0 (*)
+|    \--- androidx.databinding:databinding-common:8.10.0
++--- androidx.databinding:databinding-ktx:8.10.0
+|    +--- androidx.databinding:databinding-runtime:8.10.0 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.0 -> 2.1.21 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.0 -> 2.1.21 (*)
 |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.10.2 (*)
 |    +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -> 2.9.2
 |    |    \--- androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.2
@@ -439,10 +442,7 @@
 |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.1.0 -> 18.2.0 (*)
 |    |    |    +--- com.google.firebase:firebase-common-ktx:21.0.0
 |    |    |    |    +--- com.google.firebase:firebase-common:21.0.0 (*)
-|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
-|    |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.21 (*)
-|    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.0
-|    |    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.0 -> 2.1.21 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 2.1.0 (*)
 |    |    |    |    +--- com.google.firebase:firebase-components:18.0.0 (*)
 |    |    |    |    \--- com.google.firebase:firebase-annotations:16.2.0 (*)
 |    |    |    +--- com.google.firebase:firebase-components:18.0.0 (*)
@@ -482,10 +482,10 @@
 |    |    |    +--- com.google.firebase:firebase-encoders:17.0.0
 |    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.9.1 (*)
 |    |    |    +--- com.google.firebase:firebase-encoders-json:18.0.1
-|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.8.22 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 2.1.0 (*)
 |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.9.1 (*)
 |    |    |    |    \--- com.google.firebase:firebase-encoders:17.0.0 (*)
-|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 2.1.0 (*)
 |    |    |    +--- com.google.firebase:firebase-installations:18.0.0 (*)
 |    |    |    +--- com.google.firebase:firebase-datatransport:19.0.0
 |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.9.1 (*)
@@ -505,7 +505,7 @@
 |    |    |    |    |    +--- com.google.firebase:firebase-encoders-json:18.0.0 -> 18.0.1 (*)
 |    |    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.9.1 (*)
 |    |    |    |    +--- com.google.android.datatransport:transport-runtime:3.2.0 -> 3.3.0 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 (*)
+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 2.1.0 (*)
 |    |    |    +--- com.google.android.datatransport:transport-api:3.2.0 (*)
 |    |    |    +--- javax.inject:javax.inject:1
 |    |    |    +--- androidx.annotation:annotation:1.5.0 -> 1.9.1 (*)
@@ -599,14 +599,14 @@
 |    |    +--- com.google.firebase:firebase-installations:18.0.0 (*)
 |    |    +--- com.google.firebase:firebase-installations-interop:17.2.0 (*)
 |    |    +--- com.google.firebase:firebase-measurement-connector:20.0.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 2.1.0 (*)
 |    |    +--- com.google.android.datatransport:transport-api:3.2.0 (*)
 |    |    +--- com.google.android.datatransport:transport-backend-cct:3.3.0 (*)
 |    |    +--- com.google.android.datatransport:transport-runtime:3.3.0 (*)
 |    |    \--- androidx.annotation:annotation:1.5.0 -> 1.9.1 (*)
 |    +--- com.google.firebase:firebase-common:21.0.0 (*)
 |    +--- com.google.firebase:firebase-common-ktx:21.0.0 (*)
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 (*)
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 2.1.0 (*)
 |    \--- com.google.firebase:firebase-components:18.0.0 (*)
 +--- androidx.compose:compose-bom:2025.07.00
 |    +--- androidx.compose.material3:material3:1.3.2 (c)
@@ -1081,19 +1081,19 @@
 |    |    |         |    |    |    +--- org.jetbrains.compose.ui:ui:1.8.2
 |    |    |         |    |    |    |    +--- androidx.compose.ui:ui:1.8.2 -> 1.8.3 (*)
 |    |    |         |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4 -> 2.9.1 (*)
-|    |    |         |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4 -> 2.9.0-alpha03
+|    |    |         |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4 -> 2.9.1
 |    |    |         |    |    |    |    |    +--- androidx.arch.core:core-common:2.2.0 (*)
-|    |    |         |    |    |    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.9.0-alpha03 -> 2.9.2 (*)
-|    |    |         |    |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.0-alpha03 -> 2.9.1 (*)
-|    |    |         |    |    |    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.7.1 -> 1.8.2 (*)
+|    |    |         |    |    |    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.9.1 -> 2.9.2 (*)
+|    |    |         |    |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1 (*)
+|    |    |         |    |    |    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.8.2 (*)
+|    |    |         |    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
+|    |    |         |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4 -> 2.9.1
+|    |    |         |    |    |    |    |    +--- androidx.lifecycle:lifecycle-runtime-compose:2.9.1 -> 2.9.2 (*)
+|    |    |         |    |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1 (*)
+|    |    |         |    |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1 (*)
+|    |    |         |    |    |    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.8.2 (*)
+|    |    |         |    |    |    |    |    +--- org.jetbrains.compose.runtime:runtime:1.7.1 -> 1.8.2 (*)
 |    |    |         |    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
-|    |    |         |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
-|    |    |         |    |    |    |    |    +--- androidx.lifecycle:lifecycle-runtime-compose:2.8.5 -> 2.9.2 (*)
-|    |    |         |    |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4 -> 2.9.1 (*)
-|    |    |         |    |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4 -> 2.9.0-alpha03 (*)
-|    |    |         |    |    |    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.6.11 -> 1.8.2 (*)
-|    |    |         |    |    |    |    |    +--- org.jetbrains.compose.runtime:runtime:1.6.11 -> 1.8.2 (*)
-|    |    |         |    |    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21 (*)
 |    |    |         |    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4 -> 2.9.1 (*)
 |    |    |         |    |    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.8.2 (*)
 |    |    |         |    |    |    |    +--- org.jetbrains.compose.collection-internal:collection:1.8.2 (*)
@@ -1476,10 +1476,10 @@
 |    |    |    |    |         +--- io.ktor:ktor-client-core:3.1.2 (*)
 |    |    |    |    |         +--- com.squareup.okhttp3:okhttp:4.12.0
 |    |    |    |    |         |    +--- com.squareup.okio:okio:3.6.0 -> 3.15.0 (*)
-|    |    |    |    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.8.22 (*)
+|    |    |    |    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 2.1.0 (*)
 |    |    |    |    |         +--- com.squareup.okhttp3:okhttp-sse:4.12.0
 |    |    |    |    |         |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
-|    |    |    |    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.8.22 (*)
+|    |    |    |    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 2.1.0 (*)
 |    |    |    |    |         +--- com.squareup.okio:okio:3.10.2 -> 3.15.0 (*)
 |    |    |    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1 -> 1.10.2 (*)
 |    |    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.1.21 (*)
@@ -1603,7 +1603,7 @@
 |    |    |    +--- androidx.compose.foundation:foundation:1.7.0 -> 1.8.3 (*)
 |    |    |    +--- dev.chrisbanes.snapper:snapper:0.2.2
 |    |    |    |    +--- androidx.compose.foundation:foundation:1.1.1 -> 1.8.3 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.22 (*)
+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 2.1.0 (*)
 |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.1.21 (*)
 |    |    +--- project :core:analytics (*)
 |    |    +--- project :core:designsystem
@@ -1770,7 +1770,7 @@
 |    |    |    |    |    |    +--- org.jetbrains.compose.ui:ui-backhandler:1.8.2
 |    |    |    |    |    |    |    \--- org.jetbrains.compose.ui:ui-backhandler-android:1.8.2
 |    |    |    |    |    |    |         +--- androidx.activity:activity-compose:1.8.0 -> 1.10.1 (*)
-|    |    |    |    |    |    |         +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4 (*)
+|    |    |    |    |    |    |         +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4 -> 2.9.1 (*)
 |    |    |    |    |    |    |         +--- org.jetbrains.compose.annotation-internal:annotation:1.8.2 (*)
 |    |    |    |    |    |    |         +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
 |    |    |    |    |    |    |         +--- org.jetbrains.compose.ui:ui-util:1.8.2 (*)
@@ -1891,6 +1891,7 @@
 |    |    +--- io.insert-koin:koin-bom:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-core:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-annotations:2.1.0 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
@@ -1900,8 +1901,10 @@
 |    |    +--- org.jetbrains.compose.material3:material3:1.8.2 (*)
 |    |    +--- org.jetbrains.compose.components:components-resources:1.8.2 (*)
 |    |    +--- org.jetbrains.compose.components:components-ui-tooling-preview:1.8.2 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13
-|    |    |    +--- androidx.navigation:navigation-compose:2.8.4 -> 2.9.2
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03
+|    |    |    +--- androidx.annotation:annotation:1.9.1 (*)
+|    |    |    +--- androidx.collection:collection:1.5.0 (*)
+|    |    |    +--- androidx.navigation:navigation-compose:2.9.0 -> 2.9.2
 |    |    |    |    \--- androidx.navigation:navigation-compose-android:2.9.2
 |    |    |    |         +--- androidx.activity:activity:1.8.0 -> 1.10.1 (*)
 |    |    |    |         +--- androidx.activity:activity-compose:1.8.0 -> 1.10.1 (*)
@@ -1938,54 +1941,45 @@
 |    |    |    |         +--- androidx.navigation:navigation-runtime:2.9.2 (c)
 |    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.1.21 (c)
 |    |    |    |         \--- androidx.navigation:navigation-fragment:2.9.2 (c)
-|    |    |    +--- org.jetbrains.androidx.core:core-bundle:1.1.0-alpha03
-|    |    |    |    \--- org.jetbrains.androidx.core:core-bundle-android:1.1.0-alpha03
-|    |    |    |         +--- androidx.core:core-ktx:1.2.0 -> 1.16.0 (*)
-|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
-|    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 -> 2.1.21 (c)
-|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4 -> 2.9.1 (*)
-|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4 -> 2.9.0-alpha03 (*)
-|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4 (*)
-|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4 -> 2.9.1 (*)
-|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4 -> 2.9.1 (*)
-|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4 -> 2.9.1 (*)
-|    |    |    +--- org.jetbrains.androidx.navigation:navigation-common:2.8.0-alpha13
-|    |    |    |    +--- androidx.navigation:navigation-common:2.8.4 -> 2.9.2 (*)
-|    |    |    |    +--- org.jetbrains.androidx.core:core-bundle:1.1.0-alpha03 (*)
-|    |    |    |    +--- org.jetbrains.androidx.core:core-uri:1.1.0-alpha03
-|    |    |    |    |    \--- org.jetbrains.androidx.core:core-uri-android:1.1.0-alpha03
-|    |    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
-|    |    |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 -> 2.1.21 (c)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.0-alpha03 -> 2.9.1 (*)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.0-alpha03 (*)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.0-alpha03 -> 2.9.1 (*)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.0-alpha03 -> 2.9.1 (*)
-|    |    |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.2.2 -> 1.3.1 (*)
-|    |    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.7.1 -> 1.8.2 (*)
-|    |    |    |    +--- org.jetbrains.compose.collection-internal:collection:1.7.1 -> 1.8.2 (*)
+|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1 (*)
+|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
+|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
+|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
+|    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
+|    |    |    +--- org.jetbrains.androidx.navigation:navigation-common:2.9.0-beta03
+|    |    |    |    +--- androidx.annotation:annotation:1.9.1 (*)
+|    |    |    |    +--- androidx.collection:collection:1.5.0 (*)
+|    |    |    |    +--- androidx.navigation:navigation-common:2.9.0 -> 2.9.2 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
 |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
 |    |    |    |    \--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3 -> 1.8.0 (*)
-|    |    |    +--- org.jetbrains.androidx.navigation:navigation-runtime:2.8.0-alpha13
-|    |    |    |    +--- androidx.navigation:navigation-runtime:2.8.4 -> 2.9.2 (*)
-|    |    |    |    +--- org.jetbrains.androidx.core:core-bundle:1.1.0-alpha03 (*)
-|    |    |    |    +--- org.jetbrains.androidx.core:core-uri:1.1.0-alpha03 (*)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4 -> 2.9.1 (*)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4 -> 2.9.0-alpha03 (*)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4 -> 2.9.1 (*)
-|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4 -> 2.9.1 (*)
-|    |    |    |    +--- org.jetbrains.androidx.navigation:navigation-common:2.8.0-alpha13 (*)
-|    |    |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.2.2 -> 1.3.1 (*)
-|    |    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.7.1 -> 1.8.2 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
-|    |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.2.2 -> 1.3.1 (*)
-|    |    |    +--- org.jetbrains.compose.animation:animation:1.7.1 -> 1.8.2 (*)
-|    |    |    +--- org.jetbrains.compose.animation:animation-core:1.8.0-alpha03 -> 1.8.2 (*)
-|    |    |    +--- org.jetbrains.compose.annotation-internal:annotation:1.8.0-alpha03 -> 1.8.2 (*)
-|    |    |    +--- org.jetbrains.compose.foundation:foundation-layout:1.7.1 -> 1.8.2 (*)
-|    |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.0-alpha03 -> 1.8.2 (*)
-|    |    |    +--- org.jetbrains.compose.runtime:runtime-saveable:1.7.1 -> 1.8.2 (*)
-|    |    |    +--- org.jetbrains.compose.ui:ui:1.7.1 -> 1.8.2 (*)
-|    |    |    +--- org.jetbrains.compose.ui:ui-backhandler:1.8.0-alpha03 -> 1.8.2 (*)
+|    |    |    +--- org.jetbrains.androidx.navigation:navigation-runtime:2.9.0-beta03
+|    |    |    |    +--- androidx.annotation:annotation:1.9.1 (*)
+|    |    |    |    +--- androidx.collection:collection:1.5.0-beta01 -> 1.5.0 (*)
+|    |    |    |    +--- androidx.navigation:navigation-runtime:2.9.0 -> 2.9.2 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.navigation:navigation-common:2.9.0-beta03 (*)
+|    |    |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
+|    |    |    |    \--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3 -> 1.8.0 (*)
+|    |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
+|    |    |    +--- org.jetbrains.androidx.savedstate:savedstate-compose:1.3.1
+|    |    |    |    +--- androidx.savedstate:savedstate-compose:1.3.0 -> 1.3.1 (*)
+|    |    |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
+|    |    |    |    \--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    |    +--- org.jetbrains.compose.animation:animation:1.8.2 (*)
+|    |    |    +--- org.jetbrains.compose.animation:animation-core:1.8.2 (*)
+|    |    |    +--- org.jetbrains.compose.foundation:foundation-layout:1.8.2 (*)
+|    |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    |    +--- org.jetbrains.compose.runtime:runtime-saveable:1.8.2 (*)
+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
 |    |    |    \--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3 -> 1.8.0 (*)
 |    |    +--- io.github.vinceglb:filekit-core:0.10.0-beta04
 |    |    |    \--- io.github.vinceglb:filekit-core-android:0.10.0-beta04
@@ -2015,12 +2009,16 @@
 |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    +--- org.jetbrains.androidx.core:core-bundle:1.0.1
+|    |    \--- org.jetbrains.androidx.core:core-bundle-android:1.0.1
+|    |         +--- androidx.core:core-ktx:1.2.0 -> 1.16.0 (*)
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21 (*)
+|    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    +--- project :core:domain
@@ -2081,7 +2079,7 @@
 |    |    |    |    |    +--- com.google.android.gms:play-services-base:18.3.0 -> 18.5.0 (*)
 |    |    |    |    |    +--- com.google.android.gms:play-services-basement:18.3.0 -> 18.5.0 (*)
 |    |    |    |    |    +--- com.google.android.gms:play-services-tasks:18.1.0 -> 18.2.0 (*)
-|    |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 (*)
+|    |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 -> 2.1.0 (*)
 |    |    |    |    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.10.2 (*)
 |    |    |    |    \--- com.google.android.gms:play-services-tasks:18.2.0 (*)
 |    |    |    +--- com.google.android.gms:play-services-auth-blockstore:16.4.0
@@ -2098,7 +2096,7 @@
 |    |    |    +--- com.google.android.libraries.identity.googleid:googleid:1.1.0 -> 1.1.1
 |    |    |    |    +--- androidx.credentials:credentials:1.3.0-beta01 -> 1.5.0 (*)
 |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.1.21 (*)
-|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.22 (*)
+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 2.1.0 (*)
 |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*)
 |    |    |    +--- androidx.credentials:credentials:1.5.0 (c)
 |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21 (c)
@@ -2112,12 +2110,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- project :core:domain (*)
@@ -2149,12 +2148,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2189,12 +2189,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2221,12 +2222,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2252,12 +2254,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2283,12 +2286,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2314,12 +2318,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2349,12 +2354,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2380,12 +2386,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2411,12 +2418,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2442,12 +2450,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2474,12 +2483,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2505,12 +2515,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2540,12 +2551,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2571,12 +2583,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2611,12 +2624,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2643,12 +2657,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2674,12 +2689,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2753,12 +2769,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2785,12 +2802,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2915,12 +2933,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2947,12 +2966,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
@@ -2978,12 +2998,13 @@
 |    |    +--- io.insert-koin:koin-compose:4.1.0 (*)
 |    |    +--- io.insert-koin:koin-compose-viewmodel:4.1.0 (*)
 |    |    +--- org.jetbrains.compose.runtime:runtime:1.8.2 (*)
+|    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1 (*)
 |    |    +--- org.jetbrains.androidx.savedstate:savedstate:1.3.1 (*)
-|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 -> 1.1.0-alpha03 (*)
-|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13 (*)
+|    |    +--- org.jetbrains.androidx.core:core-bundle:1.0.1 (*)
+|    |    +--- org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 (*)
 |    |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3 -> 1.8.0 (*)
 |    |    +--- org.jetbrains.compose.ui:ui:1.8.2 (*)
diff --git a/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt
index 19ab4f15..89aaf0d2 100644
--- a/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt
+++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt
@@ -115,11 +115,11 @@ androidx.credentials:credentials:1.5.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.1.0
-androidx.databinding:databinding-adapters:8.11.1
-androidx.databinding:databinding-common:8.11.1
-androidx.databinding:databinding-ktx:8.11.1
-androidx.databinding:databinding-runtime:8.11.1
-androidx.databinding:viewbinding:8.11.1
+androidx.databinding:databinding-adapters:8.10.0
+androidx.databinding:databinding-common:8.10.0
+androidx.databinding:databinding-ktx:8.10.0
+androidx.databinding:databinding-runtime:8.10.0
+androidx.databinding:viewbinding:8.10.0
 androidx.datastore:datastore-android:1.1.3
 androidx.datastore:datastore-core-android:1.1.3
 androidx.datastore:datastore-core-okio-jvm:1.1.3
@@ -372,19 +372,18 @@ io.ktor:ktor-websocket-serialization:3.1.2
 io.ktor:ktor-websockets-jvm:3.1.2
 io.ktor:ktor-websockets:3.1.2
 javax.inject:javax.inject:1
-org.jetbrains.androidx.core:core-bundle-android:1.1.0-alpha03
-org.jetbrains.androidx.core:core-bundle:1.1.0-alpha03
-org.jetbrains.androidx.core:core-uri-android:1.1.0-alpha03
-org.jetbrains.androidx.core:core-uri:1.1.0-alpha03
+org.jetbrains.androidx.core:core-bundle-android:1.0.1
+org.jetbrains.androidx.core:core-bundle:1.0.1
 org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.1
-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.0-alpha03
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.1
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.1
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
 org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.1
-org.jetbrains.androidx.navigation:navigation-common:2.8.0-alpha13
-org.jetbrains.androidx.navigation:navigation-compose:2.8.0-alpha13
-org.jetbrains.androidx.navigation:navigation-runtime:2.8.0-alpha13
+org.jetbrains.androidx.navigation:navigation-common:2.9.0-beta03
+org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03
+org.jetbrains.androidx.navigation:navigation-runtime:2.9.0-beta03
+org.jetbrains.androidx.savedstate:savedstate-compose:1.3.1
 org.jetbrains.androidx.savedstate:savedstate:1.3.1
 org.jetbrains.androidx.window:window-core:1.3.1
 org.jetbrains.compose.animation:animation-core:1.8.2
@@ -418,8 +417,8 @@ org.jetbrains.compose.ui:ui:1.8.2
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.20
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.20
 org.jetbrains.kotlin:kotlin-reflect:2.1.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib:2.1.21
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
diff --git a/cmp-android/prodRelease-badging.txt b/cmp-android/prodRelease-badging.txt
index 7ba49685..91ced69b 100644
--- a/cmp-android/prodRelease-badging.txt
+++ b/cmp-android/prodRelease-badging.txt
@@ -1,4 +1,4 @@
-package: name='org.mifospay' versionCode='1' versionName='2025.8.1-beta.0.3' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
+package: name='org.mifospay' versionCode='1' versionName='2025.8.2-beta.0.3' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 minSdkVersion:'26'
 targetSdkVersion:'34'
 uses-permission: name='android.permission.INTERNET'
diff --git a/cmp-ios/iosApp.xcodeproj/project.pbxproj b/cmp-ios/iosApp.xcodeproj/project.pbxproj
index 866c359f..88bdfa2d 100644
--- a/cmp-ios/iosApp.xcodeproj/project.pbxproj
+++ b/cmp-ios/iosApp.xcodeproj/project.pbxproj
@@ -100,7 +100,6 @@
 				E5D357E5C5AAADD27F979C77 /* Pods-iosApp.debug.xcconfig */,
 				471D4B8AF5995E32718DCCCD /* Pods-iosApp.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -112,12 +111,11 @@
 			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */;
 			buildPhases = (
 				B64BB9FA0685531D58FB76B5 /* [CP] Check Pods Manifest.lock */,
-				F36B1CEB2AD83DDC00CB74D5 /* Compile Kotlin Framework */,
 				7555FF77242A565900829871 /* Sources */,
 				B92378962B6B1156000C7307 /* Frameworks */,
 				7555FF79242A565900829871 /* Resources */,
 				F4AFB1CDEBBAABC6D5F3DC8F /* [CP] Embed Pods Frameworks */,
-				AFD81544B3E08C350ACEF05C /* [CP] Copy Pods Resources */,
+				752A860311D78307D18B373B /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -175,7 +173,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		AFD81544B3E08C350ACEF05C /* [CP] Copy Pods Resources */ = {
+		752A860311D78307D18B373B /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -214,24 +212,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F36B1CEB2AD83DDC00CB74D5 /* Compile Kotlin Framework */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Compile Kotlin Framework";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n  echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n  exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :cmp-shared:embedAndSignAppleFrameworkForXcode\n";
-		};
 		F4AFB1CDEBBAABC6D5F3DC8F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
diff --git a/cmp-web/build.gradle.kts b/cmp-web/build.gradle.kts
index 4232fd9f..5d6149db 100644
--- a/cmp-web/build.gradle.kts
+++ b/cmp-web/build.gradle.kts
@@ -8,10 +8,10 @@ plugins {
 
 kotlin {
     js(IR) {
-        outputModuleName = "mifospay-web"
+        outputModuleName = "cmp-web"
         browser {
             commonWebpackConfig {
-                outputFileName = "mifospay-web.js"
+                outputFileName = "cmp-web.js"
             }
         }
         binaries.executable()
@@ -19,10 +19,10 @@ kotlin {
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        outputModuleName = "mifospay-wasm"
+        outputModuleName = "cmp-wasm"
         browser {
             commonWebpackConfig {
-                outputFileName = "mifospay-wasm.js"
+                outputFileName = "cmp-wasm.js"
             }
         }
         binaries.executable()
diff --git a/cmp-web/src/jsMain/resources/index.html b/cmp-web/src/jsMain/resources/index.html
index b7c4c173..0e10a796 100644
--- a/cmp-web/src/jsMain/resources/index.html
+++ b/cmp-web/src/jsMain/resources/index.html
@@ -37,7 +37,7 @@
 <body>
 <div id="ComposeTargetContainer">
     <canvas id="ComposeTarget"></canvas>
-    <script src="mifospay-web.js"></script>
+    <script src="cmp-web.js"></script>
 </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/cmp-web/src/wasmJsMain/resources/index.html b/cmp-web/src/wasmJsMain/resources/index.html
index a75f3dde..5aa701ff 100644
--- a/cmp-web/src/wasmJsMain/resources/index.html
+++ b/cmp-web/src/wasmJsMain/resources/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport"
           content="width=device-width; initial-scale=1; maximum-scale=1; user-scalable=0;"/>
     <title>Mifos Wallet</title>
-    <script type="application/javascript" src="mifospay-wasm.js"></script>
+    <script type="application/javascript" src="cmp-wasm.js"></script>
 </head>
 <body>
     <canvas id="ComposeTarget"></canvas>
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index e7833030..8714264b 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -30,6 +30,7 @@ kotlin {
             api(projects.core.designsystem)
             api(projects.core.model)
             api(projects.core.common)
+            implementation(libs.jb.lifecycle.compose)
             implementation(libs.jb.composeViewmodel)
             implementation(libs.jb.lifecycleViewmodel)
             implementation(libs.jb.lifecycleViewmodelSavedState)
diff --git a/feature/upi-setup/src/commonMain/kotlin/org/mifospay/feature/upi/setup/navigation/SetupUpiPinNavigation.kt b/feature/upi-setup/src/commonMain/kotlin/org/mifospay/feature/upi/setup/navigation/SetupUpiPinNavigation.kt
index 860cd9d8..e71e5ce4 100644
--- a/feature/upi-setup/src/commonMain/kotlin/org/mifospay/feature/upi/setup/navigation/SetupUpiPinNavigation.kt
+++ b/feature/upi-setup/src/commonMain/kotlin/org/mifospay/feature/upi/setup/navigation/SetupUpiPinNavigation.kt
@@ -17,7 +17,6 @@ import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import org.mifospay.core.common.Constants
 import org.mifospay.core.model.bank.BankAccountDetails
-import org.mifospay.feature.upi.setup.screens.SetupUpiPinScreenRoute
 
 const val SETUP_UPI_PIN_ROUTE = "setup_upi_pin_route"
 
@@ -41,15 +40,15 @@ fun NavGraphBuilder.setupUpiPinScreen(
             isUpiEnabled = false,
             upiPin = null,
         )
-        val index = backStackEntry.arguments?.getInt(Constants.INDEX) ?: 0
-        val type = backStackEntry.arguments?.getString(Constants.TYPE) ?: ""
+//        val index = backStackEntry.arguments?.getInt(Constants.INDEX) ?: 0
+//        val type = backStackEntry.arguments?.getString(Constants.TYPE) ?: ""
 
-        SetupUpiPinScreenRoute(
-            type = type,
-            index = index,
-            bankAccountDetails = bankAccountDetails,
-            onBackPress = navigateBack,
-        )
+//        SetupUpiPinScreenRoute(
+//            type = type,
+//            index = index,
+//            bankAccountDetails = bankAccountDetails,
+//            onBackPress = navigateBack,
+//        )
     }
 }
 
@@ -65,5 +64,5 @@ fun NavController.navigateToSetupUpiPin(
         this.launchSingleTop = true
         this.restoreState = true
     }
-    currentBackStackEntry?.arguments?.putAll(bundle)
+//    currentBackStackEntry?.arguments?.putAll(bundle)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2d980bbb..2309dc5a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,8 +3,8 @@ accompanist = "0.36.0"
 
 # Android
 androidDesugarJdkLibs = "2.1.5"
-androidGradlePlugin = "8.11.1"
-androidTools = "31.11.1"
+androidGradlePlugin = "8.10.0"
+androidTools = "31.10.0"
 
 # AndroidX Dependencies
 androidx-test-ext-junit = "1.2.1"
@@ -119,7 +119,7 @@ windowsSizeClass = "0.5.0"
 uiDesktopVersion = "1.7.0"
 composeJB = "1.8.2"
 composeLifecycle = "2.9.1"
-composeNavigation = "2.8.0-alpha13"
+composeNavigation = "2.9.0-beta03"
 jbCoreBundle = "1.0.1"
 jbSavedState = "1.3.1"
 gitLive = "2.1.0"