[MIRROR] Fixes dropdown displaytext not working for numeric values (#…

…2112) (#3010) * Fixes dropdown displaytext not working for numeric values * Update dropdowns.tsx --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Apr 22, 2024 · 22f7742 · 22f7742
1 parent a6d7732
commit 22f7742
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/dropdowns.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/dropdowns.tsx
@@ -43,18 +43,17 @@ export function FeatureDropdownInput(props: DropdownInputProps) {
     };
   });
 
+  let display_text = value;
+  if (display_names) {
+    display_text = display_names[value];
+  }
+
   return (
     <Dropdown
       buttons={buttons}
       disabled={disabled}
       onSelected={handleSetValue}
-      // NOVA EDIT CHANGE - ORIGINAL: displayText={value && capitalizeFirst(value)}
-      displayText={
-        display_names
-          ? display_names[value] && capitalizeFirst(display_names[value])
-          : value && capitalizeFirst(value)
-      }
-      // NOVA EDIT CHANGE END
+      displayText={capitalizeFirst(display_text)}
       options={dropdownOptions}
       selected={value}
       width="100%"
@@ -96,16 +95,15 @@ export function FeatureIconnedDropdownInput(props: IconnedDropdownInputProps) {
     };
   });
 
+  let display_text = value;
+  if (display_names) {
+    display_text = display_names[value];
+  }
+
   return (
     <Dropdown
       buttons
-      // NOVA EDIT CHANGE - ORIGINAL: displayText={value && capitalizeFirst(value)}
-      displayText={
-        display_names
-          ? display_names[value] && capitalizeFirst(display_names[value])
-          : value && capitalizeFirst(value)
-      }
-      // NOVA EDIT CHANGE END
+      displayText={capitalizeFirst(display_text)}
       onSelected={handleSetValue}
       options={dropdownOptions}
       selected={value}