Merge pull request #266 from synonymdev/test/lnurl

Test/lnurl

Author: ovitrif

.github/workflows/e2e-tests.yml

@@ -108,7 +108,7 @@ jobs:
           # - { name: onchain_boost_receive_widgets, grep: "@onchain|@boost|@receive|@widgets" }
           # - { name: settings, grep: "@settings" }
           # - { name: security, grep: "@security" }
-          - { name: e2e, grep: '@lightning|@backup|@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security' }
+          - { name: e2e, grep: '@lnurl|@lightning|@backup|@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security' }
 
     name: e2e-tests - ${{ matrix.shard.name }}
 

Bitkit/Components/NumberPadTextField.swift

@@ -7,6 +7,7 @@ struct NumberPadTextField: View {
 
     var showConversion: Bool = true
     var isFocused: Bool = true
+    var testIdentifier: String?
 
     private let springAnimation = Animation.spring(response: 0.3, dampingFraction: 0.8)
 
@@ -86,6 +87,7 @@ struct NumberPadTextField: View {
                 + Text(viewModel.getPlaceholder(currency: currency))
                 .foregroundColor(isFocused ? .textSecondary : .textPrimary))
                 .font(.custom(Fonts.black, size: 44))
+                .accessibilityIdentifierIfPresent(testIdentifier)
         }
     }
 }

Bitkit/Components/TextField.swift

