WIP

Author: robbiehanson

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

@@ -800,7 +800,7 @@ class BusinessManager {
 				do {
 					try await peer.payUnsolicitedInvoice(invoice: cardRequest.invoice)
 				} catch {
-					log.error("peer.payOffer(): error: \(error)")
+					log.error("peer.payUnsolicitedInvoice(): error: \(error)")
 				}
 			}
 		}

phoenix-ios/phoenix-ios/views/receive/LightningDualView.swift

@@ -1518,7 +1518,7 @@ struct LightningDualView: View {
 		Task { @MainActor in
 			do {
 				let tuple: KotlinPair<Lightning_kmpBolt12Invoice, Bitcoin_kmpByteVector32> =
-					try await peer.requestCardPayment2(
+					try await peer.requestCardPayment(
 						amount: msat,
 						cardHolderOffer: bolt12Offer.offer,
 						cardParams: cardParams

phoenix-ios/phoenix-notifySrvExt/NotificationService.swift

@@ -562,24 +562,17 @@ class NotificationService: UNNotificationServiceExtension {
 				}
 
 				// Send the payment
-				let paymentId = Lightning_kmpUUID.companion.randomUUID()
-//				do {
-//					try await peer.betterPayOffer(
-//						paymentId: paymentId,
-//						amount: cardRequest.amount,
-//						offer: cardRequest.offer,
-//						payerKey: Lightning_randomKey(),
-//						payerNote: nil,
-//						fetchInvoiceTimeoutInSeconds: 30
-//					)
-//				} catch {
-//					log.error("peer.betterPayOffer(): error: \(error)")
-//				}
+				do {
+					try await peer.payUnsolicitedInvoice(invoice: cardRequest.invoice)
+				} 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.id == paymentId {
+						if lnPayment.details.paymentHash == cardRequest.invoice.paymentHash {
 							self.sentPayment = lnPayment
 							log.debug("sentPayment = \(lnPayment)")
 
@@ -638,14 +631,14 @@ class NotificationService: UNNotificationServiceExtension {
 				updateBestAttemptContent_unknown()
 			}
 
-			case .pendingSettlement:
-				updateBestAttemptContent_incomingPayment()
-			
-			case .withdrawRequest:
-				updateBestAttemptContent_outgoingPayment()
-			
-			case .unknown:
-				updateBestAttemptContent_incomingPayment()
+		case .pendingSettlement:
+			updateBestAttemptContent_incomingPayment()
+		
+		case .withdrawRequest:
+			updateBestAttemptContent_outgoingPayment()
+		
+		case .unknown:
+			updateBestAttemptContent_incomingPayment()
 		}
 
 		contentHandler(bestAttemptContent)