fix: harden Paykit request handling

Author: ben-kaufman

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -781,7 +781,6 @@ class PrivatePaykitRepo @Inject constructor(
 val linkableReceiverPaths = receiverPathSelection.linkableReceiverPaths
 val publicationReceiverPaths = receiverPathSelection.publishableReceiverPaths
  receiverPathSelection.error?.let {
- firstError = firstError ?: it
  logPrivateReceiverPathSelectionFailure(publicKey, reason, it)
  }
 val cleanupReceiverPaths = receiverPathsForPrivateEndpointCleanup(

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -2337,18 +2337,27 @@ class AppViewModel @Inject constructor(
  action()
  }
 
-funclearActiveContactPaymentContext() {
+funclearActiveContactPaymentContext(retryIncomingRequest:Boolean = true) {
 val interruptedRequest = synchronized(contactPaymentContextLock) {
 val request = activeContactPaymentContext?.incomingPaymentRequest
  activeContactPaymentContext =null
  request
  }
+if (interruptedRequest ==null) return
+
+if (!retryIncomingRequest) {
+ paymentRequestPresentationGeneration++
+if (requestedPaymentRequestId == interruptedRequest.id) {
+ requestedPaymentRequestId =null
+ }
+ clearPaymentRequestPresentationRetry(interruptedRequest.id)
+ viewModelScope.launch { paykitPaymentRequestRepo.markPresented(interruptedRequest) }
+return
+ }
+
 if (
- interruptedRequest !=null&&
- (
- requestedPaymentRequestId == interruptedRequest.id ||
- paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
- )
+ requestedPaymentRequestId == interruptedRequest.id ||
+ paykitPaymentRequestRepo.automaticPendingRequests().any { it.id == interruptedRequest.id }
  ) {
  deferPaymentRequestPresentation(interruptedRequest)
  }
@@ -2472,7 +2481,7 @@ class AppViewModel @Inject constructor(
  formatMoneyValue(shortfall),
  ),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
 return
  }
 
@@ -2573,7 +2582,6 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(amount)) {
- hideSheet()
 val maxSendLightning = walletRepo.balanceState.value.maxSendLightningSats
 val shortfall = amount.safe() - maxSendLightning.safe()
  toast(
@@ -2583,7 +2591,8 @@ class AppViewModel @Inject constructor(
  .replace("{amount}", formatMoneyValue(shortfall)),
  testTag ="InsufficientSpendingToast",
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 
@@ -2627,13 +2636,13 @@ class AppViewModel @Inject constructor(
 
  lightningRepo.waitForUsableChannels()
 if (!lightningRepo.canSend(paymentAmount.coerceAtLeast(1u))) {
- hideSheet()
  toast(
  type =Toast.ToastType.WARNING,
  title = context.getString(R.string.other__lnurl_pay_error),
  description = context.getString(R.string.other__lnurl_pay_error_no_capacity),
  )
- clearActiveContactPaymentContext()
+ clearActiveContactPaymentContext(retryIncomingRequest =false)
+ hideSheet()
 return
  }
 

app/src/test/java/to/bitkit/repositories/PrivatePaykitRepoTest.kt

@@ -455,7 +455,7 @@ class PrivatePaykitRepoTest : BaseUnitTest(StandardTestDispatcher()) {
 
  sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
  clearInvocations(paykitSdkService)
-val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =false)
+val result = sut.prepareSavedContacts(listOf(CONTACT_KEY), requireImmediatePublication =true)
 
  assertTrue(result.isSuccess, result.exceptionOrNull().toString())
 val captor = argumentCaptor<List<PrivatePaymentListReservationUpdateInput>>()

app/src/test/java/to/bitkit/viewmodels/AppViewModelSendFlowTest.kt

@@ -511,6 +511,37 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  verify(privatePaykitRepo, times(2)).beginPaymentRequest(request)
  }
 
+ @Test
+fun`unaffordable request releases manual presentation state`() = test {
+val request = paymentRequest()
+ whenever { paykitPaymentRequestRepo.reject(request) }.thenReturn(Result.success(Unit))
+ pendingPaykitPaymentRequests.value =listOf(request)
+ surfacedPaykitPaymentRequestIds += request.id
+ setActiveContactPaymentContext(
+ publicKey = testPublicKey,
+ privatePaymentContext =PrivatePaykitPaymentContext("bitkit/server", 7uL),
+ incomingPaymentRequest = request,
+ )
+ setRequestedPaymentRequestId(request.id)
+
+ sut.clearActiveContactPaymentContext(retryIncomingRequest =false)
+ runCurrent()
+
+ assertNull(activeContactPaymentContext())
+ verify(paykitPaymentRequestRepo).markPresented(request)
+
+val result = sut.rejectIncomingPaymentRequest(request)
+
+ assertTrue(result.isSuccess, result.exceptionOrNull().toString())
+ verify(paykitPaymentRequestRepo).reject(request)
+ verify(paykitPaymentRequestRepo, never()).accept(any())
+ verify(privatePaykitRepo, never()).consumePrivatePaymentList(any(), any())
+
+ advanceTimeBy(30.seconds.inWholeMilliseconds)
+ runCurrent()
+ verify(privatePaykitRepo, never()).beginPaymentRequest(request)
+ }
+
  @Test
 fun`failed manual request presentation returns to the request queue`() = test {
  sut.setIsAuthenticated(true)
@@ -3684,6 +3715,12 @@ class AppViewModelSendFlowTest : BaseUnitTest() {
  field.set(sut, ContactPaymentContext(publicKey, privatePaymentContext, incomingPaymentRequest))
  }
 
+privatefunsetRequestedPaymentRequestId(id:PaykitPaymentRequestId?) {
+val field =AppViewModel::class.java.getDeclaredField("requestedPaymentRequestId")
+ field.isAccessible =true
+ field.set(sut, id)
+ }
+
 privatefunactiveContactPaymentContext(): ContactPaymentContext? {
 val field =AppViewModel::class.java.getDeclaredField("activeContactPaymentContext")
  field.isAccessible =true