feat: add account-type override to watcher

Author: coreyphillips

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

@@ -577,14 +577,15 @@ class TrezorRepo @Inject constructor(
         extendedKey: String,
         network: BitkitCoreNetwork,
         gapLimit: UInt = 20u,
+        accountType: AccountType? = null,
     ): Result<Unit> = withContext(ioDispatcher) {
         runCatching {
             val params = WatcherParams(
                 watcherId = watcherId,
                 extendedKey = extendedKey,
                 electrumUrl = electrumUrlForNetwork(network),
                 network = network,
-                accountType = null,
+                accountType = accountType,
                 gapLimit = gapLimit,
             )
             trezorService.startWatcher(params, eventBridge)

app/src/main/java/to/bitkit/ui/screens/trezor/TrezorScreen.kt

@@ -44,6 +44,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
+import com.synonym.bitkitcore.AccountType
 import com.synonym.bitkitcore.CoinSelection
 import kotlinx.collections.immutable.toImmutableList
 import to.bitkit.R
@@ -169,6 +170,7 @@ private fun TrezorScreenContent(
             onLookupTxHistory = viewModel::lookupTransactionHistory,
             onWatcherExtendedKeyChange = viewModel::setWatcherExtendedKey,
             onWatcherGapLimitChange = viewModel::setWatcherGapLimit,
+            onWatcherAccountTypeChange = viewModel::setWatcherAccountType,
             onStartWatcher = viewModel::startWatcher,
             onStopWatcher = viewModel::stopWatcher,
             onPopulateWatcherFromXpub = viewModel::populateWatcherFromXpub,
@@ -214,6 +216,7 @@ private fun Content(
     onLookupTxHistory: () -> Unit = {},
     onWatcherExtendedKeyChange: (String) -> Unit = {},
     onWatcherGapLimitChange: (String) -> Unit = {},
+    onWatcherAccountTypeChange: (AccountType?) -> Unit = {},
     onStartWatcher: () -> Unit = {},
     onStopWatcher: () -> Unit = {},
     onPopulateWatcherFromXpub: () -> Unit = {},
@@ -444,6 +447,7 @@ private fun Content(
                     trezorState = trezorState,
                     onExtendedKeyChange = onWatcherExtendedKeyChange,
                     onGapLimitChange = onWatcherGapLimitChange,
+                    onAccountTypeChange = onWatcherAccountTypeChange,
                     onStartWatcher = onStartWatcher,
                     onStopWatcher = onStopWatcher,
                     onPopulateFromXpub = onPopulateWatcherFromXpub,

app/src/main/java/to/bitkit/ui/screens/trezor/TrezorViewModel.kt

@@ -685,6 +685,10 @@ class TrezorViewModel @Inject constructor(
         _uiState.update { it.copy(watcher = it.watcher.copy(gapLimit = limit)) }
     }
 
+    fun setWatcherAccountType(type: AccountType?) {
+        _uiState.update { it.copy(watcher = it.watcher.copy(selectedAccountType = type)) }
+    }
+
     fun populateWatcherFromXpub() {
         val xpub = trezorRepo.state.value.lastPublicKey?.xpub ?: return
         _uiState.update { it.copy(watcher = it.watcher.copy(extendedKey = xpub)) }
@@ -721,6 +725,7 @@ class TrezorViewModel @Inject constructor(
                 extendedKey = key,
                 network = state.selectedNetwork,
                 gapLimit = gapLimit,
+                accountType = state.watcher.selectedAccountType,
             )
 
             if (result.isSuccess) {
@@ -979,6 +984,9 @@ data class TrezorUiState(
     val watcherAccountType: AccountType?
         get() = watcher.accountType
 
+    val watcherSelectedAccountType: AccountType?
+        get() = watcher.selectedAccountType
+
     val watcherEvents: ImmutableList<String>
         get() = watcher.events
 }
@@ -1045,6 +1053,7 @@ data class TrezorWatcherState(
     val transactionCount: UInt = 0u,
     val blockHeight: UInt = 0u,
     val accountType: AccountType? = null,
+    val selectedAccountType: AccountType? = null,
     val events: ImmutableList<String> = persistentListOf(),
 )
 

app/src/main/java/to/bitkit/ui/screens/trezor/WatcherSection.kt

@@ -8,6 +8,7 @@ import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
@@ -23,6 +24,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.synonym.bitkitcore.AccountType
 import com.synonym.bitkitcore.TxDirection
 import to.bitkit.models.safe
 import to.bitkit.repositories.TrezorState
@@ -33,6 +35,7 @@ import to.bitkit.ui.components.Footnote
 import to.bitkit.ui.components.HorizontalSpacer
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
+import to.bitkit.ui.components.TagButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -44,6 +47,7 @@ internal fun WatcherSection(
     trezorState: TrezorState,
     onExtendedKeyChange: (String) -> Unit,
     onGapLimitChange: (String) -> Unit,
+    onAccountTypeChange: (AccountType?) -> Unit,
     onStartWatcher: () -> Unit,
     onStopWatcher: () -> Unit,
     onPopulateFromXpub: () -> Unit,
@@ -103,6 +107,13 @@ internal fun WatcherSection(
             )
         }
 
+        VerticalSpacer(8.dp)
+
+        AccountTypeSelectorRow(
+            selectedAccountType = uiState.watcherSelectedAccountType,
+            onAccountTypeChange = onAccountTypeChange,
+        )
+
         VerticalSpacer(16.dp)
 
         if (uiState.activeWatcherId != null) {
@@ -134,6 +145,39 @@ internal fun WatcherSection(
     }
 }
 
+private fun AccountType?.label(): String = when (this) {
+    null -> "Auto"
+    AccountType.LEGACY -> "Legacy"
+    AccountType.WRAPPED_SEGWIT -> "Wrapped"
+    AccountType.NATIVE_SEGWIT -> "Native"
+    AccountType.TAPROOT -> "Taproot"
+}
+
+@Composable
+private fun AccountTypeSelectorRow(
+    selectedAccountType: AccountType?,
+    onAccountTypeChange: (AccountType?) -> Unit,
+) {
+    Column {
+        Caption("Account type (Auto = detect from key prefix)", color = Colors.White50)
+        VerticalSpacer(8.dp)
+        FlowRow(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            val options = listOf(null) + AccountType.entries
+            options.forEach { type ->
+                TagButton(
+                    text = type.label(),
+                    onClick = { onAccountTypeChange(type) },
+                    isSelected = type == selectedAccountType,
+                )
+            }
+        }
+    }
+}
+
 private fun WatcherConnectionStatus.toColor(): Color = when (this) {
     WatcherConnectionStatus.IDLE -> Colors.White50
     WatcherConnectionStatus.STARTING -> Colors.Yellow
@@ -242,6 +286,7 @@ private fun PreviewWatcherEmpty() {
             trezorState = TrezorState(),
             onExtendedKeyChange = {},
             onGapLimitChange = {},
+            onAccountTypeChange = {},
             onStartWatcher = {},
             onStopWatcher = {},
             onPopulateFromXpub = {},
@@ -258,6 +303,7 @@ private fun PreviewWatcherActive() {
             trezorState = TrezorState(),
             onExtendedKeyChange = {},
             onGapLimitChange = {},
+            onAccountTypeChange = {},
             onStartWatcher = {},
             onStopWatcher = {},
             onPopulateFromXpub = {},