fix: polish payment request ui

app/src/androidTest/java/to/bitkit/ui/screens/paymentrequests/CreatePaymentRequestScreenTest.kt

@@ -53,6 +53,25 @@ class CreatePaymentRequestScreenTest {
         composeTestRule.onNodeWithTag("PaymentRequestNote").assertDoesNotExist()
     }
 
+    @Test
+    fun detailsWithRecipientShowsCardAndSendRequest() {
+        composeTestRule.setContent {
+            AppThemeSurface {
+                PaymentRequestDetailsContent(
+                    amountInputViewModel = AmountInputViewModel(AmountInputHandler.stub()),
+                    initialDraft = draft,
+                    onBack = {},
+                    onContinue = {},
+                    recipient = PubkyProfile.placeholder(target.publicKey),
+                )
+            }
+        }
+
+        composeTestRule.onNodeWithTag("PaymentRequestSend").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Send Request").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestAmountContinue").assertDoesNotExist()
+    }
+
     @Test
     fun recipientShowsEligibleContactAndSendAction() {
         composeTestRule.setContent {
@@ -61,6 +80,7 @@ class CreatePaymentRequestScreenTest {
                     targets = persistentListOf(target),
                     contacts = persistentListOf(PubkyProfile.placeholder(target.publicKey)),
                     isCreating = false,
+                    onBack = {},
                     onEditExpiration = {},
                     onPaste = { target.publicKey },
                     onSend = {},
@@ -95,7 +115,7 @@ class CreatePaymentRequestScreenTest {
         composeTestRule.onNodeWithTag("PaymentRequestSent").assertIsDisplayed()
         composeTestRule.onNodeWithTag("PaymentRequestSentCheck").assertIsDisplayed()
         composeTestRule.onNodeWithText("PAYMENT REQUESTED").assertIsDisplayed()
-        composeTestRule.onNodeWithText("Waiting for payment").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Dinner").assertIsDisplayed()
     }
 
     private val draft = PaykitPaymentRequestDraft(

app/src/androidTest/java/to/bitkit/ui/screens/paymentrequests/PaymentRequestsScreenTest.kt

@@ -107,8 +107,9 @@ class PaymentRequestsScreenTest {
 
         composeTestRule.onNodeWithTag("PaymentRequestRowaccepted").assertIsDisplayed()
         composeTestRule.onNodeWithTag("PaymentRequestRowoutgoing").assertIsDisplayed()
-        composeTestRule.onNodeWithText("Waiting for", substring = true).assertIsDisplayed()
-        composeTestRule.onNodeWithText("PAYMENT REQUESTS").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Dinner").assertIsDisplayed()
+        composeTestRule.onNodeWithText("INCOMING").assertDoesNotExist()
+        composeTestRule.onNodeWithText("OUTGOING").assertIsDisplayed()
         composeTestRule.onNodeWithText("TODAY").assertIsDisplayed()
         composeTestRule.onNodeWithTag("PaymentRequestCreate").assertIsDisplayed()
     }

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

@@ -746,6 +746,7 @@ private fun RootNavHost(
                     appViewModel = appViewModel,
                     onBack = { navController.popBackStack() },
                     onRequestPayment = {
+                        navController.popBackStack()
                         appViewModel.showSheet(Sheet.Receive(route = ReceiveRoute.PaymentRequestDetails))
                     },
                 )

app/src/main/java/to/bitkit/ui/components/Money.kt

@@ -45,25 +45,34 @@ fun MoneyDisplay(
 fun MoneyCell(
     sats: Long,
     modifier: Modifier = Modifier,
+    secondaryText: String? = null,
 ) {
     val currencies = LocalCurrencies.current
     Column(
         horizontalAlignment = Alignment.End,
         verticalArrangement = Arrangement.spacedBy(2.dp),
-        modifier = modifier,
+        modifier = modifier
     ) {
         rememberMoneyText(sats = sats, unit = currencies.primaryDisplay, showSymbol = true)?.let { text ->
             BodyMSB(
                 text = text.withAccent(accentColor = Colors.White64),
-                modifier = Modifier.testTag("MoneyPrimary"),
+                modifier = Modifier.testTag("MoneyPrimary")
             )
         }
-        rememberMoneyText(sats = sats, unit = currencies.primaryDisplay.not(), showSymbol = true)?.let { text ->
+        if (secondaryText != null) {
             CaptionB(
-                text = text.withAccent(accentColor = Colors.White64),
+                text = secondaryText,
                 color = Colors.White64,
-                modifier = Modifier.testTag("MoneySecondary"),
+                modifier = Modifier.testTag("MoneySecondary")
             )
+        } else {
+            rememberMoneyText(sats = sats, unit = currencies.primaryDisplay.not(), showSymbol = true)?.let { text ->
+                CaptionB(
+                    text = text.withAccent(accentColor = Colors.White64),
+                    color = Colors.White64,
+                    modifier = Modifier.testTag("MoneySecondary")
+                )
+            }
         }
     }
 }

app/src/main/java/to/bitkit/ui/components/PubkyContactRow.kt

@@ -32,7 +32,7 @@ fun PubkyContactRow(
     modifier: Modifier = Modifier,
     isSelected: Boolean? = null,
     isEnabled: Boolean = true,
-    verticalPadding: Dp = 12.dp,
+    verticalPadding: Dp = 24.dp,
     selectionColor: Color = Colors.PubkyGreen,
 ) {
     Row(
@@ -59,13 +59,13 @@ fun PubkyContactRow(
             verticalArrangement = Arrangement.spacedBy(4.dp),
             modifier = Modifier.weight(1f)
         ) {
-            BodyS(
+            Text13Up(
                 text = profile.truncatedPublicKey,
                 color = Colors.White64,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
             )
-            BodySSB(
+            BodyMSB(
                 text = profile.name,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,