From 8f2a41bc13dda5eca99706eeec4f9408a5954020 Mon Sep 17 00:00:00 2001 From: keejef Date: Wed, 20 Sep 2023 09:23:52 +1000 Subject: [PATCH 1/6] feat: Allow enter to break line in settings https://github.com/oxen-io/session-desktop/issues/1486 --- _locales/en/messages.json | 4 ++ .../composition/CompositionBox.tsx | 41 +++++++++++++++++- .../section/CategoryConversations.tsx | 42 +++++++++++++++++-- ts/data/settings-key.ts | 3 +- ts/types/LocalizerKeys.ts | 4 ++ 5 files changed, 87 insertions(+), 7 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 09a67aa7b..70a8e2a5c 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -410,6 +410,10 @@ "open": "Open", "audioMessageAutoplayTitle": "Autoplay Audio Messages", "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.", + "enterKeySettingTitle": "Enter Key", + "enterKeySettingDescription": "Function of the enter key when typing in a conversation.", + "enterSendNewMessageDescription": "ENTER sends a message, SHIFT + ENTER starts a new line", + "enterNewLineDescription": "SHIFT + ENTER sends a message, ENTER starts a new line", "clickToTrustContact": "Click to download media", "trustThisContactDialogTitle": "Trust $name$?", "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?", diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index c3669e78a..c1d2d05e4 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -832,8 +832,19 @@ class CompositionBoxInner extends React.Component { } private async onKeyDown(event: any) { - if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing) { - // If shift, newline. If in IME composing mode, leave it to IME. Else send message. + const isEnter = event.key === 'Enter'; + const isShiftEnter = event.shiftKey && isEnter; + const isEnterNewLineSetting = (window.getSettingValue(SettingsKey.settingsEnterKeyFunction) as string) === 'enterNewLine'; + const isNotComposing = !event.nativeEvent.isComposing; + + if (isEnterNewLineSetting && isEnter && isNotComposing) { + event.preventDefault(); + if (isShiftEnter) { + await this.onSendMessage(); + } else { + this.insertNewLine(); + } + } else if (isEnter && !event.shiftKey && isNotComposing) { event.preventDefault(); await this.onSendMessage(); } else if (event.key === 'Escape' && this.state.showEmojiPanel) { @@ -845,6 +856,32 @@ class CompositionBoxInner extends React.Component { } } + private insertNewLine() { + const messageBox = this.textarea.current; + if (!messageBox) { + return; + } + + const { draft } = this.state; + const { selectedConversationKey } = this.props; + + if (!selectedConversationKey) { + return; // add this check to prevent undefined from being used + } + + const currentSelectionStart = Number(messageBox.selectionStart); + const realSelectionStart = getSelectionBasedOnMentions(draft, currentSelectionStart); + + const before = draft.slice(0, realSelectionStart); + const after = draft.slice(realSelectionStart); + + this.setState({ draft: `${before}\n${after}` }); + updateDraftForConversation({ + conversationKey: selectedConversationKey, + draft: `${before}\n${after}`, + }); + } + private async onKeyUp() { if (!this.props.selectedConversationKey) { throw new Error('selectedConversationKey is needed'); diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx index 3830883ae..b0335af4d 100644 --- a/ts/components/settings/section/CategoryConversations.tsx +++ b/ts/components/settings/section/CategoryConversations.tsx @@ -6,10 +6,9 @@ import { SettingsKey } from '../../../data/settings-key'; import { ToastUtils } from '../../../session/utils'; import { toggleAudioAutoplay } from '../../../state/ducks/userConfig'; import { getAudioAutoplay } from '../../../state/selectors/userConfig'; - +import { SessionRadioGroup } from '../../basic/SessionRadioGroup'; import { BlockedContactsList } from '../BlockedList'; - -import { SessionToggleWithDescription } from '../SessionSettingListItem'; +import { SessionSettingsItemWrapper, SessionToggleWithDescription } from '../SessionSettingListItem'; async function toggleCommunitiesPruning() { try { @@ -81,13 +80,48 @@ const AudioMessageAutoPlaySetting = () => { ); }; +const EnterKeyFunctionSetting = () => { + const forceUpdate = useUpdate(); + + const initialSetting = window.getSettingValue(SettingsKey.settingsEnterKeyFunction) || true; + + const items = [ + { + label: window.i18n('enterSendNewMessageDescription'), + value: 'enterSend', + }, + { + label: window.i18n('enterNewLineDescription'), + value: 'enterNewLine', + }, + ]; + + return ( + + { + await window.setSettingValue(SettingsKey.settingsEnterKeyFunction, selectedRadioValue); + forceUpdate(); + }} + /> + + ); +}; + export const CategoryConversations = () => { return ( <> - + ); diff --git a/ts/data/settings-key.ts b/ts/data/settings-key.ts index 345e6b081..a34782706 100644 --- a/ts/data/settings-key.ts +++ b/ts/data/settings-key.ts @@ -1,7 +1,7 @@ const settingsReadReceipt = 'read-receipt-setting'; const settingsTypingIndicator = 'typing-indicators-setting'; const settingsAutoUpdate = 'auto-update'; - +const settingsEnterKeyFunction = 'enter-key-function-setting'; const settingsMenuBar = 'hide-menu-bar'; const settingsSpellCheck = 'spell-check'; const settingsLinkPreview = 'link-preview-setting'; @@ -24,6 +24,7 @@ export const SettingsKey = { settingsReadReceipt, settingsTypingIndicator, settingsAutoUpdate, + settingsEnterKeyFunction, settingsMenuBar, settingsSpellCheck, settingsLinkPreview, diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index ed5d4ad7f..f9cc384b1 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -169,9 +169,13 @@ export type LocalizerKeys = | 'endCall' | 'enterAnOpenGroupURL' | 'enterDisplayName' + | 'enterKeySettingDescription' + | 'enterKeySettingTitle' + | 'enterNewLineDescription' | 'enterNewPassword' | 'enterPassword' | 'enterRecoveryPhrase' + | 'enterSendNewMessageDescription' | 'enterSessionID' | 'enterSessionIDOfRecipient' | 'enterSessionIDOrONSName' From 95117afeea66d94fe95313a78b6315aac0dfa761 Mon Sep 17 00:00:00 2001 From: Keejef Date: Fri, 6 Oct 2023 18:58:20 +1100 Subject: [PATCH 2/6] fix: Refactor settings to use Redux Refactor setting to use boolean which is stored in redux --- ts/components/basic/SessionRadio.tsx | 6 ++--- ts/components/basic/SessionRadioGroup.tsx | 12 +++++----- .../composition/CompositionBox.tsx | 20 ++++++++--------- .../SessionNotificationGroupSettings.tsx | 2 +- .../section/CategoryConversations.tsx | 22 ++++++++++++------- ts/data/settings-key.ts | 4 ++-- ts/state/ducks/settings.tsx | 7 ++++++ ts/state/selectors/settings.ts | 8 +++++++ 8 files changed, 51 insertions(+), 30 deletions(-) diff --git a/ts/components/basic/SessionRadio.tsx b/ts/components/basic/SessionRadio.tsx index d45fb6682..7f9379b52 100644 --- a/ts/components/basic/SessionRadio.tsx +++ b/ts/components/basic/SessionRadio.tsx @@ -4,11 +4,11 @@ import { Flex } from './Flex'; type Props = { label: string; - value: string; + value: string | boolean; active: boolean; inputName?: string; beforeMargins?: string; - onClick?: (value: string) => void; + onClick?: (value: string | boolean) => void; }; const StyledInput = styled.input<{ @@ -68,7 +68,7 @@ export const SessionRadio = (props: Props) => { ; + initialItem: string | boolean; + items: Array<{ value: string | boolean; label: string }>; group: string; - onClick: (selectedValue: string) => any; + onClick: (selectedValue: string | boolean) => void; style?: CSSProperties; } @@ -30,7 +30,7 @@ const StyledFieldSet = styled.fieldset` export const SessionRadioGroup = (props: Props) => { const { items, group, initialItem, style } = props; - const [activeItem, setActiveItem] = useState(''); + const [activeItem, setActiveItem] = useState(initialItem); useMount(() => { setActiveItem(initialItem); @@ -43,12 +43,12 @@ export const SessionRadioGroup = (props: Props) => { return ( { + onClick={(value: string | boolean) => { setActiveItem(value); props.onClick(value); }} diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index c1d2d05e4..e1e0019dd 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -834,10 +834,10 @@ class CompositionBoxInner extends React.Component { private async onKeyDown(event: any) { const isEnter = event.key === 'Enter'; const isShiftEnter = event.shiftKey && isEnter; - const isEnterNewLineSetting = (window.getSettingValue(SettingsKey.settingsEnterKeyFunction) as string) === 'enterNewLine'; + const isShiftSendEnabled = window.getSettingValue(SettingsKey.hasShiftSendEnabled) as boolean; const isNotComposing = !event.nativeEvent.isComposing; - - if (isEnterNewLineSetting && isEnter && isNotComposing) { + + if (isShiftSendEnabled && isEnter && isNotComposing) { event.preventDefault(); if (isShiftEnter) { await this.onSendMessage(); @@ -861,27 +861,27 @@ class CompositionBoxInner extends React.Component { if (!messageBox) { return; } - + const { draft } = this.state; const { selectedConversationKey } = this.props; - + if (!selectedConversationKey) { - return; // add this check to prevent undefined from being used + return; // add this check to prevent undefined from being used } - + const currentSelectionStart = Number(messageBox.selectionStart); const realSelectionStart = getSelectionBasedOnMentions(draft, currentSelectionStart); - + const before = draft.slice(0, realSelectionStart); const after = draft.slice(realSelectionStart); - + this.setState({ draft: `${before}\n${after}` }); updateDraftForConversation({ conversationKey: selectedConversationKey, draft: `${before}\n${after}`, }); } - + private async onKeyUp() { if (!this.props.selectedConversationKey) { throw new Error('selectedConversationKey is needed'); diff --git a/ts/components/settings/SessionNotificationGroupSettings.tsx b/ts/components/settings/SessionNotificationGroupSettings.tsx index 1fd73d430..c28009247 100644 --- a/ts/components/settings/SessionNotificationGroupSettings.tsx +++ b/ts/components/settings/SessionNotificationGroupSettings.tsx @@ -109,7 +109,7 @@ export const SessionNotificationGroupSettings = (props: { hasPassword: boolean | initialItem={initialNotificationEnabled} group={SettingsKey.settingsNotification} items={items} - onClick={async (selectedRadioValue: string) => { + onClick={async (selectedRadioValue: string | boolean) => { await window.setSettingValue(SettingsKey.settingsNotification, selectedRadioValue); forceUpdate(); }} diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx index b0335af4d..dd04a9115 100644 --- a/ts/components/settings/section/CategoryConversations.tsx +++ b/ts/components/settings/section/CategoryConversations.tsx @@ -8,7 +8,10 @@ import { toggleAudioAutoplay } from '../../../state/ducks/userConfig'; import { getAudioAutoplay } from '../../../state/selectors/userConfig'; import { SessionRadioGroup } from '../../basic/SessionRadioGroup'; import { BlockedContactsList } from '../BlockedList'; -import { SessionSettingsItemWrapper, SessionToggleWithDescription } from '../SessionSettingListItem'; +import { + SessionSettingsItemWrapper, + SessionToggleWithDescription, +} from '../SessionSettingListItem'; async function toggleCommunitiesPruning() { try { @@ -83,16 +86,16 @@ const AudioMessageAutoPlaySetting = () => { const EnterKeyFunctionSetting = () => { const forceUpdate = useUpdate(); - const initialSetting = window.getSettingValue(SettingsKey.settingsEnterKeyFunction) || true; + const initialSetting = window.getSettingValue(SettingsKey.hasShiftSendEnabled) || false; const items = [ { label: window.i18n('enterSendNewMessageDescription'), - value: 'enterSend', + value: false, }, { label: window.i18n('enterNewLineDescription'), - value: 'enterNewLine', + value: true, }, ]; @@ -104,11 +107,14 @@ const EnterKeyFunctionSetting = () => { > { - await window.setSettingValue(SettingsKey.settingsEnterKeyFunction, selectedRadioValue); - forceUpdate(); + onClick={(selectedRadioValue: string | boolean) => { + async function updateSetting() { + await window.setSettingValue(SettingsKey.hasShiftSendEnabled, selectedRadioValue); + forceUpdate(); + } + updateSetting().catch(error => window.log.error('Error updating setting:', error)); }} /> diff --git a/ts/data/settings-key.ts b/ts/data/settings-key.ts index a34782706..b5e9ea8c1 100644 --- a/ts/data/settings-key.ts +++ b/ts/data/settings-key.ts @@ -1,7 +1,7 @@ const settingsReadReceipt = 'read-receipt-setting'; const settingsTypingIndicator = 'typing-indicators-setting'; const settingsAutoUpdate = 'auto-update'; -const settingsEnterKeyFunction = 'enter-key-function-setting'; +const hasShiftSendEnabled = 'hasShiftSendEnabled'; const settingsMenuBar = 'hide-menu-bar'; const settingsSpellCheck = 'spell-check'; const settingsLinkPreview = 'link-preview-setting'; @@ -24,7 +24,7 @@ export const SettingsKey = { settingsReadReceipt, settingsTypingIndicator, settingsAutoUpdate, - settingsEnterKeyFunction, + hasShiftSendEnabled, settingsMenuBar, settingsSpellCheck, settingsLinkPreview, diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx index 43868f4c1..b8b0e3a5f 100644 --- a/ts/state/ducks/settings.tsx +++ b/ts/state/ducks/settings.tsx @@ -8,6 +8,7 @@ const SettingsBoolsKeyTrackedInRedux = [ SettingsKey.someDeviceOutdatedSyncing, SettingsKey.settingsLinkPreview, SettingsKey.hasBlindedMsgRequestsEnabled, + SettingsKey.hasShiftSendEnabled, ] as const; export type SettingsState = { @@ -20,6 +21,7 @@ export function getSettingsInitialState() { someDeviceOutdatedSyncing: false, 'link-preview-setting': false, // this is the value of SettingsKey.settingsLinkPreview hasBlindedMsgRequestsEnabled: false, + hasShiftSendEnabled: false, }, }; } @@ -47,6 +49,8 @@ const settingsSlice = createSlice({ SettingsKey.hasBlindedMsgRequestsEnabled, false ); + const hasShiftSendEnabled = Storage.get(SettingsKey.hasShiftSendEnabled); + state.settingsBools.someDeviceOutdatedSyncing = isBoolean(outdatedSync) ? outdatedSync : false; @@ -54,6 +58,9 @@ const settingsSlice = createSlice({ state.settingsBools.hasBlindedMsgRequestsEnabled = isBoolean(hasBlindedMsgRequestsEnabled) ? hasBlindedMsgRequestsEnabled : false; + state.settingsBools.hasShiftSendEnabled = isBoolean(hasShiftSendEnabled) + ? hasShiftSendEnabled + : false; return state; }, updateSettingsBoolValue(state, action: PayloadAction<{ id: string; value: boolean }>) { diff --git a/ts/state/selectors/settings.ts b/ts/state/selectors/settings.ts index eb70ef9b1..19a5580b2 100644 --- a/ts/state/selectors/settings.ts +++ b/ts/state/selectors/settings.ts @@ -11,6 +11,9 @@ const getHasDeviceOutdatedSyncing = (state: StateType) => const getHasBlindedMsgRequestsEnabled = (state: StateType) => state.settings.settingsBools[SettingsKey.hasBlindedMsgRequestsEnabled]; +const getHasShiftSendEnabled = (state: StateType) => + state.settings.settingsBools[SettingsKey.hasShiftSendEnabled]; + export const useHasLinkPreviewEnabled = () => { const value = useSelector(getLinkPreviewEnabled); return Boolean(value); @@ -25,3 +28,8 @@ export const useHasBlindedMsgRequestsEnabled = () => { const value = useSelector(getHasBlindedMsgRequestsEnabled); return Boolean(value); }; + +export const useHasEnterSendEnabled = () => { + const value = useSelector(getHasShiftSendEnabled); + return Boolean(value); +}; From ff09d8e10450a118ca86f345f8257bcdbf3c79cf Mon Sep 17 00:00:00 2001 From: Kee Jefferys Date: Thu, 12 Oct 2023 16:03:45 +1100 Subject: [PATCH 3/6] fix: disable eslint, refactor function --- .../settings/section/CategoryConversations.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx index dd04a9115..25853b621 100644 --- a/ts/components/settings/section/CategoryConversations.tsx +++ b/ts/components/settings/section/CategoryConversations.tsx @@ -109,13 +109,12 @@ const EnterKeyFunctionSetting = () => { initialItem={initialSetting} group={SettingsKey.hasShiftSendEnabled} // make sure to define this key in your SettingsKey enum items={items} - onClick={(selectedRadioValue: string | boolean) => { - async function updateSetting() { - await window.setSettingValue(SettingsKey.hasShiftSendEnabled, selectedRadioValue); - forceUpdate(); - } - updateSetting().catch(error => window.log.error('Error updating setting:', error)); + /* eslint-disable @typescript-eslint/no-misused-promises */ + onClick={async (selectedRadioValue: string | boolean) => { + await window.setSettingValue(SettingsKey.hasShiftSendEnabled, selectedRadioValue); + forceUpdate(); }} + /* eslint-enable @typescript-eslint/no-misused-promises */ /> ); From 6b78cc1d4bc5d4a9e919ea2d3183fcf427b4d006 Mon Sep 17 00:00:00 2001 From: Kee Jefferys Date: Thu, 12 Oct 2023 17:20:17 +1100 Subject: [PATCH 4/6] fix: ensure default value is provided --- ts/state/ducks/settings.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx index b8b0e3a5f..7ac720cf2 100644 --- a/ts/state/ducks/settings.tsx +++ b/ts/state/ducks/settings.tsx @@ -49,7 +49,7 @@ const settingsSlice = createSlice({ SettingsKey.hasBlindedMsgRequestsEnabled, false ); - const hasShiftSendEnabled = Storage.get(SettingsKey.hasShiftSendEnabled); + const hasShiftSendEnabled = Storage.get(SettingsKey.hasShiftSendEnabled, false); state.settingsBools.someDeviceOutdatedSyncing = isBoolean(outdatedSync) ? outdatedSync From b8ef827e62663bdc22a9fa56f58363181351cc70 Mon Sep 17 00:00:00 2001 From: Kee Jefferys Date: Wed, 18 Oct 2023 13:38:36 +1100 Subject: [PATCH 5/6] fix: update usage of string and bool in radio group --- ts/components/basic/SessionRadio.tsx | 6 ++--- ts/components/basic/SessionRadioGroup.tsx | 12 +++++----- .../composition/CompositionBox.tsx | 6 +++-- .../SessionNotificationGroupSettings.tsx | 2 +- .../section/CategoryConversations.tsx | 22 +++++++++---------- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/ts/components/basic/SessionRadio.tsx b/ts/components/basic/SessionRadio.tsx index 7f9379b52..d45fb6682 100644 --- a/ts/components/basic/SessionRadio.tsx +++ b/ts/components/basic/SessionRadio.tsx @@ -4,11 +4,11 @@ import { Flex } from './Flex'; type Props = { label: string; - value: string | boolean; + value: string; active: boolean; inputName?: string; beforeMargins?: string; - onClick?: (value: string | boolean) => void; + onClick?: (value: string) => void; }; const StyledInput = styled.input<{ @@ -68,7 +68,7 @@ export const SessionRadio = (props: Props) => { ; + initialItem: string; + items: Array<{ value: string; label: string }>; group: string; - onClick: (selectedValue: string | boolean) => void; + onClick: (selectedValue: string) => any; style?: CSSProperties; } @@ -30,7 +30,7 @@ const StyledFieldSet = styled.fieldset` export const SessionRadioGroup = (props: Props) => { const { items, group, initialItem, style } = props; - const [activeItem, setActiveItem] = useState(initialItem); + const [activeItem, setActiveItem] = useState(''); useMount(() => { setActiveItem(initialItem); @@ -43,12 +43,12 @@ export const SessionRadioGroup = (props: Props) => { return ( { + onClick={(value: string) => { setActiveItem(value); props.onClick(value); }} diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index e1e0019dd..466a9aeb0 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -875,10 +875,12 @@ class CompositionBoxInner extends React.Component { const before = draft.slice(0, realSelectionStart); const after = draft.slice(realSelectionStart); - this.setState({ draft: `${before}\n${after}` }); + const updatedDraft = `${before}\n${after}`; + + this.setState({ draft: updatedDraft }); updateDraftForConversation({ conversationKey: selectedConversationKey, - draft: `${before}\n${after}`, + draft: updatedDraft, }); } diff --git a/ts/components/settings/SessionNotificationGroupSettings.tsx b/ts/components/settings/SessionNotificationGroupSettings.tsx index c28009247..1fd73d430 100644 --- a/ts/components/settings/SessionNotificationGroupSettings.tsx +++ b/ts/components/settings/SessionNotificationGroupSettings.tsx @@ -109,7 +109,7 @@ export const SessionNotificationGroupSettings = (props: { hasPassword: boolean | initialItem={initialNotificationEnabled} group={SettingsKey.settingsNotification} items={items} - onClick={async (selectedRadioValue: string | boolean) => { + onClick={async (selectedRadioValue: string) => { await window.setSettingValue(SettingsKey.settingsNotification, selectedRadioValue); forceUpdate(); }} diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx index 25853b621..4fd0a2074 100644 --- a/ts/components/settings/section/CategoryConversations.tsx +++ b/ts/components/settings/section/CategoryConversations.tsx @@ -12,6 +12,7 @@ import { SessionSettingsItemWrapper, SessionToggleWithDescription, } from '../SessionSettingListItem'; +import { useHasEnterSendEnabled } from '../../../state/selectors/settings'; async function toggleCommunitiesPruning() { try { @@ -84,18 +85,17 @@ const AudioMessageAutoPlaySetting = () => { }; const EnterKeyFunctionSetting = () => { - const forceUpdate = useUpdate(); - - const initialSetting = window.getSettingValue(SettingsKey.hasShiftSendEnabled) || false; + const initialSetting = useHasEnterSendEnabled(); + const selectedWithSettingTrue = 'enterForNewLine'; const items = [ { label: window.i18n('enterSendNewMessageDescription'), - value: false, + value: 'enterForSend', }, { label: window.i18n('enterNewLineDescription'), - value: true, + value: selectedWithSettingTrue, }, ]; @@ -106,15 +106,15 @@ const EnterKeyFunctionSetting = () => { inline={false} > { - await window.setSettingValue(SettingsKey.hasShiftSendEnabled, selectedRadioValue); - forceUpdate(); + onClick={(selectedRadioValue: string) => { + void window.setSettingValue( + SettingsKey.hasShiftSendEnabled, + selectedRadioValue === selectedWithSettingTrue + ); }} - /* eslint-enable @typescript-eslint/no-misused-promises */ /> ); From 36adbaa71ecb78ebe511139119211f98c2a4d249 Mon Sep 17 00:00:00 2001 From: Kee Jefferys Date: Wed, 18 Oct 2023 15:20:17 +1100 Subject: [PATCH 6/6] fix: update any to void --- ts/components/basic/SessionRadioGroup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/basic/SessionRadioGroup.tsx b/ts/components/basic/SessionRadioGroup.tsx index e07c0b19c..aa49fa0c8 100644 --- a/ts/components/basic/SessionRadioGroup.tsx +++ b/ts/components/basic/SessionRadioGroup.tsx @@ -8,7 +8,7 @@ interface Props { initialItem: string; items: Array<{ value: string; label: string }>; group: string; - onClick: (selectedValue: string) => any; + onClick: (selectedValue: string) => void; style?: CSSProperties; }