refactor: split trezor ui state

Author: ovitrif

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

@@ -150,7 +150,7 @@ private fun PreviewAddressSectionLoading() {
     AppThemeSurface {
         AddressSection(
             trezorState = TrezorPreviewData.connectedState,
-            uiState = TrezorUiState(isGettingAddress = true),
+            uiState = TrezorUiState(network = TrezorNetworkState(isGettingAddress = true)),
             onGetAddress = {},
             onIncrementIndex = {},
         )

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

@@ -330,7 +330,12 @@ private fun PreviewBalanceLookupWithAddressInfo() {
 private fun PreviewBalanceLookupLoading() {
     AppThemeSurface {
         BalanceLookupSection(
-            uiState = TrezorUiState(lookupInput = "xpub6C...", isLookingUp = true),
+            uiState = TrezorUiState(
+                lookup = TrezorLookupState(
+                    input = "xpub6C...",
+                    isLookingUp = true,
+                ),
+            ),
             isDeviceConnected = false,
             onInputChange = {},
             onLookup = {},

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

@@ -176,7 +176,7 @@ private fun PreviewPublicKeySectionLoading() {
     AppThemeSurface {
         PublicKeySection(
             trezorState = TrezorPreviewData.connectedState,
-            uiState = TrezorUiState(isGettingPublicKey = true),
+            uiState = TrezorUiState(network = TrezorNetworkState(isGettingPublicKey = true)),
             onGetPublicKey = {},
         )
     }

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

@@ -68,8 +68,8 @@ internal fun SendTransactionSection(
         )
         VerticalSpacer(8.dp)
 
-        when (uiState.sendStep) {
-            SendStep.FORM -> ComposeForm(
+        when (val step = uiState.sendStep) {
+            SendStep.Form -> ComposeForm(
                 uiState = uiState,
                 onAddressChange = onAddressChange,
                 onAmountChange = onAmountChange,
@@ -78,24 +78,20 @@ internal fun SendTransactionSection(
                 onCoinSelectionChange = onCoinSelectionChange,
                 onCompose = onCompose,
             )
-            SendStep.REVIEW -> uiState.composeResult?.let { result ->
-                ReviewSection(
-                    result = result,
-                    isDeviceConnected = isDeviceConnected,
-                    isSigning = uiState.isSigning,
-                    onSign = onSign,
-                    onBack = onBack,
-                )
-            }
-            SendStep.SIGNED -> uiState.signedTxResult?.let { signedTx ->
-                SignedResultSection(
-                    signedTx = signedTx,
-                    isBroadcasting = uiState.isBroadcasting,
-                    broadcastTxid = uiState.broadcastTxid,
-                    onBroadcast = onBroadcast,
-                    onReset = onReset,
-                )
-            }
+            is SendStep.Review -> ReviewSection(
+                result = step.composeResult,
+                isDeviceConnected = isDeviceConnected,
+                isSigning = uiState.isSigning,
+                onSign = onSign,
+                onBack = onBack,
+            )
+            is SendStep.Signed -> SignedResultSection(
+                signedTx = step.signedTx,
+                isBroadcasting = uiState.isBroadcasting,
+                broadcastTxid = step.broadcastTxid,
+                onBroadcast = onBroadcast,
+                onReset = onReset,
+            )
         }
     }
 }
@@ -405,9 +401,11 @@ private fun PreviewSendFormFilled() {
     AppThemeSurface {
         SendTransactionSection(
             uiState = TrezorUiState(
-                sendAddress = "bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh",
-                sendAmountSats = "45000",
-                sendFeeRate = "5",
+                send = TrezorSendState(
+                    address = "bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh",
+                    amountSats = "45000",
+                    feeRate = "5",
+                ),
             ),
             isDeviceConnected = true,
             onAddressChange = {},

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

@@ -158,7 +158,7 @@ private fun PreviewSignMessageSectionWithSignature() {
 private fun PreviewSignMessageSectionSigning() {
     AppThemeSurface {
         SignMessageSection(
-            uiState = TrezorUiState(isSigningMessage = true),
+            uiState = TrezorUiState(message = TrezorMessageState(isSigningMessage = true)),
             onMessageChange = {},
             onSignMessage = {},
             onVerifyMessage = {},

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

@@ -175,7 +175,12 @@ private fun PreviewTransactionHistoryEmpty() {
 private fun PreviewTransactionHistoryLoading() {
     AppThemeSurface {
         TransactionHistorySection(
-            uiState = TrezorUiState(txHistoryInput = "vpub5Y...", isLoadingTxHistory = true),
+            uiState = TrezorUiState(
+                txHistory = TrezorTxHistoryState(
+                    input = "vpub5Y...",
+                    isLoading = true,
+                ),
+            ),
             onInputChange = {},
             onLookup = {},
         )

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

@@ -201,36 +201,42 @@ internal object TrezorPreviewData {
     )
 
     val uiStateWithSignature = TrezorUiState(
-        selectedNetwork = BitkitCoreNetwork.REGTEST,
-        lastSignature = "H3bK9x...signature...base64==",
-        lastSigningAddress = SAMPLE_ADDRESS,
+        network = TrezorNetworkState(selectedNetwork = BitkitCoreNetwork.REGTEST),
+        message = TrezorMessageState(
+            lastSignature = "H3bK9x...signature...base64==",
+            lastSigningAddress = SAMPLE_ADDRESS,
+        ),
     )
 
     val uiStateWithAccountInfo = TrezorUiState(
-        selectedNetwork = BitkitCoreNetwork.REGTEST,
-        lookupInput = SAMPLE_XPUB,
-        accountInfoResult = sampleAccountInfoResult,
+        network = TrezorNetworkState(selectedNetwork = BitkitCoreNetwork.REGTEST),
+        lookup = TrezorLookupState(
+            input = SAMPLE_XPUB,
+            accountInfoResult = sampleAccountInfoResult,
+        ),
     )
 
     val uiStateWithAddressInfo = TrezorUiState(
-        selectedNetwork = BitkitCoreNetwork.REGTEST,
-        lookupInput = SAMPLE_ADDRESS,
-        addressInfoResult = sampleAddressInfoResult,
+        network = TrezorNetworkState(selectedNetwork = BitkitCoreNetwork.REGTEST),
+        lookup = TrezorLookupState(
+            input = SAMPLE_ADDRESS,
+            addressInfoResult = sampleAddressInfoResult,
+        ),
     )
 
     val uiStateReview = TrezorUiState(
-        selectedNetwork = BitkitCoreNetwork.REGTEST,
-        sendStep = SendStep.REVIEW,
-        sendAddress = "bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh",
-        sendAmountSats = "45000",
-        sendFeeRate = "5",
-        composeResult = sampleComposeResult,
+        network = TrezorNetworkState(selectedNetwork = BitkitCoreNetwork.REGTEST),
+        send = TrezorSendState(
+            address = "bc1qxy2kgdygjrsqtzq2n0yrf2493p83kkfjhx0wlh",
+            amountSats = "45000",
+            feeRate = "5",
+            step = SendStep.Review(sampleComposeResult),
+        ),
     )
 
     val uiStateSigned = TrezorUiState(
-        selectedNetwork = BitkitCoreNetwork.REGTEST,
-        sendStep = SendStep.SIGNED,
-        signedTxResult = sampleSignedTx,
+        network = TrezorNetworkState(selectedNetwork = BitkitCoreNetwork.REGTEST),
+        send = TrezorSendState(step = SendStep.Signed(sampleSignedTx)),
     )
 
     val sampleWalletBalance = WalletBalance(
@@ -290,15 +296,20 @@ internal object TrezorPreviewData {
     )
 
     val uiStateWithTxHistory = TrezorUiState(
-        selectedNetwork = BitkitCoreNetwork.REGTEST,
-        txHistoryInput = SAMPLE_XPUB,
-        txHistoryResult = sampleTransactionHistoryResult,
+        network = TrezorNetworkState(selectedNetwork = BitkitCoreNetwork.REGTEST),
+        txHistory = TrezorTxHistoryState(
+            input = SAMPLE_XPUB,
+            result = sampleTransactionHistoryResult,
+        ),
     )
 
     val uiStateBroadcast = TrezorUiState(
-        selectedNetwork = BitkitCoreNetwork.REGTEST,
-        sendStep = SendStep.SIGNED,
-        signedTxResult = sampleSignedTx,
-        broadcastTxid = "c4d5e6f7a8b9c4d5e6f7a8b9c4d5e6f7a8b9c4d5e6f7a8b9c4d5e6f7a8b9c4d5",
+        network = TrezorNetworkState(selectedNetwork = BitkitCoreNetwork.REGTEST),
+        send = TrezorSendState(
+            step = SendStep.Signed(
+                signedTx = sampleSignedTx,
+                broadcastTxid = "c4d5e6f7a8b9c4d5e6f7a8b9c4d5e6f7a8b9c4d5e6f7a8b9c4d5e6f7a8b9c4d5",
+            ),
+        ),
     )
 }