feat: share paykit state across apps

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

@@ -21,6 +21,7 @@ import androidx.navigation.compose.rememberNavController
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.flow.flowOf
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -70,6 +71,7 @@ class DrawerMenuWidgetsTest {
                     hasSeenShopIntro = true,
                     onBeforeNavigate = {},
                     showWidgets = true,
+                    profileIdentityExists = flowOf(false),
                 )
             }
         }
@@ -102,6 +104,7 @@ class DrawerMenuWidgetsTest {
                     hasSeenShopIntro = true,
                     onBeforeNavigate = {},
                     showWidgets = true,
+                    profileIdentityExists = flowOf(false),
                     onOpenWidgetsHome = { openWidgetsHome.value = true },
                 )
                 if (openWidgetsHome.value) {
@@ -138,6 +141,7 @@ class DrawerMenuWidgetsTest {
                     hasSeenShopIntro = true,
                     onBeforeNavigate = {},
                     showWidgets = false,
+                    profileIdentityExists = flowOf(false),
                     onOpenWidgetsHome = { error("Should not request home widgets page") },
                     onOpenWidgetsSheet = { openWidgetsSheet.value = true },
                 )
@@ -177,6 +181,7 @@ class DrawerMenuWidgetsTest {
                     hasSeenShopIntro = true,
                     onBeforeNavigate = {},
                     showWidgets = true,
+                    profileIdentityExists = flowOf(true),
                     isPaykitEnabled = true,
                 )
             }
@@ -201,6 +206,7 @@ class DrawerMenuWidgetsTest {
                     hasSeenShopIntro = true,
                     onBeforeNavigate = {},
                     showWidgets = true,
+                    profileIdentityExists = flowOf(true),
                     isPaykitEnabled = false,
                 )
             }

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

@@ -88,6 +88,45 @@ class SheetHostTest {
         assertEquals(0, backgroundClickCount)
     }
 
