diff --git a/ts/components/leftpane/LeftPaneSectionHeader.tsx b/ts/components/leftpane/LeftPaneSectionHeader.tsx index c1e26115e..5cd421e05 100644 --- a/ts/components/leftpane/LeftPaneSectionHeader.tsx +++ b/ts/components/leftpane/LeftPaneSectionHeader.tsx @@ -130,7 +130,7 @@ export const LeftPaneBanner = () => { const showRecoveryPhraseModal = () => { dispatch(disableRecoveryPhrasePrompt()); dispatch(showLeftPaneSection(SectionType.Settings)); - dispatch(showSettingsSection('recoveryPassword')); + dispatch(showSettingsSection('recovery-password')); }; if (section !== SectionType.Message || isSignInWithRecoveryPhrase || hideRecoveryPassword) { diff --git a/ts/components/leftpane/LeftPaneSettingSection.tsx b/ts/components/leftpane/LeftPaneSettingSection.tsx index 2bd4a509c..c47a6ea56 100644 --- a/ts/components/leftpane/LeftPaneSettingSection.tsx +++ b/ts/components/leftpane/LeftPaneSettingSection.tsx @@ -73,7 +73,7 @@ const getCategories = (): Array => { icon: { type: 'chatBubble' as const, ...forcedSize }, }, { - id: 'messageRequests' as const, + id: 'message-requests' as const, title: window.i18n('sessionMessageRequests'), icon: { type: 'messageRequest' as const, ...forcedSize }, }, @@ -93,12 +93,12 @@ const getCategories = (): Array => { icon: { type: 'question' as const, ...forcedSize }, }, { - id: 'recoveryPassword' as const, + id: 'recovery-password' as const, title: window.i18n('sessionRecoveryPassword'), icon: { type: 'recoveryPasswordFill' as const, ...forcedSize }, }, { - id: 'clearData' as const, + id: 'clear-data' as const, title: window.i18n('sessionClearData'), icon: { type: 'delete' as const, ...forcedSize, color: 'var(--danger-color)' }, }, @@ -110,7 +110,7 @@ const LeftPaneSettingsCategoryRow = ({ item }: { item: Categories }) => { const dispatch = useDispatch(); const focusedSettingsSection = useSelector(getFocusedSettingsSection); - const isClearData = id === 'clearData'; + const isClearData = id === 'clear-data'; return ( { padding={'0px var(--margins-md) 0 var(--margins-sm)'} onClick={() => { switch (id) { - case 'messageRequests': + case 'message-requests': dispatch(showLeftPaneSection(SectionType.Message)); dispatch(setLeftOverlayMode('message-requests')); dispatch(resetConversationExternal()); break; - case 'clearData': + case 'clear-data': dispatch(updateDeleteAccountModal({})); break; default: @@ -168,7 +168,7 @@ const LeftPaneSettingsCategories = () => { const hideRecoveryPassword = useHideRecoveryPasswordEnabled(); if (hideRecoveryPassword) { - categories = categories.filter(category => category.id !== 'recoveryPassword'); + categories = categories.filter(category => category.id !== 'recovery-password'); } return ( diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx index fee434e4d..e49151921 100644 --- a/ts/components/settings/SessionSettings.tsx +++ b/ts/components/settings/SessionSettings.tsx @@ -116,12 +116,12 @@ const SettingInCategory = (props: { return ; case 'permissions': return ; - case 'recoveryPassword': + case 'recovery-password': return ; // these are just buttons and don't have screens - case 'clearData': - case 'messageRequests': + case 'clear-data': + case 'message-requests': default: return null; } diff --git a/ts/components/settings/SessionSettingsHeader.tsx b/ts/components/settings/SessionSettingsHeader.tsx index fb8a97641..5ff87abbd 100644 --- a/ts/components/settings/SessionSettingsHeader.tsx +++ b/ts/components/settings/SessionSettingsHeader.tsx @@ -43,11 +43,11 @@ export const SettingsHeader = (props: Props) => { case 'privacy': categoryTitle = window.i18n('sessionPrivacy'); break; - case 'recoveryPassword': + case 'recovery-password': categoryTitle = window.i18n('sessionRecoveryPassword'); break; - case 'clearData': - case 'messageRequests': + case 'clear-data': + case 'message-requests': throw new Error(`no header for should be tried to be rendered for "${category}"`); default: diff --git a/ts/react.d.ts b/ts/react.d.ts index 6ef2e630d..bb1859af3 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -68,15 +68,15 @@ declare module 'react' { | 'privacy-section' // settings menu item types - | 'messageRequests-settings-menu-item' - | 'recoveryPassword-settings-menu-item' + | 'message-requests-settings-menu-item' + | 'recovery-password-settings-menu-item' | 'privacy-settings-menu-item' | 'notifications-settings-menu-item' | 'conversations-settings-menu-item' | 'appearance-settings-menu-item' | 'help-settings-menu-item' | 'permissions-settings-menu-item' - | 'clearData-settings-menu-item' + | 'clear-data-settings-menu-item' | 'block-menu-item' | 'delete-menu-item' | 'accept-menu-item' diff --git a/ts/types/ReduxTypes.d.ts b/ts/types/ReduxTypes.d.ts index 327e4916a..c3630e12d 100644 --- a/ts/types/ReduxTypes.d.ts +++ b/ts/types/ReduxTypes.d.ts @@ -9,12 +9,12 @@ export type SessionSettingCategory = | 'privacy' | 'notifications' | 'conversations' - | 'messageRequests' + | 'message-requests' | 'appearance' | 'permissions' | 'help' - | 'recoveryPassword' - | 'clearData'; + | 'recovery-password' + | 'clear-data'; export type PasswordAction = 'set' | 'change' | 'remove' | 'enter'; diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 28320fe54..19a08691a 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -761,14 +761,20 @@ export const MultiEncryptWrapperActions: MultiEncryptActionsCalls = { export const EncryptionDomains = ['SessionGroupKickedMessage'] as const; export const BlindingActions: BlindingActionsCalls = { - blindVersionPubkey: async (opts: { ed25519SecretKey: Uint8Array }) => + blindVersionPubkey: async (opts: Parameters[0]) => callLibSessionWorker(['Blinding', 'blindVersionPubkey', opts]) as Promise< ReturnType >, - blindVersionSign: async (opts: { ed25519SecretKey: Uint8Array; sigTimestampSeconds: number }) => + blindVersionSign: async (opts: Parameters[0]) => callLibSessionWorker(['Blinding', 'blindVersionSign', opts]) as Promise< ReturnType >, + blindVersionSignRequest: async ( + opts: Parameters[0] + ) => + callLibSessionWorker(['Blinding', 'blindVersionSignRequest', opts]) as Promise< + ReturnType + >, }; export const callLibSessionWorker = async (