From 89fbcb967f0cf83dcb0af1f24ceaefd39c97fe2f Mon Sep 17 00:00:00 2001
From: turnoffthiscomputer <colin.remi07@gmail.com>
Date: Tue, 27 Aug 2024 10:44:57 +0200
Subject: [PATCH] clean nextScreen

---
 app/src/screens/NextScreen.tsx | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/screens/NextScreen.tsx b/app/src/screens/NextScreen.tsx
index 22ee0b59..c774791d 100644
--- a/app/src/screens/NextScreen.tsx
+++ b/app/src/screens/NextScreen.tsx
@@ -1,27 +1,33 @@
 import React from 'react';
-import { YStack, XStack, Text, Button, Image, useWindowDimensions, Fieldset } from 'tamagui';
+import { YStack, XStack, Text, Image, useWindowDimensions, Fieldset } from 'tamagui';
 import { ArrowRight, Info } from '@tamagui/lucide-icons';
 import { getFirstName, maskString } from '../../utils/utils';
 import { attributeToPosition } from '../../../common/src/constants/constants';
 import USER from '../images/user.png'
 import { bgGreen, borderColor, componentBgColor, textBlack, textColor1, textColor2 } from '../utils/colors';
 import { Platform } from 'react-native';
-import { formatAttribute, Steps } from '../utils/utils';
+import { formatAttribute } from '../utils/utils';
 import useUserStore from '../stores/userStore';
 import useNavigationStore from '../stores/navigationStore';
 import CustomButton from '../components/CustomButton';
 
 
 const NextScreen: React.FC = () => {
+
+  const { height } = useWindowDimensions();
+  const handleNext = () => {
+    setRegistered(true);
+    setSelectedTab("app");
+  }
   const {
     hideData,
-    setStep,
     setSelectedTab
 
   } = useNavigationStore()
 
   const {
     passportData,
+    setRegistered
   } = useUserStore();
 
   const disclosureOptions: any = {
@@ -31,13 +37,6 @@ const NextScreen: React.FC = () => {
     date_of_birth: "optional",
   };
 
-  const { height } = useWindowDimensions();
-  const handleNext = () => {
-    useNavigationStore.getState().setStep(Steps.REGISTERED);
-    useUserStore.getState().setRegistered(true);
-    useNavigationStore.getState().setSelectedTab("app");
-  }
-
   return (
     <YStack p="$3" f={1} mb={Platform.OS === 'ios' ? "$5" : "$0"}>
       <YStack flex={1} mx="$2" gap="$2" mt="$2">
@@ -100,6 +99,7 @@ const NextScreen: React.FC = () => {
             );
           })}
         </YStack>
+
         <YStack f={1} />
 
         <XStack bg="#ffff" borderRadius={100} py="$2.5" px="$3">
@@ -110,7 +110,6 @@ const NextScreen: React.FC = () => {
         <YStack f={1} />
 
         <CustomButton onPress={handleNext} text="Next" Icon={<ArrowRight color={textBlack} />} />
-
       </YStack >
     </YStack >
   );