diff --git a/nym-wallet/src/pages/welcome/components/index.ts b/nym-wallet/src/pages/welcome/components/index.ts index 137fbe9fbb..42c295b08f 100644 --- a/nym-wallet/src/pages/welcome/components/index.ts +++ b/nym-wallet/src/pages/welcome/components/index.ts @@ -4,3 +4,4 @@ export * from './render-page'; export * from './password-strength'; export * from './error'; export * from './textfields'; +export * from './step'; diff --git a/nym-wallet/src/pages/welcome/index.tsx b/nym-wallet/src/pages/welcome/index.tsx index e6ff75c0b8..e31a45f7c2 100644 --- a/nym-wallet/src/pages/welcome/index.tsx +++ b/nym-wallet/src/pages/welcome/index.tsx @@ -1,13 +1,21 @@ import React, { useContext, useState } from 'react'; import { Stack, Box, CircularProgress } from '@mui/material'; -import { NymLogo } from '@nymproject/react'; -import { CreatePassword, ExistingAccount, CreateMnemonic, VerifyMnemonic, WelcomeContent } from './pages'; +import { NymWordmark } from '@nymproject/react'; +import { + CreatePassword, + ExistingAccount, + CreateMnemonic, + VerifyMnemonic, + WelcomeContent, + SignInMnemonic, +} from './pages'; import { TPages } from './types'; -import { RenderPage } from './components'; +import { RenderPage, Step } from './components'; import { ClientContext } from '../../context/main'; +import { SignInPassword } from './pages/signin-password'; export const Welcome = () => { - const [page, setPage] = useState('welcome'); + const [page, setPage] = useState('sign in with mnemonic'); const { isLoading } = useContext(ClientContext); return ( @@ -30,36 +38,34 @@ export const Welcome = () => { margin: 'auto', }} > - {' '} {isLoading ? ( ) : ( - + + setPage('existing account')} - onCreateAccount={() => setPage('create password')} + onCreateAccount={() => setPage('create mnemonic')} page="welcome" /> - setPage('welcome')} - onNext={() => { - setPage('create mnemonic'); - }} - page="create password" - /> setPage('verify mnemonic')} onPrev={() => setPage('create password')} onComplete={() => setPage('existing account')} page="create mnemonic" /> - setPage('existing account')} - onPrev={() => setPage('create mnemonic')} - page="verify mnemonic" + setPage('create password')} onPrev={() => {}} page="verify mnemonic" /> + setPage('sign in with mnemonic')} + onNext={() => { + setPage('sign in with password'); + }} + page="create password" /> + setPage('welcome')} page="sign in with mnemonic" /> + setPage('welcome')} page="sign in with password" /> setPage('welcome')} onCreatePassword={() => setPage('create password')} diff --git a/nym-wallet/src/pages/welcome/pages/index.ts b/nym-wallet/src/pages/welcome/pages/index.ts index edee5b4421..bcd370c50d 100644 --- a/nym-wallet/src/pages/welcome/pages/index.ts +++ b/nym-wallet/src/pages/welcome/pages/index.ts @@ -3,3 +3,4 @@ export * from './create-mnemonic'; export * from './verify-mnemonic'; export * from './create-password'; export * from './existing-account'; +export * from './signin-mnemonic'; diff --git a/nym-wallet/src/pages/welcome/types.ts b/nym-wallet/src/pages/welcome/types.ts index 49e8e4d12e..2f5bc6ad8a 100644 --- a/nym-wallet/src/pages/welcome/types.ts +++ b/nym-wallet/src/pages/welcome/types.ts @@ -5,7 +5,9 @@ export type TPages = | 'create password' | 'existing account' | 'select network' - | 'legacy create account'; + | 'legacy create account' + | 'sign in with mnemonic' + | 'sign in with password'; export type TMnemonicWord = { name: string;