Merge remote-tracking branch 'origin/M3-intergration-test' into M3-in…

…tergration-test
sopra-fs24-group-09 · Apr 25, 2024 · 7c903e1 · 7c903e1
2 parents 5b9ca84 + d663197
commit 7c903e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/components/ui/Dropdown.tsx b/src/components/ui/Dropdown.tsx
@@ -17,7 +17,7 @@ export const Dropdown = (props) => {
         style={props.style}
         onChange={handleChange}
         defaultValue={props.defaultValue}>
-        {props.prompt && <option hidden disabled selected value>{props.prompt}</option>}
+        {props.prompt && <option hidden disabled selected value="">{props.prompt}</option>}
         {props.options.map((option, index) => (
           <option key={index} value={option.value}>
             {option.label}

diff --git a/src/components/views/Gameroom.tsx b/src/components/views/Gameroom.tsx
@@ -787,6 +787,10 @@ const Gameroom = () => {
               ffmpeg={ffmpegObj}
               audioName={"my_recording"}
               handleReversedAudioChange={handleAudioReversed}
+              disabled={
+                (currentSpeakerID !== user.id && currentStatus === "speak") ||
+                currentStatus === "reveal"
+              }
             />
           </div>
         </div>