Next button on keyboard works again!

2 files changed, 6 insertions, 13 deletions

diff --git a/src/components/common/LoginInput.tsx b/src/components/common/LoginInput.tsx
index c82682d7..e4d6b957 100644
--- a/src/components/common/LoginInput.tsx
+++ b/src/components/common/LoginInput.tsx
@@ -50,11 +50,10 @@ const LoginInput = (props: LoginInputProps) => {
         blurOnSubmit={
           props.isUsername ? false : props.isPassword ? undefined : undefined
         }
-        //   ref={props.isUsername ? undefined : useRef()}
         secureTextEntry={
           props.isUsername ? false : props.isPassword ? true : false
         }
-        // ref={props.ref}
+        ref={props.input_ref}
       />
       {!props.isValid && (
         <Text style={styles.invalidCredentials}>{props.validationWarning}</Text>
@@ -88,7 +87,7 @@ interface LoginInputProps {
   isPassword?: boolean;
   onChangeText: (input: string) => void;
   onSubmitEditing?: () => void;
-  // ref?: string;
+  input_ref?: object;
   focusPasswordInput?: boolean;
   isValid?: boolean;
   validationWarning?: string;
diff --git a/src/screens/Login.tsx b/src/screens/Login.tsx
index 6384eff1..417d9bd7 100644
--- a/src/screens/Login.tsx
+++ b/src/screens/Login.tsx
@@ -27,7 +27,7 @@ interface LoginProps {
 }
 
 const Login = ({navigation}: LoginProps) => {
-  // const passwordInput = useRef();
+  const input_ref = React.createRef();
   const [data, setData] = React.useState({
     username: '',
     password: '',
@@ -93,17 +93,12 @@ const Login = ({navigation}: LoginProps) => {
     Handler for the submit button on the Username keyboard
   */
   const handleUsernameSubmit = () => {
-    // setData({
-    //   ...data,
-    //   focusPasswordInput: true,
-    // });
-    Alert.alert('Coming soon 🚧');
-    // refs.password_input.focus()
+    input_ref.current.focus();
   };
 
   const handleRegistration = () => {
     navigation.navigate('Registration');
-  }
+  };
 
   return (
     <>
@@ -130,7 +125,6 @@ const Login = ({navigation}: LoginProps) => {
               onSubmitEditing={() => handleUsernameSubmit()}
               isValid={data.isValidUser}
               validationWarning={'Username must be at least 6 characters long.'}
-              // ref={'username_input'}
             />
             <LoginInput
               type={data.password}
@@ -140,7 +134,7 @@ const Login = ({navigation}: LoginProps) => {
               onSubmitEditing={() => handleLogin()}
               isValid={data.isValidPassword}
               validationWarning={'Password must be at least 8 characters long.'}
-              // ref={'password_input'}
+              input_ref={input_ref}
             />
             <TouchableOpacity
               accessibilityLabel="Forgot password button"