From 4d8ed76abb2b4773c9065691fbe32c404cd7553a Mon Sep 17 00:00:00 2001 From: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Date: Sun, 7 May 2023 14:39:40 -0700 Subject: [PATCH] Fix requests console merge skew (#75238) - Uses `sortStrings` to avoid downcasting to `unknown[]` (I don't know why this happens) - Removes `.map(x => x)` because that doesn't do anything (CC @Profakos, don't do this) Broke with https://github.com/tgstation/tgstation/pull/75164 --- .../interfaces/RequestsConsole/MessageWriteTab.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tgui/packages/tgui/interfaces/RequestsConsole/MessageWriteTab.tsx b/tgui/packages/tgui/interfaces/RequestsConsole/MessageWriteTab.tsx index a887e50c752..58a6ee3d3ed 100644 --- a/tgui/packages/tgui/interfaces/RequestsConsole/MessageWriteTab.tsx +++ b/tgui/packages/tgui/interfaces/RequestsConsole/MessageWriteTab.tsx @@ -1,5 +1,5 @@ import { useBackend, useLocalState } from '../../backend'; -import { sortBy } from 'common/collections'; +import { sortStrings } from 'common/collections'; import { Box, Button, Dropdown, Section, Stack, TextArea } from '../../components'; import { RequestsData, RequestType, RequestPriority } from './types'; @@ -13,9 +13,9 @@ export const MessageWriteTab = (props, context) => { information_consoles = [], } = data; - const sorted_assistance = sortBy((console) => console)(assistance_consoles); - const sorted_supply = sortBy((console) => console)(supply_consoles); - const sorted_information = sortBy((console) => console)(information_consoles); + const sorted_assistance = sortStrings(assistance_consoles); + const sorted_supply = sortStrings(supply_consoles); + const sorted_information = sortStrings(information_consoles); const resetMessage = () => { setMessageText(''); @@ -83,7 +83,7 @@ export const MessageWriteTab = (props, context) => { {requestType === RequestType.ASSISTANCE && ( recipient)} + options={sorted_assistance} selected={recipient} displayText={recipient || 'Pick a Recipient'} onSelected={(value) => setRecipient(value)} @@ -92,7 +92,7 @@ export const MessageWriteTab = (props, context) => { {requestType === RequestType.SUPPLIES && ( recipient)} + options={sorted_supply} selected={recipient} displayText={recipient || 'Pick a Recipient'} onSelected={(value) => setRecipient(value)} @@ -101,7 +101,7 @@ export const MessageWriteTab = (props, context) => { {requestType === RequestType.INFORMATION && ( recipient)} + options={sorted_information} selected={recipient} displayText={recipient || 'Pick a Recipient'} onSelected={(value) => setRecipient(value)}