From 065f1bd21beadff9983f734e5bda6b47461ba4a3 Mon Sep 17 00:00:00 2001
From: Adrian <adrian@rydeas.com>
Date: Wed, 29 Jan 2025 22:50:25 -0600
Subject: [PATCH 1/2] fix for initial values being empty

---
 ui/src/components/USBConfigDialog.tsx | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ui/src/components/USBConfigDialog.tsx b/ui/src/components/USBConfigDialog.tsx
index e9ba5f2..b21a75e 100644
--- a/ui/src/components/USBConfigDialog.tsx
+++ b/ui/src/components/USBConfigDialog.tsx
@@ -78,15 +78,13 @@ function UpdateUsbConfigModal({
   onCancel: () => void;
   error: string | null;
 }) {
-  const [usbConfig, setUsbConfig] = useState({
+  const [usbConfigState, setUsbConfigState] = useState<UsbConfigState>({
     vendor_id: '',
     product_id: '',
     serial_number: '',
     manufacturer: '',
-    product: '',
-  })
-
-  const [usbConfigState, setUsbConfigState] = useState<UsbConfigState>();
+    product: ''
+  });
   const [send] = useJsonRpc();
 
   const syncUsbConfig = useCallback(() => {
@@ -105,23 +103,23 @@ function UpdateUsbConfigModal({
   }, [syncUsbConfig]);
 
   const handleUsbVendorIdChange = (value: string) => {
-    setUsbConfig({... usbConfig, vendor_id: value})
+    setUsbConfigState({... usbConfigState, vendor_id: value})
   };
 
   const handleUsbProductIdChange = (value: string) => {
-    setUsbConfig({... usbConfig, product_id: value})
+    setUsbConfigState({... usbConfigState, product_id: value})
   };
 
   const handleUsbSerialChange = (value: string) => {
-    setUsbConfig({... usbConfig, serial_number: value})
+    setUsbConfigState({... usbConfigState, serial_number: value})
   };
 
   const handleUsbManufacturer = (value: string) => {
-    setUsbConfig({... usbConfig, manufacturer: value})
+    setUsbConfigState({... usbConfigState, manufacturer: value})
   };
 
   const handleUsbProduct = (value: string) => {
-    setUsbConfig({... usbConfig, product: value})
+    setUsbConfigState({... usbConfigState, product: value})
   };
 
   return (
@@ -180,7 +178,7 @@ function UpdateUsbConfigModal({
             size="SM"
             theme="primary"
             text="Update USB Config"
-            onClick={() => onSetUsbConfig(usbConfig)}
+            onClick={() => onSetUsbConfig(usbConfigState)}
           />
           <Button size="SM" theme="light" text="Not Now" onClick={onCancel} />
         </div>

From 194fad972e9d339c6d92583b173d8e05855df541 Mon Sep 17 00:00:00 2001
From: Adrian <adrian@rydeas.com>
Date: Wed, 29 Jan 2025 23:00:24 -0600
Subject: [PATCH 2/2] Revert "fix for initial values being empty"

This reverts commit 065f1bd21beadff9983f734e5bda6b47461ba4a3.
---
 ui/src/components/USBConfigDialog.tsx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ui/src/components/USBConfigDialog.tsx b/ui/src/components/USBConfigDialog.tsx
index b21a75e..e9ba5f2 100644
--- a/ui/src/components/USBConfigDialog.tsx
+++ b/ui/src/components/USBConfigDialog.tsx
@@ -78,13 +78,15 @@ function UpdateUsbConfigModal({
   onCancel: () => void;
   error: string | null;
 }) {
-  const [usbConfigState, setUsbConfigState] = useState<UsbConfigState>({
+  const [usbConfig, setUsbConfig] = useState({
     vendor_id: '',
     product_id: '',
     serial_number: '',
     manufacturer: '',
-    product: ''
-  });
+    product: '',
+  })
+
+  const [usbConfigState, setUsbConfigState] = useState<UsbConfigState>();
   const [send] = useJsonRpc();
 
   const syncUsbConfig = useCallback(() => {
@@ -103,23 +105,23 @@ function UpdateUsbConfigModal({
   }, [syncUsbConfig]);
 
   const handleUsbVendorIdChange = (value: string) => {
-    setUsbConfigState({... usbConfigState, vendor_id: value})
+    setUsbConfig({... usbConfig, vendor_id: value})
   };
 
   const handleUsbProductIdChange = (value: string) => {
-    setUsbConfigState({... usbConfigState, product_id: value})
+    setUsbConfig({... usbConfig, product_id: value})
   };
 
   const handleUsbSerialChange = (value: string) => {
-    setUsbConfigState({... usbConfigState, serial_number: value})
+    setUsbConfig({... usbConfig, serial_number: value})
   };
 
   const handleUsbManufacturer = (value: string) => {
-    setUsbConfigState({... usbConfigState, manufacturer: value})
+    setUsbConfig({... usbConfig, manufacturer: value})
   };
 
   const handleUsbProduct = (value: string) => {
-    setUsbConfigState({... usbConfigState, product: value})
+    setUsbConfig({... usbConfig, product: value})
   };
 
   return (
@@ -178,7 +180,7 @@ function UpdateUsbConfigModal({
             size="SM"
             theme="primary"
             text="Update USB Config"
-            onClick={() => onSetUsbConfig(usbConfigState)}
+            onClick={() => onSetUsbConfig(usbConfig)}
           />
           <Button size="SM" theme="light" text="Not Now" onClick={onCancel} />
         </div>