From 59d52d6e66f44a422e3c1ffc2d8be03a3d2f4a4f Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan Date: Mon, 16 Aug 2021 09:57:38 +1000 Subject: [PATCH] running yarn ready --- .../session/SessionRegistrationView.tsx | 2 +- .../registration/RegistrationStages.tsx | 34 ++++++++----------- .../session/registration/SignUpTab.tsx | 2 +- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/ts/components/session/SessionRegistrationView.tsx b/ts/components/session/SessionRegistrationView.tsx index e19f94f6a..e78e3bb54 100644 --- a/ts/components/session/SessionRegistrationView.tsx +++ b/ts/components/session/SessionRegistrationView.tsx @@ -36,7 +36,7 @@ export const SessionRegistrationView = () => {
- +
diff --git a/ts/components/session/registration/RegistrationStages.tsx b/ts/components/session/registration/RegistrationStages.tsx index aabc15f15..3f53380e5 100644 --- a/ts/components/session/registration/RegistrationStages.tsx +++ b/ts/components/session/registration/RegistrationStages.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { PromiseUtils, StringUtils, ToastUtils, UserUtils } from '../../../session/utils'; import { getConversationController } from '../../../session/conversations'; @@ -16,7 +16,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 { useEffect } from 'react'; export const MAX_USERNAME_LENGTH = 20; // tslint:disable: use-simple-attributes @@ -156,10 +155,10 @@ export async function signInWithLinking(signInDetails: { userRecoveryPhrase: str export enum RegistrationPhase { Start, SignIn, - SignUp + SignUp, } -export const RegistrationStages = (props: any) => { +export const RegistrationStages = () => { const [generatedRecoveryPhrase, setGeneratedRecoveryPhrase] = useState(''); const [hexGeneratedPubKey, setHexGeneratedPubKey] = useState(''); const [registrationPhase, setRegistrationPhase] = useState(RegistrationPhase.Start); @@ -167,7 +166,7 @@ export const RegistrationStages = (props: any) => { useEffect(() => { void generateMnemonicAndKeyPair(); void resetRegistration(); - }, []) + }, []); const generateMnemonicAndKeyPair = async () => { if (generatedRecoveryPhrase === '') { @@ -182,30 +181,27 @@ export const RegistrationStages = (props: any) => { } const seed = fromHex(seedHex); const keyPair = await sessionGenerateKeyPair(seed); - const hexGeneratedPubKey = StringUtils.decode(keyPair.pubKey, 'hex'); + const newHexPubKey = StringUtils.decode(keyPair.pubKey, 'hex'); setGeneratedRecoveryPhrase(mnemonic); - setHexGeneratedPubKey(hexGeneratedPubKey); // our 'frontend' sessionID + setHexGeneratedPubKey(newHexPubKey); // our 'frontend' sessionID } - } + }; return (
{(registrationPhase === RegistrationPhase.Start || - registrationPhase === RegistrationPhase.SignUp) && + registrationPhase === RegistrationPhase.SignUp) && ( - } - { - (registrationPhase === RegistrationPhase.Start || - registrationPhase === RegistrationPhase.SignIn) && - - } + )} + {(registrationPhase === RegistrationPhase.Start || + registrationPhase === RegistrationPhase.SignIn) && ( + + )}
- ) -} + ); +}; diff --git a/ts/components/session/registration/SignUpTab.tsx b/ts/components/session/registration/SignUpTab.tsx index d9de4e1ca..769300485 100644 --- a/ts/components/session/registration/SignUpTab.tsx +++ b/ts/components/session/registration/SignUpTab.tsx @@ -79,7 +79,7 @@ export const SignUpTab = (props: Props) => { { setSignUpMode(SignUpMode.SessionIDShown); - setRegistrationPhase(RegistrationPhase.SignUp) + setRegistrationPhase(RegistrationPhase.SignUp); }} /> );