yarn ready

pull/1851/head
Warrick Corfe-Tan 4 years ago
parent 85fca22c08
commit 4564863dd5

@ -1,5 +1,4 @@
import React, { useEffect, useState } from 'react'; import React, { createContext, useEffect, useState } from 'react';
import { PromiseUtils, StringUtils, ToastUtils, UserUtils } from '../../../session/utils'; import { PromiseUtils, StringUtils, ToastUtils, UserUtils } from '../../../session/utils';
import { getConversationController } from '../../../session/conversations'; import { getConversationController } from '../../../session/conversations';
import { createOrUpdateItem, removeAll } from '../../../data/data'; import { createOrUpdateItem, removeAll } from '../../../data/data';
@ -16,7 +15,6 @@ import { fromHex } from '../../../session/utils/String';
import { TaskTimedOutError } from '../../../session/utils/Promise'; import { TaskTimedOutError } from '../../../session/utils/Promise';
import { mn_decode } from '../../../session/crypto/mnemonic'; import { mn_decode } from '../../../session/crypto/mnemonic';
import { getSwarmPollingInstance } from '../../../session/snode_api/swarmPolling'; import { getSwarmPollingInstance } from '../../../session/snode_api/swarmPolling';
import { createContext } from 'react';
export const MAX_USERNAME_LENGTH = 20; export const MAX_USERNAME_LENGTH = 20;
// tslint:disable: use-simple-attributes // tslint:disable: use-simple-attributes
@ -166,7 +164,7 @@ interface RegistrationPhaseContext {
export const RegistrationContext = createContext<RegistrationPhaseContext>({ export const RegistrationContext = createContext<RegistrationPhaseContext>({
registrationPhase: RegistrationPhase.Start, registrationPhase: RegistrationPhase.Start,
setRegistrationPhase: () => {} setRegistrationPhase: () => undefined,
}); });
export const RegistrationStages = () => { export const RegistrationStages = () => {
@ -201,20 +199,17 @@ export const RegistrationStages = () => {
return ( return (
<div className="session-registration-container"> <div className="session-registration-container">
<RegistrationContext.Provider value={{registrationPhase, setRegistrationPhase}}> <RegistrationContext.Provider value={{ registrationPhase, setRegistrationPhase }}>
{(registrationPhase === RegistrationPhase.Start || {(registrationPhase === RegistrationPhase.Start ||
registrationPhase === RegistrationPhase.SignUp) && ( registrationPhase === RegistrationPhase.SignUp) && (
<SignUpTab <SignUpTab
generatedRecoveryPhrase={generatedRecoveryPhrase} generatedRecoveryPhrase={generatedRecoveryPhrase}
hexGeneratedPubKey={hexGeneratedPubKey} hexGeneratedPubKey={hexGeneratedPubKey}
// setRegistrationPhase={setRegistrationPhase} // setRegistrationPhase={setRegistrationPhase}
/> />
)} )}
{(registrationPhase === RegistrationPhase.Start || {(registrationPhase === RegistrationPhase.Start ||
registrationPhase === RegistrationPhase.SignIn) && ( registrationPhase === RegistrationPhase.SignIn) && <SignInTab />}
<SignInTab />
)}
</RegistrationContext.Provider> </RegistrationContext.Provider>
</div> </div>
); );

@ -3,7 +3,12 @@ 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 { RegistrationContext, RegistrationPhase, signInWithLinking, signInWithRecovery } from './RegistrationStages'; import {
RegistrationContext,
RegistrationPhase,
signInWithLinking,
signInWithRecovery,
} from './RegistrationStages';
import { RegistrationUserDetails } from './RegistrationUserDetails'; import { RegistrationUserDetails } from './RegistrationUserDetails';
import { TermsAndConditions } from './TermsAndConditions'; import { TermsAndConditions } from './TermsAndConditions';

Loading…
Cancel
Save