oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

adding PR change.

Browse source
This commit is contained in:
Warrick Corfe-Tan 2021-08-19 13:39:51 +10:00
parent 4564863dd5
commit 665c717271
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ts/components/session/registration/RegistrationStages.tsx
View file

@ -160,11 +160,15 @@ export enum RegistrationPhase {
interface RegistrationPhaseContext { interface RegistrationPhaseContext {
registrationPhase: RegistrationPhase; registrationPhase: RegistrationPhase;
setRegistrationPhase: (phase: RegistrationPhase) => void; setRegistrationPhase: (phase: RegistrationPhase) => void;
generatedRecoveryPhrase: string;
hexGeneratedPubKey: string;
} }
export const RegistrationContext = createContext<RegistrationPhaseContext>({ export const RegistrationContext = createContext<RegistrationPhaseContext>({
registrationPhase: RegistrationPhase.Start, registrationPhase: RegistrationPhase.Start,
setRegistrationPhase: () => undefined, setRegistrationPhase: () => undefined,
generatedRecoveryPhrase: '',
hexGeneratedPubKey: '',
}); });
export const RegistrationStages = () => { export const RegistrationStages = () => {
@ -199,15 +203,16 @@ 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,
generatedRecoveryPhrase,
hexGeneratedPubKey,
}}
>
{(registrationPhase === RegistrationPhase.Start || {(registrationPhase === RegistrationPhase.Start ||
registrationPhase === RegistrationPhase.SignUp) && ( registrationPhase === RegistrationPhase.SignUp) && <SignUpTab />}
<SignUpTab
generatedRecoveryPhrase={generatedRecoveryPhrase}
hexGeneratedPubKey={hexGeneratedPubKey}
// setRegistrationPhase={setRegistrationPhase}
/>
)}
{(registrationPhase === RegistrationPhase.Start || {(registrationPhase === RegistrationPhase.Start ||
registrationPhase === RegistrationPhase.SignIn) && <SignInTab />} registrationPhase === RegistrationPhase.SignIn) && <SignInTab />}
</RegistrationContext.Provider> </RegistrationContext.Provider>

16
ts/components/session/registration/SignUpTab.tsx
View file

@ -11,12 +11,6 @@ export enum SignUpMode {
EnterDetails, EnterDetails,
} }
export interface Props {
// tslint:disable: react-unused-props-and-state
generatedRecoveryPhrase: string;
hexGeneratedPubKey: string;
}
const CreateSessionIdButton = ({ createSessionID }: { createSessionID: any }) => { const CreateSessionIdButton = ({ createSessionID }: { createSessionID: any }) => {
return ( return (
<SessionButton <SessionButton
@ -61,8 +55,10 @@ const SignUpSessionIDShown = (props: { continueSignUp: () => void }) => {
); );
}; };
export const SignUpTab = (props: Props) => { export const SignUpTab = () => {
const { setRegistrationPhase } = useContext(RegistrationContext); const { setRegistrationPhase, generatedRecoveryPhrase, hexGeneratedPubKey } = useContext(
RegistrationContext
);
const [signUpMode, setSignUpMode] = useState(SignUpMode.Default); const [signUpMode, setSignUpMode] = useState(SignUpMode.Default);
const [displayName, setDisplayName] = useState(''); const [displayName, setDisplayName] = useState('');
@ -70,7 +66,7 @@ export const SignUpTab = (props: Props) => {
useEffect(() => { useEffect(() => {
if (signUpMode === SignUpMode.SessionIDShown) { if (signUpMode === SignUpMode.SessionIDShown) {
window.Session.setNewSessionID(props.hexGeneratedPubKey); window.Session.setNewSessionID(hexGeneratedPubKey);
} }
}, [signUpMode]); }, [signUpMode]);
@ -104,7 +100,7 @@ export const SignUpTab = (props: Props) => {
const signUpWithDetails = async () => { const signUpWithDetails = async () => {
await signUp({ await signUp({
displayName, displayName,
generatedRecoveryPhrase: props.generatedRecoveryPhrase, generatedRecoveryPhrase: generatedRecoveryPhrase,
}); });
}; };