From 4564863dd5529007348c497f89e95413fee9648d Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan <warrickct@gmail.com> Date: Wed, 18 Aug 2021 11:54:53 +1000 Subject: [PATCH] yarn ready --- .../registration/RegistrationStages.tsx | 25 ++++++++----------- .../session/registration/SignInTab.tsx | 7 +++++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ts/components/session/registration/RegistrationStages.tsx b/ts/components/session/registration/RegistrationStages.tsx index 49d9fecc7..537aa1ac5 100644 --- a/ts/components/session/registration/RegistrationStages.tsx +++ b/ts/components/session/registration/RegistrationStages.tsx @@ -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 { getConversationController } from '../../../session/conversations'; import { createOrUpdateItem, removeAll } from '../../../data/data'; @@ -16,7 +15,6 @@ import { fromHex } from '../../../session/utils/String'; import { TaskTimedOutError } from '../../../session/utils/Promise'; import { mn_decode } from '../../../session/crypto/mnemonic'; import { getSwarmPollingInstance } from '../../../session/snode_api/swarmPolling'; -import { createContext } from 'react'; export const MAX_USERNAME_LENGTH = 20; // tslint:disable: use-simple-attributes @@ -166,7 +164,7 @@ interface RegistrationPhaseContext { export const RegistrationContext = createContext<RegistrationPhaseContext>({ registrationPhase: RegistrationPhase.Start, - setRegistrationPhase: () => {} + setRegistrationPhase: () => undefined, }); export const RegistrationStages = () => { @@ -201,20 +199,17 @@ export const RegistrationStages = () => { return ( <div className="session-registration-container"> - <RegistrationContext.Provider value={{registrationPhase, setRegistrationPhase}}> + <RegistrationContext.Provider value={{ registrationPhase, setRegistrationPhase }}> {(registrationPhase === RegistrationPhase.Start || registrationPhase === RegistrationPhase.SignUp) && ( - <SignUpTab - generatedRecoveryPhrase={generatedRecoveryPhrase} - hexGeneratedPubKey={hexGeneratedPubKey} - // setRegistrationPhase={setRegistrationPhase} - /> - )} + <SignUpTab + generatedRecoveryPhrase={generatedRecoveryPhrase} + hexGeneratedPubKey={hexGeneratedPubKey} + // setRegistrationPhase={setRegistrationPhase} + /> + )} {(registrationPhase === RegistrationPhase.Start || - registrationPhase === RegistrationPhase.SignIn) && ( - <SignInTab /> - )} - + registrationPhase === RegistrationPhase.SignIn) && <SignInTab />} </RegistrationContext.Provider> </div> ); diff --git a/ts/components/session/registration/SignInTab.tsx b/ts/components/session/registration/SignInTab.tsx index 05af89b15..862e783d7 100644 --- a/ts/components/session/registration/SignInTab.tsx +++ b/ts/components/session/registration/SignInTab.tsx @@ -3,7 +3,12 @@ import { Flex } from '../../basic/Flex'; import { SpacerLG } from '../../basic/Text'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../SessionButton'; import { SessionSpinner } from '../SessionSpinner'; -import { RegistrationContext, RegistrationPhase, signInWithLinking, signInWithRecovery } from './RegistrationStages'; +import { + RegistrationContext, + RegistrationPhase, + signInWithLinking, + signInWithRecovery, +} from './RegistrationStages'; import { RegistrationUserDetails } from './RegistrationUserDetails'; import { TermsAndConditions } from './TermsAndConditions';