From c159c2ede345aa041337c0da16fa241cb5af2e3c Mon Sep 17 00:00:00 2001 From: Arturs Krumins Date: Thu, 15 Aug 2024 13:15:24 +0300 Subject: [PATCH] ios: fix pending connection sheet styling when opened via icon; fix tappable area of pending connections and contact requests (#4694) * fix new contact sheet styling * fix contact request tappable area --------- Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> --- apps/ios/Shared/Views/ChatList/ChatListNavLink.swift | 2 ++ apps/ios/Shared/Views/ChatList/ContactConnectionView.swift | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift b/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift index c8424ef332..d2a93b9bd1 100644 --- a/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift +++ b/apps/ios/Shared/Views/ChatList/ChatListNavLink.swift @@ -355,6 +355,7 @@ struct ChatListNavLink: View { .tint(.red) } .frame(height: dynamicRowHeight) + .contentShape(Rectangle()) .onTapGesture { showContactRequestDialog = true } .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) { Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } } @@ -392,6 +393,7 @@ struct ChatListNavLink: View { } } } + .contentShape(Rectangle()) .onTapGesture { showContactConnectionInfo = true } diff --git a/apps/ios/Shared/Views/ChatList/ContactConnectionView.swift b/apps/ios/Shared/Views/ChatList/ContactConnectionView.swift index 3c7bf97af9..f5156d86b8 100644 --- a/apps/ios/Shared/Views/ChatList/ContactConnectionView.swift +++ b/apps/ios/Shared/Views/ChatList/ContactConnectionView.swift @@ -16,7 +16,6 @@ struct ContactConnectionView: View { @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize @State private var localAlias = "" @FocusState private var aliasTextFieldFocused: Bool - @State private var showContactConnectionInfo = false var body: some View { if case let .contactConnection(conn) = chat.chatInfo { @@ -32,7 +31,6 @@ struct ContactConnectionView: View { .scaledToFill() .frame(width: 48, height: 48) .foregroundColor(Color(uiColor: .tertiarySystemGroupedBackground).asAnotherColorFromSecondaryVariant(theme)) - .onTapGesture { showContactConnectionInfo = true } } .frame(width: 63, height: 63) .padding(.leading, 4) @@ -72,9 +70,6 @@ struct ContactConnectionView: View { Spacer() } .frame(maxHeight: .infinity) - .appSheet(isPresented: $showContactConnectionInfo) { - ContactConnectionInfo(contactConnection: contactConnection) - } } } }