Merge pull request #282 from synonymdev/test/transfer

jvsena42 · web-flow · commit cfe52f226544 · 2025-12-24T08:59:01.000-03:00
Test/transfer
diff --git a/.github/workflows/e2e-tests.yml b/.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: '@send|@lnurl|@lightning|@backup|@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security' }
+          - { name: e2e, grep: '@transfer|@send|@lnurl|@lightning|@backup|@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security' }
 
     name: e2e-tests - ${{ matrix.shard.name }}
 
diff --git a/Bitkit/Components/NumberPadTextField.swift b/Bitkit/Components/NumberPadTextField.swift
@@ -71,6 +71,8 @@ struct NumberPadTextField: View {
         }
         .contentShape(Rectangle())
         .animation(springAnimation, value: currency.primaryDisplay)
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifierIfPresent(testIdentifier)
     }
 
     @ViewBuilder
@@ -87,7 +89,6 @@ struct NumberPadTextField: View {
                 + Text(viewModel.getPlaceholder(currency: currency))
                 .foregroundColor(isFocused ? .textSecondary : .textPrimary))
                 .font(.custom(Fonts.black, size: 44))
-                .accessibilityIdentifierIfPresent(testIdentifier)
         }
     }
 }
diff --git a/Bitkit/ViewModels/ChannelDetailsViewModel.swift b/Bitkit/ViewModels/ChannelDetailsViewModel.swift
@@ -14,10 +14,12 @@ class ChannelDetailsViewModel: ObservableObject {
     @Published var error: Error? = nil
 
     private let coreService: CoreService
+    private let transferStorage: TransferStorage
 
     /// Private initializer for the singleton instance
-    private init(coreService: CoreService = .shared) {
+    private init(coreService: CoreService = .shared, transferStorage: TransferStorage = .shared) {
         self.coreService = coreService
+        self.transferStorage = transferStorage
     }
 
     /// Find a channel by ID, checking open channels, pending channels, pending orders, then closed channels
@@ -124,15 +126,31 @@ class ChannelDetailsViewModel: ObservableObject {
             connections.append(contentsOf: channels.filter { !$0.isChannelReady })
         }
 
+        // Only show pending orders that have been paid (aligns with Android/RN behavior)
+        let paidOrderIds: Set<String> = {
+            guard let activeTransfers = try? transferStorage.getActiveTransfers() else {
+                return []
+            }
+            return Set(
+                activeTransfers
+                    .filter { $0.type.isToSpending() }
+                    .compactMap(\.lspOrderId)
+            )
+        }()
+
+        if paidOrderIds.isEmpty {
+            return connections
+        }
+
         // Create fake channels from pending orders
         guard let orders = try? await coreService.blocktank.orders(refresh: false) else {
             return connections
         }
 
-        let pendingOrders = orders.filter { order in
-            // Include orders that are created or paid but not yet opened
-            order.state2 == .created || order.state2 == .paid
-        }
+        let pendingOrders = Self.pendingOrders(
+            orders: orders,
+            paidOrderIds: paidOrderIds
+        )
 
         for order in pendingOrders {
             let fakeChannel = createFakeChannel(from: order)
@@ -142,6 +160,12 @@ class ChannelDetailsViewModel: ObservableObject {
         return connections
     }
 
+    static func pendingOrders(orders: [IBtOrder], paidOrderIds: Set<String>) -> [IBtOrder] {
+        orders.filter { order in
+            paidOrderIds.contains(order.id) && (order.state2 == .created || order.state2 == .paid)
+        }
+    }
+
     /// Creates a fake channel from a Blocktank order for UI display purposes
     private func createFakeChannel(from order: IBtOrder) -> ChannelDetails {
         return ChannelDetails(
diff --git a/Bitkit/ViewModels/TransferViewModel.swift b/Bitkit/ViewModels/TransferViewModel.swift
@@ -113,6 +113,10 @@ class TransferViewModel: ObservableObject {
         uiState.isAdvanced = true
     }
 
+    func displayOrder(for order: IBtOrder) -> IBtOrder {
+        uiState.order ?? order
+    }
+
     func payOrder(order: IBtOrder, speed: TransactionSpeed) async throws {
         var fees = try? await coreService.blocktank.fees(refresh: true)
         if fees == nil {
diff --git a/Bitkit/Views/Settings/Advanced/LightningConnectionsView.swift b/Bitkit/Views/Settings/Advanced/LightningConnectionsView.swift
@@ -70,12 +70,13 @@ struct LightningConnectionsView: View {
                                     .padding(.top, 16)
 
                                 ForEach(Array(pendingConnections.enumerated()), id: \.element.channelId) { index, channel in
+                                    let labelIndex = pendingConnections.count - index
                                     Button {
                                         navigation.navigate(.connectionDetail(channelId: channel.channelIdString))
                                     } label: {
                                         VStack(spacing: 0) {
                                             HStack {
-                                                SubtitleText("\(t("lightning__connection")) \(index + 1)")
+                                                SubtitleText("\(t("lightning__connection")) \(labelIndex)")
                                                 Spacer()
                                                 Image("chevron")
                                                     .resizable()
@@ -109,12 +110,13 @@ struct LightningConnectionsView: View {
                                     .padding(.top, 16)
 
                                 ForEach(Array(openChannels.enumerated()), id: \.element.channelId) { index, channel in
+                                    let labelIndex = openChannels.count - index
                                     Button {
                                         navigation.navigate(.connectionDetail(channelId: channel.channelIdString))
                                     } label: {
                                         VStack(spacing: 0) {
                                             HStack {
-                                                SubtitleText("\(t("lightning__connection")) \(index + 1)")
+                                                SubtitleText("\(t("lightning__connection")) \(labelIndex)")
                                                 Spacer()
                                                 Image("chevron")
                                                     .resizable()
@@ -147,12 +149,13 @@ struct LightningConnectionsView: View {
                                     .padding(.top, 16)
 
                                 ForEach(Array(closedChannels.enumerated()), id: \.element.channelId) { index, channel in
+                                    let labelIndex = closedChannels.count - index
                                     Button {
                                         navigation.navigate(.connectionDetail(channelId: channel.channelIdString))
                                     } label: {
                                         VStack(spacing: 0) {
                                             HStack {
-                                                SubtitleText("\(t("lightning__connection")) \(index + 1)")
+                                                SubtitleText("\(t("lightning__connection")) \(labelIndex)")
                                                 Spacer()
                                                 Image("chevron")
                                                     .resizable()
diff --git a/Bitkit/Views/Transfer/FundManualAmountView.swift b/Bitkit/Views/Transfer/FundManualAmountView.swift
@@ -57,6 +57,7 @@ struct FundManualAmountView: View {
                     isDisabled: amountSats == 0,
                     destination: FundManualConfirmView(lnPeer: lnPeer, amountSats: amountSats)
                 )
+                .accessibilityIdentifier("ExternalAmountContinue")
             }
         }
         .navigationBarHidden(true)
diff --git a/Bitkit/Views/Transfer/SavingsAvailabilityView.swift b/Bitkit/Views/Transfer/SavingsAvailabilityView.swift
@@ -33,6 +33,7 @@ struct SavingsAvailabilityView: View {
                 CustomButton(title: t("common__continue")) {
                     navigation.navigate(.savingsConfirm)
                 }
+                .accessibilityIdentifier("AvailabilityContinue")
             }
         }
         .navigationBarHidden(true)
diff --git a/Bitkit/Views/Transfer/SavingsProgressView.swift b/Bitkit/Views/Transfer/SavingsProgressView.swift
@@ -99,6 +99,7 @@ struct SavingsProgressContentView: View {
                     .frame(width: 256, height: 256)
                     .padding()
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
+                    .accessibilityIdentifierIfPresent(progressState == .success ? "TransferSuccess" : nil)
             }
 
             Spacer()
@@ -109,6 +110,7 @@ struct SavingsProgressContentView: View {
             ) {
                 navigation.reset()
             }
+            .accessibilityIdentifierIfPresent(progressState == .success ? "TransferSuccess-button" : nil)
         }
         .navigationBarHidden(true)
         .padding(.horizontal, 16)
diff --git a/Bitkit/Views/Transfer/SettingUpView.swift b/Bitkit/Views/Transfer/SettingUpView.swift
@@ -169,13 +169,15 @@ struct SettingUpView: View {
 
                 if isTransferring {
                     SettingUpLoadingView()
+                        .accessibilityIdentifier("LightningSettingUp")
                 } else {
                     Image("check")
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(width: 256, height: 256)
                         .padding()
                         .frame(maxWidth: .infinity, maxHeight: .infinity)
+                        .accessibilityIdentifier("TransferSuccess")
                 }
 
                 Spacer()
@@ -188,6 +190,7 @@ struct SettingUpView: View {
                 CustomButton(title: buttonTitle) {
                     navigation.reset()
                 }
+                .accessibilityIdentifier("TransferSuccess-button")
             }
         }
         .navigationBarHidden(true)
diff --git a/Bitkit/Views/Transfer/SpendingAdvancedView.swift b/Bitkit/Views/Transfer/SpendingAdvancedView.swift
@@ -34,11 +34,15 @@ struct SpendingAdvancedView: View {
                 DisplayText(t("lightning__spending_advanced__title"), accentColor: .purpleAccent)
                     .fixedSize(horizontal: false, vertical: true)
 
-                NumberPadTextField(viewModel: amountViewModel, showConversion: false)
-                    .onTapGesture {
-                        amountViewModel.togglePrimaryDisplay(currency: currency)
-                    }
-                    .padding(.top, 32)
+                NumberPadTextField(
+                    viewModel: amountViewModel,
+                    showConversion: false,
+                    testIdentifier: "SpendingAdvancedNumberField"
+                )
+                .onTapGesture {
+                    amountViewModel.togglePrimaryDisplay(currency: currency)
+                }
+                .padding(.top, 32)
 
                 // Fee estimate
                 HStack(spacing: 4) {
@@ -91,6 +95,7 @@ struct SpendingAdvancedView: View {
                         app.toast(error)
                     }
                 }
+                .accessibilityIdentifier("SpendingAdvancedContinue")
             }
         }
         .navigationBarHidden(true)
@@ -118,18 +123,21 @@ struct SpendingAdvancedView: View {
             NumberPadActionButton(text: t("common__min")) {
                 amountViewModel.updateFromSats(transfer.transferValues.minLspBalance, currency: currency)
             }
+            .accessibilityIdentifier("SpendingAdvancedMin")
 
             Spacer()
 
             NumberPadActionButton(text: t("common__default")) {
                 amountViewModel.updateFromSats(transfer.transferValues.defaultLspBalance, currency: currency)
             }
+            .accessibilityIdentifier("SpendingAdvancedDefault")
 
             Spacer()
 
             NumberPadActionButton(text: t("common__max")) {
                 amountViewModel.updateFromSats(transfer.transferValues.maxLspBalance, currency: currency)
             }
+            .accessibilityIdentifier("SpendingAdvancedMax")
         }
     }
 
diff --git a/Bitkit/Views/Transfer/SpendingAmount.swift b/Bitkit/Views/Transfer/SpendingAmount.swift
@@ -71,6 +71,7 @@ struct SpendingAmount: View {
             ) {
                 await onContinue()
             }
+            .accessibilityIdentifier("SpendingAmountContinue")
         }
         .navigationBarHidden(true)
         .padding(.horizontal, 16)
@@ -96,11 +97,13 @@ struct SpendingAmount: View {
                 let quarter = UInt64(wallet.spendableOnchainBalanceSats) / 4
                 amountViewModel.updateFromSats(min(quarter, max), currency: currency)
             }
+            .accessibilityIdentifier("SpendingAmountQuarter")
 
             NumberPadActionButton(text: t("common__max")) {
                 guard let max = maxTransferAmount else { return }
                 amountViewModel.updateFromSats(max, currency: currency)
             }
+            .accessibilityIdentifier("SpendingAmountMax")
         }
     }
 
diff --git a/Bitkit/Views/Transfer/SpendingConfirm.swift b/Bitkit/Views/Transfer/SpendingConfirm.swift
@@ -14,12 +14,16 @@ struct SpendingConfirm: View {
     @State private var hideSwipeButton = false
     @State private var transactionFee: UInt64 = 0
 
+    private var currentOrder: IBtOrder {
+        transfer.displayOrder(for: order)
+    }
+
     var lspFee: UInt64 {
-        order.feeSat - order.clientBalanceSat
+        currentOrder.feeSat - currentOrder.clientBalanceSat
     }
 
     var total: UInt64 {
-        order.feeSat + transactionFee
+        currentOrder.feeSat + transactionFee
     }
 
     var body: some View {
@@ -47,7 +51,7 @@ struct SpendingConfirm: View {
                 HStack {
                     FeeDisplayRow(
                         label: t("lightning__spending_confirm__amount"),
-                        amount: order.clientBalanceSat
+                        amount: currentOrder.clientBalanceSat
                     )
                     .frame(maxWidth: .infinity)
 
@@ -62,12 +66,14 @@ struct SpendingConfirm: View {
 
             if transfer.uiState.isAdvanced {
                 LightningChannel(
-                    capacity: order.lspBalanceSat + order.clientBalanceSat,
-                    localBalance: order.clientBalanceSat,
-                    remoteBalance: order.lspBalanceSat,
+                    capacity: currentOrder.lspBalanceSat + currentOrder.clientBalanceSat,
+                    localBalance: currentOrder.clientBalanceSat,
+                    remoteBalance: currentOrder.lspBalanceSat,
                     status: .open,
                     showLabels: true
                 )
+                .accessibilityElement(children: .ignore)
+                .accessibilityIdentifier("SpendingConfirmChannel")
                 .padding(.vertical, 16)
             }
 
@@ -87,17 +93,20 @@ struct SpendingConfirm: View {
 
             HStack(spacing: 16) {
                 CustomButton(title: t("common__learn_more"), size: .small) {
-                    navigation.navigate(.transferLearnMore(order: order))
+                    navigation.navigate(.transferLearnMore(order: currentOrder))
                 }
+                .accessibilityIdentifier("SpendingConfirmMore")
 
                 if transfer.uiState.isAdvanced {
                     CustomButton(title: t("lightning__spending_confirm__default"), size: .small) {
                         transfer.onDefaultClick()
                     }
+                    .accessibilityIdentifier("SpendingConfirmDefault")
                 } else {
                     CustomButton(title: t("common__advanced"), size: .small) {
-                        navigation.navigate(.spendingAdvanced(order: order))
+                        navigation.navigate(.spendingAdvanced(order: currentOrder))
                     }
+                    .accessibilityIdentifier("SpendingConfirmAdvanced")
                 }
             }
             .frame(maxWidth: .infinity, alignment: .leading)
@@ -125,7 +134,7 @@ struct SpendingConfirm: View {
         isPaying = true
 
         do {
-            try await transfer.payOrder(order: order, speed: .fast)
+            try await transfer.payOrder(order: currentOrder, speed: .fast)
             try await Task.sleep(nanoseconds: 1_000_000_000)
 
             navigation.navigate(.settingUp)
@@ -148,13 +157,13 @@ struct SpendingConfirm: View {
             if let feeRates = try await coreService.blocktank.fees(refresh: true) {
                 let fastFeeRate = TransactionSpeed.fast.getFeeRate(from: feeRates)
 
-                guard let address = order.payment?.onchain?.address else {
+                guard let address = currentOrder.payment?.onchain?.address else {
                     throw AppError(message: "Order payment onchain address is nil", debugMessage: nil)
                 }
 
                 let fee = try await wallet.calculateTotalFee(
                     address: address,
-                    amountSats: order.feeSat,
+                    amountSats: currentOrder.feeSat,
                     satsPerVByte: fastFeeRate
                 )
 
diff --git a/Bitkit/Views/Transfer/TransferLearnMoreView.swift b/Bitkit/Views/Transfer/TransferLearnMoreView.swift
@@ -36,6 +36,7 @@ struct TransferLearnMoreView: View {
                 dismiss()
             }
             .padding(.top, 32)
+            .accessibilityIdentifier("LiquidityContinue")
         }
         .navigationBarHidden(true)
         .padding(.horizontal, 16)
diff --git a/Bitkit/Views/Wallets/Receive/ReceiveEdit.swift b/Bitkit/Views/Wallets/Receive/ReceiveEdit.swift
diff --git a/Bitkit/Views/Wallets/SavingsWalletView.swift b/Bitkit/Views/Wallets/SavingsWalletView.swift
diff --git a/Bitkit/Views/Wallets/SpendingWalletView.swift b/Bitkit/Views/Wallets/SpendingWalletView.swift
diff --git a/BitkitTests/ChannelDetailsViewModelTests.swift b/BitkitTests/ChannelDetailsViewModelTests.swift
diff --git a/BitkitTests/TransferViewModelTests.swift b/BitkitTests/TransferViewModelTests.swift

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ struct NumberPadTextField: View {`
`71`	`71`	`}`
`72`	`72`	`.contentShape(Rectangle())`
`73`	`73`	`.animation(springAnimation, value: currency.primaryDisplay)`
	`74`	`+ .accessibilityElement(children: .contain)`
	`75`	`+ .accessibilityIdentifierIfPresent(testIdentifier)`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`@ViewBuilder`
`@@ -87,7 +89,6 @@ struct NumberPadTextField: View {`
`87`	`89`	`+ Text(viewModel.getPlaceholder(currency: currency))`
`88`	`90`	`.foregroundColor(isFocused ? .textSecondary : .textPrimary))`
`89`	`91`	`.font(.custom(Fonts.black, size: 44))`
`90`		`- .accessibilityIdentifierIfPresent(testIdentifier)`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ struct FundManualAmountView: View {`
`57`	`57`	`isDisabled: amountSats == 0,`
`58`	`58`	`destination: FundManualConfirmView(lnPeer: lnPeer, amountSats: amountSats)`
`59`	`59`	`)`
	`60`	`+ .accessibilityIdentifier("ExternalAmountContinue")`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`	`.navigationBarHidden(true)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ struct SavingsAvailabilityView: View {`
`33`	`33`	`CustomButton(title: t("common__continue")) {`
`34`	`34`	`navigation.navigate(.savingsConfirm)`
`35`	`35`	`}`
	`36`	`+ .accessibilityIdentifier("AvailabilityContinue")`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`	`.navigationBarHidden(true)`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ struct SavingsProgressContentView: View {`
`99`	`99`	`.frame(width: 256, height: 256)`
`100`	`100`	`.padding()`
`101`	`101`	`.frame(maxWidth: .infinity, maxHeight: .infinity)`
	`102`	`+ .accessibilityIdentifierIfPresent(progressState == .success ? "TransferSuccess" : nil)`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`Spacer()`
`@@ -109,6 +110,7 @@ struct SavingsProgressContentView: View {`
`109`	`110`	`) {`
`110`	`111`	`navigation.reset()`
`111`	`112`	`}`
	`113`	`+ .accessibilityIdentifierIfPresent(progressState == .success ? "TransferSuccess-button" : nil)`
`112`	`114`	`}`
`113`	`115`	`.navigationBarHidden(true)`
`114`	`116`	`.padding(.horizontal, 16)`
Original file line number	Diff line number	Diff line change
`@@ -169,13 +169,15 @@ struct SettingUpView: View {`
`169`	`169`
`170`	`170`	`if isTransferring {`
`171`	`171`	`SettingUpLoadingView()`
	`172`	`+ .accessibilityIdentifier("LightningSettingUp")`
`172`	`173`	`} else {`
`173`	`174`	`Image("check")`
`174`	`175`	`.resizable()`
`175`	`176`	`.aspectRatio(contentMode: .fit)`
`176`	`177`	`.frame(width: 256, height: 256)`
`177`	`178`	`.padding()`
`178`	`179`	`.frame(maxWidth: .infinity, maxHeight: .infinity)`
	`180`	`+ .accessibilityIdentifier("TransferSuccess")`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`Spacer()`
`@@ -188,6 +190,7 @@ struct SettingUpView: View {`
`188`	`190`	`CustomButton(title: buttonTitle) {`
`189`	`191`	`navigation.reset()`
`190`	`192`	`}`
	`193`	`+ .accessibilityIdentifier("TransferSuccess-button")`
`191`	`194`	`}`
`192`	`195`	`}`
`193`	`196`	`.navigationBarHidden(true)`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,15 @@ struct SpendingAdvancedView: View {`
`34`	`34`	`DisplayText(t("lightning__spending_advanced__title"), accentColor: .purpleAccent)`
`35`	`35`	`.fixedSize(horizontal: false, vertical: true)`
`36`	`36`
`37`		`- NumberPadTextField(viewModel: amountViewModel, showConversion: false)`
`38`		`- .onTapGesture {`
`39`		`- amountViewModel.togglePrimaryDisplay(currency: currency)`
`40`		`- }`
`41`		`- .padding(.top, 32)`
	`37`	`+ NumberPadTextField(`
	`38`	`+ viewModel: amountViewModel,`
	`39`	`+ showConversion: false,`
	`40`	`+ testIdentifier: "SpendingAdvancedNumberField"`
	`41`	`+ )`
	`42`	`+ .onTapGesture {`
	`43`	`+ amountViewModel.togglePrimaryDisplay(currency: currency)`
	`44`	`+ }`
	`45`	`+ .padding(.top, 32)`
`42`	`46`
`43`	`47`	`// Fee estimate`
`44`	`48`	`HStack(spacing: 4) {`
`@@ -91,6 +95,7 @@ struct SpendingAdvancedView: View {`
`91`	`95`	`app.toast(error)`
`92`	`96`	`}`
`93`	`97`	`}`
	`98`	`+ .accessibilityIdentifier("SpendingAdvancedContinue")`
`94`	`99`	`}`
`95`	`100`	`}`
`96`	`101`	`.navigationBarHidden(true)`
`@@ -118,18 +123,21 @@ struct SpendingAdvancedView: View {`
`118`	`123`	`NumberPadActionButton(text: t("common__min")) {`
`119`	`124`	`amountViewModel.updateFromSats(transfer.transferValues.minLspBalance, currency: currency)`
`120`	`125`	`}`
	`126`	`+ .accessibilityIdentifier("SpendingAdvancedMin")`
`121`	`127`
`122`	`128`	`Spacer()`
`123`	`129`
`124`	`130`	`NumberPadActionButton(text: t("common__default")) {`
`125`	`131`	`amountViewModel.updateFromSats(transfer.transferValues.defaultLspBalance, currency: currency)`
`126`	`132`	`}`
	`133`	`+ .accessibilityIdentifier("SpendingAdvancedDefault")`
`127`	`134`
`128`	`135`	`Spacer()`
`129`	`136`
`130`	`137`	`NumberPadActionButton(text: t("common__max")) {`
`131`	`138`	`amountViewModel.updateFromSats(transfer.transferValues.maxLspBalance, currency: currency)`
`132`	`139`	`}`
	`140`	`+ .accessibilityIdentifier("SpendingAdvancedMax")`
`133`	`141`	`}`
`134`	`142`	`}`
`135`	`143`