@@ -6,6 +6,7 @@ struct TextField: View {
     let font: Font
     let axis: Axis
     let testIdentifier: String?
+    let submitLabel: SubmitLabel
     @Binding var text: String
 
     init(
@@ -14,13 +15,15 @@ struct TextField: View {
         backgroundColor: Color = .white10,
         font: Font = .custom(Fonts.semiBold, size: 15),
         axis: Axis = .horizontal,
-        testIdentifier: String? = nil
+        testIdentifier: String? = nil,
+        submitLabel: SubmitLabel = .return
     ) {
         self.placeholder = placeholder
         self.backgroundColor = backgroundColor
         self.font = font
         self.axis = axis
         self.testIdentifier = testIdentifier
+        self.submitLabel = submitLabel
         _text = text
     }
 
@@ -35,6 +38,7 @@ struct TextField: View {
             SwiftUI.TextField("", text: $text, axis: axis)
                 .accentColor(.brandAccent)
                 .font(font)
+                .submitLabel(submitLabel)
                 .accessibilityIdentifierIfPresent(testIdentifier)
         }
         .padding()

Bitkit/Constants/Env.swift

@@ -15,6 +15,7 @@ enum Env {
         static let isE2E = ProcessInfo.processInfo.environment["E2E"] == "true"
     #endif
     static let dustLimit = 547
+    static let msatsPerSat: UInt64 = 1000
 
     #if CHECK_GEOBLOCK
         static let isGeoblockingEnabled = true

Bitkit/MainNavView.swift

@@ -83,7 +83,7 @@ struct MainNavView: View {
         .sheet(
             item: $sheets.lnurlWithdrawSheetItem,
             onDismiss: {
-                sheets.hideSheet()
+                sheets.hideSheetIfActive(.lnurlWithdraw, reason: "LNURL withdraw sheet dismissed")
             }
         ) {
             config in LnurlWithdrawSheet(config: config)
@@ -116,7 +116,7 @@ struct MainNavView: View {
         .sheet(
             item: $sheets.scannerSheetItem,
             onDismiss: {
-                sheets.hideSheet()
+                sheets.hideSheetIfActive(.scanner, reason: "Scanner sheet dismissed")
             }
         ) {
             config in ScannerSheet(config: config)
@@ -141,7 +141,7 @@ struct MainNavView: View {
         .sheet(
             item: $sheets.sendSheetItem,
             onDismiss: {
-                sheets.hideSheet()
+                sheets.hideSheetIfActive(.send, reason: "Send sheet dismissed")
             }
         ) {
             config in SendSheet(config: config)

Bitkit/Utilities/Lnurl.swift

@@ -175,13 +175,18 @@ struct LnurlHelper {
         params: LnurlChannelData,
         nodeId: String
     ) async throws {
-        let queryItems = [
-            URLQueryItem(name: "k1", value: params.k1),
-            URLQueryItem(name: "remoteid", value: nodeId),
-            URLQueryItem(name: "private", value: "1"), // Private channel
-        ]
+        let callbackUrlString = try createChannelRequestUrl(
+            k1: params.k1,
+            callback: params.callback,
+            localNodeId: nodeId,
+            isPrivate: true,
+            cancel: false
+        )
+
+        guard let callbackURL = URL(string: callbackUrlString) else {
+            throw NSError(domain: "LNURL", code: -1, userInfo: [NSLocalizedDescriptionKey: "Invalid callback URL"])
+        }
 
-        let callbackURL = try buildUrl(baseUrl: params.callback, queryItems: queryItems)
         let responseString = try await makeHttpGetRequest(url: callbackURL)
         let channelResponse = try parseJsonResponse(responseString, as: LnurlChannelResponse.self)
 

Bitkit/Utilities/PaymentNavigationHelper.swift

@@ -103,6 +103,14 @@ struct PaymentNavigationHelper {
         currency: CurrencyViewModel,
         settings: SettingsViewModel
     ) -> SendRoute {
+        if let lnurlWithdrawData = app.lnurlWithdrawData {
+            if lnurlWithdrawData.minWithdrawable == lnurlWithdrawData.maxWithdrawable {
+                return .lnurlWithdrawConfirm
+            } else {
+                return .lnurlWithdrawAmount
+            }
+        }
+
         let shouldUseQuickpay = shouldUseQuickpay(app: app, settings: settings, currency: currency)
 
         // Handle Lightning address / LNURL pay

Bitkit/ViewModels/AppViewModel.swift

@@ -252,9 +252,13 @@ extension AppViewModel {
             return
         }
 
+        var normalizedData = data
+        normalizedData.minSendable = max(1, normalizedData.minSendable / Env.msatsPerSat)
+        normalizedData.maxSendable = max(normalizedData.minSendable, normalizedData.maxSendable / Env.msatsPerSat)
+
         // Check if user has enough lightning balance to pay the minimum amount
         let lightningBalance = lightningService.balances?.totalLightningBalanceSats ?? 0
-        if lightningBalance < data.minSendable {
+        if lightningBalance < normalizedData.minSendable {
             toast(
                 type: .warning,
                 title: t("other__lnurl_pay_error"),
@@ -264,7 +268,7 @@ extension AppViewModel {
         }
 
         selectedWalletToPayFrom = .lightning
-        lnurlPayData = data
+        lnurlPayData = normalizedData
     }
 
     private func handleLnurlWithdraw(_ data: LnurlWithdrawData) {
@@ -274,8 +278,11 @@ extension AppViewModel {
             return
         }
 
+        let minMsats = data.minWithdrawable ?? Env.msatsPerSat
+        let maxMsats = data.maxWithdrawable
+
         // Check if minWithdrawable > maxWithdrawable
-        if (data.minWithdrawable ?? 1000) > data.maxWithdrawable {
+        if minMsats > maxMsats {
             toast(
                 type: .warning,
                 title: t("other__lnurl_withdr_error"),
@@ -284,9 +291,15 @@ extension AppViewModel {
             return
         }
 
+        var normalizedData = data
+        let minSats = max(1, minMsats / Env.msatsPerSat)
+        let maxSats = max(minSats, maxMsats / Env.msatsPerSat)
+        normalizedData.minWithdrawable = minSats
+        normalizedData.maxWithdrawable = maxSats
+
         // Check if we have enough receiving capacity
         let lightningBalance = lightningService.balances?.totalLightningBalanceSats ?? 0
-        if lightningBalance < (data.minWithdrawable ?? 1000) / 1000 {
+        if lightningBalance < minSats {
             toast(
                 type: .warning,
                 title: t("other__lnurl_withdr_error"),
@@ -295,7 +308,7 @@ extension AppViewModel {
             return
         }
 
-        lnurlWithdrawData = data
+        lnurlWithdrawData = normalizedData
     }
 
     private func handleLnurlChannel(_ data: LnurlChannelData) {
@@ -415,7 +428,8 @@ extension AppViewModel {
                             type: .lightning,
                             title: t("lightning__channel_opened_title"),
                             description: t("lightning__channel_opened_msg"),
-                            visibilityTime: 5.0
+                            visibilityTime: 5.0,
+                            accessibilityIdentifier: "SpendingBalanceReadyToast"
                         )
                     }
                 }
@@ -424,7 +438,8 @@ extension AppViewModel {
                     type: .lightning,
                     title: t("lightning__channel_opened_title"),
                     description: t("lightning__channel_opened_msg"),
-                    visibilityTime: 5.0
+                    visibilityTime: 5.0,
+                    accessibilityIdentifier: "SpendingBalanceReadyToast"
                 )
             }
         case .channelClosed(channelId: _, userChannelId: _, counterpartyNodeId: _, reason: _):

Bitkit/ViewModels/SheetViewModel.swift

@@ -38,6 +38,7 @@ class SheetViewModel: ObservableObject {
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) { [weak self] in
                 guard let self else { return }
+                Logger.debug("Showing sheet \(id.rawValue) after delay", context: "SheetViewModel")
                 activeSheetConfiguration = SheetConfiguration(id: id, data: data)
                 playHaptics(for: id)
 
@@ -48,6 +49,7 @@ class SheetViewModel: ObservableObject {
             }
         } else {
             // If no sheet is open, show the new sheet immediately
+            Logger.debug("Showing sheet \(id.rawValue)", context: "SheetViewModel")
             activeSheetConfiguration = SheetConfiguration(id: id, data: data)
             playHaptics(for: id)
 
@@ -58,7 +60,16 @@ class SheetViewModel: ObservableObject {
         }
     }
 
-    func hideSheet() {
+    func hideSheet(reason: String? = nil, file: String = #file, function: String = #function, line: Int = #line) {
+        if let config = activeSheetConfiguration {
+            let fallback = "\(URL(fileURLWithPath: file).lastPathComponent):\(line) \(function)"
+            let reasonText = " reason: \(reason ?? fallback)"
+            Logger.debug("Hiding sheet \(config.id.rawValue)\(reasonText)", context: "SheetViewModel")
+        } else {
+            let fallback = "\(URL(fileURLWithPath: file).lastPathComponent):\(line) \(function)"
+            let reasonText = " reason: \(reason ?? fallback)"
+            Logger.debug("hideSheet called with no active sheet\(reasonText)", context: "SheetViewModel")
+        }
         activeSheetConfiguration = nil
 
         // Notify timed sheet manager
@@ -67,6 +78,17 @@ class SheetViewModel: ObservableObject {
         }
     }
 
+    func hideSheetIfActive(_ id: SheetID, reason: String? = nil, file: String = #file, function: String = #function, line: Int = #line) {
+        guard activeSheetConfiguration?.id == id else {
+            let fallback = "\(URL(fileURLWithPath: file).lastPathComponent):\(line) \(function)"
+            let reasonText = " reason: \(reason ?? fallback)"
+            let activeId = activeSheetConfiguration?.id.rawValue ?? "none"
+            Logger.debug("hideSheetIfActive skipped for \(id.rawValue) (active: \(activeId))\(reasonText)", context: "SheetViewModel")
+            return
+        }
+        hideSheet(reason: reason, file: file, function: function, line: line)
+    }
+
     var isAnySheetOpen: Bool {
         return activeSheetConfiguration != nil
     }

Bitkit/Views/Sheets/LnurlAuth/LnurlAuthSheet.swift

@@ -85,16 +85,19 @@ struct LnurlAuthSheet: View {
                     ) {
                         onCancel()
                     }
+                    .accessibilityIdentifier("LnurlAuthCancel")
 
                     CustomButton(title: actionText) {
                         Task {
                             await onContinue()
                         }
                     }
+                    .accessibilityIdentifier("LnurlAuthContinue")
                 }
                 .padding(.top, 32)
             }
             .padding(.horizontal, 16)
+            .accessibilityElement(children: .contain)
             .accessibilityIdentifier("LnurlAuth")
         }
     }