From 0f6b0416df912a7344ac85dbc36b7f9eb4559552 Mon Sep 17 00:00:00 2001
From: Sacha Weatherstone <sachaw100@hotmail.com>
Date: Sun, 8 Jan 2023 15:10:51 +1000
Subject: [PATCH] Fix User config not saving

---
 src/components/PageComponents/Config/User.tsx | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/components/PageComponents/Config/User.tsx b/src/components/PageComponents/Config/User.tsx
index c41ced08..99de1f2a 100644
--- a/src/components/PageComponents/Config/User.tsx
+++ b/src/components/PageComponents/Config/User.tsx
@@ -12,6 +12,7 @@ import { UserValidation } from "@app/validation/config/user.js";
 import { Form } from "@components/form/Form";
 import { useDevice } from "@core/providers/useDevice.js";
 import { renderOptions } from "@core/utils/selectEnumOptions.js";
+import { ErrorMessage } from "@hookform/error-message";
 import { classValidatorResolver } from "@hookform/resolvers/class-validator";
 import { Protobuf } from "@meshtastic/meshtasticjs";
 
@@ -70,13 +71,9 @@ export const User = (): JSX.Element => {
       dirty={isDirty}
       onSubmit={onSubmit}
     >
-      <Input
-        label="Device ID"
-        disabled
-        description="Preset unique identifier for this device."
-        error={errors.id?.message}
-        {...register("id")}
-      />
+      <ErrorMessage errors={errors} name="longName" />
+      <ErrorMessage errors={errors} name="shortName" />
+      <ErrorMessage errors={errors} name="isLicensed" />
       <Input
         label="Device Name"
         description="Personalised name for this device."
@@ -88,6 +85,18 @@ export const User = (): JSX.Element => {
         maxLength={4}
         {...register("shortName")}
       />
+      <Controller
+        name="isLicensed"
+        control={control}
+        render={({ field: { value, ...rest } }) => (
+          <Toggle
+            label="Licenced Operator?"
+            description="Remove bandwidth restrictions in certain regions (HAM license required)"
+            checked={value}
+            {...rest}
+          />
+        )}
+      />
       <Input
         label="Mac Address"
         description="Hardware address for this node."
@@ -99,6 +108,13 @@ export const User = (): JSX.Element => {
             ?.join(":") ?? ""
         }
       />
+      <Input
+        label="Device ID"
+        disabled
+        description="Preset unique identifier for this device."
+        error={errors.id?.message}
+        value={myNode?.data.user?.id}
+      />
       <Select
         label="Hardware"
         description="Hardware model of this device."
@@ -107,18 +123,6 @@ export const User = (): JSX.Element => {
       >
         {renderOptions(Protobuf.HardwareModel)}
       </Select>
-      <Controller
-        name="isLicensed"
-        control={control}
-        render={({ field: { value, ...rest } }) => (
-          <Toggle
-            label="Licenced Operator?"
-            description="Remove bandwidth restrictions in certain regions (HAM license required)"
-            checked={value}
-            {...rest}
-          />
-        )}
-      />
     </Form>
   );
 };