diff --git a/_locales/en/messages.json b/_locales/en/messages.json index bb39c5d57..e3e859f79 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -403,7 +403,6 @@ "linkDevice": "Link Device", "restoreUsingRecoveryPhrase": "Restore your account", "or": "or", - "beginYourSession": "Begin your Session.", "welcomeToYourSession": "Welcome to your Session", "searchFor...": "Search conversations and contacts", "searchForContactsOnly": "Search for contacts", diff --git a/ts/components/icon/Icons.tsx b/ts/components/icon/Icons.tsx index 36a9c7ebb..7db024175 100644 --- a/ts/components/icon/Icons.tsx +++ b/ts/components/icon/Icons.tsx @@ -62,12 +62,14 @@ export type SessionIconType = | 'shield' | 'star' | 'sun' + | 'question' | 'qr' | 'users' | 'warning' | 'sending' | 'doubleCheckCircle' | 'gallery' + | 'session' | 'stop' | 'thumbnail' | 'timerFixed' @@ -115,8 +117,8 @@ export const icons: Record ( -
-
{window.i18n('beginYourSession')}
-
-); diff --git a/ts/components/registration/RegistrationStages.tsx b/ts/components/registration/RegistrationStages.tsx index 3b0cf77e2..07988d3f2 100644 --- a/ts/components/registration/RegistrationStages.tsx +++ b/ts/components/registration/RegistrationStages.tsx @@ -1,3 +1,4 @@ +import { shell } from 'electron'; import { useDispatch } from 'react-redux'; import { useMount } from 'react-use'; import styled from 'styled-components'; @@ -27,15 +28,17 @@ import { } from '../../util/accountManager'; import { Storage, setSignInByLinking, setSignWithRecoveryPhrase } from '../../util/storage'; import { Flex } from '../basic/Flex'; +import { SpacerSM } from '../basic/Text'; +import { SessionIcon, SessionIconButton } from '../icon'; import { ModalContainer } from './ModalContainer'; import { SignInTab, SignUpTab } from './stages'; const StyledRegistrationContainer = styled(Flex)` - width: 289px; + width: 348px; .session-button { - width: 80%; - margin: auto; + width: 100%; + margin: 0; } `; @@ -207,6 +210,38 @@ export const RegistrationStages = () => { <> + + + +
+ +
+ + { + void shell.openExternal('https://getsession.org/faq'); + }} + /> + + { + void shell.openExternal('https://getsession.org'); + }} + /> + + {(step === Onboarding.Start || step === Onboarding.CreateAccount) && } {(step === Onboarding.Start || step === Onboarding.RestoreAccount) && } diff --git a/ts/components/registration/SessionRegistrationView.tsx b/ts/components/registration/SessionRegistrationView.tsx index 4928af892..6124c7824 100644 --- a/ts/components/registration/SessionRegistrationView.tsx +++ b/ts/components/registration/SessionRegistrationView.tsx @@ -1,14 +1,12 @@ import { useEffect } from 'react'; import { Provider } from 'react-redux'; import styled from 'styled-components'; -import { AccentText } from './AccentText'; import { onboardingStore } from '../../state/onboarding/store'; import { SessionTheme } from '../../themes/SessionTheme'; import { setSignInByLinking } from '../../util/storage'; import { SessionToastContainer } from '../SessionToastContainer'; import { Flex } from '../basic/Flex'; -import { SessionIcon } from '../icon'; import { RegistrationStages } from './RegistrationStages'; import { Hero } from './components'; @@ -62,27 +60,24 @@ export const SessionRegistrationView = () => { }, []); return ( - - - - - - - - - - + + + + + + + - - - - - + + + + + ); }; diff --git a/ts/components/registration/stages/SignUpTab.tsx b/ts/components/registration/stages/create/SignUpTab.tsx similarity index 50% rename from ts/components/registration/stages/SignUpTab.tsx rename to ts/components/registration/stages/create/SignUpTab.tsx index 6dbf5c33b..7b94547ba 100644 --- a/ts/components/registration/stages/SignUpTab.tsx +++ b/ts/components/registration/stages/create/SignUpTab.tsx @@ -6,61 +6,26 @@ import { Onboarding, setAccountCreationStep, setOnboardingStep, -} from '../../../state/onboarding/ducks/registration'; +} from '../../../../state/onboarding/ducks/registration'; import { useOnboardAccountCreationStep, useOnboardGeneratedRecoveryPhrase, useOnboardHexGeneratedPubKey, -} from '../../../state/onboarding/selectors/registration'; -import { Noop } from '../../../types/Util'; -import { Flex } from '../../basic/Flex'; -import { SessionButton } from '../../basic/SessionButton'; -import { SessionIdEditable } from '../../basic/SessionIdEditable'; -import { signUp } from '../RegistrationStages'; -import { RegistrationUserDetails } from '../RegistrationUserDetails'; -import { TermsAndConditions } from '../TermsAndConditions'; -import { BackButton } from '../components'; -import { sanitizeDisplayNameOrToast } from './SignInTab'; +} from '../../../../state/onboarding/selectors/registration'; +import { Flex } from '../../../basic/Flex'; +import { SessionButton } from '../../../basic/SessionButton'; +import { SessionIdEditable } from '../../../basic/SessionIdEditable'; +import { signUp } from '../../RegistrationStages'; +import { RegistrationUserDetails } from '../../RegistrationUserDetails'; +import { TermsAndConditions } from '../../TermsAndConditions'; +import { BackButton } from '../../components'; +import { sanitizeDisplayNameOrToast } from '../restore/SignInTab'; const StyledContainer = styled.div` width: 100%; padding-top: 20px; `; -const CreateSessionIdButton = ({ createSessionID }: { createSessionID: any }) => { - return ; -}; - -const ContinueSignUpButton = ({ continueSignUp }: { continueSignUp: any }) => { - return ; -}; - -const SignUpDefault = (props: { createSessionID: Noop }) => { - return ( -
- -
- ); -}; - -const SignUpSessionIDShown = (props: { continueSignUp: Noop }) => { - return ( -
- - - -
- {window.i18n('yourUniqueSessionID')} -
- - -
{window.i18n('allUsersAreRandomly...')}
- - -
- ); -}; - export const SignUpTab = () => { const step = useOnboardAccountCreationStep(); const generatedRecoveryPhrase = useOnboardGeneratedRecoveryPhrase(); @@ -79,22 +44,42 @@ export const SignUpTab = () => { if (step === AccountCreation.Start) { return ( - { - dispatch(setAccountCreationStep(AccountCreation.SessionIDShown)); - dispatch(setOnboardingStep(Onboarding.CreateAccount)); - }} - /> +
+ { + dispatch(setAccountCreationStep(AccountCreation.SessionIDShown)); + dispatch(setOnboardingStep(Onboarding.CreateAccount)); + }} + text={window.i18n('createSessionID')} + /> +
); } if (step === AccountCreation.SessionIDShown) { return ( - { - dispatch(setAccountCreationStep(AccountCreation.DisplayName)); - }} - /> +
+ + + +
+ {window.i18n('yourUniqueSessionID')} +
+ + +
{window.i18n('allUsersAreRandomly...')}
+ { + dispatch(setAccountCreationStep(AccountCreation.DisplayName)); + }} + text={window.i18n('continue')} + /> + +
); } diff --git a/ts/components/registration/stages/index.tsx b/ts/components/registration/stages/index.tsx index bd4e7ab5b..c994ac5fb 100644 --- a/ts/components/registration/stages/index.tsx +++ b/ts/components/registration/stages/index.tsx @@ -1,4 +1,4 @@ -import { SignInTab } from './SignInTab'; -import { SignUpTab } from './SignUpTab'; +import { SignUpTab } from './create/SignUpTab'; +import { SignInTab } from './restore/SignInTab'; export { SignInTab, SignUpTab }; diff --git a/ts/components/registration/stages/SignInTab.tsx b/ts/components/registration/stages/restore/SignInTab.tsx similarity index 89% rename from ts/components/registration/stages/SignInTab.tsx rename to ts/components/registration/stages/restore/SignInTab.tsx index a2c082f69..c9b3eaa04 100644 --- a/ts/components/registration/stages/SignInTab.tsx +++ b/ts/components/registration/stages/restore/SignInTab.tsx @@ -1,22 +1,22 @@ import { useState } from 'react'; import { useDispatch } from 'react-redux'; -import { ToastUtils } from '../../../session/utils'; -import { sanitizeSessionUsername } from '../../../session/utils/String'; +import { ToastUtils } from '../../../../session/utils'; +import { sanitizeSessionUsername } from '../../../../session/utils/String'; import { AccountRestoration, Onboarding, setAccountRestorationStep, setOnboardingStep, -} from '../../../state/onboarding/ducks/registration'; -import { useOnboardAccountRestorationStep } from '../../../state/onboarding/selectors/registration'; -import { Flex } from '../../basic/Flex'; -import { SessionButton } from '../../basic/SessionButton'; -import { SpacerLG } from '../../basic/Text'; -import { SessionSpinner } from '../../loading'; -import { signInWithLinking, signInWithRecovery } from '../RegistrationStages'; -import { RegistrationUserDetails } from '../RegistrationUserDetails'; -import { TermsAndConditions } from '../TermsAndConditions'; -import { BackButton } from '../components'; +} from '../../../../state/onboarding/ducks/registration'; +import { useOnboardAccountRestorationStep } from '../../../../state/onboarding/selectors/registration'; +import { Flex } from '../../../basic/Flex'; +import { SessionButton } from '../../../basic/SessionButton'; +import { SpacerLG } from '../../../basic/Text'; +import { SessionSpinner } from '../../../loading'; +import { signInWithLinking, signInWithRecovery } from '../../RegistrationStages'; +import { RegistrationUserDetails } from '../../RegistrationUserDetails'; +import { TermsAndConditions } from '../../TermsAndConditions'; +import { BackButton } from '../../components'; const LinkDeviceButton = (props: { onLinkDeviceButtonClicked: () => any }) => { return ( diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 5d5cfe153..ce3c8c96c 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -37,7 +37,6 @@ export type LocalizerKeys = | 'autoUpdateSettingTitle' | 'banUser' | 'banUserAndDeleteAll' - | 'beginYourSession' | 'blindedMsgReqsSettingDesc' | 'blindedMsgReqsSettingTitle' | 'block'