From be80fec15de22250b51e7f10ce1a87692993cc1b Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Mon, 3 Feb 2025 11:49:41 +1100 Subject: [PATCH] fix customised on cancel won't dismiss the modal --- Session/Conversations/ConversationVC+Interaction.swift | 6 ++++-- Session/Onboarding/LandingScreen.swift | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 80fa0ecbb..eff54ee4f 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -1263,9 +1263,11 @@ extension ConversationVC: UIApplication.shared.open(url, options: [:], completionHandler: nil) self?.showInputAccessoryView() }, - onCancel: { [weak self] _ in + onCancel: { [weak self] modal in UIPasteboard.general.string = url.absoluteString - self?.showInputAccessoryView() + modal.dismiss(animated: true) { + self?.showInputAccessoryView() + } } ) ) diff --git a/Session/Onboarding/LandingScreen.swift b/Session/Onboarding/LandingScreen.swift index 3590fcb2b..43262ba8b 100644 --- a/Session/Onboarding/LandingScreen.swift +++ b/Session/Onboarding/LandingScreen.swift @@ -159,10 +159,11 @@ struct LandingScreen: View { UIApplication.shared.open(url) } }, - onCancel: { _ in + onCancel: { modal in if let url: URL = URL(string: "https://getsession.org/privacy-policy") { UIApplication.shared.open(url) } + modal.close() } ) )