From 3fac266013680a7af47debcbd94d78a63f5a9046 Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Wed, 5 Jan 2022 16:54:13 -0800
Subject: [PATCH] Clean up settings modal

---
 src/OverflowMenu.jsx                        |  2 +-
 src/{ => settings}/SettingsModal.jsx        | 14 +++++++-------
 src/{ => settings}/SettingsModal.module.css |  0
 src/{ => settings}/useMediaHandler.js       |  4 +---
 4 files changed, 9 insertions(+), 11 deletions(-)
 rename src/{ => settings}/SettingsModal.jsx (84%)
 rename src/{ => settings}/SettingsModal.module.css (100%)
 rename src/{ => settings}/useMediaHandler.js (97%)

diff --git a/src/OverflowMenu.jsx b/src/OverflowMenu.jsx
index 25d63d7..2937909 100644
--- a/src/OverflowMenu.jsx
+++ b/src/OverflowMenu.jsx
@@ -7,7 +7,7 @@ import { ReactComponent as SettingsIcon } from "./icons/Settings.svg";
 import { ReactComponent as AddUserIcon } from "./icons/AddUser.svg";
 import { ReactComponent as OverflowIcon } from "./icons/Overflow.svg";
 import { useModalTriggerState } from "./Modal";
-import { SettingsModal } from "./SettingsModal";
+import { SettingsModal } from "./settings/SettingsModal";
 import { InviteModal } from "./InviteModal";
 import { Tooltip, TooltipTrigger } from "./Tooltip";
 
diff --git a/src/SettingsModal.jsx b/src/settings/SettingsModal.jsx
similarity index 84%
rename from src/SettingsModal.jsx
rename to src/settings/SettingsModal.jsx
index cfead7e..d6e94f7 100644
--- a/src/SettingsModal.jsx
+++ b/src/settings/SettingsModal.jsx
@@ -1,14 +1,14 @@
 import React from "react";
-import { Modal } from "./Modal";
+import { Modal } from "../Modal";
 import styles from "./SettingsModal.module.css";
-import { TabContainer, TabItem } from "./Tabs";
-import { ReactComponent as AudioIcon } from "./icons/Audio.svg";
-import { ReactComponent as VideoIcon } from "./icons/Video.svg";
-import { ReactComponent as DeveloperIcon } from "./icons/Developer.svg";
-import { SelectInput } from "./SelectInput";
+import { TabContainer, TabItem } from "../Tabs";
+import { ReactComponent as AudioIcon } from "../icons/Audio.svg";
+import { ReactComponent as VideoIcon } from "../icons/Video.svg";
+import { ReactComponent as DeveloperIcon } from "../icons/Developer.svg";
+import { SelectInput } from "../SelectInput";
 import { Item } from "@react-stately/collections";
 import { useMediaHandler } from "./useMediaHandler";
-import { FieldRow, InputField } from "./Input";
+import { FieldRow, InputField } from "../Input";
 
 export function SettingsModal({
   client,
diff --git a/src/SettingsModal.module.css b/src/settings/SettingsModal.module.css
similarity index 100%
rename from src/SettingsModal.module.css
rename to src/settings/SettingsModal.module.css
diff --git a/src/useMediaHandler.js b/src/settings/useMediaHandler.js
similarity index 97%
rename from src/useMediaHandler.js
rename to src/settings/useMediaHandler.js
index ad42f30..f603809 100644
--- a/src/useMediaHandler.js
+++ b/src/settings/useMediaHandler.js
@@ -1,7 +1,5 @@
 import { useState, useEffect, useCallback } from "react";
 
-let audioOutput;
-
 export function useMediaHandler(client) {
   const [{ audioInput, videoInput, audioInputs, videoInputs }, setState] =
     useState(() => {
@@ -27,7 +25,7 @@ export function useMediaHandler(client) {
           (device) => device.kind === "videoinput"
         );
 
-        setState((prevState) => ({
+        setState(() => ({
           audioInput: mediaHandler.audioInput,
           videoInput: mediaHandler.videoInput,
           audioInputs,