Remove signup

elysia-dev · Mar 4, 2021 · c3d6b53 · c3d6b53
1 parent ecc5307
commit c3d6b53
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 236 deletions.
diff --git a/src/modules/account/Account.tsx b/src/modules/account/Account.tsx
@@ -1,12 +1,10 @@
 import React, { FunctionComponent, useContext } from 'react';
 import { createStackNavigator } from '@react-navigation/stack';
 import InitializeEmail from './InitializeEmail';
-import Signup from './Signup';
 import Login from './Login';
 import LockAccount from './LockAccount';
 import CurrentPassword from './CurrentPassword';
 import RecoverPassword from './RecoverPassword';
-import CertifySignup from './CertifySignup';
 import { AccountPage } from '../../enums/pageEnum';
 import CertifyRecover from './CertifyRecover';
 import ExpiredAccount from './ExpiredAccount';
@@ -26,8 +24,8 @@ export const Account: FunctionComponent = () => {
         signedIn === SignInStatus.DELETE
           ? AccountPage.WithdrawnMember
           : signedIn === SignInStatus.EXPIRED
-          ? AccountPage.ExpiredAccount
-          : AccountPage.IntroduceElysia
+            ? AccountPage.ExpiredAccount
+            : AccountPage.IntroduceElysia
       }
       headerMode="none">
       <Stack.Screen
@@ -38,13 +36,6 @@ export const Account: FunctionComponent = () => {
         name={AccountPage.InitializeEmail}
         component={InitializeEmail}
       />
-      <Stack.Screen
-        name={AccountPage.Signup}
-        component={Signup}
-        options={{
-          gestureEnabled: false,
-        }}
-      />
       <Stack.Screen name={AccountPage.Login} component={Login} />
       <Stack.Screen name={AccountPage.LockAccount} component={LockAccount} />
       <Stack.Screen
@@ -55,10 +46,6 @@ export const Account: FunctionComponent = () => {
         name={AccountPage.RecoverPassword}
         component={RecoverPassword}
       />
-      <Stack.Screen
-        name={AccountPage.CertifySignup}
-        component={CertifySignup}
-      />
       <Stack.Screen
         name={AccountPage.CertifyRecover}
         component={CertifyRecover}

diff --git a/src/modules/account/CertifySignup.tsx b/src/modules/account/CertifySignup.tsx
diff --git a/src/modules/account/InitializeEmail.tsx b/src/modules/account/InitializeEmail.tsx
@@ -43,11 +43,7 @@ const InitializeEmail: FunctionComponent = () => {
         }
       })
       .catch((e) => {
-        if (e.response.status === 400) {
-          alert(i18n.t('account.try_again_later'));
-        } else if (e.response.status === 500) {
-          alert(i18n.t('account_errors.server'));
-        }
+        alert(i18n.t('account_errors.unmatched_email'));
       });
   };
 
@@ -98,12 +94,12 @@ const InitializeEmail: FunctionComponent = () => {
               state.errorLength === 1
                 ? i18n.t('account.insert_account_email')
                 : state.errorReg === 1
-                ? i18n.t('account.check_email')
-                : i18n.t('account_label.continue')
+                  ? i18n.t('account.check_email')
+                  : i18n.t('account_label.continue')
             }
             handler={
               state.errorLength === 1 || state.errorReg === 1
-                ? () => {}
+                ? () => { }
                 : () => callEmailApi()
             }
             variant={

diff --git a/src/modules/account/Login.tsx b/src/modules/account/Login.tsx
@@ -113,9 +113,8 @@ const Login: FunctionComponent = () => {
             secure={true}
             helperText={
               state.error !== 0
-                ? ` ${i18n.t('account_errors.password_do_not_match')} ${
-                    state.error
-                  }/5`
+                ? ` ${i18n.t('account_errors.password_do_not_match')} ${state.error
+                }/5`
                 : undefined
             }
             helperIcon={state.error !== 0 ? 'Error' : undefined}
@@ -124,7 +123,7 @@ const Login: FunctionComponent = () => {
             label={i18n.t('account_label.account_email')}
             value={route.params.email}
             editable={false}
-            eventHandler={() => {}}
+            eventHandler={() => { }}
           />
         </>
       }

diff --git a/src/modules/account/Signup.tsx b/src/modules/account/Signup.tsx