diff --git a/.idea/misc.xml b/.idea/misc.xml
index b94a8804b..f1fa836fa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/Demo/build.gradle b/Demo/build.gradle
index 7f3194b57..70824b0ad 100644
--- a/Demo/build.gradle
+++ b/Demo/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'androidx.navigation.safeargs.kotlin'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
     id 'kotlin-parcelize'
@@ -11,12 +10,12 @@ plugins {
 def paypalProperties = loadPropertiesFromFile("paypal.properties")
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.paypal.android"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode modules.demoAppVersionCode
         versionName modules.sdkVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -117,7 +116,7 @@ dependencies {
     implementation deps.fragmentKtx
 
     // TODO: remove dependency when we don't relay on nxo models anymore
-    implementation (deps.nativeCheckout) {
+    implementation(deps.nativeCheckout) {
         exclude module: 'data-collector'
     }
 
@@ -138,8 +137,6 @@ dependencies {
     implementation deps.lifecycleViewModelCompose
     implementation deps.lifecycleRuntimeCompose
 
-    implementation deps.navigationFragment
-    implementation deps.navigationUI
     implementation deps.preference
 
     implementation deps.retrofit
@@ -149,6 +146,9 @@ dependencies {
     implementation deps.hilt
     kapt deps.hiltKapt
 
+    implementation deps.navigationCompose
+    implementation deps.hiltNavigationCompose
+
     testImplementation deps.junit
 
     androidTestImplementation deps.androidxJUnit
@@ -171,6 +171,7 @@ def loadPropertiesFromFile(filePath) {
     def result = new Properties()
     try {
         result.load(new FileInputStream(rootProject.file(filePath)))
-    } catch (e) { /* ignored */ }
+    } catch (e) { /* ignored */
+    }
     return result
 }
diff --git a/Demo/src/androidTest/java/com/paypal/android/CardTest.kt b/Demo/src/androidTest/java/com/paypal/android/CardTest.kt
index 2253375ab..db4833816 100644
--- a/Demo/src/androidTest/java/com/paypal/android/CardTest.kt
+++ b/Demo/src/androidTest/java/com/paypal/android/CardTest.kt
@@ -15,7 +15,7 @@ import org.junit.runner.RunWith
 class CardTest {
 
     @get:Rule
-    val composeTestRule = createAndroidComposeRule<DemoActivity>()
+    val composeTestRule = createAndroidComposeRule<MainActivity>()
 
     @Test
     fun approveOrder() {
diff --git a/Demo/src/main/AndroidManifest.xml b/Demo/src/main/AndroidManifest.xml
index f38124500..a63e93b6b 100644
--- a/Demo/src/main/AndroidManifest.xml
+++ b/Demo/src/main/AndroidManifest.xml
@@ -15,10 +15,10 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidSDK"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:name=".DemoApplication"
+        android:name=".MainApplication"
         tools:ignore="MediaCapabilities,UnusedAttribute">
         <activity
-            android:name=".DemoActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop">
             <intent-filter>
diff --git a/Demo/src/main/java/com/paypal/android/DemoActivity.kt b/Demo/src/main/java/com/paypal/android/DemoActivity.kt
deleted file mode 100644
index 6e88335f6..000000000
--- a/Demo/src/main/java/com/paypal/android/DemoActivity.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.paypal.android
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.NavController
-import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.NavigationUI
-import androidx.preference.PreferenceManager
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class DemoActivity : AppCompatActivity() {
-
-    private lateinit var navHostFragment: NavHostFragment
-    private lateinit var navController: NavController
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_demo)
-
-        navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
-        navController = navHostFragment.navController
-
-        val appBarConfiguration = AppBarConfiguration(navController.graph)
-        NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration)
-
-        PreferenceManager.setDefaultValues(this, R.xml.preferences, false)
-    }
-
-    override fun onSupportNavigateUp(): Boolean {
-        return navController.navigateUp() || super.onSupportNavigateUp()
-    }
-
-    override fun onNewIntent(newIntent: Intent?) {
-        super.onNewIntent(newIntent)
-        intent = newIntent
-        Log.e("DEMO ACTIVITY", "ON NEW INTENT")
-    }
-
-    override fun onResume() {
-        super.onResume()
-        Log.e("DEMO ACTIVITY", "ON RESUME")
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/MainActivity.kt b/Demo/src/main/java/com/paypal/android/MainActivity.kt
new file mode 100644
index 000000000..acbe7a8cb
--- /dev/null
+++ b/Demo/src/main/java/com/paypal/android/MainActivity.kt
@@ -0,0 +1,28 @@
+package com.paypal.android
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.material3.ExperimentalMaterial3Api
+import com.paypal.android.ui.DemoApp
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : AppCompatActivity() {
+
+    @ExperimentalMaterial3Api
+    @ExperimentalFoundationApi
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            DemoApp()
+        }
+    }
+
+    override fun onNewIntent(newIntent: Intent) {
+        super.onNewIntent(newIntent)
+        intent = newIntent
+    }
+}
diff --git a/Demo/src/main/java/com/paypal/android/DemoApplication.kt b/Demo/src/main/java/com/paypal/android/MainApplication.kt
similarity index 75%
rename from Demo/src/main/java/com/paypal/android/DemoApplication.kt
rename to Demo/src/main/java/com/paypal/android/MainApplication.kt
index 048a0e7fb..f7a1b3fde 100644
--- a/Demo/src/main/java/com/paypal/android/DemoApplication.kt
+++ b/Demo/src/main/java/com/paypal/android/MainApplication.kt
@@ -4,4 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class DemoApplication : Application()
+class MainApplication : Application()
diff --git a/Demo/src/main/java/com/paypal/android/models/TestCard.kt b/Demo/src/main/java/com/paypal/android/models/TestCard.kt
index f1b0410cc..d6a6cadae 100644
--- a/Demo/src/main/java/com/paypal/android/models/TestCard.kt
+++ b/Demo/src/main/java/com/paypal/android/models/TestCard.kt
@@ -3,11 +3,201 @@ package com.paypal.android.models
 import android.os.Parcelable
 import com.paypal.android.cardpayments.Card
 import com.paypal.android.ui.approveorder.CardFormatter
+import com.paypal.android.ui.selectcard.SelectCardViewModel.Companion.validExpirationYear
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class TestCard(val name: String, val card: Card) : Parcelable {
+data class TestCard(val id: String, val name: String, val card: Card) : Parcelable {
+
+    companion object {
+        val VISA_VAULT_WITH_PURCHASE_NO_3DS = TestCard(
+            id = "vault_with_purchase_no_3DS",
+            name = "🇺🇸 Vault with Purchase (no 3DS)",
+            card = Card(
+                number = "4000000000000002",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_NO_3DS_1 = TestCard(
+            id = "visa_no_3DS_1",
+            name = "Visa",
+            card = Card(
+                number = "4111111111111111",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            )
+        )
+
+        val VISA_NO_3DS_2 = TestCard(
+            id = "visa_no_3DS_2",
+            name = "New Visa",
+            card = Card(
+                number = "4032035809742661",
+                expirationMonth = "09",
+                expirationYear = validExpirationYear,
+                securityCode = "655"
+            )
+        )
+
+        val VISA_3DS_SUCCESSFUL_AUTH = TestCard(
+            id = "visa_3DS_successful_auth",
+            name = "3DS Successful Auth",
+            card = Card(
+                number = "4000000000000002",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_FAILED_SIGNATURE = TestCard(
+            id = "visa_3DS_failed_signature",
+            name = "3DS Failed Signature",
+            card = Card(
+                number = "4000000000000010",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_FAILED_AUTHENTICATION = TestCard(
+            id = "visa_3DS_failed_authentication",
+            name = "3DS Failed Authentication",
+            card = Card(
+                number = "4000000000000028",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_PASSIVE_AUTHENTICATION = TestCard(
+            id = "visa_3DS_passive_authentication",
+            name = "3DS Passive Authentication",
+            card = Card(
+                number = "4000000000000101",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_TRANSACTION_TIMEOUT = TestCard(
+            id = "visa_3DS_transaction_timeout",
+            name = "3DS Transaction Timeout",
+            card = Card(
+                number = "4000000000000044",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_NOT_ENROLLED = TestCard(
+            id = "visa_3DS_not_enrolled",
+            name = "3DS Not Enrolled",
+            card = Card(
+                number = "4000000000000051",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_AUTH_SYSTEM_UNAVAILABLE = TestCard(
+            id = "visa_3DS_auth_system_unavailable",
+            name = "3DS Auth System Unavailable",
+            card = Card(
+                number = "4000000000000069",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_AUTH_ERROR = TestCard(
+            id = "visa_3DS_auth_error",
+            name = "3DS Auth Error",
+            card = Card(
+                number = "4000000000000093",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_AUTH_UNAVAILABLE = TestCard(
+            id = "visa_3DS_auth_unavailable",
+            name = "3DS Auth Unavailable",
+            card = Card(
+                number = "4000000000000036",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_MERCHANT_BYPASSED_AUTH = TestCard(
+            id = "visa_3DS_merchant_bypassed_auth",
+            name = "3DS Merchant Bypassed Auth",
+            card = Card(
+                number = "4000990000000004",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_MERCHANT_INACTIVE = TestCard(
+            id = "visa_3DS_merchant_inactive",
+            name = "3DS Merchant Inactive",
+            card = Card(
+                number = "4000000000000077",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        val VISA_3DS_CMPI_LOOKUP_ERROR = TestCard(
+            id = "visa_3DS_cmpi_lookup_error",
+            name = "3DS cmpi_lookup Error",
+            card = Card(
+                number = "4000000000000085",
+                expirationMonth = "01",
+                expirationYear = validExpirationYear,
+                securityCode = "123"
+            ),
+        )
+
+        private val testCardMapById = mapOf(
+            VISA_VAULT_WITH_PURCHASE_NO_3DS.id to VISA_VAULT_WITH_PURCHASE_NO_3DS,
+            VISA_NO_3DS_1.id to VISA_NO_3DS_1,
+            VISA_NO_3DS_2.id to VISA_NO_3DS_2,
+            VISA_3DS_SUCCESSFUL_AUTH.id to VISA_3DS_SUCCESSFUL_AUTH,
+            VISA_3DS_FAILED_SIGNATURE.id to VISA_3DS_FAILED_SIGNATURE,
+            VISA_3DS_FAILED_AUTHENTICATION.id to VISA_3DS_FAILED_AUTHENTICATION,
+            VISA_3DS_PASSIVE_AUTHENTICATION.id to VISA_3DS_PASSIVE_AUTHENTICATION,
+            VISA_3DS_TRANSACTION_TIMEOUT.id to VISA_3DS_TRANSACTION_TIMEOUT,
+            VISA_3DS_NOT_ENROLLED.id to VISA_3DS_NOT_ENROLLED,
+            VISA_3DS_AUTH_SYSTEM_UNAVAILABLE.id to VISA_3DS_AUTH_SYSTEM_UNAVAILABLE,
+            VISA_3DS_AUTH_ERROR.id to VISA_3DS_AUTH_ERROR,
+            VISA_3DS_AUTH_UNAVAILABLE.id to VISA_3DS_AUTH_UNAVAILABLE,
+            VISA_3DS_MERCHANT_BYPASSED_AUTH.id to VISA_3DS_MERCHANT_BYPASSED_AUTH,
+            VISA_3DS_MERCHANT_INACTIVE.id to VISA_3DS_MERCHANT_INACTIVE,
+            VISA_3DS_CMPI_LOOKUP_ERROR.id to VISA_3DS_CMPI_LOOKUP_ERROR,
+        )
+
+        fun byId(testCardId: String): TestCard? {
+            return testCardMapById[testCardId]
+        }
+    }
 
     @IgnoredOnParcel
     val formattedCardNumber: String = CardFormatter.formatCardNumber(card.number)
diff --git a/Demo/src/main/java/com/paypal/android/ui/DemoApp.kt b/Demo/src/main/java/com/paypal/android/ui/DemoApp.kt
new file mode 100644
index 000000000..9ad9fa26d
--- /dev/null
+++ b/Demo/src/main/java/com/paypal/android/ui/DemoApp.kt
@@ -0,0 +1,121 @@
+package com.paypal.android.ui
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.SavedStateHandle
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import com.paypal.android.models.TestCard
+import com.paypal.android.ui.approveorder.ApproveOrderView
+import com.paypal.android.ui.approveorder.ApproveOrderViewModel
+import com.paypal.android.ui.features.FeaturesView
+import com.paypal.android.ui.paypalbuttons.PayPalButtonsView
+import com.paypal.android.ui.paypalnative.PayPalNativeView
+import com.paypal.android.ui.paypalweb.PayPalWebView
+import com.paypal.android.ui.selectcard.SelectCardView
+import com.paypal.android.ui.vaultcard.VaultCardView
+import com.paypal.android.ui.vaultcard.VaultCardViewModel
+import com.paypal.android.uishared.components.DemoAppTopBar
+import com.paypal.android.uishared.effects.NavDestinationChangeDisposableEffect
+
+// The architecture of the Demo app is heavily influenced by Google sample apps written
+// entirely in compose, most specifically the Jetsnack app
+// Ref: https://github.com/android/compose-samples/tree/main
+
+@Suppress("LongMethod")
+@ExperimentalMaterial3Api
+@ExperimentalFoundationApi
+@Composable
+fun DemoApp() {
+    val navController = rememberNavController()
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    var shouldDisplayBackButton by remember { mutableStateOf(false) }
+
+    NavDestinationChangeDisposableEffect(navController) { controller ->
+        shouldDisplayBackButton = controller.previousBackStackEntry != null
+    }
+
+    MaterialTheme {
+        Scaffold(
+            topBar = {
+                val route = navBackStackEntry?.destination?.route
+                val titleText = DemoAppDestinations.titleForDestination(route)
+                DemoAppTopBar(
+                    title = titleText,
+                    shouldDisplayBackButton = shouldDisplayBackButton,
+                    onBackButtonClick = {
+                        val destinationId = navController.graph.startDestinationId
+                        navController.popBackStack(destinationId, false)
+                    }
+                )
+            },
+        ) { innerPadding ->
+            NavHost(
+                navController = navController,
+                startDestination = "features",
+                modifier = Modifier.padding(innerPadding)
+            ) {
+                // Ref: https://youtu.be/goFpG25uoc8?si=hqYGEaA95We6qUiE&t=76
+                composable(DemoAppDestinations.FEATURES_ROUTE) {
+                    FeaturesView(onFeatureSelected = { feature ->
+                        navController.navigate(feature.routeName)
+                    })
+                }
+                composable(DemoAppDestinations.CARD_APPROVE_ORDER) { entry ->
+                    // prefill test card (if necessary)
+                    val viewModel: ApproveOrderViewModel = hiltViewModel()
+                    parseTestCardFromSavedState(entry.savedStateHandle)?.let { testCard ->
+                        viewModel.prefillCard(testCard)
+                    }
+                    ApproveOrderView(
+                        viewModel = viewModel,
+                        onUseTestCardClick = { navController.navigate(DemoAppDestinations.SELECT_TEST_CARD) }
+                    )
+                }
+                composable(DemoAppDestinations.CARD_VAULT) { entry ->
+                    // prefill test card (if necessary)
+                    val viewModel: VaultCardViewModel = hiltViewModel()
+                    parseTestCardFromSavedState(entry.savedStateHandle)?.let { testCard ->
+                        viewModel.prefillCard(testCard)
+                    }
+                    VaultCardView(
+                        viewModel = viewModel,
+                        onUseTestCardClick = { navController.navigate(DemoAppDestinations.SELECT_TEST_CARD) }
+                    )
+                }
+                composable(DemoAppDestinations.PAYPAL_WEB) {
+                    PayPalWebView()
+                }
+                composable(DemoAppDestinations.PAYPAL_BUTTONS) {
+                    PayPalButtonsView()
+                }
+                composable(DemoAppDestinations.PAYPAL_NATIVE) {
+                    PayPalNativeView()
+                }
+                composable(DemoAppDestinations.SELECT_TEST_CARD) {
+                    SelectCardView(onTestCardSelected = { testCardId ->
+                        val prevBackStackEntry = navController.previousBackStackEntry
+                        prevBackStackEntry?.savedStateHandle?.set("test_card_id", testCardId)
+                        navController.popBackStack()
+                    })
+                }
+            }
+        }
+    }
+}
+
+// Ref: https://youtu.be/NhoV78E6yWo?si=zZR2kFKHtthJ93tG
+private fun parseTestCardFromSavedState(savedStateHandle: SavedStateHandle): TestCard? =
+    savedStateHandle.get<String>("test_card_id")?.let { TestCard.byId(it) }
diff --git a/Demo/src/main/java/com/paypal/android/ui/DemoAppDestinations.kt b/Demo/src/main/java/com/paypal/android/ui/DemoAppDestinations.kt
new file mode 100644
index 000000000..ae3fac5c3
--- /dev/null
+++ b/Demo/src/main/java/com/paypal/android/ui/DemoAppDestinations.kt
@@ -0,0 +1,22 @@
+package com.paypal.android.ui
+
+object DemoAppDestinations {
+    const val CARD_APPROVE_ORDER = "card_approve_order"
+    const val FEATURES_ROUTE = "features"
+    const val CARD_VAULT = "card_vault"
+    const val PAYPAL_WEB = "paypal_web"
+    const val PAYPAL_BUTTONS = "paypal_buttons"
+    const val PAYPAL_NATIVE = "paypal_native"
+    const val SELECT_TEST_CARD = "select_test_card"
+
+    fun titleForDestination(destination: String?): String = when (destination) {
+        CARD_APPROVE_ORDER -> "Card Approve Order"
+        FEATURES_ROUTE -> "Features"
+        CARD_VAULT -> "Vault Card"
+        PAYPAL_WEB -> "PayPal Web"
+        PAYPAL_BUTTONS -> "PayPal Buttons"
+        PAYPAL_NATIVE -> "PayPal Native"
+        SELECT_TEST_CARD -> "Select a Test Card"
+        else -> "Demo"
+    }
+}
diff --git a/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderFragment.kt b/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderFragment.kt
deleted file mode 100644
index e35fd0f16..000000000
--- a/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderFragment.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.paypal.android.ui.approveorder
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.setFragmentResultListener
-import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
-import com.paypal.android.models.TestCard
-import com.paypal.android.ui.selectcard.SelectCardFragment
-import com.paypal.android.utils.parcelable
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class ApproveOrderFragment : Fragment() {
-
-    private val viewModel by viewModels<ApproveOrderViewModel>()
-
-    @ExperimentalMaterial3Api
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        registerPrefillCardListener()
-        return ComposeView(requireContext()).apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
-                MaterialTheme {
-                    Surface(modifier = Modifier.fillMaxSize()) {
-                        ApproveOrderView(
-                            viewModel = viewModel,
-                            onUseTestCardClick = { showTestCards() }
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    private fun registerPrefillCardListener() {
-        setFragmentResultListener(SelectCardFragment.REQUEST_KEY_TEST_CARD) { _, bundle ->
-            bundle.parcelable<TestCard>(SelectCardFragment.DATA_KEY_TEST_CARD)?.let { testCard ->
-                viewModel.prefillCard(testCard)
-            }
-        }
-    }
-
-    private fun showTestCards() {
-        val action = ApproveOrderFragmentDirections.actionCardFragmentToSelectCardFragment()
-        findNavController().navigate(action)
-    }
-
-    @ExperimentalMaterial3Api
-    @Preview
-    @Composable
-    fun ApproveOrderViewPreview() {
-        MaterialTheme {
-            Surface(modifier = Modifier.fillMaxSize()) {
-                ApproveOrderView(viewModel)
-            }
-        }
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderView.kt b/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderView.kt
index 3d6af97a6..cb0dc85d0 100644
--- a/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderView.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/approveorder/ApproveOrderView.kt
@@ -5,7 +5,7 @@ import android.content.ContextWrapper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -44,7 +44,7 @@ fun ApproveOrderView(
     }
     Column(
         modifier = Modifier
-            .fillMaxWidth()
+            .fillMaxSize()
             .padding(16.dp)
             .verticalScroll(scrollState)
             .semantics {
diff --git a/Demo/src/main/java/com/paypal/android/ui/approveorder/CardFormatter.kt b/Demo/src/main/java/com/paypal/android/ui/approveorder/CardFormatter.kt
index 3666f6d36..c9e58ca35 100644
--- a/Demo/src/main/java/com/paypal/android/ui/approveorder/CardFormatter.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/approveorder/CardFormatter.kt
@@ -18,7 +18,7 @@ object CardFormatter {
         return if (previousCardNumber.length == cardType.maxCardLength + cardType.cardNumberIndices.size) {
             previousCardNumber
         } else {
-            cardType.cardNumberIndices.forEach { index ->
+            for (index in cardType.cardNumberIndices) {
                 if (index <= cardString.length) {
                     cardString = cardString.insertChar(index, ' ')
                 }
diff --git a/Demo/src/main/java/com/paypal/android/ui/features/Feature.kt b/Demo/src/main/java/com/paypal/android/ui/features/Feature.kt
index 5432cb1da..921077398 100644
--- a/Demo/src/main/java/com/paypal/android/ui/features/Feature.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/features/Feature.kt
@@ -2,11 +2,12 @@ package com.paypal.android.ui.features
 
 import androidx.annotation.StringRes
 import com.paypal.android.R
+import com.paypal.android.ui.DemoAppDestinations
 
-enum class Feature(@StringRes val stringRes: Int) {
-    CARD_APPROVE_ORDER(R.string.feature_approve_order),
-    CARD_VAULT(R.string.feature_vault),
-    PAYPAL_WEB(R.string.feature_paypal_web),
-    PAYPAL_BUTTONS(R.string.feature_paypal_buttons),
-    PAYPAL_NATIVE(R.string.feature_paypal_native)
+enum class Feature(@StringRes val stringRes: Int, val routeName: String) {
+    CARD_APPROVE_ORDER(R.string.feature_approve_order, DemoAppDestinations.CARD_APPROVE_ORDER),
+    CARD_VAULT(R.string.feature_vault, DemoAppDestinations.CARD_VAULT),
+    PAYPAL_WEB(R.string.feature_paypal_web, DemoAppDestinations.PAYPAL_WEB),
+    PAYPAL_BUTTONS(R.string.feature_paypal_buttons, DemoAppDestinations.PAYPAL_BUTTONS),
+    PAYPAL_NATIVE(R.string.feature_paypal_native, DemoAppDestinations.PAYPAL_NATIVE)
 }
diff --git a/Demo/src/main/java/com/paypal/android/ui/features/FeaturesFragment.kt b/Demo/src/main/java/com/paypal/android/ui/features/FeaturesFragment.kt
deleted file mode 100644
index 83a1f8e79..000000000
--- a/Demo/src/main/java/com/paypal/android/ui/features/FeaturesFragment.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.paypal.android.ui.features
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-
-class FeaturesFragment : Fragment() {
-
-    @ExperimentalFoundationApi
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = ComposeView(requireContext()).apply {
-        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-        setContent {
-            MaterialTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize()
-                ) {
-                    FeaturesView(onFeatureSelected = ::onFeatureSelected)
-                }
-            }
-        }
-    }
-
-    private fun onFeatureSelected(feature: Feature) {
-        val action = when (feature) {
-            Feature.PAYPAL_BUTTONS -> {
-                FeaturesFragmentDirections.actionPaymentMethodsFragmentToPayPalButtonsFragment()
-            }
-
-            Feature.PAYPAL_WEB -> {
-                FeaturesFragmentDirections.actionPaymentMethodsFragmentToPayPalWebFragment()
-            }
-
-            Feature.PAYPAL_NATIVE -> {
-                FeaturesFragmentDirections.actionPaymentMethodsFragmentToPayPalNativeFragment()
-            }
-
-            Feature.CARD_APPROVE_ORDER -> {
-                FeaturesFragmentDirections.actionPaymentMethodsFragmentToCardFragment()
-            }
-
-            Feature.CARD_VAULT -> {
-                FeaturesFragmentDirections.actionPaymentMethodsFragmentToVaultFragment()
-            }
-        }
-        findNavController().navigate(action)
-    }
-
-    @ExperimentalFoundationApi
-    @Preview
-    @Composable
-    fun PaymentMethodsViewPreview() {
-        MaterialTheme {
-            Surface(modifier = Modifier.fillMaxSize()) {
-                FeaturesView(onFeatureSelected = {})
-            }
-        }
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/ui/features/FeaturesView.kt b/Demo/src/main/java/com/paypal/android/ui/features/FeaturesView.kt
index 365cb465b..9bc799c18 100644
--- a/Demo/src/main/java/com/paypal/android/ui/features/FeaturesView.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/features/FeaturesView.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -50,6 +51,7 @@ fun FeaturesView(
         modifier = Modifier
             .background(DemoColors.white)
             .padding(horizontal = 16.dp)
+            .fillMaxSize()
     ) {
         stickyHeader {
             FeatureGroupHeader(text = "Card")
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalbuttons/PayPalButtonsFragment.kt b/Demo/src/main/java/com/paypal/android/ui/paypalbuttons/PayPalButtonsFragment.kt
deleted file mode 100644
index 1f48a5ba0..000000000
--- a/Demo/src/main/java/com/paypal/android/ui/paypalbuttons/PayPalButtonsFragment.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.paypal.android.ui.paypalbuttons
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.Fragment
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class PayPalButtonsFragment : Fragment() {
-
-    @ExperimentalMaterial3Api
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return ComposeView(requireContext()).apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
-                MaterialTheme {
-                    Surface(modifier = Modifier.fillMaxSize()) {
-                        PayPalButtonsView()
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalnative/PayPalNativeFragment.kt b/Demo/src/main/java/com/paypal/android/ui/paypalnative/PayPalNativeFragment.kt
deleted file mode 100644
index d0ed50512..000000000
--- a/Demo/src/main/java/com/paypal/android/ui/paypalnative/PayPalNativeFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.paypal.android.ui.paypalnative
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.Fragment
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class PayPalNativeFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = ComposeView(requireContext()).apply {
-        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-        setContent {
-            MaterialTheme {
-                Surface(modifier = Modifier.fillMaxSize()) {
-                    PayPalNativeView()
-                }
-            }
-        }
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalnative/PayPalNativeView.kt b/Demo/src/main/java/com/paypal/android/ui/paypalnative/PayPalNativeView.kt
index f54a7753c..98692fa5d 100644
--- a/Demo/src/main/java/com/paypal/android/ui/paypalnative/PayPalNativeView.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/paypalnative/PayPalNativeView.kt
@@ -2,6 +2,7 @@ package com.paypal.android.ui.paypalnative
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -12,8 +13,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.paypal.android.R
 import com.paypal.android.ui.paypalweb.PayPalWebCheckoutCanceledView
 import com.paypal.android.ui.paypalweb.PayPalWebCheckoutResultView
@@ -24,7 +25,7 @@ import com.paypal.android.uishared.components.PayPalSDKErrorView
 
 @Composable
 fun PayPalNativeView(
-    viewModel: PayPalNativeViewModel = viewModel()
+    viewModel: PayPalNativeViewModel = hiltViewModel()
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val scrollState = rememberScrollState()
@@ -34,6 +35,7 @@ fun PayPalNativeView(
     }
     Column(
         modifier = Modifier
+            .fillMaxSize()
             .padding(16.dp)
             .verticalScroll(scrollState)
     ) {
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebFragment.kt b/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebFragment.kt
deleted file mode 100644
index 65863c259..000000000
--- a/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.paypal.android.ui.paypalweb
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.Fragment
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class PayPalWebFragment : Fragment() {
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = ComposeView(requireContext()).apply {
-        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-        setContent {
-            MaterialTheme {
-                Surface(modifier = Modifier.fillMaxSize()) {
-                    PayPalWebView()
-                }
-            }
-        }
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebView.kt b/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebView.kt
index 056b275a5..303d78f7e 100644
--- a/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebView.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/paypalweb/PayPalWebView.kt
@@ -17,8 +17,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.paypal.android.R
 import com.paypal.android.ui.approveorder.getActivity
 import com.paypal.android.uishared.components.CompleteOrderForm
@@ -28,7 +28,7 @@ import com.paypal.android.uishared.components.PayPalSDKErrorView
 
 @Composable
 fun PayPalWebView(
-    viewModel: PayPalWebViewModel = viewModel()
+    viewModel: PayPalWebViewModel = hiltViewModel()
 ) {
     val context = LocalContext.current
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
@@ -39,6 +39,7 @@ fun PayPalWebView(
     }
     Column(
         modifier = Modifier
+            .fillMaxSize()
             .padding(16.dp)
             .verticalScroll(scrollState)
     ) {
diff --git a/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardFragment.kt b/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardFragment.kt
deleted file mode 100644
index 53183615e..000000000
--- a/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardFragment.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.paypal.android.ui.selectcard
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.setFragmentResult
-import androidx.navigation.fragment.findNavController
-import com.paypal.android.models.TestCard
-
-class SelectCardFragment : Fragment() {
-
-    companion object {
-        const val REQUEST_KEY_TEST_CARD = "SELECT_CARD_REQUEST_KEY_TEST_CARD"
-        const val DATA_KEY_TEST_CARD = "SELECT_CARD_DATA_KEY_TEST_CARD"
-    }
-
-    @ExperimentalFoundationApi
-    @ExperimentalMaterial3Api
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = ComposeView(requireContext()).apply {
-        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-        setContent {
-            MaterialTheme {
-                Surface(modifier = Modifier.fillMaxSize()) {
-                    SelectCardView(onTestCardSelected = { onTestCardSelected(it) })
-                }
-            }
-        }
-    }
-
-    private fun onTestCardSelected(testCard: TestCard) {
-        val bundle = bundleOf(DATA_KEY_TEST_CARD to testCard)
-        setFragmentResult(REQUEST_KEY_TEST_CARD, bundle)
-
-        // go back to previous fragment with test card as a result
-        findNavController().navigateUp()
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardView.kt b/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardView.kt
index 6f0ec44d7..b7e29624d 100644
--- a/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardView.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardView.kt
@@ -28,11 +28,11 @@ import com.paypal.android.models.TestCard
 @Composable
 fun SelectCardView(
     viewModel: SelectCardViewModel = viewModel(),
-    onTestCardSelected: (TestCard) -> Unit = {}
+    onTestCardSelected: (String) -> Unit = {}
 ) {
     LazyColumn(
         modifier = Modifier
-            .fillMaxWidth()
+            .fillMaxSize()
             .padding(horizontal = 16.dp)
     ) {
         stickyHeader {
@@ -43,7 +43,7 @@ fun SelectCardView(
             TestCardView(
                 testCard = card
             ) {
-                onTestCardSelected(card)
+                onTestCardSelected(card.id)
             }
         }
         stickyHeader {
@@ -54,7 +54,7 @@ fun SelectCardView(
             TestCardView(
                 testCard = card
             ) {
-                onTestCardSelected(card)
+                onTestCardSelected(card.id)
             }
         }
         stickyHeader {
@@ -65,7 +65,7 @@ fun SelectCardView(
             TestCardView(
                 testCard = card
             ) {
-                onTestCardSelected(card)
+                onTestCardSelected(card.id)
             }
         }
     }
diff --git a/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardViewModel.kt b/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardViewModel.kt
index fe61c911d..ddcbaa453 100644
--- a/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardViewModel.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/selectcard/SelectCardViewModel.kt
@@ -1,7 +1,6 @@
 package com.paypal.android.ui.selectcard
 
 import androidx.lifecycle.ViewModel
-import com.paypal.android.cardpayments.Card
 import com.paypal.android.models.TestCard
 import java.util.Calendar
 
@@ -12,146 +11,26 @@ class SelectCardViewModel : ViewModel() {
     }
 
     val verifiedTestCards = listOf(
-        TestCard(
-            name = "🇺🇸 Vault with Purchase (no 3DS)",
-            card = Card(
-                number = "4000000000000002",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
+        TestCard.VISA_VAULT_WITH_PURCHASE_NO_3DS
     )
 
     val nonThreeDSCards = listOf(
-        TestCard(
-            name = "Visa",
-            card = Card(
-                number = "4111111111111111",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            )
-        ),
-        TestCard(
-            name = "New Visa",
-            card = Card(
-                number = "4032035809742661",
-                expirationMonth = "09",
-                expirationYear = validExpirationYear,
-                securityCode = "655"
-            )
-        ),
+        TestCard.VISA_NO_3DS_1,
+        TestCard.VISA_NO_3DS_2
     )
 
     val threeDSCards = listOf(
-        TestCard(
-            name = "3DS Successful Auth",
-            card = Card(
-                number = "4000000000000002",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Failed Signature",
-            card = Card(
-                number = "4000000000000010",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Failed Authentication",
-            card = Card(
-                number = "4000000000000028",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Passive Authentication",
-            card = Card(
-                number = "4000000000000101",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Transaction Timeout",
-            card = Card(
-                number = "4000000000000044",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Not Enrolled",
-            card = Card(
-                number = "4000000000000051",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Auth System Unavailable",
-            card = Card(
-                number = "4000000000000069",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Auth Error",
-            card = Card(
-                number = "4000000000000093",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Auth Unavailable",
-            card = Card(
-                number = "4000000000000036",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Merchant Bypassed Auth",
-            card = Card(
-                number = "4000990000000004",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS Merchant Inactive",
-            card = Card(
-                number = "4000000000000077",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
-        TestCard(
-            name = "3DS cmpi_lookup Error",
-            card = Card(
-                number = "4000000000000085",
-                expirationMonth = "01",
-                expirationYear = validExpirationYear,
-                securityCode = "123"
-            ),
-        ),
+        TestCard.VISA_3DS_SUCCESSFUL_AUTH,
+        TestCard.VISA_3DS_FAILED_SIGNATURE,
+        TestCard.VISA_3DS_FAILED_AUTHENTICATION,
+        TestCard.VISA_3DS_PASSIVE_AUTHENTICATION,
+        TestCard.VISA_3DS_TRANSACTION_TIMEOUT,
+        TestCard.VISA_3DS_NOT_ENROLLED,
+        TestCard.VISA_3DS_AUTH_SYSTEM_UNAVAILABLE,
+        TestCard.VISA_3DS_AUTH_ERROR,
+        TestCard.VISA_3DS_AUTH_UNAVAILABLE,
+        TestCard.VISA_3DS_MERCHANT_BYPASSED_AUTH,
+        TestCard.VISA_3DS_MERCHANT_INACTIVE,
+        TestCard.VISA_3DS_CMPI_LOOKUP_ERROR
     )
 }
diff --git a/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardFragment.kt b/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardFragment.kt
deleted file mode 100644
index edb6a24e3..000000000
--- a/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardFragment.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.paypal.android.ui.vaultcard
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.setFragmentResultListener
-import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
-import com.paypal.android.models.TestCard
-import com.paypal.android.ui.selectcard.SelectCardFragment
-import com.paypal.android.utils.parcelable
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class VaultCardFragment : Fragment() {
-
-    private val viewModel by viewModels<VaultCardViewModel>()
-
-    @ExperimentalMaterial3Api
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        registerPrefillCardListener()
-        return ComposeView(requireContext()).apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
-                MaterialTheme {
-                    Surface(modifier = Modifier.fillMaxSize()) {
-                        VaultCardView(
-                            viewModel = viewModel,
-                            onUseTestCardClick = { showTestCards() }
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    private fun registerPrefillCardListener() {
-        setFragmentResultListener(SelectCardFragment.REQUEST_KEY_TEST_CARD) { _, bundle ->
-            bundle.parcelable<TestCard>(SelectCardFragment.DATA_KEY_TEST_CARD)?.let { testCard ->
-                viewModel.prefillCard(testCard)
-            }
-        }
-    }
-
-    private fun showTestCards() {
-        val action = VaultCardFragmentDirections.actionVaultFragmentToSelectCardFragment()
-        findNavController().navigate(action)
-    }
-}
diff --git a/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardView.kt b/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardView.kt
index 83d54ccc3..fb7af7310 100644
--- a/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardView.kt
+++ b/Demo/src/main/java/com/paypal/android/ui/vaultcard/VaultCardView.kt
@@ -43,7 +43,7 @@ fun VaultCardView(
     }
     Column(
         modifier = Modifier
-            .fillMaxWidth()
+            .fillMaxSize()
             .padding(8.dp)
             .verticalScroll(scrollState)
     ) {
diff --git a/Demo/src/main/java/com/paypal/android/uishared/components/DemoAppTopBar.kt b/Demo/src/main/java/com/paypal/android/uishared/components/DemoAppTopBar.kt
new file mode 100644
index 000000000..58bbe5cd6
--- /dev/null
+++ b/Demo/src/main/java/com/paypal/android/uishared/components/DemoAppTopBar.kt
@@ -0,0 +1,35 @@
+package com.paypal.android.uishared.components
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+
+@ExperimentalMaterial3Api
+@Composable
+fun DemoAppTopBar(
+    title: String,
+    shouldDisplayBackButton: Boolean,
+    onBackButtonClick: () -> Unit
+) {
+    CenterAlignedTopAppBar(
+        title = {
+            Text(text = title)
+        },
+        navigationIcon = {
+            // Ref: https://stackoverflow.com/a/70409412
+            if (shouldDisplayBackButton) {
+                IconButton(onClick = onBackButtonClick) {
+                    Icon(
+                        imageVector = Icons.Filled.ArrowBack,
+                        contentDescription = "Back"
+                    )
+                }
+            }
+        }
+    )
+}
diff --git a/Demo/src/main/java/com/paypal/android/uishared/components/UriView.kt b/Demo/src/main/java/com/paypal/android/uishared/components/UriView.kt
index 834fd8b7d..bcbafbe8e 100644
--- a/Demo/src/main/java/com/paypal/android/uishared/components/UriView.kt
+++ b/Demo/src/main/java/com/paypal/android/uishared/components/UriView.kt
@@ -36,7 +36,8 @@ fun UriView(uri: Uri) {
         Text("Path:")
         Text(uri.path ?: "NOT SET")
     }
-    if (uri.queryParameterNames?.isNotEmpty() == true) {
+    val queryParameterNames = uri.queryParameterNames ?: emptySet()
+    if (queryParameterNames.isNotEmpty()) {
         Text(
             text = "Params:",
             modifier = Modifier
@@ -45,7 +46,7 @@ fun UriView(uri: Uri) {
         Column(
             modifier = Modifier.padding(start = 8.dp)
         ) {
-            uri.queryParameterNames?.forEach { paramName ->
+            for (paramName in queryParameterNames) {
                 Row(
                     horizontalArrangement = Arrangement.spacedBy(8.dp)
                 ) {
diff --git a/Demo/src/main/java/com/paypal/android/uishared/effects/NavDestinationChangeDisposableEffect.kt b/Demo/src/main/java/com/paypal/android/uishared/effects/NavDestinationChangeDisposableEffect.kt
new file mode 100644
index 000000000..cb185b24e
--- /dev/null
+++ b/Demo/src/main/java/com/paypal/android/uishared/effects/NavDestinationChangeDisposableEffect.kt
@@ -0,0 +1,22 @@
+package com.paypal.android.uishared.effects
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.navigation.NavController
+
+@Composable
+fun NavDestinationChangeDisposableEffect(
+    navController: NavController,
+    onDestinationChange: (controller: NavController) -> Unit
+) {
+    // Ref: https://stackoverflow.com/a/68700967
+    DisposableEffect(navController) {
+        val listener = NavController.OnDestinationChangedListener { controller, _, _ ->
+            onDestinationChange(controller)
+        }
+        navController.addOnDestinationChangedListener(listener)
+        onDispose {
+            navController.removeOnDestinationChangedListener(listener)
+        }
+    }
+}
diff --git a/Demo/src/main/res/layout/activity_demo.xml b/Demo/src/main/res/layout/activity_demo.xml
deleted file mode 100644
index edc165000..000000000
--- a/Demo/src/main/res/layout/activity_demo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_host_fragment"
-    android:name="androidx.navigation.fragment.NavHostFragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:defaultNavHost="true"
-    app:navGraph="@navigation/nav_graph"
-    tools:context=".DemoActivity" />
diff --git a/Demo/src/main/res/navigation/nav_graph.xml b/Demo/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index 01ab37469..000000000
--- a/Demo/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/nav_graph"
-    app:startDestination="@id/paymentMethodsFragment">
-
-    <fragment
-        android:id="@+id/paymentMethodsFragment"
-        android:name="com.paypal.android.ui.features.FeaturesFragment"
-        android:label="@string/feature_title">
-        <action
-            android:id="@+id/action_paymentMethodsFragment_to_cardFragment"
-            app:destination="@id/cardFragment" />
-        <action
-            android:id="@+id/action_paymentMethodsFragment_to_vaultFragment"
-            app:destination="@id/vaultFragment" />
-        <action
-            android:id="@+id/action_paymentMethodsFragment_to_payPalWebFragment"
-            app:destination="@id/payPalWebFragment" />
-        <action
-            android:id="@+id/action_paymentMethodsFragment_to_payPalButtonsFragment"
-            app:destination="@id/payPalButtonsFragment" />
-        <action
-            android:id="@+id/action_paymentMethodsFragment_to_payPalNativeFragment"
-            app:destination="@id/payPalNativeFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/cardFragment"
-        android:name="com.paypal.android.ui.approveorder.ApproveOrderFragment"
-        android:label="CardFragment">
-        <action
-            android:id="@+id/action_cardFragment_to_selectCardFragment"
-            app:destination="@id/selectCardFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/vaultFragment"
-        android:name="com.paypal.android.ui.vaultcard.VaultCardFragment"
-        android:label="VaultFragment">
-        <action
-            android:id="@+id/action_vaultFragment_to_selectCardFragment"
-            app:destination="@id/selectCardFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/payPalButtonsFragment"
-        android:name="com.paypal.android.ui.paypalbuttons.PayPalButtonsFragment"
-        android:label="PayPalButtonsFragment" />
-    <fragment
-        android:id="@+id/payPalNativeFragment"
-        android:name="com.paypal.android.ui.paypalnative.PayPalNativeFragment"
-        android:label="PayPalNativeFragment" />
-    <fragment
-        android:id="@+id/selectCardFragment"
-        android:name="com.paypal.android.ui.selectcard.SelectCardFragment"
-        android:label="SelectCardFragment" />
-    <fragment
-        android:id="@+id/payPalWebFragment"
-        android:name="com.paypal.android.ui.paypalweb.PayPalWebFragment"
-        android:label="PayPalWebFragment" />
-</navigation>
diff --git a/Demo/src/main/res/values/strings.xml b/Demo/src/main/res/values/strings.xml
index aaa182f10..60d64c8cb 100644
--- a/Demo/src/main/res/values/strings.xml
+++ b/Demo/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
     <string name="app_name">AndroidSDK</string>
 
     <!-- Payment Methods -->
-    <string name="feature_title">Select a Feature:</string>
     <string name="feature_approve_order">Approve Order</string>
     <string name="feature_vault">Vault</string>
     <string name="feature_paypal_web">PayPal Web</string>
diff --git a/Demo/src/main/res/values/themes.xml b/Demo/src/main/res/values/themes.xml
index 7b11503f8..93660df3a 100644
--- a/Demo/src/main/res/values/themes.xml
+++ b/Demo/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
-    <style name="Theme.AndroidSDK" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.AndroidSDK" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/pay_pal_blue</item>
         <item name="colorPrimaryVariant">@color/pay_pal_light_blue</item>
diff --git a/build.gradle b/build.gradle
index 6072de67e..17e37b007 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,10 +8,9 @@ buildscript {
     ]
 
     ext.versions = [
-            "kotlin"    : "1.8.21",
-            "compose"   : "1.4.7",
-            "navigation": "2.3.5",
-            "hilt"      : "2.44"
+            "kotlin" : "1.8.21",
+            "compose": "1.4.7",
+            "hilt"   : "2.44"
     ]
 
     ext.deps = [
@@ -43,10 +42,8 @@ buildscript {
             "composeConstraintLayout"     : "androidx.constraintlayout:constraintlayout-compose",
             "lifecycleViewModelCompose"   : "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1",
             "lifecycleRuntimeCompose"     : "androidx.lifecycle:lifecycle-runtime-compose:2.6.1",
-
-            // Navigation Component
-            "navigationFragment"          : "androidx.navigation:navigation-fragment-ktx:${versions.navigation}",
-            "navigationUI"                : "androidx.navigation:navigation-ui-ktx:${versions.navigation}",
+            "navigationCompose"           : "androidx.navigation:navigation-compose:2.7.5",
+            "hiltNavigationCompose"       : "androidx.hilt:hilt-navigation-compose:1.1.0",
 
             // Jetpack
             "preference"                  : "androidx.preference:preference-ktx:1.1.1",
@@ -77,7 +74,7 @@ buildscript {
             "jsonAssert"                  : "org.skyscreamer:jsonassert:1.4.0",
             "striktMockk"                 : "io.strikt:strikt-mockk:0.30.1",
             "striktCore"                  : "io.strikt:strikt-core:0.30.1",
-            "json" : "org.json:json:20220320",
+            "json"                        : "org.json:json:20220320",
 
             // PayPal
             "nativeCheckout"              : "com.paypal.checkout:android-sdk:1.2.0",
@@ -98,7 +95,6 @@ buildscript {
         classpath "com.android.tools.build:gradle:7.4.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "com.dicedmelon.gradle:jacoco-android:0.1.5"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
         classpath "com.google.dagger:hilt-android-gradle-plugin:${versions.hilt}"
     }
 }
@@ -137,7 +133,7 @@ allprojects {
         }
 
         maven {
-            url  "https://cardinalcommerceprod.jfrog.io/artifactory/android"
+            url "https://cardinalcommerceprod.jfrog.io/artifactory/android"
             credentials {
                 username cardinalUsername
                 password cardinalPassword
@@ -236,7 +232,7 @@ task setDemoAppVersionCode {
         def topLevelGradleFile = file('./build.gradle')
         def topLevelGradleFileText = topLevelGradleFile.getText('UTF-8')
         def updatedScript =
-            topLevelGradleFileText.replaceFirst(/("demoAppVersionCode"\s*: )[0-9]*,/, '$1' + demoAppVersionCodeParam + ',')
+                topLevelGradleFileText.replaceFirst(/("demoAppVersionCode"\s*: )[0-9]*,/, '$1' + demoAppVersionCodeParam + ',')
         topLevelGradleFile.write(updatedScript, 'UTF-8')
     }
 }