Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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: '^(?!.*@settings_10)(@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security)' }
- { name: e2e, grep: '^(?!.*@settings_10)(@backup|@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security)' }

name: e2e-tests - ${{ matrix.shard.name }}

Expand Down
1 change: 0 additions & 1 deletion Bitkit/Components/Activity/DateRangeSelectorSheet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ struct DateRangeSelectorSheet: View {
startDate = nil
endDate = nil
viewModel.clearDateRange()
isPresented = false
}
.accessibilityIdentifier("CalendarClearButton")

Expand Down
21 changes: 19 additions & 2 deletions Bitkit/Views/Settings/Backup/BackupSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ struct BackupSettings: View {
@EnvironmentObject var sheets: SheetViewModel
@StateObject private var viewModel = BackupViewModel()

private var allSynced: Bool {
BackupCategory.allCases.allSatisfy { category in
let status = viewModel.getStatus(for: category)
return !status.running && !status.isRequired
}
}

var body: some View {
VStack(alignment: .leading, spacing: 0) {
NavigationBar(title: t("settings__backup_title"))
Expand All @@ -74,8 +81,18 @@ struct BackupSettings: View {
}
.accessibilityIdentifier("ResetAndRestore")

SettingsLabel(t("settings__backup__latest"))
.padding(.top, 16)
HStack(alignment: .center, spacing: 8) {
SettingsLabel(t("settings__backup__latest"))

if Env.isE2E, allSynced {
Image("check")
.resizable()
.frame(width: 16, height: 16)
.foregroundColor(.greenAccent)
.accessibilityIdentifier("AllSynced")
}
}
.padding(.top, 16)

ForEach(BackupCategory.allCases, id: \.self) { category in
let status = viewModel.getStatus(for: category)
Expand Down
4 changes: 3 additions & 1 deletion Bitkit/Views/Wallets/Sheets/AddTagSheet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ struct AddTagSheet: View {
TagInputForm(
tagText: $newTag,
isTextFieldFocused: $isTextFieldFocused,
isLoading: isLoading
isLoading: isLoading,
textFieldTestId: "TagInput",
buttonTestId: "ActivityTagsSubmit"
) { tag in
await appendTagAndClose(tag)
}
Expand Down
Loading