From f0ef7ae0493277c403bfbd77dbb8125a93f9e42d Mon Sep 17 00:00:00 2001
From: malmen237 <linda.malm@eyevinn.se>
Date: Tue, 14 Jan 2025 11:31:13 +0100
Subject: [PATCH 1/2] fix: added variable to toggle-hotkey

---
 .../production-line/hotkeys-component.tsx          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/production-line/hotkeys-component.tsx b/src/components/production-line/hotkeys-component.tsx
index c0837942..8c33db4b 100644
--- a/src/components/production-line/hotkeys-component.tsx
+++ b/src/components/production-line/hotkeys-component.tsx
@@ -70,12 +70,14 @@ export const HotkeysComponent = ({
             </strong>
             Toggle Output Mute
           </TempDiv>
-          <TempDiv>
-            <strong>
-              {(savedHotkeys?.pushToTalkHotkey || "").toUpperCase()}:{" "}
-            </strong>
-            Push to Talk
-          </TempDiv>
+          {!isProgramOutputLine && (
+            <TempDiv>
+              <strong>
+                {(savedHotkeys?.pushToTalkHotkey || "").toUpperCase()}:{" "}
+              </strong>
+              Push to Talk
+            </TempDiv>
+          )}
           <TempDiv>
             <strong>
               {savedHotkeys?.increaseVolumeHotkey.toUpperCase()}:{" "}

From 3679a0a57863ca6d465f05f97b023a4436a721cd Mon Sep 17 00:00:00 2001
From: malmen237 <linda.malm@eyevinn.se>
Date: Tue, 14 Jan 2025 11:40:02 +0100
Subject: [PATCH 2/2] fix: added conditions to hotkeys-settings

---
 .../production-line/settings-modal.tsx        | 132 +++++++++---------
 1 file changed, 68 insertions(+), 64 deletions(-)

diff --git a/src/components/production-line/settings-modal.tsx b/src/components/production-line/settings-modal.tsx
index 13f033ad..b259d76f 100644
--- a/src/components/production-line/settings-modal.tsx
+++ b/src/components/production-line/settings-modal.tsx
@@ -300,39 +300,41 @@ export const SettingsModal = ({
                   />
                 )}
               </FormLabel>
-              <FormLabel>
-                <DecorativeLabel>Toggle push to talk: </DecorativeLabel>
-                <FormInput
-                  id="hotkeyPushToTalk"
-                  ref={(el) => setInputRef(2, el)}
-                  type="text"
-                  value={hotkeys.pushToTalkHotkey}
-                  onChange={(e) =>
-                    handleInputChange("pushToTalkHotkey", e.target.value)
-                  }
-                  placeholder="Enter hotkey"
-                  maxLength={1}
-                  onKeyDown={(e) => handleKeyDown(e, 2)}
-                />
-                {errors.pushToTalkHotkey && (
-                  <ErrorMessage
-                    errors={{
-                      longpresskey: { message: errors.pushToTalkHotkey },
-                    }}
-                    name="longpresskey"
-                    as={<StyledWarningMessage className="error-message" />}
+              {!programOutPutLine && (
+                <FormLabel>
+                  <DecorativeLabel>Toggle push to talk: </DecorativeLabel>
+                  <FormInput
+                    id="hotkeyPushToTalk"
+                    ref={(el) => setInputRef(2, el)}
+                    type="text"
+                    value={hotkeys.pushToTalkHotkey}
+                    onChange={(e) =>
+                      handleInputChange("pushToTalkHotkey", e.target.value)
+                    }
+                    placeholder="Enter hotkey"
+                    maxLength={1}
+                    onKeyDown={(e) => handleKeyDown(e, 2)}
                   />
-                )}
-                {!errors.pushToTalkHotkey && warning.pushToTalkHotkey && (
-                  <ErrorMessage
-                    errors={{
-                      longpresskey: { message: warning.pushToTalkHotkey },
-                    }}
-                    name="longpresskey"
-                    as={StyledWarningMessage}
-                  />
-                )}
-              </FormLabel>
+                  {errors.pushToTalkHotkey && (
+                    <ErrorMessage
+                      errors={{
+                        longpresskey: { message: errors.pushToTalkHotkey },
+                      }}
+                      name="longpresskey"
+                      as={<StyledWarningMessage className="error-message" />}
+                    />
+                  )}
+                  {!errors.pushToTalkHotkey && warning.pushToTalkHotkey && (
+                    <ErrorMessage
+                      errors={{
+                        longpresskey: { message: warning.pushToTalkHotkey },
+                      }}
+                      name="longpresskey"
+                      as={StyledWarningMessage}
+                    />
+                  )}
+                </FormLabel>
+              )}
               <FormLabel>
                 <DecorativeLabel>Increase volume:</DecorativeLabel>
                 <FormInput
@@ -411,39 +413,41 @@ export const SettingsModal = ({
               </FormLabel>
             </>
           )}
-          <FormLabel>
-            <DecorativeLabel>Toggle mute all microphones: </DecorativeLabel>
-            <FormInput
-              id="globalMuteMicrophones"
-              ref={(el) => setInputRef(3, el)}
-              type="text"
-              value={hotkeys.globalMuteHotkey}
-              onChange={(e) =>
-                handleInputChange("globalMuteHotkey", e.target.value)
-              }
-              placeholder="Enter hotkey"
-              maxLength={1}
-              onKeyDown={(e) => handleKeyDown(e, 3)}
-            />
-            {errors.globalMuteHotkey && (
-              <ErrorMessage
-                errors={{
-                  globalMuteHotkey: { message: errors.globalMuteHotkey },
-                }}
-                name="globalMuteHotkey"
-                as={<StyledWarningMessage className="error-message" />}
-              />
-            )}
-            {!errors.globalMuteHotkey && warning.globalMuteHotkey && (
-              <ErrorMessage
-                errors={{
-                  globalMuteHotkey: { message: warning.globalMuteHotkey },
-                }}
-                name="globalMuteHotkey"
-                as={StyledWarningMessage}
+          {!programOutPutLine && (
+            <FormLabel>
+              <DecorativeLabel>Toggle mute all microphones: </DecorativeLabel>
+              <FormInput
+                id="globalMuteMicrophones"
+                ref={(el) => setInputRef(3, el)}
+                type="text"
+                value={hotkeys.globalMuteHotkey}
+                onChange={(e) =>
+                  handleInputChange("globalMuteHotkey", e.target.value)
+                }
+                placeholder="Enter hotkey"
+                maxLength={1}
+                onKeyDown={(e) => handleKeyDown(e, 3)}
               />
-            )}
-          </FormLabel>
+              {errors.globalMuteHotkey && (
+                <ErrorMessage
+                  errors={{
+                    globalMuteHotkey: { message: errors.globalMuteHotkey },
+                  }}
+                  name="globalMuteHotkey"
+                  as={<StyledWarningMessage className="error-message" />}
+                />
+              )}
+              {!errors.globalMuteHotkey && warning.globalMuteHotkey && (
+                <ErrorMessage
+                  errors={{
+                    globalMuteHotkey: { message: warning.globalMuteHotkey },
+                  }}
+                  name="globalMuteHotkey"
+                  as={StyledWarningMessage}
+                />
+              )}
+            </FormLabel>
+          )}
           <ButtonDiv>
             <CancelButton type="button" onClick={onClose}>
               Cancel