Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 20 insertions, 35 deletions

diff --git a/src/client/views/DictationOverlay.tsx b/src/client/views/DictationOverlay.tsx
index e098bc361..b242acdba 100644
--- a/src/client/views/DictationOverlay.tsx
+++ b/src/client/views/DictationOverlay.tsx
@@ -7,14 +7,14 @@ import { MainViewModal } from './MainViewModal';
 
 @observer
 export class DictationOverlay extends React.Component {
+    // eslint-disable-next-line no-use-before-define
     public static Instance: DictationOverlay;
     @observable private _dictationState = DictationManager.placeholder;
     @observable private _dictationSuccessState: boolean | undefined = undefined;
     @observable private _dictationDisplayState = false;
     @observable private _dictationListeningState: DictationManager.Controls.ListeningUIStatus = false;
 
-    public isPointerDown = false;
-    public overlayTimeout: NodeJS.Timeout | undefined;
+    // eslint-disable-next-line react/no-unused-class-component-methods
     public hasActiveModal = false;
 
     constructor(props: any) {
@@ -23,47 +23,32 @@ export class DictationOverlay extends React.Component {
         DictationOverlay.Instance = this;
     }
 
-    public initiateDictationFade = () => {
-        const duration = DictationManager.Commands.dictationFadeDuration;
-        this.overlayTimeout = setTimeout(() => {
-            this.dictationOverlayVisible = false;
-            this.dictationSuccess = undefined;
-            DictationOverlay.Instance.hasActiveModal = false;
-            setTimeout(() => (this.dictatedPhrase = DictationManager.placeholder), 500);
-        }, duration);
-    };
-    public cancelDictationFade = () => {
-        if (this.overlayTimeout) {
-            clearTimeout(this.overlayTimeout);
-            this.overlayTimeout = undefined;
-        }
-    };
-
-    @computed public get dictatedPhrase() {
-        return this._dictationState;
-    }
-    @computed public get dictationSuccess() {
-        return this._dictationSuccessState;
-    }
-    @computed public get dictationOverlayVisible() {
-        return this._dictationDisplayState;
-    }
-    @computed public get isListening() {
-        return this._dictationListeningState;
-    }
-
+    @computed public get dictatedPhrase() { return this._dictationState; } // prettier-ignore
     public set dictatedPhrase(value: string) {
-        runInAction(() => (this._dictationState = value));
+        runInAction(() => {
+            this._dictationState = value;
+        });
     }
+    @computed public get dictationSuccess() { return this._dictationSuccessState; } // prettier-ignore
     public set dictationSuccess(value: boolean | undefined) {
-        runInAction(() => (this._dictationSuccessState = value));
+        runInAction(() => { this._dictationSuccessState = value; }); // prettier-ignore
     }
+    @computed public get dictationOverlayVisible() { return this._dictationDisplayState; } // prettier-ignore
     public set dictationOverlayVisible(value: boolean) {
-        runInAction(() => (this._dictationDisplayState = value));
+        runInAction(() => { this._dictationDisplayState = value; }); // prettier-ignore
     }
+    @computed public get isListening() { return this._dictationListeningState; } // prettier-ignore
     public set isListening(value: DictationManager.Controls.ListeningUIStatus) {
-        runInAction(() => (this._dictationListeningState = value));
+        runInAction(() => { this._dictationListeningState = value; }); // prettier-ignore
     }
+    public initiateDictationFade = () => {
+        setTimeout(() => {
+            this.dictationOverlayVisible = false;
+            this.dictationSuccess = undefined;
+            DictationOverlay.Instance.hasActiveModal = false;
+            setTimeout(() => { this.dictatedPhrase = DictationManager.placeholder; }, 500); // prettier-ignore
+        }, DictationManager.Commands.dictationFadeDuration);
+    };
 
     render() {
         const success = this.dictationSuccess;