From 3d8eec939271bc076fa4868842cc449e78dd8e2a Mon Sep 17 00:00:00 2001
From: kate-signal <kate@signal.org>
Date: Tue, 21 Oct 2025 13:01:40 -0400
Subject: [PATCH] Poll create options editing cleanup

---
 Signal/src/ViewControllers/Polls/NewPollViewController.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Signal/src/ViewControllers/Polls/NewPollViewController.swift b/Signal/src/ViewControllers/Polls/NewPollViewController.swift
index 39679299ca..6c0a35ed6e 100644
--- a/Signal/src/ViewControllers/Polls/NewPollViewController.swift
+++ b/Signal/src/ViewControllers/Polls/NewPollViewController.swift
@@ -184,7 +184,8 @@ struct NewPollView: View {
                     .padding()
                     Spacer()
 
-                    let sendButtonEnabled = pollOptions.count >= 3 && !pollQuestion.isEmpty ? true : false
+                    let filteredPollOptions = pollOptions.filter({ !$0.text.stripped.isEmpty })
+                    let sendButtonEnabled = filteredPollOptions.count >= 2 && !pollQuestion.isEmpty
                     Button(MessageStrings.sendButton, action: {
                         if sendButtonEnabled {
                             viewModel.onSend(
@@ -281,7 +282,7 @@ struct NewPollView: View {
         }
 
         // If 0/1 option, we want exactly 2 fields in this case, so don't append or filter.
-        guard filteredPollOptions.count > 1 else {
+        if filteredPollOptions.count <= 1 && pollOptions.count == 2 {
             return
         }