diff --git a/src/components/auth/Auth.scss b/src/components/auth/Auth.scss index 37275dc59..b4c4eda65 100644 --- a/src/components/auth/Auth.scss +++ b/src/components/auth/Auth.scss @@ -1,3 +1,7 @@ +.Auth { + height: 100%; +} + .auth-form { width: 100%; max-width: 25.5rem; diff --git a/src/components/auth/Auth.tsx b/src/components/auth/Auth.tsx index e885fe47e..bec4418e3 100644 --- a/src/components/auth/Auth.tsx +++ b/src/components/auth/Auth.tsx @@ -11,6 +11,7 @@ import windowSize from '../../util/windowSize'; import useHistoryBack from '../../hooks/useHistoryBack'; import useCurrentOrPrev from '../../hooks/useCurrentOrPrev'; +import Transition from '../ui/Transition'; import AuthPhoneNumber from './AuthPhoneNumber'; import AuthCode from './AuthCode.async'; import AuthPassword from './AuthPassword.async'; @@ -51,7 +52,7 @@ const Auth: FC = ({ useHistoryBack({ isActive: (!isMobile && authState === 'authorizationStateWaitPhoneNumber') - || (isMobile && authState === 'authorizationStateWaitQrCode'), + || (isMobile && authState === 'authorizationStateWaitQrCode'), onBack: handleChangeAuthorizationMethod, }); @@ -70,20 +71,45 @@ const Auth: FC = ({ true, ); - switch (renderingAuthState) { - case 'authorizationStateWaitCode': - return ; - case 'authorizationStateWaitPassword': - return ; - case 'authorizationStateWaitRegistration': - return ; - case 'authorizationStateWaitPhoneNumber': - return ; - case 'authorizationStateWaitQrCode': - return ; - default: - return isMobile ? : ; + function getScreen() { + switch (renderingAuthState) { + case 'authorizationStateWaitCode': + return ; + case 'authorizationStateWaitPassword': + return ; + case 'authorizationStateWaitRegistration': + return ; + case 'authorizationStateWaitPhoneNumber': + return ; + case 'authorizationStateWaitQrCode': + return ; + default: + return isMobile ? : ; + } } + + function getActiveKey() { + switch (renderingAuthState) { + case 'authorizationStateWaitCode': + return 0; + case 'authorizationStateWaitPassword': + return 1; + case 'authorizationStateWaitRegistration': + return 2; + case 'authorizationStateWaitPhoneNumber': + return 3; + case 'authorizationStateWaitQrCode': + return 4; + default: + return isMobile ? 3 : 4; + } + } + + return ( + + {getScreen()} + + ); }; export default memo(withGlobal(