From 132fa254a1eb0b220279d47b5558f76eeaf3ec91 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 24 Mar 2025 08:58:45 +1100 Subject: [PATCH] Only delay the dismissal if we want to show feedback before dismissing --- .../Media Viewing & Editing/MessageInfoScreen.swift | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Session/Media Viewing & Editing/MessageInfoScreen.swift b/Session/Media Viewing & Editing/MessageInfoScreen.swift index e9427b9e4..b7f4f7618 100644 --- a/Session/Media Viewing & Editing/MessageInfoScreen.swift +++ b/Session/Media Viewing & Editing/MessageInfoScreen.swift @@ -313,11 +313,13 @@ struct MessageInfoScreen: View { Button( action: { actions[index].work() { - if actions[index].shouldDismissInfoScreen { - let deadline: DispatchTime = .now() + (feedbackMessage?.isEmpty == false ? 2 : 0) - DispatchQueue.main.asyncAfter(deadline: deadline, execute: { - dismiss() - }) + switch (actions[index].shouldDismissInfoScreen, actions[index].feedback) { + case (true, .some): + DispatchQueue.main.asyncAfter(deadline: .now() + 2, execute: { + dismiss() + }) + + default: dismiss() } } feedbackMessage = actions[index].feedback