bad merge on Security.tsx

src/components/PageComponents/Config/Security.tsx

@@ -164,15 +164,18 @@ export const Security = (): JSX.Element => {
                 type: "text",
                 name: "publicKey",
                 label: "Public Key",
-              disabled: true,
                 description:
                   "Sent out to other nodes on the mesh to allow them to compute a shared secret key",
+                disabledBy: [{ fieldName: "always" }],
+                properties: {
+                  value: publicKey,
+                },
               },
             ],
           },
           {
             label: "Admin Settings",
-          description: "Settings for Admin ",
+            description: "Settings for Admin",
             fields: [
               {
                 type: "toggle",
@@ -189,28 +192,16 @@ export const Security = (): JSX.Element => {
                   'If true, device is considered to be "managed" by a mesh administrator via admin messages',
               },
               {
-              type: "passwordGenerator",
+                type: "text",
                 name: "adminKey",
                 label: "Admin Key",
                 description:
                   "The public key authorized to send admin messages to this node",
                 validationText: adminKeyValidationText,
-              devicePSKBitCount: adminKeyBitCount,
                 inputChange: adminKeyInputChangeEvent,
-              selectChange: adminKeySelectChangeEvent,
-              hide: !adminKeyVisible,
-              buttonClick: () =>
-                clickEvent(
-                  setAdminKey,
-                  adminKeyBitCount,
-                  setAdminKeyValidationText,
-                ),
                 disabledBy: [{ fieldName: "adminChannelEnabled" }],
                 properties: {
                   value: adminKey,
-                action: {
-                  icon: adminKeyVisible ? EyeOff : Eye,
-                  onClick: () => setAdminKeyVisible(!adminKeyVisible),
                 },
               },
             ],