+    @Test
+    fun dismissingSheetPresentsQueuedSheet() {
+        val sheet = mutableStateOf<Sheet?>(Sheet.Receive())
+        val request = Sheet.Send()
+        var dismissCount = 0
+        var presentationCount = 0
+        composeTestRule.setContent {
+            AppThemeSurface {
+                SheetHost(
+                    shouldExpand = sheet.value != null,
+                    visibilityKey = sheet.value,
+                    onDismiss = {
+                        dismissCount++
+                        sheet.value = null
+                        sheet.value = request
+                    },
+                    onVisible = { presentationCount++ },
+                    sheets = {
+                        Box(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(320.dp)
+                                .testTag(if (sheet.value === request) "PaymentRequestSheet" else "ReceiveSheet")
+                        )
+                    },
+                    content = { Box(Modifier.fillMaxSize()) },
+                )
+            }
+        }
+        composeTestRule.onNodeWithTag("ReceiveSheet").assertIsDisplayed()
+
+        pressBack()
+        composeTestRule.waitForIdle()
+
+        composeTestRule.onNodeWithTag("PaymentRequestSheet").assertIsDisplayed()
+        assertEquals(1, dismissCount)
+        assertEquals(2, presentationCount)
+    }
+
     @Test
     fun programmaticHideDoesNotInvokeDismissalCallback() {
         val shouldExpand = mutableStateOf(true)

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

@@ -15,6 +15,7 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
+import com.synonym.paykit.PaymentRequestLifecycleState
 import kotlinx.collections.immutable.persistentListOf
 import org.junit.Rule
 import org.junit.Test
@@ -24,8 +25,10 @@ import to.bitkit.models.PubkyProfile
 import to.bitkit.models.USD_SYMBOL
 import to.bitkit.repositories.AmountInputHandler
 import to.bitkit.repositories.CurrencyState
+import to.bitkit.repositories.PaykitBillingPeriod
 import to.bitkit.repositories.PaykitPaymentRequest
 import to.bitkit.repositories.PaykitPaymentRequestDeliveryStatus
+import to.bitkit.repositories.PaykitPaymentRequestDirection
 import to.bitkit.repositories.PaykitPaymentRequestDraft
 import to.bitkit.repositories.PaykitPaymentRequestTarget
 import to.bitkit.test.annotations.ComposeUi
@@ -130,11 +133,15 @@ class CreatePaymentRequestScreenTest {
     @Test
     fun sentShowsSuccessSurface() {
         val contact = PubkyProfile.forDisplay(target.publicKey, "Anna", imageUrl = null)
-        var deliveryStatus by mutableStateOf(PaykitPaymentRequestDeliveryStatus.Queued)
+        val createdRequest = request.copy(note = null, deliveryStatus = PaykitPaymentRequestDeliveryStatus.Queued)
+        val sentRequest = createdRequest.copy(deliveryStatus = PaykitPaymentRequestDeliveryStatus.Sent)
+        val proofRequest = sentRequest.copy(lifecycleState = PaymentRequestLifecycleState.PROOF_SUBMITTED)
+        var history by mutableStateOf(persistentListOf<PaykitPaymentRequest>())
         composeTestRule.setContent {
             AppThemeSurface {
                 PaymentRequestSentContent(
-                    request = request.copy(deliveryStatus = deliveryStatus),
+                    request = createdRequest,
+                    history = history,
                     contact = contact,
                     onDone = {},
                 )
@@ -145,14 +152,65 @@ class CreatePaymentRequestScreenTest {
         composeTestRule.onNodeWithTag("PaymentRequestSentCheck").assertIsDisplayed()
         composeTestRule.onNodeWithText("PAYMENT REQUESTED").assertIsDisplayed()
         composeTestRule.onNodeWithText("Anna").assertIsDisplayed()
-        composeTestRule.onNodeWithText("Dinner").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Queued for delivery").assertIsDisplayed()
         composeTestRule.onNodeWithText("Your payment request is queued and will send automatically").assertIsDisplayed()
         composeTestRule.onNodeWithText("You have sent a payment request").assertDoesNotExist()
 
-        composeTestRule.runOnIdle { deliveryStatus = PaykitPaymentRequestDeliveryStatus.Sent }
+        composeTestRule.runOnIdle { history = persistentListOf(sentRequest) }
 
         composeTestRule.onNodeWithText("You have sent a payment request").assertIsDisplayed()
         composeTestRule.onNodeWithText("Your payment request is queued and will send automatically").assertDoesNotExist()
+        composeTestRule.onNodeWithText("Waiting for payment").assertIsDisplayed()
+
+        composeTestRule.runOnIdle { history = persistentListOf(proofRequest) }
+
+        composeTestRule.onNodeWithText("Proof submitted").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Waiting for payment").assertDoesNotExist()
+        composeTestRule.onNodeWithText("PAYMENT REQUESTED").assertIsDisplayed()
+
+        composeTestRule.runOnIdle { history = persistentListOf(proofRequest.copy(note = "Dinner")) }
+
+        composeTestRule.onNodeWithText("Dinner").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Proof submitted").assertDoesNotExist()
+
+        composeTestRule.runOnIdle { history = persistentListOf() }
+
+        composeTestRule.onNodeWithText("Queued for delivery").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Dinner").assertDoesNotExist()
+    }
+
+    @Test
+    fun sentIgnoresHistoryForOtherRequests() {
+        val createdRequest = request.copy(note = "", deliveryStatus = PaykitPaymentRequestDeliveryStatus.Queued)
+        val proofRequest = createdRequest.copy(lifecycleState = PaymentRequestLifecycleState.PROOF_SUBMITTED)
+        var history by mutableStateOf(persistentListOf<PaykitPaymentRequest>())
+        composeTestRule.setContent {
+            AppThemeSurface {
+                PaymentRequestSentContent(
+                    request = createdRequest,
+                    history = history,
+                    contact = null,
+                    onDone = {},
+                )
+            }
+        }
+
+        listOf(
+            proofRequest.copy(paymentRequestId = "another-request"),
+            proofRequest.copy(counterparty = "another-counterparty"),
+            proofRequest.copy(direction = PaykitPaymentRequestDirection.Incoming),
+            proofRequest.copy(
+                billingPeriod = PaykitBillingPeriod(
+                    startsAt = Instant.parse("2027-01-15T08:00:00Z"),
+                    endsAt = Instant.parse("2027-02-15T08:00:00Z"),
+                ),
+            ),
+        ).forEach { unrelatedRequest ->
+            composeTestRule.runOnIdle { history = persistentListOf(unrelatedRequest) }
+
+            composeTestRule.onNodeWithText("Queued for delivery").assertIsDisplayed()
+            composeTestRule.onNodeWithText("Proof submitted").assertDoesNotExist()
+        }
     }
 
     private val draft = PaykitPaymentRequestDraft(
@@ -163,18 +221,17 @@ class CreatePaymentRequestScreenTest {
 
     private val target = PaykitPaymentRequestTarget(
         publicKey = "pubky3rsduhcxpw74snwyct86m38c63j3pq8x4ycqikxg64roik8yw5xg",
-        receiverPath = "bitkit/wallet",
     )
 
     private val request = PaykitPaymentRequest(
         paymentRequestId = "payment-request",
         counterparty = target.publicKey,
-        counterpartyReceiverPath = target.receiverPath,
         amountValue = "0.00025",
         amountSats = draft.amountSats,
         note = draft.note,
         createdAt = Instant.parse("2027-01-15T08:00:00Z"),
-        expiresAt = draft.expiresAt,
+        expiresAt = Instant.DISTANT_FUTURE,
         acceptedPaymentEndpointIdentifiers = listOf("btc-lightning-bolt11"),
+        direction = PaykitPaymentRequestDirection.Outgoing,
     )
 }

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

@@ -4,8 +4,10 @@ package to.bitkit.ui.screens.paymentrequests
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertTextContains
 import androidx.compose.ui.test.assertTextEquals
@@ -40,6 +42,31 @@ class PaymentRequestsScreenTest {
     @get:Rule
     val composeTestRule = createComposeRule()
 
+    @Test
+    fun detailsDisablePayWhilePreparationIsPending() {
+        val isPreparing = mutableStateOf(false)
+        val request = request()
+        composeTestRule.setContent {
+            PaymentRequestsTestSurface {
+                IncomingPaymentRequestDetailsContent(
+                    request = request,
+                    contact = PubkyProfile.placeholder(request.counterparty),
+                    isPending = true,
+                    isPreparing = isPreparing.value,
+                    onBack = {},
+                    onPay = {},
+                    onDismiss = { Result.success(Unit) },
+                )
+            }
+        }
+
+        composeTestRule.onNodeWithTag("PaymentRequestDetailsPay").assertIsEnabled()
+        composeTestRule.runOnIdle { isPreparing.value = true }
+        composeTestRule.onNodeWithTag("PaymentRequestDetailsPay").assertIsNotEnabled()
+        composeTestRule.runOnIdle { isPreparing.value = false }
+        composeTestRule.onNodeWithTag("PaymentRequestDetailsPay").assertIsEnabled()
+    }
+
     @Test
     fun queueShowsIncomingRequestAndSeeAllAction() {
         val request = request(id = "incoming")
@@ -289,7 +316,6 @@ class PaymentRequestsScreenTest {
     private fun request(id: String = "request") = PaykitPaymentRequest(
         paymentRequestId = id,
         counterparty = "pubky3rsduhcxpw74snwyct86m38c63j3pq8x4ycqikxg64roik8yw5xg",
-        counterpartyReceiverPath = "bitkit/wallet",
         amountValue = "0.00025",
         amountSats = 25_000uL,
         note = "Dinner",
@@ -301,7 +327,6 @@ class PaymentRequestsScreenTest {
     private fun subscription(note: String) = PaykitSubscription(
         paymentRequestId = "subscription",
         counterparty = request().counterparty,
-        counterpartyReceiverPath = "bitkit/wallet",
         amountValue = "0.00025",
         amountSats = 25_000uL,
         note = note,

app/src/androidTest/java/to/bitkit/ui/screens/subscriptions/CreateSubscriptionScreenTest.kt

@@ -93,7 +93,7 @@ class CreateSubscriptionScreenTest {
 
     @Test
     fun recipientAllowsExactlyOneSelectionAndChangesExpiry() {
-        val second = PaykitPaymentRequestTarget("pubky" + "z".repeat(52), "bitkit/wallet")
+        val second = PaykitPaymentRequestTarget("pubky" + "z".repeat(52))
         var selected by mutableStateOf<PaykitPaymentRequestTarget?>(null)
         var expiration by mutableStateOf(PaymentRequestExpiration.Week)
         var proposedTo: PaykitPaymentRequestTarget? = null
@@ -158,13 +158,12 @@ class CreateSubscriptionScreenTest {
         composeTestRule.onNodeWithText("OK").assertIsDisplayed()
     }
 
-    private val target = PaykitPaymentRequestTarget("pubky" + "y".repeat(52), "bitkit/wallet")
+    private val target = PaykitPaymentRequestTarget("pubky" + "y".repeat(52))
     private val contact = PubkyProfile.forDisplay(target.publicKey, "Anna", null)
     private val startsAt = Instant.parse("2027-01-15T08:00:00Z")
     private val subscription = PaykitSubscription(
         paymentRequestId = "creator-proposal",
         counterparty = target.publicKey,
-        counterpartyReceiverPath = target.receiverPath,
         amountValue = "0.00001",
         amountSats = 1000uL,
         note = "Support",