fix: route hardware finish to wallet

Author: ovitrif

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -468,7 +468,11 @@ fun ContentView(
                         Sheet.ChangePin -> ChangePinSheet(appViewModel)
                         Sheet.DisablePin -> DisablePinSheet(appViewModel)
                         is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
-                        is Sheet.Hardware -> HardwareSheet(sheet, appViewModel)
+                        is Sheet.Hardware -> HardwareSheet(
+                            sheet = sheet,
+                            appViewModel = appViewModel,
+                            onFinish = navigateToHomeWallet,
+                        )
                         is Sheet.Widgets -> {
                             WidgetsSheet(
                                 sheet = sheet,

app/src/main/java/to/bitkit/ui/sheets/hardware/HardwareSheet.kt

@@ -65,6 +65,7 @@ private val bluetoothPermissions: List<String>
 fun HardwareSheet(
     sheet: Sheet.Hardware,
     appViewModel: AppViewModel,
+    onFinish: () -> Unit = {},
     viewModel: HwConnectViewModel = hiltViewModel(),
 ) {
     val context = LocalContext.current
@@ -120,6 +121,7 @@ fun HardwareSheet(
         viewModel = viewModel,
         navController = navController,
         appViewModel = appViewModel,
+        onFinish = onFinish,
     )
 
     Column(
@@ -206,6 +208,7 @@ private fun ConnectEffectHandler(
     viewModel: HwConnectViewModel,
     navController: NavHostController,
     appViewModel: AppViewModel,
+    onFinish: () -> Unit,
 ) {
     LaunchedEffect(Unit) {
         viewModel.effects.collect { effect ->
@@ -220,6 +223,10 @@ private fun ConnectEffectHandler(
                 HwConnectEffect.NavigateToPairCode -> navController.navigateTo(HardwareRoute.PairCode)
                 HwConnectEffect.NavigateToPaired -> navController.navigateTo(HardwareRoute.Paired)
                 HwConnectEffect.Dismiss -> appViewModel.hideSheet()
+                HwConnectEffect.Finish -> {
+                    appViewModel.hideSheet()
+                    onFinish()
+                }
             }
         }
     }

app/src/main/java/to/bitkit/ui/sheets/hardware/HwConnectViewModel.kt

@@ -157,7 +157,7 @@ class HwConnectViewModel @Inject constructor(
         }
         viewModelScope.launch {
             hwWalletRepo.setDeviceLabel(deviceId, _uiState.value.labelInput)
-            setEffect(HwConnectEffect.Dismiss)
+            setEffect(HwConnectEffect.Finish)
         }
     }
 
@@ -269,4 +269,5 @@ sealed interface HwConnectEffect {
     data object NavigateToPairCode : HwConnectEffect
     data object NavigateToPaired : HwConnectEffect
     data object Dismiss : HwConnectEffect
+    data object Finish : HwConnectEffect
 }

app/src/test/java/to/bitkit/ui/sheets/hardware/HwConnectViewModelTest.kt

@@ -238,7 +238,7 @@ class HwConnectViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `onFinishClick persists the edited label and dismisses`() = test {
+    fun `onFinishClick persists the edited label and finishes`() = test {
         givenDeviceFound()
         val connectedFeatures = features(model = "Safe 3")
         whenever(hwWalletRepo.connect("dev1")).thenReturn(Result.success(connectedFeatures))
@@ -248,7 +248,7 @@ class HwConnectViewModelTest : BaseUnitTest() {
 
         sut.effects.test {
             sut.onFinishClick()
-            assertEquals(HwConnectEffect.Dismiss, awaitItem())
+            assertEquals(HwConnectEffect.Finish, awaitItem())
             cancelAndIgnoreRemainingEvents()
         }