diff --git a/app/build.gradle b/app/build.gradle
index 4d99286a..27bbfc18 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id("com.android.application")
+    id("org.jetbrains.kotlin.android")
 }
 
 android {
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index 72b804f7..aebe59c9 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -22,7 +22,7 @@ object Versions {
     const val lifeCycle = "2.5.1"
     const val compose_compiler_ext = "1.5.3"
     const val compose_material3 = "1.1.2"
-    const val compose_version = "1.5.3"
+    const val compose_version = "1.7.4"
     const val compose_activity_version = "1.8.0"
     const val compose_customview_poolingcontainer = "1.0.0"
     const val compose_viewmodel = "2.6.2"
diff --git a/example_app_frames/lint-baseline.xml b/example_app_frames/lint-baseline.xml
index 30cf809f..a726f312 100644
--- a/example_app_frames/lint-baseline.xml
+++ b/example_app_frames/lint-baseline.xml
@@ -1,65 +1,129 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.2.1" type="baseline" client="gradle" dependencies="false"
-    name="AGP (7.2.1)" variant="all" version="7.2.1">
+<issues format="6" by="lint 8.1.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.2)" variant="all" version="8.1.2">
 
-    <issue id="UnusedResources" message="The resource `R.color.purple_200` appears to be unused"
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.compose.runtime.lint.RuntimeIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;org.jetbrains.kotlin.analysis.api.session.KtAnalysisSessionProvider: org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenFactory getTokenFactory()&#xA;(Referenced from androidx/compose/runtime/lint/AutoboxingStateCreationDetector.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`AutoboxingStateValueProperty`&#xA;`AutoboxingStateCreation`&#xA;`CoroutineCreationDuringComposition`&#xA;`FlowOperatorInvokedInComposition`&#xA;`ComposableLambdaParameterNaming`&#xA;`ComposableLambdaParameterPosition`&#xA;`ComposableNaming`&#xA;`StateFlowValueCalledInComposition`&#xA;`CompositionLocalNaming`&#xA;`MutableCollectionMutableState`&#xA;`ProduceStateDoesNotAssignValue`&#xA;`RememberReturnType`&#xA;`OpaqueUnitKey`&#xA;`UnrememberedMutableState`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="$GRADLE_USER_HOME/caches/transforms-3/55dbf94641422208b28dd84285056eb8/transformed/jetified-runtime-release/jars/lint.jar"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.compose.ui.lint.UiIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;org.jetbrains.kotlin.analysis.api.session.KtAnalysisSessionProvider: org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenFactory getTokenFactory()&#xA;(Referenced from androidx/compose/ui/lint/ModifierDeclarationDetectorKt$ensureReceiverIsReferenced$1.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`UnnecessaryComposedModifier`&#xA;`ModifierFactoryExtensionFunction`&#xA;`ModifierFactoryReturnType`&#xA;`ModifierFactoryUnreferencedReceiver`&#xA;`ModifierNodeInspectableProperties`&#xA;`ModifierParameter`&#xA;`MultipleAwaitPointerEventScopes`&#xA;`ReturnFromAwaitPointerEventScope`&#xA;`SuspiciousCompositionLocalModifierRead`&#xA;`SuspiciousModifierThen`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="$GRADLE_USER_HOME/caches/transforms-3/97fc3ca3cff827bed21c0a7632d39367/transformed/jetified-ui-release/jars/lint.jar"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.lifecycle.lint.LiveDataCoreIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;org.jetbrains.kotlin.analysis.api.session.KtAnalysisSessionProvider: org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenFactory getTokenFactory()&#xA;(Referenced from androidx/lifecycle/lint/NonNullableMutableLiveDataDetector$createUastHandler$1.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`NullSafeMutableLiveData`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="$GRADLE_USER_HOME/caches/transforms-3/8ceccbadb8d8497487beca744d78dc71/transformed/lifecycle-livedata-core-2.8.3/jars/lint.jar"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.purple_200` appears to be unused"
         errorLine1="    &lt;color name=&quot;purple_200&quot;>#FFBB86FC&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~~~">
-        <location file="src/main/res/values/colors.xml" line="3" column="12" />
+        <location
+            file="src/main/res/values/colors.xml"
+            line="3"
+            column="12"/>
     </issue>
 
-    <issue id="UnusedResources" message="The resource `R.color.purple_500` appears to be unused"
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.purple_500` appears to be unused"
         errorLine1="    &lt;color name=&quot;purple_500&quot;>#FF6200EE&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~~~">
-        <location file="src/main/res/values/colors.xml" line="4" column="12" />
+        <location
+            file="src/main/res/values/colors.xml"
+            line="4"
+            column="12"/>
     </issue>
 
-    <issue id="UnusedResources" message="The resource `R.color.purple_700` appears to be unused"
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.purple_700` appears to be unused"
         errorLine1="    &lt;color name=&quot;purple_700&quot;>#FF3700B3&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~~~">
-        <location file="src/main/res/values/colors.xml" line="5" column="12" />
+        <location
+            file="src/main/res/values/colors.xml"
+            line="5"
+            column="12"/>
     </issue>
 
-    <issue id="UnusedResources" message="The resource `R.color.teal_200` appears to be unused"
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.teal_200` appears to be unused"
         errorLine1="    &lt;color name=&quot;teal_200&quot;>#FF03DAC5&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~">
-        <location file="src/main/res/values/colors.xml" line="6" column="12" />
+        <location
+            file="src/main/res/values/colors.xml"
+            line="6"
+            column="12"/>
     </issue>
 
-    <issue id="UnusedResources" message="The resource `R.color.teal_700` appears to be unused"
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.teal_700` appears to be unused"
         errorLine1="    &lt;color name=&quot;teal_700&quot;>#FF018786&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~~~~">
-        <location file="src/main/res/values/colors.xml" line="7" column="12" />
+        <location
+            file="src/main/res/values/colors.xml"
+            line="7"
+            column="12"/>
     </issue>
 
-    <issue id="UnusedResources" message="The resource `R.color.black` appears to be unused"
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.black` appears to be unused"
         errorLine1="    &lt;color name=&quot;black&quot;>#FF000000&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~">
-        <location file="src/main/res/values/colors.xml" line="8" column="12" />
+        <location
+            file="src/main/res/values/colors.xml"
+            line="8"
+            column="12"/>
     </issue>
 
-    <issue id="UnusedResources" message="The resource `R.color.white` appears to be unused"
+    <issue
+        id="UnusedResources"
+        message="The resource `R.color.white` appears to be unused"
         errorLine1="    &lt;color name=&quot;white&quot;>#FFFFFFFF&lt;/color>"
         errorLine2="           ~~~~~~~~~~~~">
-        <location file="src/main/res/values/colors.xml" line="9" column="12" />
+        <location
+            file="src/main/res/values/colors.xml"
+            line="9"
+            column="12"/>
     </issue>
 
-    <issue id="UnusedResources"
+    <issue
+        id="UnusedResources"
         message="The resource `R.drawable.ic_launcher_foreground` appears to be unused"
         errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
         errorLine2="^">
-        <location file="src/main/res/drawable-v24/ic_launcher_foreground.xml" line="1" column="1" />
+        <location
+            file="src/main/res/drawable-v24/ic_launcher_foreground.xml"
+            line="1"
+            column="1"/>
     </issue>
 
-    <issue id="IconLocation"
+    <issue
+        id="IconLocation"
         message="Found bitmap drawable `res/drawable/ic_logo.png` in densityless folder">
-        <location file="src/main/res/drawable/ic_logo.png" />
+        <location
+            file="src/main/res/drawable/ic_logo.png"/>
     </issue>
 
-    <issue id="IconDuplicates"
+    <issue
+        id="IconDuplicates"
         message="The following unrelated icon files have identical contents: ic_logo.png, ic_launcher_foreground.png">
-        <location file="src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png" />
-        <location file="src/main/res/drawable/ic_logo.png" />
+        <location
+            file="src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png"/>
+        <location
+            file="src/main/res/drawable/ic_logo.png"/>
     </issue>
 
 </issues>
diff --git a/frames/lint-baseline.xml b/frames/lint-baseline.xml
index fe369fe7..dbd5889e 100644
--- a/frames/lint-baseline.xml
+++ b/frames/lint-baseline.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.2.1" type="baseline" client="gradle" dependencies="false"
-    name="AGP (7.2.1)" variant="all" version="7.2.1">
+<issues format="6" by="lint 8.1.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.2)" variant="all" version="8.1.2">
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.compose.runtime.lint.RuntimeIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;org.jetbrains.kotlin.analysis.api.session.KtAnalysisSessionProvider: org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenFactory getTokenFactory()&#xA;(Referenced from androidx/compose/runtime/lint/AutoboxingStateCreationDetector.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`AutoboxingStateValueProperty`&#xA;`AutoboxingStateCreation`&#xA;`CoroutineCreationDuringComposition`&#xA;`FlowOperatorInvokedInComposition`&#xA;`ComposableLambdaParameterNaming`&#xA;`ComposableLambdaParameterPosition`&#xA;`ComposableNaming`&#xA;`StateFlowValueCalledInComposition`&#xA;`CompositionLocalNaming`&#xA;`MutableCollectionMutableState`&#xA;`ProduceStateDoesNotAssignValue`&#xA;`RememberReturnType`&#xA;`OpaqueUnitKey`&#xA;`UnrememberedMutableState`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="$GRADLE_USER_HOME/caches/transforms-3/55dbf94641422208b28dd84285056eb8/transformed/jetified-runtime-release/jars/lint.jar"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.compose.ui.lint.UiIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;org.jetbrains.kotlin.analysis.api.session.KtAnalysisSessionProvider: org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenFactory getTokenFactory()&#xA;(Referenced from androidx/compose/ui/lint/ModifierDeclarationDetectorKt$ensureReceiverIsReferenced$1.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`UnnecessaryComposedModifier`&#xA;`ModifierFactoryExtensionFunction`&#xA;`ModifierFactoryReturnType`&#xA;`ModifierFactoryUnreferencedReceiver`&#xA;`ModifierNodeInspectableProperties`&#xA;`ModifierParameter`&#xA;`MultipleAwaitPointerEventScopes`&#xA;`ReturnFromAwaitPointerEventScope`&#xA;`SuspiciousCompositionLocalModifierRead`&#xA;`SuspiciousModifierThen`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="$GRADLE_USER_HOME/caches/transforms-3/97fc3ca3cff827bed21c0a7632d39367/transformed/jetified-ui-release/jars/lint.jar"/>
+    </issue>
+
+    <issue
+        id="ObsoleteLintCustomCheck"
+        message="Library lint checks reference invalid APIs; these checks **will be skipped**!&#xA;&#xA;Lint found an issue registry (`androidx.lifecycle.lint.LiveDataCoreIssueRegistry`)&#xA;which contains some references to invalid API:&#xA;org.jetbrains.kotlin.analysis.api.session.KtAnalysisSessionProvider: org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenFactory getTokenFactory()&#xA;(Referenced from androidx/lifecycle/lint/NonNullableMutableLiveDataDetector$createUastHandler$1.class)&#xA;&#xA;Therefore, this lint check library is **not** included&#xA;in analysis. This affects the following lint checks:&#xA;`NullSafeMutableLiveData`&#xA;&#xA;To use this lint check, upgrade to a more recent version&#xA;of the library.">
+        <location
+            file="$GRADLE_USER_HOME/caches/transforms-3/8ceccbadb8d8497487beca744d78dc71/transformed/lifecycle-livedata-core-2.8.3/jars/lint.jar"/>
+    </issue>
 
 </issues>
diff --git a/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt b/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt
index 1b809029..b4274513 100644
--- a/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt
+++ b/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt
@@ -15,10 +15,10 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.checkout.frames.di.base.Injector