refactor: hide trezor setup gate

ovitrif · ovitrif · commit e4291972d6b0 · 2026-06-20T23:54:33.000+02:00
diff --git a/app/src/main/java/to/bitkit/repositories/TrezorRepo.kt b/app/src/main/java/to/bitkit/repositories/TrezorRepo.kt
@@ -52,6 +52,7 @@ import to.bitkit.data.HwWalletStore
 import to.bitkit.di.IoDispatcher
 import to.bitkit.env.Env
 import to.bitkit.ext.nowMs
+import to.bitkit.ext.runSuspendCatching
 import to.bitkit.models.ALL_ADDRESS_TYPES
 import to.bitkit.models.TransportType
 import to.bitkit.models.toAccountDerivationPath
@@ -190,7 +191,6 @@ class TrezorRepo @Inject constructor(
         hwWalletStore.reset()
         _state.update {
             it.copy(
-                isInitialized = false,
                 isScanning = false,
                 isConnecting = false,
                 isAutoReconnecting = false,
@@ -242,16 +242,16 @@ class TrezorRepo @Inject constructor(
                 isSetup = CompletableDeferred()
             }
             if (isSetup.isCompleted) {
-                if (runCatching { isSetup.await() }.isSuccess) return@withLock Result.success(Unit)
+                if (runSuspendCatching { isSetup.await() }.isSuccess) return@withLock Result.success(Unit)
                 isSetup = CompletableDeferred()
             }
 
-            runCatching {
+            runSuspendCatching {
                 val credentialPath = "${Env.bitkitCoreStoragePath(walletIndex)}/trezor-credentials.json"
                 Logger.debug("Initializing Trezor with credential path: '$credentialPath'", context = TAG)
                 trezorService.initialize(credentialPath)
                 val known = loadKnownDevices()
-                _state.update { it.copy(isInitialized = true, knownDevices = known.toImmutableList(), error = null) }
+                _state.update { it.copy(knownDevices = known.toImmutableList(), error = null) }
                 isSetup.complete(Unit)
                 Unit
             }.onFailure { e ->
@@ -264,7 +264,7 @@ class TrezorRepo @Inject constructor(
 
     suspend fun scan(includeBluetooth: Boolean = true): Result<List<TrezorDeviceInfo>> = withContext(ioDispatcher) {
         runCatching {
-            ensureInitialized()
+            awaitSetup()
             _state.update { it.copy(isScanning = true, error = null) }
             val devices = trezorService.scan(includeBluetooth = includeBluetooth)
             val knownIds = _state.value.knownDevices.map { it.id }.toSet()
@@ -279,7 +279,7 @@ class TrezorRepo @Inject constructor(
 
     suspend fun listDevices(): Result<List<TrezorDeviceInfo>> = withContext(ioDispatcher) {
         runCatching {
-            ensureInitialized()
+            awaitSetup()
             val devices = trezorService.listDevices()
             val knownIds = _state.value.knownDevices.map { it.id }.toSet()
             val nearby = devices.filter { it.id !in knownIds }
@@ -296,7 +296,7 @@ class TrezorRepo @Inject constructor(
         requestUsbPermission: Boolean = true,
     ): Result<TrezorFeatures> = withContext(ioDispatcher) {
         runCatching {
-            ensureInitialized()
+            awaitSetup()
             _state.update { it.copy(isConnecting = true, error = null) }
             TrezorDebugLog.log("CONNECT", "connect() called for deviceId=$deviceId")
             val features = connectWithThpRetry(
@@ -382,6 +382,7 @@ class TrezorRepo @Inject constructor(
         scriptType: AccountType? = null,
     ): Result<TransactionHistoryResult> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             trezorService.getTransactionHistory(
                 extendedKey = extendedKey,
                 electrumUrl = electrumUrlForNetwork(network),
@@ -400,6 +401,7 @@ class TrezorRepo @Inject constructor(
         scriptType: AccountType? = null,
     ): Result<AccountInfoResult> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             trezorService.getAccountInfo(
                 extendedKey = extendedKey,
                 electrumUrl = electrumUrlForNetwork(network),
@@ -417,6 +419,7 @@ class TrezorRepo @Inject constructor(
         network: BitkitCoreNetwork = Env.network.toCoreNetwork(),
     ): Result<SingleAddressInfoResult> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             trezorService.getAddressInfo(
                 address = address,
                 electrumUrl = electrumUrlForNetwork(network),
@@ -438,6 +441,7 @@ class TrezorRepo @Inject constructor(
         coinSelection: CoinSelection,
     ): Result<List<ComposeResult>> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             val fingerprint = trezorService.getDeviceFingerprint()
             val params = ComposeParams(
                 wallet = WalletParams(
@@ -478,6 +482,7 @@ class TrezorRepo @Inject constructor(
         network: BitkitCoreNetwork,
     ): Result<String> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             trezorService.broadcastRawTx(
                 serializedTx = serializedTx,
                 electrumUrl = electrumUrlForNetwork(network),
@@ -577,7 +582,7 @@ class TrezorRepo @Inject constructor(
 
         _state.update { it.copy(isAutoReconnecting = true, error = null) }
         runCatching {
-            ensureInitialized(walletIndex)
+            awaitSetup(walletIndex)
             val cachedFeatures = if (trezorService.isConnected()) _state.value.connectedDevice else null
             if (cachedFeatures != null) {
                 cachedFeatures
@@ -629,11 +634,9 @@ class TrezorRepo @Inject constructor(
             _state.update { it.copy(isConnecting = true, error = null) }
             TrezorDebugLog.log("RECONNECT", "=== connectKnownDevice START ===")
             TrezorDebugLog.log("RECONNECT", "deviceId=$deviceId")
-            TrezorDebugLog.log("RECONNECT", "isInitialized=${_state.value.isInitialized}")
-            val needsInitialization = !_state.value.isInitialized
-            if (needsInitialization) TrezorDebugLog.log("RECONNECT", "Initializing...")
-            ensureInitialized()
-            if (needsInitialization) TrezorDebugLog.log("RECONNECT", "Initialized OK")
+            TrezorDebugLog.log("RECONNECT", "Awaiting setup...")
+            awaitSetup()
+            TrezorDebugLog.log("RECONNECT", "Setup OK")
             TrezorDebugLog.log("RECONNECT", "Scanning for devices...")
             val scannedDevices = trezorService.scan()
             TrezorDebugLog.log(
@@ -704,6 +707,7 @@ class TrezorRepo @Inject constructor(
         electrumUrl: String = electrumUrlForNetwork(network),
     ): Result<Unit> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             val params = WatcherParams(
                 watcherId = watcherId,
                 extendedKey = extendedKey,
@@ -723,6 +727,7 @@ class TrezorRepo @Inject constructor(
 
     suspend fun stopWatcher(watcherId: String): Result<Unit> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             trezorService.stopWatcher(watcherId)
             TrezorDebugLog.log(WATCHER_TAG, "Stopped watcher '$watcherId'")
             Logger.info("Stopped watcher '$watcherId'", context = TAG)
@@ -738,6 +743,7 @@ class TrezorRepo @Inject constructor(
 
     suspend fun stopAllWatchers(): Result<Unit> = withContext(ioDispatcher) {
         runCatching {
+            awaitSetup()
             trezorService.stopAllWatchers()
             TrezorDebugLog.log(WATCHER_TAG, "Stopped all watchers")
         }.onFailure {
@@ -888,18 +894,23 @@ class TrezorRepo @Inject constructor(
         val deviceId = _state.value.connectedDeviceId
             ?: _state.value.knownDevices.firstOrNull()?.id
             ?: throw AppError("No device to reconnect")
-        ensureInitialized()
+        awaitSetup()
         val devices = trezorService.scan()
         val device = devices.find { it.id == deviceId }
             ?: throw AppError("Device not found during reconnect")
         val features = connectWithThpRetry(device.id, trezorUiHandler.currentSelection())
         _state.update { it.copy(connected = ConnectedTrezorDevice(id = deviceId, features = features)) }
     }
 
-    private suspend fun ensureInitialized(walletIndex: Int = 0) {
-        if (!_state.value.isInitialized) {
+    private suspend fun awaitSetup(walletIndex: Int = 0) {
+        if (isSetup.isCancelled || !isSetup.isCompleted) {
             initialize(walletIndex).getOrThrow()
         }
+        val setup = runSuspendCatching { isSetup.await() }
+        if (setup.isSuccess) return
+
+        initialize(walletIndex).getOrThrow()
+        isSetup.await()
     }
 
     private suspend fun resetSetup() {
@@ -980,7 +991,6 @@ class TrezorRepo @Inject constructor(
 
 @Stable
 data class TrezorState(
-    val isInitialized: Boolean = false,
     val isScanning: Boolean = false,
     val isConnecting: Boolean = false,
     val isAutoReconnecting: Boolean = false,
diff --git a/app/src/main/java/to/bitkit/ui/screens/trezor/TrezorPreviewData.kt b/app/src/main/java/to/bitkit/ui/screens/trezor/TrezorPreviewData.kt
@@ -187,15 +187,13 @@ internal object TrezorPreviewData {
     )
 
     val connectedState = TrezorState(
-        isInitialized = true,
         connected = ConnectedTrezorDevice(
             id = "trezor-abc123",
             features = sampleFeatures,
         ),
     )
 
     val connectedStateWithResults = TrezorState(
-        isInitialized = true,
         connected = ConnectedTrezorDevice(
             id = "trezor-abc123",
             features = sampleFeatures,
diff --git a/app/src/main/java/to/bitkit/ui/screens/trezor/TrezorScreen.kt b/app/src/main/java/to/bitkit/ui/screens/trezor/TrezorScreen.kt
@@ -102,10 +102,6 @@ private fun TrezorScreenContent(
 
     val permissionsState = rememberMultiplePermissionsState(bluetoothPermissions)
 
-    LaunchedEffect(Unit) {
-        viewModel.initialize()
-    }
-
     val onScanWithPermissions: () -> Unit = {
         if (permissionsState.allPermissionsGranted) {
             viewModel.scan()
@@ -130,7 +126,6 @@ private fun TrezorScreenContent(
         Content(
             trezorState = trezorState,
             uiState = uiState,
-            onInitialize = viewModel::initialize,
             onScan = onScanWithPermissions,
             onConnectNearby = viewModel::connect,
             onConnectKnown = viewModel::connectKnownDevice,
@@ -178,7 +173,6 @@ private fun TrezorScreenContent(
 private fun Content(
     trezorState: TrezorState,
     uiState: TrezorUiState,
-    onInitialize: () -> Unit = {},
     onScan: () -> Unit = {},
     onConnectNearby: (String) -> Unit = {},
     onConnectKnown: (String) -> Unit = {},
@@ -249,7 +243,6 @@ private fun Content(
 
                 ActionButtonsRow(
                     trezorState = trezorState,
-                    onInitialize = onInitialize,
                     onScan = onScan,
                     onDisconnect = onDisconnect,
                     permissionsGranted = permissionsGranted,
@@ -679,12 +672,8 @@ private fun StatusRow(trezorState: TrezorState) {
                     StatusBadge(text = "Connected", color = Colors.Green)
                 }
 
-                trezorState.isInitialized -> {
-                    StatusBadge(text = "Ready", color = Colors.Brand)
-                }
-
                 else -> {
-                    StatusBadge(text = "Not initialized", color = Colors.White32)
+                    StatusBadge(text = "Ready", color = Colors.Brand)
                 }
             }
         }
@@ -706,7 +695,6 @@ internal fun StatusBadge(text: String, color: Color) {
 @Composable
 private fun ActionButtonsRow(
     trezorState: TrezorState,
-    onInitialize: () -> Unit,
     onScan: () -> Unit,
     onDisconnect: () -> Unit,
     permissionsGranted: Boolean = true,
@@ -716,14 +704,7 @@ private fun ActionButtonsRow(
         modifier = Modifier.fillMaxWidth()
     ) {
         if (trezorState.isAutoReconnecting) return@Row
-        if (!trezorState.isInitialized) {
-            PrimaryButton(
-                text = "Initialize",
-                onClick = onInitialize,
-                size = ButtonSize.Small,
-                modifier = Modifier.weight(1f)
-            )
-        } else if (trezorState.connectedDevice != null) {
+        if (trezorState.connectedDevice != null) {
             SecondaryButton(
                 text = "Disconnect",
                 onClick = onDisconnect,
@@ -751,7 +732,7 @@ private fun ActionButtonsRow(
 
 @Preview
 @Composable
-private fun PreviewNotInitialized() {
+private fun PreviewReady() {
     AppThemeSurface {
         Content(
             trezorState = TrezorState(),
@@ -762,10 +743,10 @@ private fun PreviewNotInitialized() {
 
 @Preview
 @Composable
-private fun PreviewInitialized() {
+private fun PreviewScanning() {
     AppThemeSurface {
         Content(
-            trezorState = TrezorState(isInitialized = true),
+            trezorState = TrezorState(isScanning = true),
             uiState = TrezorUiState(),
         )
     }
@@ -777,7 +758,6 @@ private fun PreviewWithDevices() {
     AppThemeSurface {
         Content(
             trezorState = TrezorState(
-                isInitialized = true,
                 knownDevices = listOf(TrezorPreviewData.sampleKnownDevice).toImmutableList(),
                 nearbyDevices = listOf(TrezorPreviewData.sampleNearbyDevice).toImmutableList(),
                 connected = ConnectedTrezorDevice(
diff --git a/app/src/main/java/to/bitkit/ui/screens/trezor/TrezorViewModel.kt b/app/src/main/java/to/bitkit/ui/screens/trezor/TrezorViewModel.kt
@@ -143,16 +143,6 @@ class TrezorViewModel @Inject constructor(
         }
     }
 
-    fun initialize() {
-        viewModelScope.launch(bgDispatcher) {
-            trezorRepo.initialize()
-                .onSuccess {
-                    ToastEventBus.send(type = Toast.ToastType.INFO, title = "Trezor initialized")
-                }
-                .onFailure { ToastEventBus.send(it) }
-        }
-    }
-
     fun scan() {
         viewModelScope.launch(bgDispatcher) {
             trezorRepo.scan()
diff --git a/app/src/test/java/to/bitkit/repositories/TrezorRepoTest.kt b/app/src/test/java/to/bitkit/repositories/TrezorRepoTest.kt
@@ -162,13 +162,15 @@ class TrezorRepoTest : BaseUnitTest() {
     // region initialize
 
     @Test
-    fun `initialize should update state to initialized on success`() = test {
+    fun `initialize should load known devices on success`() = test {
+        val knownDevice = mockKnownDevice()
+        whenever(hwWalletStore.loadKnownDevices()).thenReturn(listOf(knownDevice))
         sut = createSut()
 
         val result = sut.initialize()
 
         assertTrue(result.isSuccess)
-        assertTrue(sut.state.value.isInitialized)
+        assertEquals(listOf(knownDevice), sut.state.value.knownDevices)
         assertNull(sut.state.value.error)
     }
 
@@ -192,7 +194,6 @@ class TrezorRepoTest : BaseUnitTest() {
         val result = sut.initialize()
 
         assertTrue(result.isFailure)
-        assertFalse(sut.state.value.isInitialized)
         assertEquals("init failed", sut.state.value.error)
     }
 
@@ -223,7 +224,6 @@ class TrezorRepoTest : BaseUnitTest() {
         val result = sut.scan()
 
         assertTrue(result.isSuccess)
-        assertTrue(sut.state.value.isInitialized)
         verify(trezorService).initialize(anyOrNull())
         verify(trezorService).scan()
     }
@@ -1095,7 +1095,6 @@ class TrezorRepoTest : BaseUnitTest() {
         sut = createSut()
 
         val state = sut.state.value
-        assertFalse(state.isInitialized)
         assertFalse(state.isScanning)
         assertFalse(state.isConnecting)
         assertFalse(state.isAutoReconnecting)
diff --git a/app/src/test/java/to/bitkit/ui/screens/trezor/TrezorViewModelTest.kt b/app/src/test/java/to/bitkit/ui/screens/trezor/TrezorViewModelTest.kt
@@ -167,16 +167,6 @@ class TrezorViewModelTest : BaseUnitTest() {
 
     // region Async methods
 
-    @Test
-    fun `initialize should call trezorRepo initialize`() = test {
-        whenever(trezorRepo.initialize()).thenReturn(Result.success(Unit))
-
-        sut.initialize()
-        advanceUntilIdle()
-
-        verify(trezorRepo).initialize()
-    }
-
     @Test
     fun `scan should call trezorRepo scan`() = test {
         whenever(trezorRepo.scan()).thenReturn(Result.success(emptyList()))

Original file line number	Diff line number	Diff line change
`@@ -187,15 +187,13 @@ internal object TrezorPreviewData {`
`187`	`187`	`)`
`188`	`188`
`189`	`189`	`val connectedState = TrezorState(`
`190`		`- isInitialized = true,`
`191`	`190`	`connected = ConnectedTrezorDevice(`
`192`	`191`	`id = "trezor-abc123",`
`193`	`192`	`features = sampleFeatures,`
`194`	`193`	`),`
`195`	`194`	`)`
`196`	`195`
`197`	`196`	`val connectedStateWithResults = TrezorState(`
`198`		`- isInitialized = true,`
`199`	`197`	`connected = ConnectedTrezorDevice(`
`200`	`198`	`id = "trezor-abc123",`
`201`	`199`	`features = sampleFeatures,`