2 files changed, 44 insertions, 20 deletions
diff --git a/src/screens/onboarding/OnboardingStepOne.tsx b/src/screens/onboarding/OnboardingStepOne.tsx
index 0fa7a6a5..618bc39b 100644
--- a/src/screens/onboarding/OnboardingStepOne.tsx
+++ b/src/screens/onboarding/OnboardingStepOne.tsx
@@ -108,15 +108,18 @@ const OnboardingStepOne: React.FC<OnboardingStepOneProps> = ({navigation}) => {
       });
     }
     try {
-      if (form.isValidFname && form.isValidLname && form.isValidPhone) {
-        const code = await sendOtpStatusCode(form.phone);
+      const {isValidFname, isValidLname, isValidPhone} = form;
+      if (isValidFname && isValidLname && isValidPhone) {
+        const {phone} = form;
+        const code = await sendOtpStatusCode(phone);
         if (code) {
           switch (code) {
             case 200:
+              const {fname, lname} = form;
               navigation.navigate('PhoneVerification', {
-                firstName: form.fname,
-                lastName: form.lname,
-                phone: form.phone,
+                firstName: fname,
+                lastName: lname,
+                phone,
               });
               break;
             case 409:
@@ -157,7 +160,14 @@ const OnboardingStepOne: React.FC<OnboardingStepOneProps> = ({navigation}) => {
         </TouchableOpacity>
       </View>
     ),
-    [form.isValidFname, form.isValidLname, form.isValidPhone],
+    [
+      form.fname,
+      form.lname,
+      form.phone,
+      form.isValidFname,
+      form.isValidLname,
+      form.isValidPhone,
+    ],
   );
 
   return (
diff --git a/src/screens/onboarding/OnboardingStepTwo.tsx b/src/screens/onboarding/OnboardingStepTwo.tsx
index e79e1886..a1100827 100644
--- a/src/screens/onboarding/OnboardingStepTwo.tsx
+++ b/src/screens/onboarding/OnboardingStepTwo.tsx
@@ -143,30 +143,40 @@ const OnboardingStepTwo: React.FC<OnboardingStepTwoProps> = ({
         attemptedSubmit: true,
       });
     }
+    const {
+      isValidEmail,
+      isValidUsername,
+      isValidPassword,
+      passwordsMatch,
+      tcAccepted,
+    } = form;
     try {
       if (
-        form.isValidEmail &&
-        form.isValidUsername &&
-        form.isValidPassword &&
-        form.passwordsMatch
+        isValidEmail &&
+        isValidUsername &&
+        isValidPassword &&
+        passwordsMatch
       ) {
-        if (form.tcAccepted) {
+        if (tcAccepted) {
+          const {email, username, password} = form;
+          const {firstName, lastName, phone} = route.params;
           const response = await sendRegister(
-            route.params.firstName,
-            route.params.lastName,
-            route.params.phone,
-            form.email,
-            form.username,
-            form.password,
+            firstName,
+            lastName,
+            phone,
+            email,
+            username,
+            password,
           );
           if (response) {
             const data = await response.json();
+            const {token, UserID, username} = data;
             switch (response.status) {
               case 201:
-                await AsyncStorage.setItem('token', data.token);
+                await AsyncStorage.setItem('token', token);
                 navigation.navigate('OnboardingStepThree', {
-                  userId: data.UserID,
-                  username: form.username,
+                  userId: UserID,
+                  username: username,
                 });
                 break;
               case 400:
@@ -224,6 +234,10 @@ const OnboardingStepTwo: React.FC<OnboardingStepTwoProps> = ({
       </View>
     ),
     [
+      form.email,
+      form.username,
+      form.password,
+      form.confirm,
       form.isValidEmail,
       form.isValidUsername,
       form.isValidPassword,