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/screens/paymentrequests/CreatePaymentRequestScreenTest.kt

@@ -163,13 +163,11 @@ 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,

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",

app/src/androidTest/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreenTest.kt

@@ -1,39 +1,159 @@
+@file:OptIn(ExperimentalTime::class)
+
 package to.bitkit.ui.screens.wallets.send
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.getUnclippedBoundsInRoot
 import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipeRight
 import androidx.compose.ui.test.swipeUp
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import to.bitkit.models.FeeRate
 import to.bitkit.models.PubkyProfile
+import to.bitkit.repositories.PaykitPaymentRequest
 import to.bitkit.test.annotations.ComposeUi
+import to.bitkit.ui.components.Sheet
+import to.bitkit.ui.components.SheetHost
+import to.bitkit.ui.shared.modifiers.sheetHeight
+import to.bitkit.ui.sheets.SendRoute
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.viewmodels.OnchainFeeUi
 import to.bitkit.viewmodels.SendMethod
 import to.bitkit.viewmodels.SendUiState
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import kotlin.time.ExperimentalTime
 
+@HiltAndroidTest
 @ComposeUi
+@OptIn(ExperimentalMaterial3Api::class)
 class SendConfirmScreenTest {
+    @get:Rule
+    val hiltRule = HiltAndroidRule(this)
+
     @get:Rule
     val composeTestRule = createComposeRule()
 
+    @Before
+    fun setup() {
+        hiltRule.inject()
+    }
+
+    @Test
+    fun preparingRequestShowsSavedMetadataUntilConfirmationIsReady() {
+        val request = PaykitPaymentRequest(
+            paymentRequestId = "preparing",
+            counterparty = "requester",
+            amountValue = "5000",
+            amountSats = 5_000u,
+            note = "Dinner",
+            expiresAt = null,
+            acceptedPaymentEndpointIdentifiers = listOf("bitcoin"),
+        )
+        val contact = PubkyProfile.placeholder(request.counterparty).copy(name = "Coffee House")
+        val preparation = mutableStateOf<PaykitPaymentRequest?>(request)
+        val state = mutableStateOf(
+            SendUiState(
+                amount = 99_000u,
+                isAmountInputValid = true,
+                payMethod = SendMethod.LIGHTNING,
+                isInitialSubscriptionPayment = true,
+                initialSubscriptionPaymentAutoStartPending = true,
+                paymentRequestNote = "Stale note",
+            ),
+        )
+        var paymentAttempts = 0
+        var dismissCount = 0
+        var visibleCount = 0
+        lateinit var sheetState: SheetState
+        composeTestRule.setContent {
+            AppThemeSurface {
+                CompositionLocalProvider(LocalInspectionMode provides true) {
+                    sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+                    SheetHost(
+                        shouldExpand = true,
+                        visibilityKey = Sheet.Send(SendRoute.Confirm, preparingRequest = preparation.value),
+                        onVisible = { visibleCount++ },
+                        onDismiss = { dismissCount++ },
+                        sheetState = sheetState,
+                        sheets = {
+                            SendConfirmContent(
+                                uiState = state.value,
+                                isNodeRunning = preparation.value == null,
+                                isLoading = false,
+                                showBiometrics = false,
+                                preparingRequest = preparation.value,
+                                preparingContact = contact,
+                                onSwipeToConfirm = { paymentAttempts++ },
+                                modifier = Modifier.sheetHeight()
+                            )
+                        },
+                        content = { Box(Modifier.fillMaxSize()) },
+                    )
+                }
+            }
+        }
+
+        composeTestRule.onNodeWithTag("PaymentRequestConfirm").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestFrom").assertTextEquals("Coffee House")
+        composeTestRule.onNodeWithTag("PaymentRequestFor").assertTextEquals("Dinner")
+        composeTestRule.onNodeWithTag("PaymentRequestPreparing").assertIsDisplayed().assertIsNotEnabled()
+        composeTestRule.onNodeWithTag("SendConfirmToggleDetails").assertDoesNotExist()
+        composeTestRule.onNodeWithText("Stale note").assertDoesNotExist()
+        composeTestRule.onNodeWithTag("PaymentRequestPreparing").performTouchInput { swipeRight() }
+        composeTestRule.runOnIdle {
+            assertEquals(0, paymentAttempts)
+            assertEquals(SheetValue.Expanded, sheetState.currentValue)
+            assertEquals(1, visibleCount)
+            state.value = SendUiState(
+                amount = request.amountSats,
+                isPaymentRequest = true,
+                isAmountInputValid = true,
+                contactPaymentProfile = contact,
+                paymentRequestNote = request.note,
+                incomingPaymentRequestId = request.id,
+            )
+            preparation.value = null
+        }
+
+        composeTestRule.onNodeWithTag("PaymentRequestPreparing").assertDoesNotExist()
+        composeTestRule.onNodeWithTag("PaymentRequestConfirm").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestFrom").assertTextEquals("Coffee House")
+        composeTestRule.onNodeWithTag("PaymentRequestFor").assertTextEquals("Dinner")
+        composeTestRule.onNodeWithTag("GRAB").assertIsDisplayed()
+        composeTestRule.runOnIdle {
+            assertEquals(SheetValue.Expanded, sheetState.currentValue)
+            assertEquals(SheetValue.Expanded, sheetState.targetValue)
+            assertEquals(2, visibleCount)
+            assertEquals(0, dismissCount)
+        }
+    }
+
     @Test
     fun initialOnchainSubscriptionShowsFeeBeforeConfirmation() {
         val state = SendUiState(

app/src/main/java/to/bitkit/data/CacheStore.kt

@@ -59,6 +59,14 @@ class CacheStore internal constructor(
         store.updateData { it.copy(onchainAddress = address) }
     }
 
+    suspend fun setActivityContactDetached(activityId: String, walletId: String, detached: Boolean) {
+        val id = scopedActivityId(walletId, activityId)
+        store.updateData {
+            val contacts = it.detachedActivityContacts
+            it.copy(detachedActivityContacts = if (detached) contacts + id else contacts - id)
+        }
+    }
+
     suspend fun saveBolt11(bolt11: String, paymentHash: String) {
         store.updateData { it.copy(bolt11 = bolt11, bolt11PaymentHash = paymentHash) }
     }
@@ -171,6 +179,7 @@ data class AppCacheData(
     val balance: BalanceState? = null,
     val backupStatuses: Map<BackupCategory, BackupItemStatus> = mapOf(),
     val deletedActivities: List<String> = listOf(),
+    val detachedActivityContacts: Set<String> = emptySet(),
     val pendingBoostActivities: List<PendingBoostActivity> = listOf(),
     val backgroundReceive: NewTransactionSheetDetails? = null,
     val addressSearchLastUsedReceiveIndexes: Map<String, Int> = mapOf(),
@@ -180,6 +189,9 @@ data class AppCacheData(
     /** LNURL-pay comments by payment hash, kept until the sent payment's activity stores them. */
     val pendingLightningMessages: Map<String, String> = mapOf(),
 ) {
+    fun isContactDetached(activityId: String, walletId: String): Boolean =
+        scopedActivityId(walletId, activityId) in detachedActivityContacts
+
     fun isActivityDeleted(activityId: String, walletId: String): Boolean =
         scopedActivityId(walletId, activityId) in deletedActivities ||
             walletId == WalletScope.default && activityId in deletedActivities

app/src/main/java/to/bitkit/data/PrivatePaykitStores.kt

@@ -68,10 +68,10 @@ data class PrivatePaykitCacheData(
 @Serializable
 data class PrivatePaykitContactCacheData(
     val remoteEndpoints: List<PrivatePaykitStoredPaymentEntryData> = emptyList(),
-    val consumedPrivatePaymentListVersionsByReceiverPath: Map<String, ULong> = emptyMap(),
-    val localInvoicesByReceiverPath: Map<String, PrivatePaykitStoredInvoiceData> = emptyMap(),
+    val consumedPrivatePaymentListVersion: ULong? = null,
+    val localInvoice: PrivatePaykitStoredInvoiceData? = null,
     val receivedInvoicePaymentHashes: List<String> = emptyList(),
-    val publishedPrivatePaymentReceiverPaths: Set<String> = emptySet(),
+    val hasPublishedPrivatePaymentList: Boolean = false,
 )
 
 @Serializable

app/src/main/java/to/bitkit/data/keychain/Keychain.kt

@@ -232,10 +232,11 @@ class Keychain @Inject constructor(
         PIN,
         PIN_ATTEMPTS_REMAINING,
         PAYKIT_SESSION,
-        PAYKIT_RECEIVER_NOISE_SECRET_KEY,
-        PAYKIT_SDK_STATE,
+        PAYKIT_KEY_GENERATION,
+        PAYKIT_RECOVERY_BACKUP,
         PAYKIT_PENDING_BACKUP_RESTORE,
         PAYKIT_PENDING_PAYMENT_PROOFS,
+        PAYKIT_ACCEPTED_PAYMENT_REQUESTS,
         PAYKIT_PRESENTED_PAYMENT_REQUESTS,
         PUBKY_SECRET_KEY,
         SHARED_PUBKY_SOURCE,

app/src/main/java/to/bitkit/di/EnvModule.kt

@@ -13,6 +13,7 @@ import java.util.Locale
 import javax.inject.Qualifier
 import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
+import kotlin.time.TimeSource
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -25,6 +26,9 @@ object EnvModule {
     @Provides
     fun provideClock(): Clock = Clock.System
 
+    @Provides
+    fun provideTimeSource(): TimeSource = TimeSource.Monotonic
+
     @Provides
     @SubscriptionClock
     fun provideSubscriptionClock(clock: Clock): Clock = SubscriptionClockOffset.subscriptionClock(clock)

app/src/main/java/to/bitkit/ext/PaykitExceptionExt.kt

@@ -7,3 +7,9 @@ fun Throwable.isPaykitIdentityError(): Boolean =
 
 fun Throwable.isPaykitRecoveryRequired(): Boolean =
     generateSequence(this) { it.cause }.any { it is PaykitException.RecoveryRequired }
+
+fun Throwable.isPaykitTemporarilyUnavailable(): Boolean =
+    generateSequence(this) { it.cause }.any {
+        it is PaykitException.ConcurrentUpdate || it is PaykitException.SharedStateBusy ||
+            it is PaykitException.Transport
+    }