1 files changed, 16 insertions, 6 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 (