fix: rename camelCase settingsCategories to kebab-case

this is reused as is for the datatestids
pull/3281/head
Audric Ackermann 11 months ago
parent 2d5d86b92d
commit 10ec8306e5
No known key found for this signature in database

@ -130,7 +130,7 @@ export const LeftPaneBanner = () => {
const showRecoveryPhraseModal = () => { const showRecoveryPhraseModal = () => {
dispatch(disableRecoveryPhrasePrompt()); dispatch(disableRecoveryPhrasePrompt());
dispatch(showLeftPaneSection(SectionType.Settings)); dispatch(showLeftPaneSection(SectionType.Settings));
dispatch(showSettingsSection('recoveryPassword')); dispatch(showSettingsSection('recovery-password'));
}; };
if (section !== SectionType.Message || isSignInWithRecoveryPhrase || hideRecoveryPassword) { if (section !== SectionType.Message || isSignInWithRecoveryPhrase || hideRecoveryPassword) {

@ -73,7 +73,7 @@ const getCategories = (): Array<Categories> => {
icon: { type: 'chatBubble' as const, ...forcedSize }, icon: { type: 'chatBubble' as const, ...forcedSize },
}, },
{ {
id: 'messageRequests' as const, id: 'message-requests' as const,
title: window.i18n('sessionMessageRequests'), title: window.i18n('sessionMessageRequests'),
icon: { type: 'messageRequest' as const, ...forcedSize }, icon: { type: 'messageRequest' as const, ...forcedSize },
}, },
@ -93,12 +93,12 @@ const getCategories = (): Array<Categories> => {
icon: { type: 'question' as const, ...forcedSize }, icon: { type: 'question' as const, ...forcedSize },
}, },
{ {
id: 'recoveryPassword' as const, id: 'recovery-password' as const,
title: window.i18n('sessionRecoveryPassword'), title: window.i18n('sessionRecoveryPassword'),
icon: { type: 'recoveryPasswordFill' as const, ...forcedSize }, icon: { type: 'recoveryPasswordFill' as const, ...forcedSize },
}, },
{ {
id: 'clearData' as const, id: 'clear-data' as const,
title: window.i18n('sessionClearData'), title: window.i18n('sessionClearData'),
icon: { type: 'delete' as const, ...forcedSize, color: 'var(--danger-color)' }, icon: { type: 'delete' as const, ...forcedSize, color: 'var(--danger-color)' },
}, },
@ -110,7 +110,7 @@ const LeftPaneSettingsCategoryRow = ({ item }: { item: Categories }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const focusedSettingsSection = useSelector(getFocusedSettingsSection); const focusedSettingsSection = useSelector(getFocusedSettingsSection);
const isClearData = id === 'clearData'; const isClearData = id === 'clear-data';
return ( return (
<StyledSettingsListItem <StyledSettingsListItem
@ -125,12 +125,12 @@ const LeftPaneSettingsCategoryRow = ({ item }: { item: Categories }) => {
padding={'0px var(--margins-md) 0 var(--margins-sm)'} padding={'0px var(--margins-md) 0 var(--margins-sm)'}
onClick={() => { onClick={() => {
switch (id) { switch (id) {
case 'messageRequests': case 'message-requests':
dispatch(showLeftPaneSection(SectionType.Message)); dispatch(showLeftPaneSection(SectionType.Message));
dispatch(setLeftOverlayMode('message-requests')); dispatch(setLeftOverlayMode('message-requests'));
dispatch(resetConversationExternal()); dispatch(resetConversationExternal());
break; break;
case 'clearData': case 'clear-data':
dispatch(updateDeleteAccountModal({})); dispatch(updateDeleteAccountModal({}));
break; break;
default: default:
@ -168,7 +168,7 @@ const LeftPaneSettingsCategories = () => {
const hideRecoveryPassword = useHideRecoveryPasswordEnabled(); const hideRecoveryPassword = useHideRecoveryPasswordEnabled();
if (hideRecoveryPassword) { if (hideRecoveryPassword) {
categories = categories.filter(category => category.id !== 'recoveryPassword'); categories = categories.filter(category => category.id !== 'recovery-password');
} }
return ( return (

@ -116,12 +116,12 @@ const SettingInCategory = (props: {
return <SettingsCategoryHelp />; return <SettingsCategoryHelp />;
case 'permissions': case 'permissions':
return <SettingsCategoryPermissions />; return <SettingsCategoryPermissions />;
case 'recoveryPassword': case 'recovery-password':
return <SettingsCategoryRecoveryPassword />; return <SettingsCategoryRecoveryPassword />;
// these are just buttons and don't have screens // these are just buttons and don't have screens
case 'clearData': case 'clear-data':
case 'messageRequests': case 'message-requests':
default: default:
return null; return null;
} }

@ -43,11 +43,11 @@ export const SettingsHeader = (props: Props) => {
case 'privacy': case 'privacy':
categoryTitle = window.i18n('sessionPrivacy'); categoryTitle = window.i18n('sessionPrivacy');
break; break;
case 'recoveryPassword': case 'recovery-password':
categoryTitle = window.i18n('sessionRecoveryPassword'); categoryTitle = window.i18n('sessionRecoveryPassword');
break; break;
case 'clearData': case 'clear-data':
case 'messageRequests': case 'message-requests':
throw new Error(`no header for should be tried to be rendered for "${category}"`); throw new Error(`no header for should be tried to be rendered for "${category}"`);
default: default:

6
ts/react.d.ts vendored

@ -68,15 +68,15 @@ declare module 'react' {
| 'privacy-section' | 'privacy-section'
// settings menu item types // settings menu item types
| 'messageRequests-settings-menu-item' | 'message-requests-settings-menu-item'
| 'recoveryPassword-settings-menu-item' | 'recovery-password-settings-menu-item'
| 'privacy-settings-menu-item' | 'privacy-settings-menu-item'
| 'notifications-settings-menu-item' | 'notifications-settings-menu-item'
| 'conversations-settings-menu-item' | 'conversations-settings-menu-item'
| 'appearance-settings-menu-item' | 'appearance-settings-menu-item'
| 'help-settings-menu-item' | 'help-settings-menu-item'
| 'permissions-settings-menu-item' | 'permissions-settings-menu-item'
| 'clearData-settings-menu-item' | 'clear-data-settings-menu-item'
| 'block-menu-item' | 'block-menu-item'
| 'delete-menu-item' | 'delete-menu-item'
| 'accept-menu-item' | 'accept-menu-item'

@ -9,12 +9,12 @@ export type SessionSettingCategory =
| 'privacy' | 'privacy'
| 'notifications' | 'notifications'
| 'conversations' | 'conversations'
| 'messageRequests' | 'message-requests'
| 'appearance' | 'appearance'
| 'permissions' | 'permissions'
| 'help' | 'help'
| 'recoveryPassword' | 'recovery-password'
| 'clearData'; | 'clear-data';
export type PasswordAction = 'set' | 'change' | 'remove' | 'enter'; export type PasswordAction = 'set' | 'change' | 'remove' | 'enter';

@ -761,14 +761,20 @@ export const MultiEncryptWrapperActions: MultiEncryptActionsCalls = {
export const EncryptionDomains = ['SessionGroupKickedMessage'] as const; export const EncryptionDomains = ['SessionGroupKickedMessage'] as const;
export const BlindingActions: BlindingActionsCalls = { export const BlindingActions: BlindingActionsCalls = {
blindVersionPubkey: async (opts: { ed25519SecretKey: Uint8Array }) => blindVersionPubkey: async (opts: Parameters<BlindingActionsCalls['blindVersionPubkey']>[0]) =>
callLibSessionWorker(['Blinding', 'blindVersionPubkey', opts]) as Promise< callLibSessionWorker(['Blinding', 'blindVersionPubkey', opts]) as Promise<
ReturnType<BlindingActionsCalls['blindVersionPubkey']> ReturnType<BlindingActionsCalls['blindVersionPubkey']>
>, >,
blindVersionSign: async (opts: { ed25519SecretKey: Uint8Array; sigTimestampSeconds: number }) => blindVersionSign: async (opts: Parameters<BlindingActionsCalls['blindVersionSign']>[0]) =>
callLibSessionWorker(['Blinding', 'blindVersionSign', opts]) as Promise< callLibSessionWorker(['Blinding', 'blindVersionSign', opts]) as Promise<
ReturnType<BlindingActionsCalls['blindVersionSign']> ReturnType<BlindingActionsCalls['blindVersionSign']>
>, >,
blindVersionSignRequest: async (
opts: Parameters<BlindingActionsCalls['blindVersionSignRequest']>[0]
) =>
callLibSessionWorker(['Blinding', 'blindVersionSignRequest', opts]) as Promise<
ReturnType<BlindingActionsCalls['blindVersionSignRequest']>
>,
}; };
export const callLibSessionWorker = async ( export const callLibSessionWorker = async (

Loading…
Cancel
Save