[TMA - 238] Added invitation code verification screen as the first onboarding screen (#46)

* Added invitation code verification screen as the first onboarding screen

* Changed screen order on some screens and a quick check on back navigation

1 files changed, 4 insertions, 20 deletions

diff --git a/src/screens/onboarding/Verification.tsx b/src/screens/onboarding/Verification.tsx
index 89f79ac8..91e6b181 100644
--- a/src/screens/onboarding/Verification.tsx
+++ b/src/screens/onboarding/Verification.tsx
@@ -8,6 +8,7 @@ import {
   RegistrationWizard,
   SubmitButton,
   ArrowButton,
+  LoadingIndicator,
 } from '../../components';
 import {VERIFY_OTP_ENDPOINT, SEND_OTP_ENDPOINT} from '../../constants';
 import {Text} from 'react-native-animatable';
@@ -23,10 +24,9 @@ import {
   TouchableOpacity,
   KeyboardAvoidingView,
   Alert,
-  ActivityIndicator,
   Platform,
 } from 'react-native';
-import {usePromiseTracker, trackPromise} from 'react-promise-tracker';
+import {trackPromise} from 'react-promise-tracker';
 
 type VerificationScreenRouteProp = RouteProp<
   OnboardingStackParams,
@@ -64,7 +64,7 @@ const Verification: React.FC<VerificationProps> = ({route, navigation}) => {
         }),
       });
       let statusCode = verifyOtpResponse.status;
-      if (statusCode == 200) {
+      if (statusCode === 200) {
         navigation.navigate('RegistrationTwo', {
           email: email,
         });
@@ -114,22 +114,6 @@ const Verification: React.FC<VerificationProps> = ({route, navigation}) => {
     }
   };
 
-  /**
-   * An activity indicator to indicate that the app is working during the verify_otp request.
-   */
-  const LoadingIndicator = () => {
-    const {promiseInProgress} = usePromiseTracker();
-    return promiseInProgress ? (
-      <ActivityIndicator
-        style={styles.loadingIndicator}
-        size="large"
-        color="#fff"
-      />
-    ) : (
-      <></>
-    );
-  };
-
   const Footer = () => (
     <View style={styles.footer}>
       <ArrowButton
@@ -141,7 +125,7 @@ const Verification: React.FC<VerificationProps> = ({route, navigation}) => {
 
   return (
     <Background centered style={styles.container}>
-      <RegistrationWizard style={styles.wizard} step="two" />
+      <RegistrationWizard style={styles.wizard} step="three" />
       <KeyboardAvoidingView behavior="padding" style={styles.form}>
         <Text style={styles.formHeader}>Enter 6 digit code</Text>
         <Text style={styles.description}>