Skip to content

Test/boost #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 13, 2025
Merged

Test/boost #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b108682
Boost test ids
piotr-iohk Nov 7, 2025
078a2f3
Time sheets testIDs
piotr-iohk Nov 10, 2025
e6207a7
ActivityItemView test ids
piotr-iohk Nov 10, 2025
6f97f6a
go to home after boost
piotr-iohk Nov 10, 2025
39f85a1
enable boost tests
piotr-iohk Nov 10, 2025
23319f8
fix typo
piotr-iohk Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
1 change: 1 addition & 0 deletions Bitkit/Components/NavigationBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct NavigationBar: View {
.foregroundColor(.textPrimary)
.frame(width: 24, height: 24)
}
.accessibilityIdentifier("NavigationBack")
} else {
Spacer()
.frame(width: 24, height: 24)
Expand Down
11 changes: 10 additions & 1 deletion Bitkit/Components/SheetIntro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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")
}
}
}
14 changes: 12 additions & 2 deletions Bitkit/Views/Wallets/Activity/ActivityExplorerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -94,6 +101,7 @@ struct ActivityExplorerView: View {
}
}
.buttonStyle(.plain)
.accessibilityIdentifierIfPresent(testId)
}
}

Expand All @@ -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 {
Expand Down Expand Up @@ -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"
)
}
}
Expand Down
70 changes: 40 additions & 30 deletions Bitkit/Views/Wallets/Activity/ActivityIcon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
23 changes: 20 additions & 3 deletions Bitkit/Views/Wallets/Activity/ActivityItemView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -124,7 +139,6 @@ struct ActivityItemView: View {
Spacer()
ActivityIcon(activity: viewModel.activity, size: 48)
}
.accessibilityIdentifier("ActivityAmount")
.padding(.bottom, 16)

statusSection
Expand Down Expand Up @@ -208,6 +222,7 @@ struct ActivityItemView: View {
}
}
}
.accessibilityIdentifierIfPresent(statusAccessibilityIdentifier)
.padding(.bottom, 16)

Divider()
Expand Down Expand Up @@ -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)

Expand All @@ -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)

Expand Down
8 changes: 8 additions & 0 deletions Bitkit/Views/Wallets/Sheets/BoostSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down Expand Up @@ -115,6 +116,7 @@ struct BoostSheet: View {
.cornerRadius(200)
}
.disabled(currentFeeRate <= minFeeRate)
.accessibilityIdentifier("Minus")

Spacer()

Expand All @@ -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)
Expand Down Expand Up @@ -203,6 +207,7 @@ struct BoostSheet: View {
}
.buttonStyle(PlainButtonStyle())
.disabled(feeRate == nil || fetchingFees)
.accessibilityIdentifier("CustomFeeButton")
}
.padding(.vertical, 12)
.cornerRadius(12)
Expand All @@ -219,6 +224,8 @@ struct BoostSheet: View {
}
}
.padding(.horizontal, 16)
.accessibilityElement(children: .contain)
.accessibilityIdentifier(isIncoming ? "CPFPBoost" : "RBFBoost")
}
.onAppear {
fetchFeeRate()
Expand Down Expand Up @@ -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")
Expand Down
Loading