changing registration component and filename.

pull/1851/head
Warrick Corfe-Tan 4 years ago
parent bf645f36b7
commit 0c5f2f8232

@ -9,7 +9,7 @@ import { SessionButton, SessionButtonColor, SessionButtonType } from '../session
import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon'; import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
import { PillDivider } from '../session/PillDivider'; import { PillDivider } from '../session/PillDivider';
import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils'; import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils';
import { MAX_USERNAME_LENGTH } from '../session/registration/RegistrationTabs'; import { MAX_USERNAME_LENGTH } from '../session/registration/RegistrationStages';
import { SessionSpinner } from '../session/SessionSpinner'; import { SessionSpinner } from '../session/SessionSpinner';
import { ConversationModel, ConversationTypeEnum } from '../../models/conversation'; import { ConversationModel, ConversationTypeEnum } from '../../models/conversation';

@ -1,7 +1,7 @@
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import { AccentText } from './AccentText'; import { AccentText } from './AccentText';
import { RegistrationOptions } from './registration/RegistrationTabs'; import { RegistrationStages } from './registration/RegistrationStages';
import { SessionIconButton, SessionIconSize, SessionIconType } from './icon'; import { SessionIconButton, SessionIconSize, SessionIconType } from './icon';
import { SessionToastContainer } from './SessionToastContainer'; import { SessionToastContainer } from './SessionToastContainer';
import { lightTheme, SessionTheme } from '../../state/ducks/SessionTheme'; import { lightTheme, SessionTheme } from '../../state/ducks/SessionTheme';
@ -36,7 +36,7 @@ export const SessionRegistrationView = () => {
<AccentText /> <AccentText />
</div> </div>
<div className="session-content-registration"> <div className="session-content-registration">
<RegistrationOptions theme={lightTheme} /> <RegistrationStages theme={lightTheme} />
</div> </div>
</div> </div>
</div> </div>

@ -5,7 +5,6 @@ import { getConversationController } from '../../../session/conversations';
import { createOrUpdateItem, removeAll } from '../../../data/data'; import { createOrUpdateItem, removeAll } from '../../../data/data';
import { SignUpTab } from './SignUpTab'; import { SignUpTab } from './SignUpTab';
import { SignInTab } from './SignInTab'; import { SignInTab } from './SignInTab';
import { TabLabel, TabType } from './TabLabel'; // TODO: remove unused tabs
import { trigger } from '../../../shims/events'; import { trigger } from '../../../shims/events';
import { import {
generateMnemonic, generateMnemonic,
@ -157,12 +156,10 @@ export async function signInWithLinking(signInDetails: { userRecoveryPhrase: str
export enum RegistrationPhase { export enum RegistrationPhase {
Start, Start,
SignIn, SignIn,
CreateSessionID, SignUp
RestoreYourAccount,
LinkDevice
} }
export const RegistrationOptions = (props: any) => { export const RegistrationStages = (props: any) => {
const [generatedRecoveryPhrase, setGeneratedRecoveryPhrase] = useState(''); const [generatedRecoveryPhrase, setGeneratedRecoveryPhrase] = useState('');
const [hexGeneratedPubKey, setHexGeneratedPubKey] = useState(''); const [hexGeneratedPubKey, setHexGeneratedPubKey] = useState('');
const [registrationPhase, setRegistrationPhase] = useState(RegistrationPhase.Start); const [registrationPhase, setRegistrationPhase] = useState(RegistrationPhase.Start);
@ -195,7 +192,7 @@ export const RegistrationOptions = (props: any) => {
return ( return (
<div className="session-registration-container"> <div className="session-registration-container">
{(registrationPhase === RegistrationPhase.Start || {(registrationPhase === RegistrationPhase.Start ||
registrationPhase === RegistrationPhase.CreateSessionID) && registrationPhase === RegistrationPhase.SignUp) &&
<SignUpTab <SignUpTab
generatedRecoveryPhrase={generatedRecoveryPhrase} generatedRecoveryPhrase={generatedRecoveryPhrase}
hexGeneratedPubKey={hexGeneratedPubKey} hexGeneratedPubKey={hexGeneratedPubKey}

@ -2,7 +2,7 @@ import classNames from 'classnames';
import React from 'react'; import React from 'react';
import { lightTheme } from '../../../state/ducks/SessionTheme'; import { lightTheme } from '../../../state/ducks/SessionTheme';
import { SessionInput } from '../SessionInput'; import { SessionInput } from '../SessionInput';
import { MAX_USERNAME_LENGTH } from './RegistrationTabs'; import { MAX_USERNAME_LENGTH } from './RegistrationStages';
const DisplayNameInput = (props: { const DisplayNameInput = (props: {
stealAutoFocus?: boolean; stealAutoFocus?: boolean;

@ -3,7 +3,7 @@ import { Flex } from '../../basic/Flex';
import { SpacerLG } from '../../basic/Text'; import { SpacerLG } from '../../basic/Text';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../SessionButton'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../SessionButton';
import { SessionSpinner } from '../SessionSpinner'; import { SessionSpinner } from '../SessionSpinner';
import { RegistrationPhase, signInWithLinking, signInWithRecovery } from './RegistrationTabs'; import { RegistrationPhase, signInWithLinking, signInWithRecovery } from './RegistrationStages';
import { RegistrationUserDetails } from './RegistrationUserDetails'; import { RegistrationUserDetails } from './RegistrationUserDetails';
import { TermsAndConditions } from './TermsAndConditions'; import { TermsAndConditions } from './TermsAndConditions';

@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { SessionButton, SessionButtonColor, SessionButtonType } from '../SessionButton'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../SessionButton';
import { SessionIdEditable } from '../SessionIdEditable'; import { SessionIdEditable } from '../SessionIdEditable';
import { RegistrationPhase, signUp } from './RegistrationTabs'; import { RegistrationPhase, signUp } from './RegistrationStages';
import { RegistrationUserDetails } from './RegistrationUserDetails'; import { RegistrationUserDetails } from './RegistrationUserDetails';
import { TermsAndConditions } from './TermsAndConditions'; import { TermsAndConditions } from './TermsAndConditions';
@ -79,7 +79,7 @@ export const SignUpTab = (props: Props) => {
<SignUpDefault <SignUpDefault
createSessionID={() => { createSessionID={() => {
setSignUpMode(SignUpMode.SessionIDShown); setSignUpMode(SignUpMode.SessionIDShown);
setRegistrationPhase(RegistrationPhase.CreateSessionID) setRegistrationPhase(RegistrationPhase.SignUp)
}} }}
/> />
); );

Loading…
Cancel
Save