feat(receive): add logic for additional CJIT (#145)

Author: pwltr

Bitkit/ViewModels/WalletViewModel.swift

@@ -422,7 +422,7 @@ class WalletViewModel: ObservableObject {
         }
     }
 
-    var incomingLightningCapacitySats: UInt64? {
+    var totalInboundLightningSats: UInt64? {
         guard let channels else {
             return nil
         }

Bitkit/Views/Settings/Advanced/LightningConnectionsView.swift

@@ -241,7 +241,7 @@ struct LightningConnectionsView: View {
     }
 
     private var receivingCapacity: UInt64 {
-        wallet.incomingLightningCapacitySats ?? 0
+        wallet.totalInboundLightningSats ?? 0
     }
 
     private var pendingChannels: [ChannelDetails] {

Bitkit/Views/Wallets/Receive/ReceiveCjitAmount.swift

@@ -67,19 +67,8 @@ struct ReceiveCjitAmount: View {
             Spacer()
 
             CustomButton(title: t("common__continue"), isDisabled: amountSats < minimumAmount) {
-                // Wait until node is running if it's in starting state
-                if await wallet.waitForNodeToRun() {
-                    // Only proceed if node is running
-                    do {
-                        let entry = try await blocktank.createCjit(amountSats: amountSats, description: "Bitkit")
-                        navigationPath.append(.cjitConfirm(entry: entry, receiveAmountSats: amountSats))
-                    } catch {
-                        app.toast(error)
-                        Logger.error(error)
-                    }
-                } else {
-                    // Show error if node is not running or timed out
-                    app.toast(type: .warning, title: "Lightning not ready", description: "Lightning node must be running to create an invoice")
+                Task {
+                    await onContinue()
                 }
             }
         }
@@ -90,4 +79,21 @@ struct ReceiveCjitAmount: View {
             try? await blocktank.refreshMinCjitSats()
         }
     }
+
+    private func onContinue() async {
+        // Wait until node is running if it's in starting state
+        if await wallet.waitForNodeToRun() {
+            // Only proceed if node is running
+            do {
+                let entry = try await blocktank.createCjit(amountSats: amountSats, description: "Bitkit")
+                navigationPath.append(.cjitConfirm(entry: entry, receiveAmountSats: amountSats, isAdditional: false))
+            } catch {
+                app.toast(error)
+                Logger.error(error)
+            }
+        } else {
+            // Show error if node is not running or timed out
+            app.toast(type: .warning, title: "Lightning not ready", description: "Lightning node must be running to create an invoice")
+        }
+    }
 }

Bitkit/Views/Wallets/Receive/ReceiveCjitConfirmation.swift

@@ -5,6 +5,7 @@ struct ReceiveCjitConfirmation: View {
     @Binding var navigationPath: [ReceiveRoute]
     let entry: IcJitEntry
     let receiveAmountSats: UInt64
+    let isAdditional: Bool
 
     @EnvironmentObject private var currency: CurrencyViewModel
 
@@ -36,7 +37,7 @@ struct ReceiveCjitConfirmation: View {
 
                 BodyMText(
                     t(
-                        "wallet__receive_connect_initial",
+                        isAdditional ? "wallet__receive_connect_additional" : "wallet__receive_connect_initial",
                         variables: [
                             "networkFee": formattedNetworkFee(),
                             "serviceFee": formattedServiceFee(),
@@ -64,7 +65,7 @@ struct ReceiveCjitConfirmation: View {
 
             HStack(spacing: 16) {
                 CustomButton(title: t("common__learn_more"), variant: .secondary) {
-                    navigationPath.append(.cjitLearnMore(entry: entry, receiveAmountSats: receiveAmountSats))
+                    navigationPath.append(.cjitLearnMore(entry: entry, receiveAmountSats: receiveAmountSats, isAdditional: isAdditional))
                 }
 
                 CustomButton(title: t("common__continue")) {

Bitkit/Views/Wallets/Receive/ReceiveCjitLearnMore.swift

@@ -4,12 +4,10 @@ import SwiftUI
 struct ReceiveCjitLearnMore: View {
     let entry: IcJitEntry
     let receiveAmountSats: UInt64
+    let isAdditional: Bool
 
     @Environment(\.dismiss) var dismiss
 
-    // TODO: check if additional CJIT
-    let isAdditional = false
-
     var text: String {
         isAdditional
             ? t("wallet__receive_liquidity__text_additional")

Bitkit/Views/Wallets/Receive/ReceiveEdit.swift

@@ -2,7 +2,9 @@ import SwiftUI
 
 struct ReceiveEdit: View {
     @EnvironmentObject private var app: AppViewModel
+    @EnvironmentObject private var blocktank: BlocktankViewModel
     @EnvironmentObject private var currency: CurrencyViewModel
+    @EnvironmentObject private var transfer: TransferViewModel
     @EnvironmentObject private var wallet: WalletViewModel
     @Environment(\.dismiss) private var dismiss
 
@@ -13,6 +15,10 @@ struct ReceiveEdit: View {
     @State private var isAmountInputFocused: Bool = false
     @FocusState private var isNoteEditorFocused: Bool
 
+    var amountSats: UInt64 {
+        amountViewModel.amountSats
+    }
+
     var body: some View {
         VStack(spacing: 0) {
             SheetHeader(title: t("wallet__receive_specify"))
@@ -122,10 +128,17 @@ struct ReceiveEdit: View {
         // Wait until node is running if it's in starting state
         if await wallet.waitForNodeToRun() {
             do {
-                wallet.invoiceAmountSats = amountViewModel.amountSats
+                wallet.invoiceAmountSats = amountSats
                 wallet.invoiceNote = note
                 try await wallet.refreshBip21(forceRefreshBolt11: true)
-                dismiss()
+
+                // Check if CJIT flow should be shown
+                if needsAdditionalCjit() {
+                    let entry = try await blocktank.createCjit(amountSats: amountSats, description: note)
+                    navigationPath.append(.cjitConfirm(entry: entry, receiveAmountSats: amountSats, isAdditional: true))
+                } else {
+                    dismiss()
+                }
             } catch {
                 app.toast(error)
             }
@@ -139,6 +152,34 @@ struct ReceiveEdit: View {
         }
     }
 
+    private func needsAdditionalCjit() -> Bool {
+        let isGeoBlocked = app.isGeoBlocked ?? false
+        let minimumAmount = blocktank.minCjitSats ?? 0
+        let inboundCapacity = wallet.totalInboundLightningSats ?? 0
+        let invoiceAmount = amountViewModel.amountSats
+
+        // Calculate maxClientBalance using TransferViewModel
+        let maxChannelSize = blocktank.info?.options.maxChannelSizeSat ?? 0
+        let maxClientBalance = transfer.getMaxClientBalance(maxChannelSize: UInt64(maxChannelSize))
+
+        if
+            // user is geo-blocked
+            isGeoBlocked ||
+            // failed to get minimum amount
+            minimumAmount == 0 ||
+            // amount is less than minimum CJIT amount
+            invoiceAmount < minimumAmount ||
+            // there is enough inbound capacity
+            invoiceAmount <= inboundCapacity ||
+            // amount is above the maximum client balance
+            invoiceAmount > maxClientBalance
+        {
+            return false
+        }
+
+        return true
+    }
+
     @ViewBuilder
     private var numberPadButtons: some View {
         HStack(alignment: .bottom) {

Bitkit/Views/Wallets/Receive/ReceiveSheet.swift

@@ -6,8 +6,8 @@ enum ReceiveRoute: Hashable {
     case edit
     case tag
     case cjitAmount
-    case cjitLearnMore(entry: IcJitEntry, receiveAmountSats: UInt64)
-    case cjitConfirm(entry: IcJitEntry, receiveAmountSats: UInt64)
+    case cjitConfirm(entry: IcJitEntry, receiveAmountSats: UInt64, isAdditional: Bool)
+    case cjitLearnMore(entry: IcJitEntry, receiveAmountSats: UInt64, isAdditional: Bool)
 }
 
 struct ReceiveConfig {
@@ -62,10 +62,10 @@ struct ReceiveSheet: View {
             ReceiveTag(navigationPath: $navigationPath)
         case .cjitAmount:
             ReceiveCjitAmount(navigationPath: $navigationPath)
-        case let .cjitLearnMore(entry, receiveAmountSats):
-            ReceiveCjitLearnMore(entry: entry, receiveAmountSats: receiveAmountSats)
-        case let .cjitConfirm(entry, receiveAmountSats):
-            ReceiveCjitConfirmation(navigationPath: $navigationPath, entry: entry, receiveAmountSats: receiveAmountSats)
+        case let .cjitConfirm(entry, receiveAmountSats, isAdditional):
+            ReceiveCjitConfirmation(navigationPath: $navigationPath, entry: entry, receiveAmountSats: receiveAmountSats, isAdditional: isAdditional)
+        case let .cjitLearnMore(entry, receiveAmountSats, isAdditional):
+            ReceiveCjitLearnMore(entry: entry, receiveAmountSats: receiveAmountSats, isAdditional: isAdditional)
         }
     }
 }