fix: nodeidview delete seed

reez · Sep 18, 2024 · a99b598 · a99b598
1 parent 52fad75
commit a99b598
Show file tree

Hide file tree

Showing 21 changed files with 408 additions and 390 deletions.
diff --git a/LDKNodeMonday/App/LDKNodeMondayApp.swift b/LDKNodeMonday/App/LDKNodeMondayApp.swift
@@ -11,13 +11,19 @@ import SwiftUI
 struct LDKNodeMondayApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @AppStorage("isOnboarding") var isOnboarding: Bool = true
+    @State private var navigationPath = NavigationPath()
 
     var body: some Scene {
         WindowGroup {
-            if isOnboarding {
-                OnboardingView(viewModel: .init())
-            } else {
-                StartView(viewModel: .init())
+            NavigationStack(path: $navigationPath) {
+                if isOnboarding {
+                    OnboardingView(viewModel: .init())
+                } else {
+                    StartView(viewModel: .init())
+                }
+            }
+            .onChange(of: isOnboarding) { oldValue, newValue in
+                navigationPath = NavigationPath()
             }
         }
     }

diff --git a/LDKNodeMonday/Extensions/PaymentKind+Extensions.swift b/LDKNodeMonday/Extensions/PaymentKind+Extensions.swift
@@ -18,9 +18,9 @@ extension PaymentKind {
             return preimage
         case .spontaneous(_, let preimage):
             return preimage
-        case .bolt12Offer(hash: _, let preimage, secret: _, offerId: _):
+        case .bolt12Offer(hash: _, let preimage, secret: _, offerId: _, payerNote: _, quantity: _):
             return preimage
-        case .bolt12Refund(hash: _, let preimage, secret: _):
+        case .bolt12Refund(hash: _, let preimage, secret: _, payerNote: _, quantity: _):
             return preimage
         }
     }

diff --git a/LDKNodeMonday/Service/Lightning Service/LightningServiceError.swift b/LDKNodeMonday/Service/Lightning Service/LightningServiceError.swift
@@ -161,6 +161,9 @@ func handleNodeError(_ error: NodeError) -> MondayError {
     case .InvalidUri(let message):
         return .init(title: "InvalidUri", detail: message)
 
+    case .InvalidQuantity(let message):
+        return .init(title: "InvalidQuantity", detail: message)
+
     }
 
 }
diff --git a/LDKNodeMonday/View Model/Profile/Channel/ChannelAddViewModel.swift b/LDKNodeMonday/View Model/Profile/Channel/ChannelAddViewModel.swift
@@ -16,15 +16,14 @@ class ChannelAddViewModel: ObservableObject {
     @Published var nodeId: PublicKey = ""
     @Published var isOpenChannelFinished: Bool = false
     @Published var isProgressViewShowing: Bool = false
-    private let channelConfig = ChannelConfig()
-
-    init() {
-        self.channelConfig.setForwardingFeeProportionalMillionths(value: UInt32(0))
-        self.channelConfig.setForwardingFeeBaseMsat(feeMsat: UInt32(1000))
-        self.channelConfig.setCltvExpiryDelta(value: UInt16(72))
-        self.channelConfig.setMaxDustHtlcExposureFromFixedLimit(limitMsat: UInt64(50_000_000))
-        self.channelConfig.setForceCloseAvoidanceMaxFeeSatoshis(valueSat: UInt64(1000))
-    }
+    private let channelConfig = ChannelConfig(
+        forwardingFeeProportionalMillionths: UInt32(0),
+        forwardingFeeBaseMsat: UInt32(1000),
+        cltvExpiryDelta: UInt16(72),
+        maxDustHtlcExposure: .feeRateMultiplier(multiplier: UInt64(50_000_000)),
+        forceCloseAvoidanceMaxFeeSatoshis: UInt64(1000),
+        acceptUnderpayingHtlcs: false
+    )
 
     func openChannel(
         nodeId: PublicKey,