chore: group hw transfer screens

Author: ovitrif

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

@@ -144,11 +144,6 @@ class HwWalletRepo @Inject constructor(
     /** Reconnects a known paired device so its session is live for on-device signing. */
     suspend fun reconnect(deviceId: String): Result<TrezorFeatures> = trezorRepo.connectKnownDevice(deviceId)
 
-    /**
-     * Resolves the native-segwit funding account for a paired wallet: its account xpub, [AccountType]
-     * and the balance currently watched for that account. Used to compose the on-chain funding send the
-     * Trezor signs when transferring to spending. v1 funds from native segwit only.
-     */
     suspend fun getFundingAccount(deviceId: String): Result<HwFundingAccount> = withContext(ioDispatcher) {
         runSuspendCatching {
             val devices = hwWalletStore.loadKnownDevices()
@@ -173,7 +168,7 @@ class HwWalletRepo @Inject constructor(
 
     /**
      * Composes the on-chain funding payment from the device's native-segwit account, has the Trezor sign
-     * it and broadcasts it. The signing step prompts the user on the device. Returns the broadcast txid.
+     * and broadcasts it. The signing step prompts the user on the device. Returns the broadcast txid.
      */
     suspend fun signAndBroadcastFunding(
         deviceId: String,
@@ -501,7 +496,6 @@ class HwWalletRepo @Inject constructor(
     private fun String.toDeviceId(): String = substringBefore(WATCHER_ID_SEPARATOR)
 }
 
-/** Native-segwit account used to fund a Trezor-signed transfer to spending. */
 data class HwFundingAccount(
     val xpub: String,
     val accountType: AccountType,

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

@@ -118,11 +118,8 @@ import to.bitkit.ui.screens.transfer.SavingsIntroScreen
 import to.bitkit.ui.screens.transfer.SavingsProgressScreen
 import to.bitkit.ui.screens.transfer.SettingUpScreen
 import to.bitkit.ui.screens.transfer.SpendingAdvancedScreen
-import to.bitkit.ui.screens.transfer.SpendingAmountHwScreen
 import to.bitkit.ui.screens.transfer.SpendingAmountScreen
 import to.bitkit.ui.screens.transfer.SpendingConfirmScreen
-import to.bitkit.ui.screens.transfer.SpendingHwSignScreen
-import to.bitkit.ui.screens.transfer.SpendingHwSignedScreen
 import to.bitkit.ui.screens.transfer.SpendingIntroScreen
 import to.bitkit.ui.screens.transfer.TransferIntroScreen
 import to.bitkit.ui.screens.transfer.external.ExternalAmountScreen
@@ -131,6 +128,9 @@ import to.bitkit.ui.screens.transfer.external.ExternalConnectionScreen
 import to.bitkit.ui.screens.transfer.external.ExternalNodeViewModel
 import to.bitkit.ui.screens.transfer.external.ExternalSuccessScreen
 import to.bitkit.ui.screens.transfer.external.LnurlChannelScreen
+import to.bitkit.ui.screens.transfer.hardware.SpendingAmountHwScreen
+import to.bitkit.ui.screens.transfer.hardware.SpendingHwSignScreen
+import to.bitkit.ui.screens.transfer.hardware.SpendingHwSignedScreen
 import to.bitkit.ui.screens.trezor.TrezorScreen
 import to.bitkit.ui.screens.wallets.HardwareWalletScreen
 import to.bitkit.ui.screens.wallets.HomeScreen

…reens/transfer/SpendingAmountHwScreen.kt …nsfer/hardware/SpendingAmountHwScreen.ktapp/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountHwScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/transfer/hardware/SpendingAmountHwScreen.kt app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountHwScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/transfer/hardware/SpendingAmountHwScreen.kt

@@ -1,4 +1,4 @@
-package to.bitkit.ui.screens.transfer
+package to.bitkit.ui.screens.transfer.hardware
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn

…screens/transfer/SpendingHwSignScreen.kt …ransfer/hardware/SpendingHwSignScreen.ktapp/src/main/java/to/bitkit/ui/screens/transfer/SpendingHwSignScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/transfer/hardware/SpendingHwSignScreen.kt app/src/main/java/to/bitkit/ui/screens/transfer/SpendingHwSignScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/transfer/hardware/SpendingHwSignScreen.kt

@@ -1,4 +1,4 @@
-package to.bitkit.ui.screens.transfer
+package to.bitkit.ui.screens.transfer.hardware
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -33,6 +33,7 @@ import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
+import to.bitkit.ui.screens.transfer.previewBtOrder
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent

…reens/transfer/SpendingHwSignedScreen.kt …nsfer/hardware/SpendingHwSignedScreen.ktapp/src/main/java/to/bitkit/ui/screens/transfer/SpendingHwSignedScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/transfer/hardware/SpendingHwSignedScreen.kt app/src/main/java/to/bitkit/ui/screens/transfer/SpendingHwSignedScreen.kt renamed to app/src/main/java/to/bitkit/ui/screens/transfer/hardware/SpendingHwSignedScreen.kt

@@ -1,4 +1,4 @@
-package to.bitkit.ui.screens.transfer
+package to.bitkit.ui.screens.transfer.hardware
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -26,6 +26,7 @@ import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
+import to.bitkit.ui.screens.transfer.previewBtOrder
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent