Merge pull request synonymdev#213 from synonymdev/test/boost

ovitrif · web-flow · commit 0172581116fa · 2025-11-13T10:52:04.000+01:00
Test/boost
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -107,7 +107,7 @@ jobs:
           # - { name: onchain_boost_receive_widgets, grep: "@onchain|@boost|@receive|@widgets" }
           # - { name: settings, grep: "@settings" }
           # - { name: security, grep: "@security" }
-          - { name: e2e, grep: "@onboarding|@onchain_1|@numberpad|@widgets" }
+          - { name: e2e, grep: "@onboarding|@onchain_1|@numberpad|@widgets|@boost" }
 
     name: e2e-tests - ${{ matrix.shard.name }}
 
diff --git a/Bitkit/Components/NavigationBar.swift b/Bitkit/Components/NavigationBar.swift
@@ -48,6 +48,7 @@ struct NavigationBar: View {
                         .foregroundColor(.textPrimary)
                         .frame(width: 24, height: 24)
                 }
+                .accessibilityIdentifier("NavigationBack")
             } else {
                 Spacer()
                     .frame(width: 24, height: 24)
diff --git a/Bitkit/Components/SheetIntro.swift b/Bitkit/Components/SheetIntro.swift
@@ -12,6 +12,9 @@ struct SheetIntro: View {
     let testID: String?
     let onCancel: (() -> Void)?
     let onContinue: () -> Void
+    private var baseTestID: String {
+        testID ?? "SheetIntro"
+    }
 
     init(
         navTitle: String,
@@ -52,20 +55,23 @@ struct SheetIntro: View {
                     .frame(width: UIScreen.main.bounds.width * 0.8)
                     .frame(maxHeight: 256)
                     .padding(.bottom, 32)
+                    .accessibilityIdentifier("\(baseTestID)Image")
 
                 DisplayText(title, accentColor: accentColor)
                     .padding(.bottom, 14)
                     .frame(maxWidth: .infinity, alignment: .leading)
 
                 BodyMText(description, accentFont: accentFont)
                     .frame(maxWidth: .infinity, alignment: .leading)
+                    .accessibilityIdentifier("\(baseTestID)Description")
             }
 
             buttonStack
                 .padding(.top, 32)
         }
         .padding(.horizontal, 32)
-        .accessibilityIdentifier(testID ?? "SheetIntro")
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifier(baseTestID)
     }
 
     @ViewBuilder
@@ -78,19 +84,22 @@ struct SheetIntro: View {
                 ) {
                     onCancel()
                 }
+                .accessibilityIdentifier("\(baseTestID)Cancel")
 
                 CustomButton(
                     title: continueText
                 ) {
                     onContinue()
                 }
+                .accessibilityIdentifier("\(baseTestID)Continue")
             }
         } else {
             CustomButton(
                 title: continueText
             ) {
                 onContinue()
             }
+            .accessibilityIdentifier("\(baseTestID)Continue")
         }
     }
 }
diff --git a/Bitkit/Views/Wallets/Activity/ActivityExplorerView.swift b/Bitkit/Views/Wallets/Activity/ActivityExplorerView.swift
@@ -76,8 +76,15 @@ struct ActivityExplorerView: View {
     private struct InfoSection: View {
         let title: String
         let content: String
+        let testId: String?
         @EnvironmentObject var app: AppViewModel
 
+        init(title: String, content: String, testId: String? = nil) {
+            self.title = title
+            self.content = content
+            self.testId = testId
+        }
+
         var body: some View {
             Button {
                 UIPasteboard.general.string = content
@@ -94,6 +101,7 @@ struct ActivityExplorerView: View {
                 }
             }
             .buttonStyle(.plain)
+            .accessibilityIdentifierIfPresent(testId)
         }
     }
 
@@ -112,7 +120,8 @@ struct ActivityExplorerView: View {
             if let onchain {
                 InfoSection(
                     title: t("wallet__activity_tx_id"),
-                    content: onchain.txId
+                    content: onchain.txId,
+                    testId: "TXID"
                 )
 
                 if let txDetails {
@@ -153,7 +162,8 @@ struct ActivityExplorerView: View {
 
                         InfoSection(
                             title: t(key, variables: ["num": String(index + 1)]),
-                            content: boostTxId
+                            content: boostTxId,
+                            testId: onchain.txType == .received ? "CPFPBoosted" : "RBFBoosted"
                         )
                     }
                 }
diff --git a/Bitkit/Views/Wallets/Activity/ActivityIcon.swift b/Bitkit/Views/Wallets/Activity/ActivityIcon.swift
@@ -31,44 +31,54 @@ struct ActivityIcon: View {
     }
 
     var body: some View {
-        if isLightning {
-            if status == .failed {
+        Group {
+            if isLightning {
+                if status == .failed {
+                    CircularIcon(
+                        icon: "x-circle",
+                        iconColor: .purpleAccent,
+                        backgroundColor: .purple16,
+                        size: size
+                    )
+                } else if status == .pending {
+                    CircularIcon(
+                        icon: "hourglass-simple",
+                        iconColor: .purpleAccent,
+                        backgroundColor: .purple16,
+                        size: size
+                    )
+                } else {
+                    CircularIcon(
+                        icon: txType == .sent ? "arrow-up" : "arrow-down",
+                        iconColor: .purpleAccent,
+                        backgroundColor: .purple16,
+                        size: size
+                    )
+                }
+            } else if isBoosted && !(confirmed ?? false) {
                 CircularIcon(
-                    icon: "x-circle",
-                    iconColor: .purpleAccent,
-                    backgroundColor: .purple16,
-                    size: size
-                )
-            } else if status == .pending {
-                CircularIcon(
-                    icon: "hourglass-simple",
-                    iconColor: .purpleAccent,
-                    backgroundColor: .purple16,
+                    icon: "timer-alt",
+                    iconColor: .yellow,
+                    backgroundColor: .yellow16,
                     size: size
                 )
             } else {
+                let paymentIcon = txType == PaymentType.sent ? "arrow-up" : "arrow-down"
                 CircularIcon(
-                    icon: txType == .sent ? "arrow-up" : "arrow-down",
-                    iconColor: .purpleAccent,
-                    backgroundColor: .purple16,
+                    icon: isTransfer ? "arrow-up-down" : paymentIcon,
+                    iconColor: .brandAccent,
+                    backgroundColor: .brand16,
                     size: size
                 )
             }
-        } else if isBoosted && !(confirmed ?? false) {
-            CircularIcon(
-                icon: "timer-alt",
-                iconColor: .yellow,
-                backgroundColor: .yellow16,
-                size: size
-            )
-        } else {
-            let paymentIcon = txType == PaymentType.sent ? "arrow-up" : "arrow-down"
-            CircularIcon(
-                icon: isTransfer ? "arrow-up-down" : paymentIcon,
-                iconColor: .brandAccent,
-                backgroundColor: .brand16,
-                size: size
-            )
         }
+        .accessibilityIdentifierIfPresent(iconAccessibilityIdentifier)
+    }
+
+    private var iconAccessibilityIdentifier: String? {
+        if !isLightning, isBoosted, !(confirmed ?? false) {
+            return "BoostingIcon"
+        }
+        return nil
     }
 }
diff --git a/Bitkit/Views/Wallets/Activity/ActivityItemView.swift b/Bitkit/Views/Wallets/Activity/ActivityItemView.swift
@@ -112,6 +112,21 @@ struct ActivityItemView: View {
         }
     }
 
+    private var statusAccessibilityIdentifier: String? {
+        switch viewModel.activity {
+        case let .onchain(activity):
+            if activity.confirmed == true {
+                return "StatusConfirmed"
+            }
+            if activity.isBoosted {
+                return "StatusBoosting"
+            }
+            return "StatusConfirming"
+        case .lightning:
+            return nil
+        }
+    }
+
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             NavigationBar(title: navigationTitle)
@@ -124,7 +139,6 @@ struct ActivityItemView: View {
                         Spacer()
                         ActivityIcon(activity: viewModel.activity, size: 48)
                     }
-                    .accessibilityIdentifier("ActivityAmount")
                     .padding(.bottom, 16)
 
                     statusSection
@@ -208,6 +222,7 @@ struct ActivityItemView: View {
                     }
                 }
             }
+            .accessibilityIdentifierIfPresent(statusAccessibilityIdentifier)
             .padding(.bottom, 16)
 
             Divider()
@@ -263,8 +278,9 @@ struct ActivityItemView: View {
                         Image("user")
                             .foregroundColor(accentColor)
                             .frame(width: 16, height: 16)
-                        MoneyText(sats: Int(activity.value), size: .bodySSB)
+                        MoneyText(sats: Int(activity.value), size: .bodySSB, testIdentifier: "MoneyText")
                     }
+                    .accessibilityElement(children: .contain)
                     .accessibilityIdentifier("ActivityAmount")
                     .padding(.bottom, 16)
 
@@ -281,8 +297,9 @@ struct ActivityItemView: View {
                             Image("timer")
                                 .foregroundColor(accentColor)
                                 .frame(width: 16, height: 16)
-                            MoneyText(sats: Int(fee), size: .bodySSB)
+                            MoneyText(sats: Int(fee), size: .bodySSB, testIdentifier: "MoneyText")
                         }
+                        .accessibilityElement(children: .contain)
                         .accessibilityIdentifier("ActivityFee")
                         .padding(.bottom, 16)
 
diff --git a/Bitkit/Views/Wallets/Sheets/BoostSheet.swift b/Bitkit/Views/Wallets/Sheets/BoostSheet.swift
@@ -26,6 +26,7 @@ struct BoostSheet: View {
     @EnvironmentObject private var wallet: WalletViewModel
     @EnvironmentObject private var currency: CurrencyViewModel
     @EnvironmentObject private var activityList: ActivityListViewModel
+    @EnvironmentObject private var navigation: NavigationViewModel
     let config: BoostSheetItem
 
     @State private var feeRate: UInt32?
@@ -115,6 +116,7 @@ struct BoostSheet: View {
                                     .cornerRadius(200)
                                 }
                                 .disabled(currentFeeRate <= minFeeRate)
+                                .accessibilityIdentifier("Minus")
 
                                 Spacer()
 
@@ -141,12 +143,14 @@ struct BoostSheet: View {
                                     .cornerRadius(200)
                                 }
                                 .disabled(currentFeeRate >= maxFeeRate)
+                                .accessibilityIdentifier("Plus")
                             }
 
                             CustomButton(title: "Use Suggested Fee", size: .small) {
                                 isEditingFee = false
                                 editedFeeRate = nil
                             }
+                            .accessibilityIdentifier("RecommendedFeeButton")
                         }
                         .padding(.vertical, 12)
                         .cornerRadius(12)
@@ -203,6 +207,7 @@ struct BoostSheet: View {
                             }
                             .buttonStyle(PlainButtonStyle())
                             .disabled(feeRate == nil || fetchingFees)
+                            .accessibilityIdentifier("CustomFeeButton")
                         }
                         .padding(.vertical, 12)
                         .cornerRadius(12)
@@ -219,6 +224,8 @@ struct BoostSheet: View {
                 }
             }
             .padding(.horizontal, 16)
+            .accessibilityElement(children: .contain)
+            .accessibilityIdentifier(isIncoming ? "CPFPBoost" : "RBFBoost")
         }
         .onAppear {
             fetchFeeRate()
@@ -391,6 +398,7 @@ struct BoostSheet: View {
 
             Logger.info("Boost transaction completed successfully, hiding sheet", context: "BoostSheet.performBoost")
             sheets.hideSheet()
+            navigation.reset()
 
         } catch {
             Logger.error("Failed to boost transaction: \(error)", context: "BoostSheet.performBoost")

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ struct NavigationBar: View {`
`48`	`48`	`.foregroundColor(.textPrimary)`
`49`	`49`	`.frame(width: 24, height: 24)`
`50`	`50`	`}`
	`51`	`+ .accessibilityIdentifier("NavigationBack")`
`51`	`52`	`} else {`
`52`	`53`	`Spacer()`
`53`	`54`	`.frame(width: 24, height: 24)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ struct SheetIntro: View {`
`12`	`12`	`let testID: String?`
`13`	`13`	`let onCancel: (() -> Void)?`
`14`	`14`	`let onContinue: () -> Void`
	`15`	`+ private var baseTestID: String {`
	`16`	`+ testID ?? "SheetIntro"`
	`17`	`+ }`
`15`	`18`
`16`	`19`	`init(`
`17`	`20`	`navTitle: String,`
`@@ -52,20 +55,23 @@ struct SheetIntro: View {`
`52`	`55`	`.frame(width: UIScreen.main.bounds.width * 0.8)`
`53`	`56`	`.frame(maxHeight: 256)`
`54`	`57`	`.padding(.bottom, 32)`
	`58`	`+ .accessibilityIdentifier("\(baseTestID)Image")`
`55`	`59`
`56`	`60`	`DisplayText(title, accentColor: accentColor)`
`57`	`61`	`.padding(.bottom, 14)`
`58`	`62`	`.frame(maxWidth: .infinity, alignment: .leading)`
`59`	`63`
`60`	`64`	`BodyMText(description, accentFont: accentFont)`
`61`	`65`	`.frame(maxWidth: .infinity, alignment: .leading)`
	`66`	`+ .accessibilityIdentifier("\(baseTestID)Description")`
`62`	`67`	`}`
`63`	`68`
`64`	`69`	`buttonStack`
`65`	`70`	`.padding(.top, 32)`
`66`	`71`	`}`
`67`	`72`	`.padding(.horizontal, 32)`
`68`		`- .accessibilityIdentifier(testID ?? "SheetIntro")`
	`73`	`+ .accessibilityElement(children: .contain)`
	`74`	`+ .accessibilityIdentifier(baseTestID)`
`69`	`75`	`}`
`70`	`76`
`71`	`77`	`@ViewBuilder`
`@@ -78,19 +84,22 @@ struct SheetIntro: View {`
`78`	`84`	`) {`
`79`	`85`	`onCancel()`
`80`	`86`	`}`
	`87`	`+ .accessibilityIdentifier("\(baseTestID)Cancel")`
`81`	`88`
`82`	`89`	`CustomButton(`
`83`	`90`	`title: continueText`
`84`	`91`	`) {`
`85`	`92`	`onContinue()`
`86`	`93`	`}`
	`94`	`+ .accessibilityIdentifier("\(baseTestID)Continue")`
`87`	`95`	`}`
`88`	`96`	`} else {`
`89`	`97`	`CustomButton(`
`90`	`98`	`title: continueText`
`91`	`99`	`) {`
`92`	`100`	`onContinue()`
`93`	`101`	`}`
	`102`	`+ .accessibilityIdentifier("\(baseTestID)Continue")`
`94`	`103`	`}`
`95`	`104`	`}`
`96`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,15 @@ struct ActivityExplorerView: View {`
`76`	`76`	`private struct InfoSection: View {`
`77`	`77`	`let title: String`
`78`	`78`	`let content: String`
	`79`	`+ let testId: String?`
`79`	`80`	`@EnvironmentObject var app: AppViewModel`
`80`	`81`
	`82`	`+ init(title: String, content: String, testId: String? = nil) {`
	`83`	`+ self.title = title`
	`84`	`+ self.content = content`
	`85`	`+ self.testId = testId`
	`86`	`+ }`
	`87`	`+`
`81`	`88`	`var body: some View {`
`82`	`89`	`Button {`
`83`	`90`	`UIPasteboard.general.string = content`
`@@ -94,6 +101,7 @@ struct ActivityExplorerView: View {`
`94`	`101`	`}`
`95`	`102`	`}`
`96`	`103`	`.buttonStyle(.plain)`
	`104`	`+ .accessibilityIdentifierIfPresent(testId)`
`97`	`105`	`}`
`98`	`106`	`}`
`99`	`107`
`@@ -112,7 +120,8 @@ struct ActivityExplorerView: View {`
`112`	`120`	`if let onchain {`
`113`	`121`	`InfoSection(`
`114`	`122`	`title: t("wallet__activity_tx_id"),`
`115`		`- content: onchain.txId`
	`123`	`+ content: onchain.txId,`
	`124`	`+ testId: "TXID"`
`116`	`125`	`)`
`117`	`126`
`118`	`127`	`if let txDetails {`
`@@ -153,7 +162,8 @@ struct ActivityExplorerView: View {`
`153`	`162`
`154`	`163`	`InfoSection(`
`155`	`164`	`title: t(key, variables: ["num": String(index + 1)]),`
`156`		`- content: boostTxId`
	`165`	`+ content: boostTxId,`
	`166`	`+ testId: onchain.txType == .received ? "CPFPBoosted" : "RBFBoosted"`
`157`	`167`	`)`
`158`	`168`	`}`
`159`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ struct BoostSheet: View {`
`26`	`26`	`@EnvironmentObject private var wallet: WalletViewModel`
`27`	`27`	`@EnvironmentObject private var currency: CurrencyViewModel`
`28`	`28`	`@EnvironmentObject private var activityList: ActivityListViewModel`
	`29`	`+ @EnvironmentObject private var navigation: NavigationViewModel`
`29`	`30`	`let config: BoostSheetItem`
`30`	`31`
`31`	`32`	`@State private var feeRate: UInt32?`
`@@ -115,6 +116,7 @@ struct BoostSheet: View {`
`115`	`116`	`.cornerRadius(200)`
`116`	`117`	`}`
`117`	`118`	`.disabled(currentFeeRate <= minFeeRate)`
	`119`	`+ .accessibilityIdentifier("Minus")`
`118`	`120`
`119`	`121`	`Spacer()`
`120`	`122`
`@@ -141,12 +143,14 @@ struct BoostSheet: View {`
`141`	`143`	`.cornerRadius(200)`
`142`	`144`	`}`
`143`	`145`	`.disabled(currentFeeRate >= maxFeeRate)`
	`146`	`+ .accessibilityIdentifier("Plus")`
`144`	`147`	`}`
`145`	`148`
`146`	`149`	`CustomButton(title: "Use Suggested Fee", size: .small) {`
`147`	`150`	`isEditingFee = false`
`148`	`151`	`editedFeeRate = nil`
`149`	`152`	`}`
	`153`	`+ .accessibilityIdentifier("RecommendedFeeButton")`
`150`	`154`	`}`
`151`	`155`	`.padding(.vertical, 12)`
`152`	`156`	`.cornerRadius(12)`
`@@ -203,6 +207,7 @@ struct BoostSheet: View {`
`203`	`207`	`}`
`204`	`208`	`.buttonStyle(PlainButtonStyle())`
`205`	`209`	`.disabled(feeRate == nil \|\| fetchingFees)`
	`210`	`+ .accessibilityIdentifier("CustomFeeButton")`
`206`	`211`	`}`
`207`	`212`	`.padding(.vertical, 12)`
`208`	`213`	`.cornerRadius(12)`
`@@ -219,6 +224,8 @@ struct BoostSheet: View {`
`219`	`224`	`}`
`220`	`225`	`}`
`221`	`226`	`.padding(.horizontal, 16)`
	`227`	`+ .accessibilityElement(children: .contain)`
	`228`	`+ .accessibilityIdentifier(isIncoming ? "CPFPBoost" : "RBFBoost")`
`222`	`229`	`}`
`223`	`230`	`.onAppear {`
`224`	`231`	`fetchFeeRate()`
`@@ -391,6 +398,7 @@ struct BoostSheet: View {`
`391`	`398`
`392`	`399`	`Logger.info("Boost transaction completed successfully, hiding sheet", context: "BoostSheet.performBoost")`
`393`	`400`	`sheets.hideSheet()`
	`401`	`+ navigation.reset()`
`394`	`402`
`395`	`403`	`} catch {`
`396`	`404`	`Logger.error("Failed to boost transaction: \(error)", context: "BoostSheet.performBoost")`