From f81cebe29878cb8ff8ce3606ea5906d87bb5fde7 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Fri, 12 Nov 2021 19:55:12 -0800
Subject: [PATCH] Fixes for feedback form

---
 src/Feedback.js        | 4 ++++
 src/Header.js          | 5 +++--
 src/redux/selectors.js | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Feedback.js b/src/Feedback.js
index 8badbc75..3666fdfa 100644
--- a/src/Feedback.js
+++ b/src/Feedback.js
@@ -16,6 +16,10 @@ export default function Feedback() {
   const url = useSelector(getUrl);
   const send = useCallback(async () => {
     const body = { message, email, url: "https://skins/webamp.org" + url };
+    if (message.trim().length === 0) {
+      alert("Please add a message before sending.");
+      return;
+    }
     setSending(true);
     await fetch(`${API_URL}/feedback`, {
       method: "POST",
diff --git a/src/Header.js b/src/Header.js
index e6491c4f..97b922e5 100644
--- a/src/Header.js
+++ b/src/Header.js
@@ -27,9 +27,10 @@ function SearchLogo() {
 
 function useFocusOnSlash() {
   const [input, setInput] = useState(null);
+  const feedbackFormOpen = useSelector(Selectors.getFeedbackFormOpen);
 
   useEffect(() => {
-    if (input == null) {
+    if (input == null || feedbackFormOpen) {
       return;
     }
     const handler = (e) => {
@@ -45,7 +46,7 @@ function useFocusOnSlash() {
     return () => {
       window.document.removeEventListener("keydown", handler);
     };
-  }, [input]);
+  }, [input, feedbackFormOpen]);
 
   return setInput;
 }
diff --git a/src/redux/selectors.js b/src/redux/selectors.js
index 6d5e9ab9..95be2497 100644
--- a/src/redux/selectors.js
+++ b/src/redux/selectors.js
@@ -246,3 +246,7 @@ export function getUploadedFiles(state) {
   });
   return files;
 }
+
+export function getFeedbackFormOpen(state) {
+  return state.showFeedbackForm;
+}