From c6b0a7d731bce7000f545b90638574e2a4f39791 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@did.science>
Date: Tue, 29 Sep 2020 16:31:09 +0200
Subject: [PATCH] Fixed the sensitivity activity detector

---
 shared/js/ui/modal/settings/Microphone.scss        | 2 ++
 shared/js/ui/modal/settings/MicrophoneRenderer.tsx | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/shared/js/ui/modal/settings/Microphone.scss b/shared/js/ui/modal/settings/Microphone.scss
index 66ef89df..9721b0e2 100644
--- a/shared/js/ui/modal/settings/Microphone.scss
+++ b/shared/js/ui/modal/settings/Microphone.scss
@@ -187,6 +187,8 @@
                     width: 100%;
                     background: transparent;
 
+                    z-index: 10;
+
                     .filler {
                         display: none;
                     }
diff --git a/shared/js/ui/modal/settings/MicrophoneRenderer.tsx b/shared/js/ui/modal/settings/MicrophoneRenderer.tsx
index a2447bca..5bfdab15 100644
--- a/shared/js/ui/modal/settings/MicrophoneRenderer.tsx
+++ b/shared/js/ui/modal/settings/MicrophoneRenderer.tsx
@@ -47,6 +47,8 @@ const ActivityBar = (props: { events: Registry<MicrophoneSettingsEvents>, device
     const refHider = useRef<HTMLDivElement>();
     const [status, setStatus] = useState<ActivityBarStatus>({mode: "loading"});
 
+    if(typeof props.deviceId === "undefined") { throw "invalid device id"; }
+
     props.events.reactUse("notify_device_level", event => {
         if (event.status === "uninitialized") {
             if (status.mode === "uninitialized")
@@ -62,8 +64,9 @@ const ActivityBar = (props: { events: Registry<MicrophoneSettingsEvents>, device
         } else {
             const device = event.level[props.deviceId];
             if (!device) {
-                if (status.mode === "loading")
+                if (status.mode === "loading") {
                     return;
+                }
 
                 setStatus({mode: "loading"});
             } else if (device.status === "success") {
@@ -503,7 +506,7 @@ const ThresholdSelector = (props: { events: Registry<MicrophoneSettingsEvents> }
     return (
         <div className={cssStyle.containerSensitivity}>
             <div className={cssStyle.containerBar}>
-                <ActivityBar events={props.events} deviceId={currentDevice} disabled={!isActive || !currentDevice}/>
+                <ActivityBar events={props.events} deviceId={currentDevice || "none"} disabled={!isActive || !currentDevice} key={"activity-" + currentDevice} />
             </div>
             <Slider
                 ref={refSlider}