fix: keep trezor forget cleanup

Author: ovitrif

app/src/main/java/to/bitkit/repositories/TrezorRepo.kt

@@ -462,16 +462,21 @@ class TrezorRepo @Inject constructor(
     suspend fun forgetDevice(deviceId: String): Result<Unit> = withContext(ioDispatcher) {
         runCatching {
             TrezorDebugLog.log("FORGET", "forgetDevice called for: $deviceId")
-            if (_state.value.connectedDeviceId == deviceId) {
-                trezorService.disconnect()
-                _state.update { it.copy(connectedDevice = null, connectedDeviceId = null) }
+            val disconnectResult = if (_state.value.connectedDeviceId == deviceId) {
+                runCatching { trezorService.disconnect() }.also {
+                    _state.update { it.copy(connectedDevice = null, connectedDeviceId = null) }
+                }
+            } else {
+                Result.success(Unit)
             }
             TrezorDebugLog.log("FORGET", "Clearing credentials...")
             trezorTransport.clearDeviceCredential(deviceId)
-            trezorService.clearCredentials(deviceId)
+            val clearCredentialsResult = runCatching { trezorService.clearCredentials(deviceId) }
             val updated = _state.value.knownDevices.filter { it.id != deviceId }
             saveKnownDevices(updated)
             _state.update { it.copy(knownDevices = updated.toImmutableList()) }
+            disconnectResult.getOrThrow()
+            clearCredentialsResult.getOrThrow()
             TrezorDebugLog.log("FORGET", "Device forgotten successfully")
             Logger.info("Forgot device: '$deviceId'", context = TAG)
         }.onFailure { e ->

app/src/test/java/to/bitkit/repositories/TrezorRepoTest.kt

@@ -17,6 +17,7 @@ import org.junit.rules.TemporaryFolder
 import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import to.bitkit.data.TrezorStore
 import to.bitkit.env.Env
@@ -102,6 +103,22 @@ class TrezorRepoTest : BaseUnitTest() {
         on { this.model }.thenReturn(model)
     }
 
+    private fun mockKnownDevice(
+        id: String = DEVICE_ID,
+        name: String? = DEVICE_NAME,
+        path: String = DEVICE_PATH,
+        label: String? = DEVICE_LABEL,
+        model: String? = DEVICE_MODEL,
+    ) = KnownDevice(
+        id = id,
+        name = name,
+        path = path,
+        transportType = "usb",
+        label = label,
+        model = model,
+        lastConnectedAt = 123L,
+    )
+
     // region initialize
 
     @Test
@@ -425,6 +442,38 @@ class TrezorRepoTest : BaseUnitTest() {
 
     // endregion
 
+    // region forgetDevice
+
+    @Test
+    fun `forgetDevice should remove known device when service cleanup fails`() = test {
+        val knownDevice = mockKnownDevice()
+        val features = mockFeatures()
+        val device = mockDeviceInfo()
+        whenever(trezorStore.loadKnownDevices()).thenReturn(listOf(knownDevice))
+        whenever(trezorService.connect(DEVICE_ID)).thenReturn(features)
+        whenever(trezorService.scan()).thenReturn(listOf(device))
+        sut = createSut()
+
+        sut.initialize()
+        sut.scan()
+        sut.connect(DEVICE_ID)
+        whenever(trezorService.disconnect()).thenThrow(RuntimeException("disconnect failed"))
+        whenever(trezorService.clearCredentials(DEVICE_ID)).thenThrow(RuntimeException("clear failed"))
+
+        val result = sut.forgetDevice(DEVICE_ID)
+
+        assertTrue(result.isFailure)
+        assertTrue(sut.state.value.knownDevices.isEmpty())
+        assertNull(sut.state.value.connectedDevice)
+        assertNull(sut.state.value.connectedDeviceId)
+        assertEquals("disconnect failed", sut.state.value.error)
+        verify(trezorTransport).clearDeviceCredential(DEVICE_ID)
+        verify(trezorService).clearCredentials(DEVICE_ID)
+        verify(trezorStore).saveKnownDevices(emptyList())
+    }
+
+    // endregion
+
     // region initial state
 
     @Test