Correction après le merge

bob_party/src/screens/Settings.tsx

@@ -12,7 +12,7 @@ import RNPickerSelect from "react-native-picker-select";
 import { PickerGreySmall } from '../components/PickerGreySmall';
 import { MANAGER_USER } from '../../App';
 import { useUserStore } from '../../userContext';
-import DialogInput from 'react-native-dialog/lib/Input';
+import DialogInput from 'react-native-dialog-input';
 
 
 function Settings(props: { navigation: any; }) {

bob_party/src/screens/SignIn.tsx

@@ -20,7 +20,6 @@ function SignIn(props: { navigation: any; }) {
     const setUser = useUserStore((state) => state.setUser);
 
     const errorList = useSelector((state: RootState) => state.credentialErrors.loginErrorList);
-    {/*
     const [pseudo, setPseudo] = useState('');
     const [password, setPassword] = useState('');
     const dispatch=useDispatch();
@@ -29,7 +28,6 @@ function SignIn(props: { navigation: any; }) {
             Alert.alert("Pseudo ou Mot de passe incorrect");
             dispatch(updateIncorrectCredentials(true));
     }
-*/}
 
 
     const handleUserConnect = useCallback(async (pseudo: string, password: string) => {
@@ -50,13 +48,11 @@ function SignIn(props: { navigation: any; }) {
     return (
     <View style={stylesScreen.container}>
         <View style={stylesScreen.bodyCenter}>
-            {/*
             <TextInput style={styles.textInput} placeholder='Login' onChangeText={(val) => setPseudo(val)} autoCapitalize='none' />
             <TextInput style={styles.textInput} placeholder='Password' onChangeText={(val) => setPassword(val)} autoCapitalize='none' secureTextEntry={true}/>
             <Pressable style={styles.button} onPress={() => handleUserConnect(pseudo, password)}>
                 <Text style={styles.text}>Se connecter</Text>
             </Pressable>
-    */}
             <Pressable onPress={() => navigation.navigate('SignUp')}>
                 <Text style={styles.textLink}>Pas de compte? Inscrivez vous !</Text>
             </Pressable>

bob_party/yarn.lock

@@ -6844,7 +6844,7 @@ react-native-date-picker@^4.2.5:
 
 react-native-dialog-input@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/react-native-dialog-input/-/react-native-dialog-input-1.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/react-native-dialog-input/-/react-native-dialog-input-1.0.8.tgz#6813d3b158bbb85d83a94310f38695d9f2b02682"
   integrity sha512-W9YNMt6r+rUUMDEkOR1WMuGfSJw97ujB8H1xp8TjJTOnYVSlsf4aEP6t+J8tVk3XZaDcTawXgDjxH6E1WVWRog==
 
 react-native-dialog@^9.2.2: