From 2895c374c09feb5896d5933e3ebff2608338d0bf Mon Sep 17 00:00:00 2001 From: ericholguin Date: Thu, 2 Nov 2023 13:15:53 +0900 Subject: [PATCH] fix: relay filter button fix Closes: https://github.com/damus-io/damus/pull/1678 Tested-by: William Casarin Signed-off-by: William Casarin --- damus/ContentView.swift | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/damus/ContentView.swift b/damus/ContentView.swift index 05a23781..79cce5c0 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -264,16 +264,13 @@ struct ContentView: View { // maybe expand this to other timelines in the future if selected_timeline == .search { + Button(action: { - //isFilterVisible.toggle() present_sheet(.filter) - }) { - // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease..., line.3.horizontail.decrease - Label(NSLocalizedString("Filter", comment: "Button label text for filtering relay servers."), image: "filter") + }, label: { + Image("filter") .foregroundColor(.gray) - //.contentShape(Rectangle()) - } - .buttonStyle(.plain) + }) } } } @@ -326,13 +323,9 @@ struct ContentView: View { SelectWalletView(default_wallet: damus_state!.settings.default_wallet, active_sheet: $active_sheet, our_pubkey: damus_state!.pubkey, invoice: select.invoice) case .filter: let timeline = selected_timeline - if #available(iOS 16.0, *) { - RelayFilterView(state: damus_state!, timeline: timeline) - .presentationDetents([.height(550)]) - .presentationDragIndicator(.visible) - } else { - RelayFilterView(state: damus_state!, timeline: timeline) - } + RelayFilterView(state: damus_state!, timeline: timeline) + .presentationDetents([.height(550)]) + .presentationDragIndicator(.visible) case .onboardingSuggestions: OnboardingSuggestionsView(model: SuggestedUsersViewModel(damus_state: damus_state!)) }