From 0bbe96ab1cb7440088a8145314f0f78bba101ed8 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Wed, 8 Dec 2021 12:28:53 +0200
Subject: [PATCH] vector-im/element-ios/issues/5114 - Fix SwiftUI not allowing
multiple alerts on the same view prior to iOS 15.
---
.../PollTimeline/View/PollTimelineView.swift | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineView.swift b/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineView.swift
index 4bb95a47b2..22a94bb686 100644
--- a/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineView.swift
+++ b/RiotSwiftUI/Modules/Room/PollTimeline/View/PollTimelineView.swift
@@ -47,23 +47,23 @@ struct PollTimelineView: View {
viewModel.send(viewAction: .selectAnswerOptionWithIdentifier(answerOption.id))
}
}
+ .alert(isPresented: $viewModel.showsClosingFailureAlert) {
+ Alert(title: Text(VectorL10n.pollTimelineNotClosedTitle),
+ message: Text(VectorL10n.pollTimelineNotClosedSubtitle),
+ dismissButton: .default(Text(VectorL10n.pollTimelineNotClosedAction)))
+ }
}
.disabled(poll.closed)
.fixedSize(horizontal: false, vertical: true)
- .alert(isPresented: $viewModel.showsAnsweringFailureAlert) {
- Alert(title: Text(VectorL10n.pollTimelineNotClosedTitle),
- message: Text(VectorL10n.pollTimelineNotClosedSubtitle),
- dismissButton: .default(Text(VectorL10n.pollTimelineNotClosedAction)))
- }
- .alert(isPresented: $viewModel.showsClosingFailureAlert) {
- Alert(title: Text(VectorL10n.pollTimelineVoteNotRegisteredTitle),
- message: Text(VectorL10n.pollTimelineVoteNotRegisteredSubtitle),
- dismissButton: .default(Text(VectorL10n.pollTimelineVoteNotRegisteredAction)))
- }
Text(totalVotesString)
.font(theme.fonts.footnote)
.foregroundColor(theme.colors.tertiaryContent)
+ .alert(isPresented: $viewModel.showsAnsweringFailureAlert) {
+ Alert(title: Text(VectorL10n.pollTimelineVoteNotRegisteredTitle),
+ message: Text(VectorL10n.pollTimelineVoteNotRegisteredSubtitle),
+ dismissButton: .default(Text(VectorL10n.pollTimelineVoteNotRegisteredAction)))
+ }
}
.padding([.horizontal, .top], 2.0)
.padding([.bottom])