feat: link delete account modal to new user settings page

Author: Bilb

ts/components/dialog/DeleteAccountModal.tsx

@@ -123,6 +123,7 @@ export const DeleteAccountModal = () => {
     <SessionWrapperModal
       headerChildren={<ModalBasicHeader title={tr('clearDataAll')} />}
       onClose={onClickCancelHandler}
+      topAnchor="center"
       buttonChildren={
         <ModalActionsContainer>
           <SessionButton

ts/components/dialog/user-settings/pages/DefaultSettingsPage.tsx

@@ -12,6 +12,7 @@ import {
   updateSessionNetworkModal,
   updateConversationDetailsModal,
   userSettingsModal,
+  updateDeleteAccountModal,
 } from '../../../../state/ducks/modalDialog';
 import { networkDataActions } from '../../../../state/ducks/networkData';
 import { sectionActions } from '../../../../state/ducks/section';
@@ -214,6 +215,7 @@ function SettingsSection() {
 }
 
 function AdminSection() {
+  const dispatch = useDispatch();
   return (
     <PanelButtonGroup>
       <PanelIconButton
@@ -241,7 +243,7 @@ function AdminSection() {
         }
         text={tr('sessionClearData')}
         onClick={() => {
-          throw new Error('Not implemented');
+          dispatch(updateDeleteAccountModal({}));
         }}
         dataTestId="clear-data-settings-menu-item"
         color="var(--danger-color)"

ts/components/leftpane/LeftPaneSettingSection.tsx

@@ -2,15 +2,13 @@ import { type ReactNode, SessionDataTestId, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 
-import { updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import { sectionActions } from '../../state/ducks/section';
 import { getFocusedSettingsSection } from '../../state/selectors/section';
 import { useHideRecoveryPasswordEnabled } from '../../state/selectors/settings';
 import type { SessionSettingCategory } from '../../types/ReduxTypes';
 import { Flex } from '../basic/Flex';
 import { SessionIcon, SessionIconType } from '../icon';
 import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
-import { getSessionNetworkModalState } from '../../state/selectors/modal';
 import { Localizer } from '../basic/Localizer';
 import { tr } from '../../localization/localeTools';
 import { LUCIDE_ICONS_UNICODE, type WithLucideUnicode } from '../icon/lucide';
@@ -111,12 +109,8 @@ const LeftPaneSettingsCategoryRow = ({ item }: { item: Categories }) => {
   const { id, title, titleColor, icon, dataTestId, isNew } = item;
   const dispatch = useDispatch();
   const focusedSettingsSection = useSelector(getFocusedSettingsSection);
-  const sessionNetworkModalState = useSelector(getSessionNetworkModalState);
 
-  const isSelected = useMemo(
-    () => (sessionNetworkModalState ? id === 'session-network' : focusedSettingsSection === id),
-    [focusedSettingsSection, id, sessionNetworkModalState]
-  );
+  const isSelected = useMemo(() => focusedSettingsSection === id, [focusedSettingsSection, id]);
 
   const iconSize = 'medium';
 
@@ -135,13 +129,6 @@ const LeftPaneSettingsCategoryRow = ({ item }: { item: Categories }) => {
         switch (id) {
           case 'message-requests':
             break;
-          case 'session-network':
-            // if the network modal is not open yet do an info request
-
-            break;
-          case 'clear-data':
-            dispatch(updateDeleteAccountModal({}));
-            break;
           default:
             dispatch(sectionActions.showSettingsSection(id));
         }

ts/components/settings/SessionSettings.tsx

@@ -123,8 +123,6 @@ const SettingInCategory = (props: { category: SessionSettingCategory }) => {
 
     // these are just buttons or modals and don't have screens
     case 'message-requests':
-    case 'session-network':
-    case 'clear-data':
     default:
       return null;
   }

ts/components/settings/SessionSettingsHeader.tsx

@@ -42,8 +42,6 @@ export const SettingsHeader = (props: Props) => {
       categoryTitleKey = 'sessionRecoveryPassword';
       break;
     // these are modals or other screens
-    case 'session-network':
-    case 'clear-data':
     case 'message-requests':
       throw new Error(`no header for should be tried to be rendered for "${category}"`);
 

ts/types/ReduxTypes.d.ts

@@ -10,10 +10,8 @@ export type SessionSettingCategory =
   | 'message-requests'
   | 'appearance'
   | 'permissions'
-  | 'session-network'
   | 'recovery-password'
-  | 'help'
-  | 'clear-data';
+  | 'help';
 
 export type PasswordAction = 'set' | 'change' | 'remove' | 'enter';