Bug fix: Outgoing payments are properly linked with the associated card again

Author: robbiehanson

phoenix-ios/phoenix-ios/officers/BusinessManager.swift

@@ -789,16 +789,14 @@ class BusinessManager {
 			case .abortHandledElsewhere(_):
 				log.warning("handleCardReqeust: abort: handled elsewhere")
 
-			case .continueAndSendPayment(_, _, _):
+			case .continueAndSendPayment(let card, _, _):
 				log.debug("handleCardReqeust: continue: send payment")
 
-				guard let peer = business.peerManager.peerStateValue() else {
-					log.error("handleCardReqeust: peer is nil")
-					return
-				}
-				
 				do {
-					try await peer.payUnsolicitedInvoice(invoice: cardRequest.invoice)
+					try await business.sendManager.payUnsolicitedInvoice(
+						invoice: cardRequest.invoice,
+						metadata: WalletPaymentMetadata.withCard(card.id)
+					)
 				} catch {
 					log.error("peer.payUnsolicitedInvoice(): error: \(error)")
 				}

phoenix-ios/phoenix-notifySrvExt/NotificationService.swift

@@ -553,23 +553,20 @@ class NotificationService: UNNotificationServiceExtension {
 			case .abortHandledElsewhere(_):
 				log.warning("handleCardReqeust: abort: handled elsewhere")
 
-			case .continueAndSendPayment(_, _, _):
+			case .continueAndSendPayment(let card, _, _):
 				log.debug("handleCardReqeust: continue: send payment")
 
-				guard let peer = business.peerManager.peerStateValue() else {
-					log.error("handleCardReqeust: peer is nil")
-					return
-				}
-				
 				// Send the payment
 				do {
-					try await peer.payUnsolicitedInvoice(invoice: cardRequest.invoice)
+					try await business.sendManager.payUnsolicitedInvoice(
+						invoice: cardRequest.invoice,
+						metadata: WalletPaymentMetadata.withCard(card.id)
+					)
 				} catch {
 					log.error("peer.payUnsolicitedInvoice(): error: \(error)")
 				}
 
 				// Wait for the outgoing payment to complete
-				let paymentHash = cardRequest.invoice.paymentHash
 				business.paymentsManager.lastCompletedPaymentPublisher().sink { payment in
 					if let lnPayment = payment as? Lightning_kmpLightningOutgoingPayment {
 						if lnPayment.details.paymentHash == cardRequest.invoice.paymentHash {

phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/managers/SendManager.kt

@@ -9,6 +9,7 @@ import fr.acinq.lightning.MilliSatoshi
 import fr.acinq.lightning.TrampolineFees
 import fr.acinq.lightning.db.LightningOutgoingPayment
 import fr.acinq.lightning.io.PayInvoice
+import fr.acinq.lightning.io.SendPaymentResult
 import fr.acinq.lightning.logging.LoggerFactory
 import fr.acinq.lightning.logging.debug
 import fr.acinq.lightning.logging.error
@@ -477,6 +478,21 @@ class SendManager(
         )
     }
 
+    suspend fun payUnsolicitedInvoice(
+        invoice: Bolt12Invoice,
+        metadata: WalletPaymentMetadata?
+    ): SendPaymentResult {
+        val paymentId: UUID = UUID.randomUUID()
+        val peer = peerManager.getPeer()
+
+        // save card metadata if any
+        metadata?.let { row ->
+            databaseManager.metadataQueue.enqueue(row = row, id = paymentId)
+        }
+
+        return peer.payUnsolicitedInvoice(invoice, paymentId)
+    }
+
     /**
      * Step 1 of 2:
      * First call this function to convert the LnurlPay.Intent into a LnurlPay.Invoice.