Merge pull request #1081 from lyncasterc/feature/edit-custom-device-name

Add ability to edit a custom device's name
responsively-org · Sep 19, 2023 · c9c2d43 · c9c2d43
2 parents 835ff44 + abeb136
commit c9c2d43
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/desktop-app/src/renderer/components/DeviceManager/DeviceDetailsModal.tsx b/desktop-app/src/renderer/components/DeviceManager/DeviceDetailsModal.tsx
@@ -85,7 +85,11 @@ const DeviceDetailsModal = ({
   const isCustom = device != null ? device.isCustom ?? false : true;
 
   const handleAddDevice = async (): Promise<void> => {
-    if (device == null && existingDevices.find((d) => d.name === name)) {
+    const existingDevice = existingDevices.find((d) => d.name === name);
+    const doesDeviceExist =
+      existingDevice != null && (isNew || existingDevice.id !== device.id);
+
+    if (doesDeviceExist) {
       // eslint-disable-next-line no-alert
       return alert(
         'Device With the name already exists, try with a different name'
@@ -133,11 +137,8 @@ const DeviceDetailsModal = ({
               placeholder="My Mobile Device"
               value={name}
               onChange={(e) => setName(e.target.value)}
-              disabled={!isCustom || !isNew}
+              disabled={!isCustom}
             />
-            {!isNew && isCustom ? (
-              <p>Note: Device name cannot be modified once created!</p>
-            ) : null}
             <Input
               label="Device Width"
               type="number"