fix: polish wallet ui

app/src/androidTest/java/to/bitkit/ui/components/ButtonTest.kt

@@ -0,0 +1,100 @@
+package to.bitkit.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.assertHeightIsEqualTo
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.dp
+import org.junit.Rule
+import org.junit.Test
+import to.bitkit.test.annotations.ComposeUi
+import to.bitkit.ui.theme.AppThemeSurface
+
+@ComposeUi
+class ButtonTest {
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun buttonHeightsRemainStableAcrossStates() {
+        composeTestRule.setContent {
+            AppThemeSurface {
+                Column {
+                    PrimaryButton(
+                        text = "Primary",
+                        onClick = {},
+                        size = ButtonSize.Small,
+                        fullWidth = false,
+                        modifier = Modifier.testTag("PrimarySmallEnabled")
+                    )
+                    PrimaryButton(
+                        text = "Primary",
+                        onClick = {},
+                        size = ButtonSize.Small,
+                        enabled = false,
+                        fullWidth = false,
+                        modifier = Modifier.testTag("PrimarySmallDisabled")
+                    )
+                    PrimaryButton(
+                        text = "Primary",
+                        onClick = {},
+                        size = ButtonSize.Small,
+                        isLoading = true,
+                        fullWidth = false,
+                        modifier = Modifier.testTag("PrimarySmallLoading")
+                    )
+                    SecondaryButton(
+                        text = "Secondary",
+                        onClick = {},
+                        size = ButtonSize.Small,
+                        fullWidth = false,
+                        modifier = Modifier.testTag("SecondarySmallEnabled")
+                    )
+                    SecondaryButton(
+                        text = "Secondary",
+                        onClick = {},
+                        size = ButtonSize.Small,
+                        enabled = false,
+                        fullWidth = false,
+                        modifier = Modifier.testTag("SecondarySmallDisabled")
+                    )
+                    SecondaryButton(
+                        text = "Secondary",
+                        onClick = {},
+                        size = ButtonSize.Small,
+                        isLoading = true,
+                        fullWidth = false,
+                        modifier = Modifier.testTag("SecondarySmallLoading")
+                    )
+                    PrimaryButton(
+                        text = "Primary",
+                        onClick = {},
+                        fullWidth = false,
+                        modifier = Modifier.testTag("PrimaryLarge")
+                    )
+                    SecondaryButton(
+                        text = "Secondary",
+                        onClick = {},
+                        fullWidth = false,
+                        modifier = Modifier.testTag("SecondaryLarge")
+                    )
+                }
+            }
+        }
+
+        listOf(
+            "PrimarySmallEnabled",
+            "PrimarySmallDisabled",
+            "PrimarySmallLoading",
+            "SecondarySmallEnabled",
+            "SecondarySmallDisabled",
+            "SecondarySmallLoading",
+        ).forEach {
+            composeTestRule.onNodeWithTag(it).assertHeightIsEqualTo(40.dp)
+        }
+        composeTestRule.onNodeWithTag("PrimaryLarge").assertHeightIsEqualTo(56.dp)
+        composeTestRule.onNodeWithTag("SecondaryLarge").assertHeightIsEqualTo(56.dp)
+    }
+}

app/src/androidTest/java/to/bitkit/ui/screens/wallets/receive/EditInvoiceContentTest.kt

@@ -28,7 +28,6 @@ class EditInvoiceContentTest {
                 EditInvoiceContent(
                     amountInputViewModel = previewAmountInputViewModel(sats = 12_345),
                     noteText = "Hardware payment",
-                    isSoftKeyboardVisible = false,
                     onchainOnly = true,
                     keyboardVisible = false,
                     tags = persistentListOf("Hardware"),

app/src/androidTest/java/to/bitkit/ui/screens/wallets/receive/EditInvoiceScreenTest.kt

@@ -24,7 +24,6 @@ class EditInvoiceScreenTest {
                 EditInvoiceContent(
                     amountInputViewModel = AmountInputViewModel(AmountInputHandler.stub()),
                     noteText = "Dinner",
-                    isSoftKeyboardVisible = false,
                     keyboardVisible = false,
                     tags = persistentListOf(),
                     onBack = {},
@@ -51,7 +50,6 @@ class EditInvoiceScreenTest {
                 EditInvoiceContent(
                     amountInputViewModel = AmountInputViewModel(AmountInputHandler.stub()),
                     noteText = "",
-                    isSoftKeyboardVisible = false,
                     keyboardVisible = false,
                     tags = persistentListOf(),
                     onBack = {},

app/src/main/java/to/bitkit/models/FeeRate.kt

@@ -11,48 +11,55 @@ import to.bitkit.ui.theme.Colors
 enum class FeeRate(
     @StringRes val title: Int,
     @StringRes val description: Int,
+    @StringRes val duration: Int,
     @StringRes val shortDescription: Int,
     @DrawableRes val icon: Int,
     val color: Color,
 ) {
     INSTANT(
         title = R.string.fee__instant__title,
         description = R.string.fee__instant__description,
+        duration = R.string.fee__instant__duration,
         shortDescription = R.string.fee__instant__shortDescription,
         color = Colors.Purple,
         icon = R.drawable.ic_speed_fast,
     ),
     FAST(
         title = R.string.fee__fast__title,
         description = R.string.fee__fast__description,
+        duration = R.string.fee__fast__duration,
         shortDescription = R.string.fee__fast__shortDescription,
         color = Colors.Brand,
         icon = R.drawable.ic_speed_fast,
     ),
     NORMAL(
         title = R.string.fee__normal__title,
         description = R.string.fee__normal__description,
+        duration = R.string.fee__normal__duration,
         shortDescription = R.string.fee__normal__shortDescription,
         color = Colors.Brand,
         icon = R.drawable.ic_speed_normal,
     ),
     SLOW(
         title = R.string.fee__slow__title,
         description = R.string.fee__slow__description,
+        duration = R.string.fee__slow__duration,
         shortDescription = R.string.fee__slow__shortDescription,
         color = Colors.Brand,
         icon = R.drawable.ic_speed_slow,
     ),
     MINIMUM(
         title = R.string.fee__minimum__title,
         description = R.string.fee__minimum__description,
+        duration = R.string.fee__minimum__duration,
         shortDescription = R.string.fee__minimum__shortDescription,
         color = Colors.Brand,
         icon = R.drawable.ic_speed_slow,
     ),
     CUSTOM(
         title = R.string.fee__custom__title,
         description = R.string.fee__custom__description,
+        duration = R.string.fee__custom__duration,
         shortDescription = R.string.fee__custom__shortDescription,
         color = Colors.White64,
         icon = R.drawable.ic_settings,

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

@@ -729,7 +729,7 @@ fun ContentView(
                             onReceiveClick = {
                                 appViewModel.showSheet(Sheet.Receive(hardwareWalletId = currentHardwareWalletId))
                             },
-                            onScanClick = { appViewModel.showScannerSheet() },
+                            onScanClick = { appViewModel.showScannerSheet(showBackButton = false) },
                         )
                     }
                 }