fix: moved resetRegistration out of utils to make unit testing easier

pull/3056/head
William Grant 1 year ago
parent 006193faa2
commit 4c48056013

@ -1,6 +1,8 @@
import { shell } from 'electron'; import { shell } from 'electron';
import { Data } from 'emoji-mart';
import { AnimatePresence } from 'framer-motion'; import { AnimatePresence } from 'framer-motion';
import styled from 'styled-components'; import styled from 'styled-components';
import { getConversationController } from '../../session/conversations';
import { import {
AccountCreation, AccountCreation,
AccountRestoration, AccountRestoration,
@ -11,12 +13,21 @@ import {
useOnboardAccountRestorationStep, useOnboardAccountRestorationStep,
useOnboardStep, useOnboardStep,
} from '../../state/onboarding/selectors/registration'; } from '../../state/onboarding/selectors/registration';
import { Storage } from '../../util/storage';
import { Flex } from '../basic/Flex'; import { Flex } from '../basic/Flex';
import { SpacerLG, SpacerSM } from '../basic/Text'; import { SpacerLG, SpacerSM } from '../basic/Text';
import { SessionIcon, SessionIconButton } from '../icon'; import { SessionIcon, SessionIconButton } from '../icon';
import { OnboardContainer } from './components'; import { OnboardContainer } from './components';
import { CreateAccount, RestoreAccount, Start } from './stages'; import { CreateAccount, RestoreAccount, Start } from './stages';
export async function resetRegistration() {
await Data.removeAll();
Storage.reset();
await Storage.fetch();
getConversationController().reset();
await getConversationController().load();
}
const StyledRegistrationContainer = styled(Flex)` const StyledRegistrationContainer = styled(Flex)`
width: 348px; width: 348px;
.session-button { .session-button {

@ -28,9 +28,10 @@ import { Flex } from '../../basic/Flex';
import { SessionButton, SessionButtonColor } from '../../basic/SessionButton'; import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
import { SpacerLG, SpacerSM } from '../../basic/Text'; import { SpacerLG, SpacerSM } from '../../basic/Text';
import { SessionInput } from '../../inputs'; import { SessionInput } from '../../inputs';
import { resetRegistration } from '../RegistrationStages';
import { OnboardDescription, OnboardHeading } from '../components'; import { OnboardDescription, OnboardHeading } from '../components';
import { BackButtonWithininContainer } from '../components/BackButton'; import { BackButtonWithininContainer } from '../components/BackButton';
import { displayNameIsValid, resetRegistration, sanitizeDisplayNameOrToast } from '../utils'; import { displayNameIsValid, sanitizeDisplayNameOrToast } from '../utils';
export type AccountDetails = { export type AccountDetails = {
recoveryPassword: string; recoveryPassword: string;

@ -37,10 +37,11 @@ import { SpacerLG, SpacerSM } from '../../basic/Text';
import { SessionIcon } from '../../icon'; import { SessionIcon } from '../../icon';
import { SessionInput } from '../../inputs'; import { SessionInput } from '../../inputs';
import { SessionProgressBar } from '../../loading'; import { SessionProgressBar } from '../../loading';
import { resetRegistration } from '../RegistrationStages';
import { OnboardDescription, OnboardHeading } from '../components'; import { OnboardDescription, OnboardHeading } from '../components';
import { BackButtonWithininContainer } from '../components/BackButton'; import { BackButtonWithininContainer } from '../components/BackButton';
import { useRecoveryProgressEffect } from '../hooks'; import { useRecoveryProgressEffect } from '../hooks';
import { displayNameIsValid, resetRegistration, sanitizeDisplayNameOrToast } from '../utils'; import { displayNameIsValid, sanitizeDisplayNameOrToast } from '../utils';
import { AccountDetails } from './CreateAccount'; import { AccountDetails } from './CreateAccount';
type AccountRestoreDetails = AccountDetails & { dispatch: Dispatch; abortSignal?: AbortSignal }; type AccountRestoreDetails = AccountDetails & { dispatch: Dispatch; abortSignal?: AbortSignal };

@ -12,8 +12,8 @@ import {
} from '../../../state/onboarding/ducks/registration'; } from '../../../state/onboarding/ducks/registration';
import { SessionButton, SessionButtonColor } from '../../basic/SessionButton'; import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
import { SpacerLG } from '../../basic/Text'; import { SpacerLG } from '../../basic/Text';
import { resetRegistration } from '../RegistrationStages';
import { TermsAndConditions } from '../TermsAndConditions'; import { TermsAndConditions } from '../TermsAndConditions';
import { resetRegistration } from '../utils';
export const Start = () => { export const Start = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();

@ -1,17 +1,5 @@
import { AnyAction, Dispatch } from '@reduxjs/toolkit'; import { AnyAction, Dispatch } from '@reduxjs/toolkit';
import { Data } from '../../../data/data';
import { getConversationController } from '../../../session/conversations';
import { sanitizeSessionUsername } from '../../../session/utils/String'; import { sanitizeSessionUsername } from '../../../session/utils/String';
import { Storage } from '../../../util/storage';
export async function resetRegistration() {
await Data.removeAll();
Storage.reset();
await Storage.fetch();
getConversationController().reset();
await getConversationController().load();
// TODO[epic=ses-899] onboarding reset here?
}
export function sanitizeDisplayNameOrToast( export function sanitizeDisplayNameOrToast(
displayName: string, displayName: string,

Loading…
Cancel
Save