From da7c0f644fb69552b83c373d5ad13550634900f9 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 02:57:00 -0600
Subject: [PATCH 01/16] Adding dev flags to turn off certain analytics
 settings/ui while testing. Fixed modal overflow

---
 fission/src/Synthesis.tsx                        | 2 +-
 fission/src/systems/analytics/AnalyticsSystem.ts | 3 ++-
 fission/src/ui/components/Modal.tsx              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fission/src/Synthesis.tsx b/fission/src/Synthesis.tsx
index 51e9c4db05..1b3d308176 100644
--- a/fission/src/Synthesis.tsx
+++ b/fission/src/Synthesis.tsx
@@ -95,7 +95,7 @@ function Synthesis() {
 
         World.InitWorld()
 
-        if (!PreferencesSystem.getGlobalPreference<boolean>("ReportAnalytics")) {
+        if (!PreferencesSystem.getGlobalPreference<boolean>("ReportAnalytics") && !import.meta.env.DEV) {
             setConsentPopupDisable(false)
         }
 
diff --git a/fission/src/systems/analytics/AnalyticsSystem.ts b/fission/src/systems/analytics/AnalyticsSystem.ts
index 778a60b69f..6fd1d04a9d 100644
--- a/fission/src/systems/analytics/AnalyticsSystem.ts
+++ b/fission/src/systems/analytics/AnalyticsSystem.ts
@@ -27,7 +27,8 @@ class AnalyticsSystem extends WorldSystem {
         init({
             measurementId: "G-6XNCRD7QNC",
             debug: import.meta.env.DEV,
-            sendPageViews: true,
+            anonymizeIp: true,
+            sendPageViews: false,
             trackingConsent: PreferencesSystem.getGlobalPreference<boolean>("ReportAnalytics"),
         })
 
diff --git a/fission/src/ui/components/Modal.tsx b/fission/src/ui/components/Modal.tsx
index 97152494b2..a0570db82e 100644
--- a/fission/src/ui/components/Modal.tsx
+++ b/fission/src/ui/components/Modal.tsx
@@ -70,7 +70,7 @@ const Modal: React.FC<ModalProps> = ({
                     id="content"
                     className={`${contentClassName} ${
                         !contentClassName?.includes("mx") ? "mx-[2rem]" : ""
-                    } flex flex-col gap-4 max-h-75vh`}
+                    } flex flex-col gap-4 max-h-75vh overflow-y-auto p-4`}
                 >
                     {children}
                 </div>

From a15615554bd5bff03583a35dae2fe8e93461b2f6 Mon Sep 17 00:00:00 2001
From: LucaHaverty <lucahaverty@gmail.com>
Date: Mon, 29 Jul 2024 10:18:02 -0700
Subject: [PATCH 02/16] Fixed only one input scheme saving

---
 fission/src/systems/input/InputSchemeManager.ts | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/fission/src/systems/input/InputSchemeManager.ts b/fission/src/systems/input/InputSchemeManager.ts
index 76c433c962..23a5ede69d 100644
--- a/fission/src/systems/input/InputSchemeManager.ts
+++ b/fission/src/systems/input/InputSchemeManager.ts
@@ -122,24 +122,10 @@ class InputSchemeManager {
 
     /** Save all schemes that have been customized to local storage via preferences */
     public static saveSchemes() {
-        const customizedSchemes = Array.from(InputSystem.brainIndexSchemeMap.values()).filter(s => {
+        const customizedSchemes = this.allInputSchemes.filter(s => {
             return s.customized
         })
 
-        // Save default schemes that have been customized if a customized version does not already exist
-        this.defaultInputSchemes.forEach(s => {
-            if (!s.customized) return
-
-            if (
-                customizedSchemes.some(c => {
-                    if (c.schemeName === s.schemeName) return true
-                })
-            )
-                return
-
-            customizedSchemes.push(s)
-        })
-
         PreferencesSystem.setGlobalPreference("InputSchemes", customizedSchemes)
         PreferencesSystem.savePreferences()
     }

From f1e8a8c21e94b2a847d3926876f0067c212e9d54 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:15:33 -0600
Subject: [PATCH 03/16] Trying to fix bug with selecting scheme

---
 fission/src/ui/components/Dropdown.tsx        |  2 +-
 fission/src/ui/components/Panel.tsx           |  1 +
 .../modals/spawning/ManageAssembliesModal.tsx | 37 ++++++++++++++++++-
 .../configuring/ChooseInputSchemePanel.tsx    | 28 +++++++++++---
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/fission/src/ui/components/Dropdown.tsx b/fission/src/ui/components/Dropdown.tsx
index 43229fa496..7b57996c81 100644
--- a/fission/src/ui/components/Dropdown.tsx
+++ b/fission/src/ui/components/Dropdown.tsx
@@ -45,7 +45,7 @@ const Dropdown: React.FC<DropdownProps> = ({ label, options, onSelect }) => {
                     ) => typeof value === "string" && onSelect && onSelect(value)}
                 >
                     {optionList.map(option => (
-                        <Option value={option} key={option}>
+                        <Option className={"z-[10000]"} value={option} key={option}>
                             {option}
                         </Option>
                     ))}
diff --git a/fission/src/ui/components/Panel.tsx b/fission/src/ui/components/Panel.tsx
index b8faee4977..f37c95becc 100644
--- a/fission/src/ui/components/Panel.tsx
+++ b/fission/src/ui/components/Panel.tsx
@@ -70,6 +70,7 @@ export type PanelPropsImpl = {
     panelId: string
     openLocation?: OpenLocation
     sidePadding?: number
+    args?: unknown[]
 }
 
 type PanelProps = {
diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 4f4451da78..41accd8ad3 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -1,10 +1,13 @@
-import React, { useReducer } from "react"
+import React, { useMemo, useReducer } from "react"
 import Modal, { ModalPropsImpl } from "@/components/Modal"
 import { FaWrench } from "react-icons/fa6"
 import Button from "@/components/Button"
 import Label, { LabelSize } from "@/components/Label"
 import World from "@/systems/World"
 import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
+import { usePanelControlContext } from "@/ui/PanelContext"
+import { setSelectedBrainIndexGlobal } from "@/ui/panels/configuring/ChooseInputSchemePanel"
+import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 
 interface AssemblyCardProps {
     mira: MirabufSceneObject
@@ -12,12 +15,44 @@ interface AssemblyCardProps {
 }
 
 const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
+
+    const { openPanel } = usePanelControlContext()
+
+    const brain = useMemo(() => (mira.brain as SynthesisBrain)?.brainIndex, [mira])
+
     return (
         <div
             key={mira.id}
             className="flex flex-row align-middle justify-between items-center bg-background rounded-sm p-2 gap-2"
         >
             <Label className="text-wrap break-all">{mira.assemblyName}</Label>
+            {/* <Dropdown
+                // label={}
+                // Moves the selected option to the start of the array
+                options={moveElementToTop(
+                    InputSchemeManager.allInputSchemes.map(s => s.schemeName),
+                    selectedScheme?.schemeName
+                )}
+                onSelect={value => {
+                    const schemeData = InputSchemeManager.allInputSchemes.find(
+                        s => s.schemeName == value
+                    )
+                    if (!schemeData || schemeData == selectedScheme) return
+
+                    setSelectedScheme(schemeData)
+                    if (brain != undefined) {
+                        console.debug(schemeData.schemeName)
+                        InputSystem.brainIndexSchemeMap.set(brain, schemeData)
+                    }
+                }}
+            /> */}
+            <Button
+                value="Set Scheme"
+                onClick={() => {
+                    setSelectedBrainIndexGlobal(brain)
+                    openPanel('change-scheme')
+                }}
+            />
             <Button
                 value="Delete"
                 onClick={() => {
diff --git a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
index c6cfdceab3..ac332f6879 100644
--- a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
+++ b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
@@ -9,14 +9,24 @@ import Label, { LabelSize } from "@/ui/components/Label"
 import { useModalControlContext } from "@/ui/ModalContext"
 import { usePanelControlContext } from "@/ui/PanelContext"
 import { Box, Divider, styled } from "@mui/material"
-import { useEffect, useReducer } from "react"
+import { useEffect, useMemo, useReducer } from "react"
 import { AiOutlinePlus } from "react-icons/ai"
 import { IoCheckmark, IoPencil, IoTrashBin } from "react-icons/io5"
 
+// eslint-disable-next-line react-refresh/only-export-components
+let selectedBrainIndexGlobal: number | undefined = undefined
+export function setSelectedBrainIndexGlobal(index: number | undefined) {
+    selectedBrainIndexGlobal = index
+}
+
 const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
     const { closePanel } = usePanelControlContext()
     const { openModal } = useModalControlContext()
 
+    const selectedBrainIndex = useMemo(() => {
+        return selectedBrainIndexGlobal != undefined ? selectedBrainIndexGlobal : SynthesisBrain.brainIndexMap.size - 1
+    }, [])
+
     const [_, update] = useReducer(x => !x, false)
 
     const AddIcon = <AiOutlinePlus size={"1.25rem"} />
@@ -38,7 +48,8 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
         /** If the panel is closed before a scheme is selected, defaults to the top of the list */
         return () => {
-            const brainIndex = SynthesisBrain.brainIndexMap.size - 1
+            const brainIndex = selectedBrainIndex
+            console.log(brainIndex)
 
             if (InputSystem.brainIndexSchemeMap.has(brainIndex)) return
 
@@ -49,6 +60,13 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
             openModal("change-inputs")
         }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [closePanel, openModal])
+
+    useEffect(() => {
+        return () => {
+            selectedBrainIndexGlobal = undefined
+        }
     }, [])
 
     return (
@@ -95,7 +113,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                     value={SelectIcon}
                                     onClick={() => {
                                         InputSystem.brainIndexSchemeMap.set(
-                                            SynthesisBrain.brainIndexMap.size - 1,
+                                            selectedBrainIndex,
                                             scheme
                                         )
                                         closePanel(panelId)
@@ -107,7 +125,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                     value={EditIcon}
                                     onClick={() => {
                                         InputSystem.brainIndexSchemeMap.set(
-                                            SynthesisBrain.brainIndexMap.size - 1,
+                                            selectedBrainIndex,
                                             scheme
                                         )
                                         InputSystem.selectedScheme = scheme
@@ -153,7 +171,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                 value={AddIcon}
                 onClick={() => {
                     InputSystem.brainIndexSchemeMap.set(
-                        SynthesisBrain.brainIndexMap.size - 1,
+                        selectedBrainIndex,
                         DefaultInputs.newBlankScheme
                     )
                     openModal("assign-new-scheme")

From 248a043c9dc10edaf294c306d6ceb54f4ea4beec Mon Sep 17 00:00:00 2001
From: LucaHaverty <lucahaverty@gmail.com>
Date: Mon, 29 Jul 2024 13:27:30 -0700
Subject: [PATCH 04/16] Open the schoos scheme panel when an APS robot is
 spawned

---
 fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
index 30b8159cfc..0b9bbb684e 100644
--- a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
+++ b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -282,8 +282,10 @@ const ImportMirabufPanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                 .catch(() => status.Fail())
 
             closePanel(panelId)
+
+            if (type == MiraType.ROBOT) openPanel("choose-scheme")
         },
-        [closePanel, panelId]
+        [closePanel, panelId, openPanel]
     )
 
     // Generate Item cards for cached robots.

From f6f3a81f4380f10412edacf0aec8edbf4f1e1390 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:53:19 -0600
Subject: [PATCH 05/16] Fixed scheme selection, added text to show which scheme
 is being used

---
 .../modals/spawning/ManageAssembliesModal.tsx | 70 ++++++-------------
 .../configuring/ChooseInputSchemePanel.tsx    | 33 ++++-----
 2 files changed, 34 insertions(+), 69 deletions(-)

diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 41accd8ad3..02a0195a31 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -8,6 +8,8 @@ import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import { usePanelControlContext } from "@/ui/PanelContext"
 import { setSelectedBrainIndexGlobal } from "@/ui/panels/configuring/ChooseInputSchemePanel"
 import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
+import { useModalControlContext } from "@/ui/ModalContext"
+import InputSystem from "@/systems/input/InputSystem"
 
 interface AssemblyCardProps {
     mira: MirabufSceneObject
@@ -15,8 +17,8 @@ interface AssemblyCardProps {
 }
 
 const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
-
     const { openPanel } = usePanelControlContext()
+    const { closeModal } = useModalControlContext()
 
     const brain = useMemo(() => (mira.brain as SynthesisBrain)?.brainIndex, [mira])
 
@@ -25,41 +27,24 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
             key={mira.id}
             className="flex flex-row align-middle justify-between items-center bg-background rounded-sm p-2 gap-2"
         >
-            <Label className="text-wrap break-all">{mira.assemblyName}</Label>
-            {/* <Dropdown
-                // label={}
-                // Moves the selected option to the start of the array
-                options={moveElementToTop(
-                    InputSchemeManager.allInputSchemes.map(s => s.schemeName),
-                    selectedScheme?.schemeName
-                )}
-                onSelect={value => {
-                    const schemeData = InputSchemeManager.allInputSchemes.find(
-                        s => s.schemeName == value
-                    )
-                    if (!schemeData || schemeData == selectedScheme) return
-
-                    setSelectedScheme(schemeData)
-                    if (brain != undefined) {
-                        console.debug(schemeData.schemeName)
-                        InputSystem.brainIndexSchemeMap.set(brain, schemeData)
-                    }
-                }}
-            /> */}
-            <Button
-                value="Set Scheme"
-                onClick={() => {
-                    setSelectedBrainIndexGlobal(brain)
-                    openPanel('change-scheme')
-                }}
-            />
-            <Button
-                value="Delete"
-                onClick={() => {
-                    World.SceneRenderer.RemoveSceneObject(mira.id)
-                    update()
-                }}
-            />
+            <Label className="text-wrap break-all">{`[${InputSystem.brainIndexSchemeMap.get(brain)?.schemeName ?? "-"}] ${mira.assemblyName}`}</Label>
+            <div className="flex flex-row gap-4">
+                <Button
+                    value="Set Scheme"
+                    onClick={() => {
+                        setSelectedBrainIndexGlobal(brain)
+                        openPanel("choose-scheme")
+                        closeModal()
+                    }}
+                />
+                <Button
+                    value="Delete"
+                    onClick={() => {
+                        World.SceneRenderer.RemoveSceneObject(mira.id)
+                        update()
+                    }}
+                />
+            </div>
         </div>
     )
 }
@@ -78,18 +63,7 @@ const ManageAssembliesModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
         .map(x => x[1] as MirabufSceneObject)
 
     return (
-        <Modal
-            name={"Manage Assemblies"}
-            icon={<FaWrench />}
-            modalId={modalId}
-            onAccept={() => {
-                // showTooltip("controls", [
-                //     { control: "WASD", description: "Drive" },
-                //     { control: "E", description: "Intake" },
-                //     { control: "Q", description: "Dispense" },
-                // ]);
-            }}
-        >
+        <Modal name={"Manage Assemblies"} icon={<FaWrench />} modalId={modalId}>
             <div className="flex overflow-y-auto flex-col gap-2 min-w-[50vw] max-h-[60vh] bg-background-secondary rounded-md p-2">
                 <Label size={LabelSize.Medium} className="text-center border-b-[1pt] mt-[4pt] mb-[2pt] mx-[5%]">
                     {assemblies ? `${assemblies.length} Assemblies` : "No Assemblies"}
diff --git a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
index ac332f6879..62fd13eaa8 100644
--- a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
+++ b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
@@ -9,24 +9,24 @@ import Label, { LabelSize } from "@/ui/components/Label"
 import { useModalControlContext } from "@/ui/ModalContext"
 import { usePanelControlContext } from "@/ui/PanelContext"
 import { Box, Divider, styled } from "@mui/material"
-import { useEffect, useMemo, useReducer } from "react"
+import { useEffect, useReducer } from "react"
 import { AiOutlinePlus } from "react-icons/ai"
 import { IoCheckmark, IoPencil, IoTrashBin } from "react-icons/io5"
 
-// eslint-disable-next-line react-refresh/only-export-components
 let selectedBrainIndexGlobal: number | undefined = undefined
+// eslint-disable-next-line react-refresh/only-export-components
 export function setSelectedBrainIndexGlobal(index: number | undefined) {
     selectedBrainIndexGlobal = index
 }
 
+function getBrainIndex() {
+    return selectedBrainIndexGlobal != undefined ? selectedBrainIndexGlobal : SynthesisBrain.brainIndexMap.size - 1
+}
+
 const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
     const { closePanel } = usePanelControlContext()
     const { openModal } = useModalControlContext()
 
-    const selectedBrainIndex = useMemo(() => {
-        return selectedBrainIndexGlobal != undefined ? selectedBrainIndexGlobal : SynthesisBrain.brainIndexMap.size - 1
-    }, [])
-
     const [_, update] = useReducer(x => !x, false)
 
     const AddIcon = <AiOutlinePlus size={"1.25rem"} />
@@ -48,7 +48,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
         /** If the panel is closed before a scheme is selected, defaults to the top of the list */
         return () => {
-            const brainIndex = selectedBrainIndex
+            const brainIndex = getBrainIndex()
             console.log(brainIndex)
 
             if (InputSystem.brainIndexSchemeMap.has(brainIndex)) return
@@ -60,8 +60,8 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
             openModal("change-inputs")
         }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [closePanel, openModal])
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
 
     useEffect(() => {
         return () => {
@@ -112,10 +112,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                 <Button
                                     value={SelectIcon}
                                     onClick={() => {
-                                        InputSystem.brainIndexSchemeMap.set(
-                                            selectedBrainIndex,
-                                            scheme
-                                        )
+                                        InputSystem.brainIndexSchemeMap.set(getBrainIndex(), scheme)
                                         closePanel(panelId)
                                     }}
                                     colorOverrideClass="bg-accept-button hover:brightness-90"
@@ -124,10 +121,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                 <Button
                                     value={EditIcon}
                                     onClick={() => {
-                                        InputSystem.brainIndexSchemeMap.set(
-                                            selectedBrainIndex,
-                                            scheme
-                                        )
+                                        InputSystem.brainIndexSchemeMap.set(getBrainIndex(), scheme)
                                         InputSystem.selectedScheme = scheme
                                         openModal("change-inputs")
                                     }}
@@ -170,10 +164,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
             <Button
                 value={AddIcon}
                 onClick={() => {
-                    InputSystem.brainIndexSchemeMap.set(
-                        selectedBrainIndex,
-                        DefaultInputs.newBlankScheme
-                    )
+                    InputSystem.brainIndexSchemeMap.set(getBrainIndex(), DefaultInputs.newBlankScheme)
                     openModal("assign-new-scheme")
                 }}
             />

From e2fcde37a91aee3992a849f558633d400b59f6a6 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:56:23 -0600
Subject: [PATCH 06/16] Removing change to dropdown

---
 fission/src/ui/components/Dropdown.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fission/src/ui/components/Dropdown.tsx b/fission/src/ui/components/Dropdown.tsx
index 7b57996c81..43229fa496 100644
--- a/fission/src/ui/components/Dropdown.tsx
+++ b/fission/src/ui/components/Dropdown.tsx
@@ -45,7 +45,7 @@ const Dropdown: React.FC<DropdownProps> = ({ label, options, onSelect }) => {
                     ) => typeof value === "string" && onSelect && onSelect(value)}
                 >
                     {optionList.map(option => (
-                        <Option className={"z-[10000]"} value={option} key={option}>
+                        <Option value={option} key={option}>
                             {option}
                         </Option>
                     ))}

From a624d12e22159f66e87ff80c015b859cfb0a762f Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:56:55 -0600
Subject: [PATCH 07/16] Removed changes to panel

---
 fission/src/ui/components/Panel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fission/src/ui/components/Panel.tsx b/fission/src/ui/components/Panel.tsx
index f37c95becc..b8faee4977 100644
--- a/fission/src/ui/components/Panel.tsx
+++ b/fission/src/ui/components/Panel.tsx
@@ -70,7 +70,6 @@ export type PanelPropsImpl = {
     panelId: string
     openLocation?: OpenLocation
     sidePadding?: number
-    args?: unknown[]
 }
 
 type PanelProps = {

From fa595e521cd1bdc079053a9542e57e2edaf44d6e Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 02:57:00 -0600
Subject: [PATCH 08/16] Adding dev flags to turn off certain analytics
 settings/ui while testing. Fixed modal overflow

---
 fission/src/Synthesis.tsx                        | 2 +-
 fission/src/systems/analytics/AnalyticsSystem.ts | 3 ++-
 fission/src/ui/components/Modal.tsx              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fission/src/Synthesis.tsx b/fission/src/Synthesis.tsx
index 51e9c4db05..1b3d308176 100644
--- a/fission/src/Synthesis.tsx
+++ b/fission/src/Synthesis.tsx
@@ -95,7 +95,7 @@ function Synthesis() {
 
         World.InitWorld()
 
-        if (!PreferencesSystem.getGlobalPreference<boolean>("ReportAnalytics")) {
+        if (!PreferencesSystem.getGlobalPreference<boolean>("ReportAnalytics") && !import.meta.env.DEV) {
             setConsentPopupDisable(false)
         }
 
diff --git a/fission/src/systems/analytics/AnalyticsSystem.ts b/fission/src/systems/analytics/AnalyticsSystem.ts
index 778a60b69f..6fd1d04a9d 100644
--- a/fission/src/systems/analytics/AnalyticsSystem.ts
+++ b/fission/src/systems/analytics/AnalyticsSystem.ts
@@ -27,7 +27,8 @@ class AnalyticsSystem extends WorldSystem {
         init({
             measurementId: "G-6XNCRD7QNC",
             debug: import.meta.env.DEV,
-            sendPageViews: true,
+            anonymizeIp: true,
+            sendPageViews: false,
             trackingConsent: PreferencesSystem.getGlobalPreference<boolean>("ReportAnalytics"),
         })
 
diff --git a/fission/src/ui/components/Modal.tsx b/fission/src/ui/components/Modal.tsx
index 97152494b2..a0570db82e 100644
--- a/fission/src/ui/components/Modal.tsx
+++ b/fission/src/ui/components/Modal.tsx
@@ -70,7 +70,7 @@ const Modal: React.FC<ModalProps> = ({
                     id="content"
                     className={`${contentClassName} ${
                         !contentClassName?.includes("mx") ? "mx-[2rem]" : ""
-                    } flex flex-col gap-4 max-h-75vh`}
+                    } flex flex-col gap-4 max-h-75vh overflow-y-auto p-4`}
                 >
                     {children}
                 </div>

From ee02494c8e64c97391dccddc2a3b3e94cdf20f29 Mon Sep 17 00:00:00 2001
From: LucaHaverty <lucahaverty@gmail.com>
Date: Mon, 29 Jul 2024 10:18:02 -0700
Subject: [PATCH 09/16] Fixed only one input scheme saving

---
 fission/src/systems/input/InputSchemeManager.ts | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/fission/src/systems/input/InputSchemeManager.ts b/fission/src/systems/input/InputSchemeManager.ts
index 76c433c962..23a5ede69d 100644
--- a/fission/src/systems/input/InputSchemeManager.ts
+++ b/fission/src/systems/input/InputSchemeManager.ts
@@ -122,24 +122,10 @@ class InputSchemeManager {
 
     /** Save all schemes that have been customized to local storage via preferences */
     public static saveSchemes() {
-        const customizedSchemes = Array.from(InputSystem.brainIndexSchemeMap.values()).filter(s => {
+        const customizedSchemes = this.allInputSchemes.filter(s => {
             return s.customized
         })
 
-        // Save default schemes that have been customized if a customized version does not already exist
-        this.defaultInputSchemes.forEach(s => {
-            if (!s.customized) return
-
-            if (
-                customizedSchemes.some(c => {
-                    if (c.schemeName === s.schemeName) return true
-                })
-            )
-                return
-
-            customizedSchemes.push(s)
-        })
-
         PreferencesSystem.setGlobalPreference("InputSchemes", customizedSchemes)
         PreferencesSystem.savePreferences()
     }

From 76c38d85e5bc31adeca5e01d307eacbcedc31e3b Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:15:33 -0600
Subject: [PATCH 10/16] Trying to fix bug with selecting scheme

---
 fission/src/ui/components/Dropdown.tsx        |  2 +-
 fission/src/ui/components/Panel.tsx           |  1 +
 .../modals/spawning/ManageAssembliesModal.tsx | 37 ++++++++++++++++++-
 .../configuring/ChooseInputSchemePanel.tsx    | 28 +++++++++++---
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/fission/src/ui/components/Dropdown.tsx b/fission/src/ui/components/Dropdown.tsx
index 43229fa496..7b57996c81 100644
--- a/fission/src/ui/components/Dropdown.tsx
+++ b/fission/src/ui/components/Dropdown.tsx
@@ -45,7 +45,7 @@ const Dropdown: React.FC<DropdownProps> = ({ label, options, onSelect }) => {
                     ) => typeof value === "string" && onSelect && onSelect(value)}
                 >
                     {optionList.map(option => (
-                        <Option value={option} key={option}>
+                        <Option className={"z-[10000]"} value={option} key={option}>
                             {option}
                         </Option>
                     ))}
diff --git a/fission/src/ui/components/Panel.tsx b/fission/src/ui/components/Panel.tsx
index b8faee4977..f37c95becc 100644
--- a/fission/src/ui/components/Panel.tsx
+++ b/fission/src/ui/components/Panel.tsx
@@ -70,6 +70,7 @@ export type PanelPropsImpl = {
     panelId: string
     openLocation?: OpenLocation
     sidePadding?: number
+    args?: unknown[]
 }
 
 type PanelProps = {
diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 4f4451da78..41accd8ad3 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -1,10 +1,13 @@
-import React, { useReducer } from "react"
+import React, { useMemo, useReducer } from "react"
 import Modal, { ModalPropsImpl } from "@/components/Modal"
 import { FaWrench } from "react-icons/fa6"
 import Button from "@/components/Button"
 import Label, { LabelSize } from "@/components/Label"
 import World from "@/systems/World"
 import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
+import { usePanelControlContext } from "@/ui/PanelContext"
+import { setSelectedBrainIndexGlobal } from "@/ui/panels/configuring/ChooseInputSchemePanel"
+import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 
 interface AssemblyCardProps {
     mira: MirabufSceneObject
@@ -12,12 +15,44 @@ interface AssemblyCardProps {
 }
 
 const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
+
+    const { openPanel } = usePanelControlContext()
+
+    const brain = useMemo(() => (mira.brain as SynthesisBrain)?.brainIndex, [mira])
+
     return (
         <div
             key={mira.id}
             className="flex flex-row align-middle justify-between items-center bg-background rounded-sm p-2 gap-2"
         >
             <Label className="text-wrap break-all">{mira.assemblyName}</Label>
+            {/* <Dropdown
+                // label={}
+                // Moves the selected option to the start of the array
+                options={moveElementToTop(
+                    InputSchemeManager.allInputSchemes.map(s => s.schemeName),
+                    selectedScheme?.schemeName
+                )}
+                onSelect={value => {
+                    const schemeData = InputSchemeManager.allInputSchemes.find(
+                        s => s.schemeName == value
+                    )
+                    if (!schemeData || schemeData == selectedScheme) return
+
+                    setSelectedScheme(schemeData)
+                    if (brain != undefined) {
+                        console.debug(schemeData.schemeName)
+                        InputSystem.brainIndexSchemeMap.set(brain, schemeData)
+                    }
+                }}
+            /> */}
+            <Button
+                value="Set Scheme"
+                onClick={() => {
+                    setSelectedBrainIndexGlobal(brain)
+                    openPanel('change-scheme')
+                }}
+            />
             <Button
                 value="Delete"
                 onClick={() => {
diff --git a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
index c6cfdceab3..ac332f6879 100644
--- a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
+++ b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
@@ -9,14 +9,24 @@ import Label, { LabelSize } from "@/ui/components/Label"
 import { useModalControlContext } from "@/ui/ModalContext"
 import { usePanelControlContext } from "@/ui/PanelContext"
 import { Box, Divider, styled } from "@mui/material"
-import { useEffect, useReducer } from "react"
+import { useEffect, useMemo, useReducer } from "react"
 import { AiOutlinePlus } from "react-icons/ai"
 import { IoCheckmark, IoPencil, IoTrashBin } from "react-icons/io5"
 
+// eslint-disable-next-line react-refresh/only-export-components
+let selectedBrainIndexGlobal: number | undefined = undefined
+export function setSelectedBrainIndexGlobal(index: number | undefined) {
+    selectedBrainIndexGlobal = index
+}
+
 const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
     const { closePanel } = usePanelControlContext()
     const { openModal } = useModalControlContext()
 
+    const selectedBrainIndex = useMemo(() => {
+        return selectedBrainIndexGlobal != undefined ? selectedBrainIndexGlobal : SynthesisBrain.brainIndexMap.size - 1
+    }, [])
+
     const [_, update] = useReducer(x => !x, false)
 
     const AddIcon = <AiOutlinePlus size={"1.25rem"} />
@@ -38,7 +48,8 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
         /** If the panel is closed before a scheme is selected, defaults to the top of the list */
         return () => {
-            const brainIndex = SynthesisBrain.brainIndexMap.size - 1
+            const brainIndex = selectedBrainIndex
+            console.log(brainIndex)
 
             if (InputSystem.brainIndexSchemeMap.has(brainIndex)) return
 
@@ -49,6 +60,13 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
             openModal("change-inputs")
         }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [closePanel, openModal])
+
+    useEffect(() => {
+        return () => {
+            selectedBrainIndexGlobal = undefined
+        }
     }, [])
 
     return (
@@ -95,7 +113,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                     value={SelectIcon}
                                     onClick={() => {
                                         InputSystem.brainIndexSchemeMap.set(
-                                            SynthesisBrain.brainIndexMap.size - 1,
+                                            selectedBrainIndex,
                                             scheme
                                         )
                                         closePanel(panelId)
@@ -107,7 +125,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                     value={EditIcon}
                                     onClick={() => {
                                         InputSystem.brainIndexSchemeMap.set(
-                                            SynthesisBrain.brainIndexMap.size - 1,
+                                            selectedBrainIndex,
                                             scheme
                                         )
                                         InputSystem.selectedScheme = scheme
@@ -153,7 +171,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                 value={AddIcon}
                 onClick={() => {
                     InputSystem.brainIndexSchemeMap.set(
-                        SynthesisBrain.brainIndexMap.size - 1,
+                        selectedBrainIndex,
                         DefaultInputs.newBlankScheme
                     )
                     openModal("assign-new-scheme")

From 1fda19282afa6e2c0a30e0e6cc9e72405fd5b240 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:53:19 -0600
Subject: [PATCH 11/16] Fixed scheme selection, added text to show which scheme
 is being used

---
 .../modals/spawning/ManageAssembliesModal.tsx | 70 ++++++-------------
 .../configuring/ChooseInputSchemePanel.tsx    | 33 ++++-----
 2 files changed, 34 insertions(+), 69 deletions(-)

diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 41accd8ad3..02a0195a31 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -8,6 +8,8 @@ import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import { usePanelControlContext } from "@/ui/PanelContext"
 import { setSelectedBrainIndexGlobal } from "@/ui/panels/configuring/ChooseInputSchemePanel"
 import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
+import { useModalControlContext } from "@/ui/ModalContext"
+import InputSystem from "@/systems/input/InputSystem"
 
 interface AssemblyCardProps {
     mira: MirabufSceneObject
@@ -15,8 +17,8 @@ interface AssemblyCardProps {
 }
 
 const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
-
     const { openPanel } = usePanelControlContext()
+    const { closeModal } = useModalControlContext()
 
     const brain = useMemo(() => (mira.brain as SynthesisBrain)?.brainIndex, [mira])
 
@@ -25,41 +27,24 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
             key={mira.id}
             className="flex flex-row align-middle justify-between items-center bg-background rounded-sm p-2 gap-2"
         >
-            <Label className="text-wrap break-all">{mira.assemblyName}</Label>
-            {/* <Dropdown
-                // label={}
-                // Moves the selected option to the start of the array
-                options={moveElementToTop(
-                    InputSchemeManager.allInputSchemes.map(s => s.schemeName),
-                    selectedScheme?.schemeName
-                )}
-                onSelect={value => {
-                    const schemeData = InputSchemeManager.allInputSchemes.find(
-                        s => s.schemeName == value
-                    )
-                    if (!schemeData || schemeData == selectedScheme) return
-
-                    setSelectedScheme(schemeData)
-                    if (brain != undefined) {
-                        console.debug(schemeData.schemeName)
-                        InputSystem.brainIndexSchemeMap.set(brain, schemeData)
-                    }
-                }}
-            /> */}
-            <Button
-                value="Set Scheme"
-                onClick={() => {
-                    setSelectedBrainIndexGlobal(brain)
-                    openPanel('change-scheme')
-                }}
-            />
-            <Button
-                value="Delete"
-                onClick={() => {
-                    World.SceneRenderer.RemoveSceneObject(mira.id)
-                    update()
-                }}
-            />
+            <Label className="text-wrap break-all">{`[${InputSystem.brainIndexSchemeMap.get(brain)?.schemeName ?? "-"}] ${mira.assemblyName}`}</Label>
+            <div className="flex flex-row gap-4">
+                <Button
+                    value="Set Scheme"
+                    onClick={() => {
+                        setSelectedBrainIndexGlobal(brain)
+                        openPanel("choose-scheme")
+                        closeModal()
+                    }}
+                />
+                <Button
+                    value="Delete"
+                    onClick={() => {
+                        World.SceneRenderer.RemoveSceneObject(mira.id)
+                        update()
+                    }}
+                />
+            </div>
         </div>
     )
 }
@@ -78,18 +63,7 @@ const ManageAssembliesModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
         .map(x => x[1] as MirabufSceneObject)
 
     return (
-        <Modal
-            name={"Manage Assemblies"}
-            icon={<FaWrench />}
-            modalId={modalId}
-            onAccept={() => {
-                // showTooltip("controls", [
-                //     { control: "WASD", description: "Drive" },
-                //     { control: "E", description: "Intake" },
-                //     { control: "Q", description: "Dispense" },
-                // ]);
-            }}
-        >
+        <Modal name={"Manage Assemblies"} icon={<FaWrench />} modalId={modalId}>
             <div className="flex overflow-y-auto flex-col gap-2 min-w-[50vw] max-h-[60vh] bg-background-secondary rounded-md p-2">
                 <Label size={LabelSize.Medium} className="text-center border-b-[1pt] mt-[4pt] mb-[2pt] mx-[5%]">
                     {assemblies ? `${assemblies.length} Assemblies` : "No Assemblies"}
diff --git a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
index ac332f6879..62fd13eaa8 100644
--- a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
+++ b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
@@ -9,24 +9,24 @@ import Label, { LabelSize } from "@/ui/components/Label"
 import { useModalControlContext } from "@/ui/ModalContext"
 import { usePanelControlContext } from "@/ui/PanelContext"
 import { Box, Divider, styled } from "@mui/material"
-import { useEffect, useMemo, useReducer } from "react"
+import { useEffect, useReducer } from "react"
 import { AiOutlinePlus } from "react-icons/ai"
 import { IoCheckmark, IoPencil, IoTrashBin } from "react-icons/io5"
 
-// eslint-disable-next-line react-refresh/only-export-components
 let selectedBrainIndexGlobal: number | undefined = undefined
+// eslint-disable-next-line react-refresh/only-export-components
 export function setSelectedBrainIndexGlobal(index: number | undefined) {
     selectedBrainIndexGlobal = index
 }
 
+function getBrainIndex() {
+    return selectedBrainIndexGlobal != undefined ? selectedBrainIndexGlobal : SynthesisBrain.brainIndexMap.size - 1
+}
+
 const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
     const { closePanel } = usePanelControlContext()
     const { openModal } = useModalControlContext()
 
-    const selectedBrainIndex = useMemo(() => {
-        return selectedBrainIndexGlobal != undefined ? selectedBrainIndexGlobal : SynthesisBrain.brainIndexMap.size - 1
-    }, [])
-
     const [_, update] = useReducer(x => !x, false)
 
     const AddIcon = <AiOutlinePlus size={"1.25rem"} />
@@ -48,7 +48,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
         /** If the panel is closed before a scheme is selected, defaults to the top of the list */
         return () => {
-            const brainIndex = selectedBrainIndex
+            const brainIndex = getBrainIndex()
             console.log(brainIndex)
 
             if (InputSystem.brainIndexSchemeMap.has(brainIndex)) return
@@ -60,8 +60,8 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
 
             openModal("change-inputs")
         }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [closePanel, openModal])
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
 
     useEffect(() => {
         return () => {
@@ -112,10 +112,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                 <Button
                                     value={SelectIcon}
                                     onClick={() => {
-                                        InputSystem.brainIndexSchemeMap.set(
-                                            selectedBrainIndex,
-                                            scheme
-                                        )
+                                        InputSystem.brainIndexSchemeMap.set(getBrainIndex(), scheme)
                                         closePanel(panelId)
                                     }}
                                     colorOverrideClass="bg-accept-button hover:brightness-90"
@@ -124,10 +121,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
                                 <Button
                                     value={EditIcon}
                                     onClick={() => {
-                                        InputSystem.brainIndexSchemeMap.set(
-                                            selectedBrainIndex,
-                                            scheme
-                                        )
+                                        InputSystem.brainIndexSchemeMap.set(getBrainIndex(), scheme)
                                         InputSystem.selectedScheme = scheme
                                         openModal("change-inputs")
                                     }}
@@ -170,10 +164,7 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
             <Button
                 value={AddIcon}
                 onClick={() => {
-                    InputSystem.brainIndexSchemeMap.set(
-                        selectedBrainIndex,
-                        DefaultInputs.newBlankScheme
-                    )
+                    InputSystem.brainIndexSchemeMap.set(getBrainIndex(), DefaultInputs.newBlankScheme)
                     openModal("assign-new-scheme")
                 }}
             />

From 2394466124909d177651170263acaa5bf1b0f108 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:56:23 -0600
Subject: [PATCH 12/16] Removing change to dropdown

---
 fission/src/ui/components/Dropdown.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fission/src/ui/components/Dropdown.tsx b/fission/src/ui/components/Dropdown.tsx
index 7b57996c81..43229fa496 100644
--- a/fission/src/ui/components/Dropdown.tsx
+++ b/fission/src/ui/components/Dropdown.tsx
@@ -45,7 +45,7 @@ const Dropdown: React.FC<DropdownProps> = ({ label, options, onSelect }) => {
                     ) => typeof value === "string" && onSelect && onSelect(value)}
                 >
                     {optionList.map(option => (
-                        <Option className={"z-[10000]"} value={option} key={option}>
+                        <Option value={option} key={option}>
                             {option}
                         </Option>
                     ))}

From 616865ebe3d604e1266c0dc38215118945fed8ad Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 14:56:55 -0600
Subject: [PATCH 13/16] Removed changes to panel

---
 fission/src/ui/components/Panel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fission/src/ui/components/Panel.tsx b/fission/src/ui/components/Panel.tsx
index f37c95becc..b8faee4977 100644
--- a/fission/src/ui/components/Panel.tsx
+++ b/fission/src/ui/components/Panel.tsx
@@ -70,7 +70,6 @@ export type PanelPropsImpl = {
     panelId: string
     openLocation?: OpenLocation
     sidePadding?: number
-    args?: unknown[]
 }
 
 type PanelProps = {

From 9159dda77d0d3856fd902615dbc65c3cd2249423 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 17:45:03 -0600
Subject: [PATCH 14/16] Change delete button for manage assemblies, removed
 view button from MainHUD, fixed temp scoreboard reset

---
 fission/src/ui/components/Button.tsx          | 10 +++----
 fission/src/ui/components/MainHUD.tsx         |  4 +--
 .../modals/spawning/ManageAssembliesModal.tsx | 27 +++++++++++++------
 .../ui/panels/information/ScoreboardPanel.tsx |  5 ++--
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/fission/src/ui/components/Button.tsx b/fission/src/ui/components/Button.tsx
index 3f6f5ada7e..997a2081af 100644
--- a/fission/src/ui/components/Button.tsx
+++ b/fission/src/ui/components/Button.tsx
@@ -25,16 +25,16 @@ const Button: React.FC<ButtonProps> = ({ value, colorOverrideClass, sizeOverride
     if (!sizeClassNames) {
         switch (size) {
             case ButtonSize.Small:
-                sizeClassNames = "px-4 py-1"
+                sizeClassNames = "w-fit h-fit px-4 py-1"
                 break
             case ButtonSize.Medium:
-                sizeClassNames = "px-6 py-1.5"
+                sizeClassNames = "w-fit h-fit px-6 py-1.5"
                 break
             case ButtonSize.Large:
-                sizeClassNames = "px-8 py-2"
+                sizeClassNames = "w-fit h-fit px-8 py-2"
                 break
             case ButtonSize.XL:
-                sizeClassNames = "px-10 py-2"
+                sizeClassNames = "w-fit h-fit px-10 py-2"
                 break
         }
     }
@@ -46,7 +46,7 @@ const Button: React.FC<ButtonProps> = ({ value, colorOverrideClass, sizeOverride
                 colorOverrideClass
                     ? colorOverrideClass
                     : "bg-gradient-to-r from-interactive-element-left via-interactive-element-right to-interactive-element-left bg-[length:200%_100%] active:bg-right"
-            } w-fit h-fit ${sizeClassNames} rounded-sm font-semibold cursor-pointer duration-200 border-none focus-visible:outline-0 focus:outline-0 ${
+            }  ${sizeClassNames} rounded-sm font-semibold cursor-pointer duration-200 border-none focus-visible:outline-0 focus:outline-0 ${
                 className || ""
             }`}
         >
diff --git a/fission/src/ui/components/MainHUD.tsx b/fission/src/ui/components/MainHUD.tsx
index af55290eab..e25a7c6570 100644
--- a/fission/src/ui/components/MainHUD.tsx
+++ b/fission/src/ui/components/MainHUD.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react"
 import {
     FaGear,
-    FaMagnifyingGlass,
+    // FaMagnifyingGlass,
     FaPlus,
     FaGamepad,
     FaBasketball,
@@ -103,7 +103,7 @@ const MainHUD: React.FC = () => {
                         onClick={() => openModal("manage-assemblies")}
                     />
                     <MainHUDButton value={"Settings"} icon={<FaGear />} onClick={() => openModal("settings")} />
-                    <MainHUDButton value={"View"} icon={<FaMagnifyingGlass />} onClick={() => openModal("view")} />
+                    {/* <MainHUDButton value={"View"} icon={<FaMagnifyingGlass />} onClick={() => openModal("view")} /> */}
                     <MainHUDButton value={"Controls"} icon={<FaGamepad />} onClick={() => openModal("change-inputs")} />
                     <MainHUDButton
                         value={"Import Local Mira"}
diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 02a0195a31..d7cd6a02f2 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo, useReducer } from "react"
 import Modal, { ModalPropsImpl } from "@/components/Modal"
 import { FaWrench } from "react-icons/fa6"
-import Button from "@/components/Button"
+import Button, { ButtonProps, ButtonSize } from "@/components/Button"
 import Label, { LabelSize } from "@/components/Label"
 import World from "@/systems/World"
 import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
@@ -10,12 +10,25 @@ import { setSelectedBrainIndexGlobal } from "@/ui/panels/configuring/ChooseInput
 import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 import { useModalControlContext } from "@/ui/ModalContext"
 import InputSystem from "@/systems/input/InputSystem"
+import { HiDownload } from "react-icons/hi"
+import { IoTrashBin } from "react-icons/io5"
 
 interface AssemblyCardProps {
     mira: MirabufSceneObject
     update: React.DispatchWithoutAction
 }
 
+const ButtonSecondary: React.FC<ButtonProps> = ({ value, onClick }) => {
+    return (
+        <Button
+            sizeOverrideClass="px-6 py-2"
+            value={value}
+            onClick={onClick}
+            colorOverrideClass="bg-cancel-button hover:brightness-90"
+        ></Button>
+    )
+}
+
 const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
     const { openPanel } = usePanelControlContext()
     const { closeModal } = useModalControlContext()
@@ -30,6 +43,7 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
             <Label className="text-wrap break-all">{`[${InputSystem.brainIndexSchemeMap.get(brain)?.schemeName ?? "-"}] ${mira.assemblyName}`}</Label>
             <div className="flex flex-row gap-4">
                 <Button
+                    sizeOverrideClass="px-6 py-2"
                     value="Set Scheme"
                     onClick={() => {
                         setSelectedBrainIndexGlobal(brain)
@@ -37,8 +51,8 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
                         closeModal()
                     }}
                 />
-                <Button
-                    value="Delete"
+                <ButtonSecondary
+                    value={<IoTrashBin />}
                     onClick={() => {
                         World.SceneRenderer.RemoveSceneObject(mira.id)
                         update()
@@ -50,9 +64,6 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ mira, update }) => {
 }
 
 const ManageAssembliesModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
-    // update tooltip based on type of drivetrain, receive message from Synthesis
-    // const { showTooltip } = useTooltipControlContext()
-
     const [_, update] = useReducer(x => !x, false)
 
     const assemblies = [...World.SceneRenderer.sceneObjects.entries()]
@@ -63,12 +74,12 @@ const ManageAssembliesModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
         .map(x => x[1] as MirabufSceneObject)
 
     return (
-        <Modal name={"Manage Assemblies"} icon={<FaWrench />} modalId={modalId}>
+        <Modal name={"Manage Assemblies"} icon={<FaWrench />} modalId={modalId} acceptEnabled={false} cancelName="Back">
             <div className="flex overflow-y-auto flex-col gap-2 min-w-[50vw] max-h-[60vh] bg-background-secondary rounded-md p-2">
                 <Label size={LabelSize.Medium} className="text-center border-b-[1pt] mt-[4pt] mb-[2pt] mx-[5%]">
                     {assemblies ? `${assemblies.length} Assemblies` : "No Assemblies"}
                 </Label>
-                {assemblies.map(x => AssemblyCard({ mira: x, update: update }))}
+                {assemblies.map(x => <AssemblyCard key={x.id} mira={x} update={update} />)}
             </div>
         </Modal>
     )
diff --git a/fission/src/ui/panels/information/ScoreboardPanel.tsx b/fission/src/ui/panels/information/ScoreboardPanel.tsx
index b75ac535e1..3a343861db 100644
--- a/fission/src/ui/panels/information/ScoreboardPanel.tsx
+++ b/fission/src/ui/panels/information/ScoreboardPanel.tsx
@@ -5,10 +5,11 @@ import Stack, { StackDirection } from "@/components/Stack"
 import { OnScoreChangedEvent } from "@/mirabuf/ScoringZoneSceneObject"
 import { usePanelControlContext } from "@/ui/PanelContext"
 import PreferencesSystem, { PreferenceEvent } from "@/systems/preferences/PreferencesSystem"
+import SimulationSystem from "@/systems/simulation/SimulationSystem"
 
 const ScoreboardPanel: React.FC<PanelPropsImpl> = ({ panelId, openLocation, sidePadding }) => {
-    const [redScore, setRedScore] = useState<number>(0)
-    const [blueScore, setBlueScore] = useState<number>(0)
+    const [redScore, setRedScore] = useState<number>(SimulationSystem.redScore)
+    const [blueScore, setBlueScore] = useState<number>(SimulationSystem.blueScore)
     const [initialTime] = useState<number>(-1)
     const [startTime] = useState<number>(Date.now())
     const [time, setTime] = useState<number>(-1)

From 46ef8816f13db07ff4b0ddb704917fef50b9aac9 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 17:52:18 -0600
Subject: [PATCH 15/16] Formatted

---
 fission/src/ui/modals/spawning/ManageAssembliesModal.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index d7cd6a02f2..b5b3d9b4e3 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo, useReducer } from "react"
 import Modal, { ModalPropsImpl } from "@/components/Modal"
 import { FaWrench } from "react-icons/fa6"
-import Button, { ButtonProps, ButtonSize } from "@/components/Button"
+import Button, { ButtonProps } from "@/components/Button"
 import Label, { LabelSize } from "@/components/Label"
 import World from "@/systems/World"
 import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
@@ -10,7 +10,6 @@ import { setSelectedBrainIndexGlobal } from "@/ui/panels/configuring/ChooseInput
 import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 import { useModalControlContext } from "@/ui/ModalContext"
 import InputSystem from "@/systems/input/InputSystem"
-import { HiDownload } from "react-icons/hi"
 import { IoTrashBin } from "react-icons/io5"
 
 interface AssemblyCardProps {
@@ -79,7 +78,9 @@ const ManageAssembliesModal: React.FC<ModalPropsImpl> = ({ modalId }) => {
                 <Label size={LabelSize.Medium} className="text-center border-b-[1pt] mt-[4pt] mb-[2pt] mx-[5%]">
                     {assemblies ? `${assemblies.length} Assemblies` : "No Assemblies"}
                 </Label>
-                {assemblies.map(x => <AssemblyCard key={x.id} mira={x} update={update} />)}
+                {assemblies.map(x => (
+                    <AssemblyCard key={x.id} mira={x} update={update} />
+                ))}
             </div>
         </Modal>
     )

From e74aa6ae68250ae897d482199cbbefa847bf4124 Mon Sep 17 00:00:00 2001
From: KyroVibe <hunter.barclay18@gmail.com>
Date: Mon, 29 Jul 2024 18:03:21 -0600
Subject: [PATCH 16/16] Added cancel for reassigned scheme

---
 fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
index 62fd13eaa8..ab42a35daa 100644
--- a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
+++ b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
@@ -76,7 +76,8 @@ const ChooseInputSchemePanel: React.FC<PanelPropsImpl> = ({ panelId }) => {
             openLocation={"right"}
             sidePadding={8}
             acceptEnabled={false}
-            cancelEnabled={false}
+            cancelEnabled={selectedBrainIndexGlobal != undefined}
+            cancelName="Close"
         >
             {/** A scroll view with buttons to select default and custom input schemes */}
             <div className="flex overflow-y-auto flex-col gap-2 min-w-[20vw] max-h-[45vh] bg-background-secondary rounded-md p-2">