From f720c46958cd06ecce0345666a7775ccc6730faa Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Sun, 20 Apr 2025 21:10:48 +0200
Subject: [PATCH] Tweak login flow (#771)

---
 mobile-app/app/index.tsx               |   4 +-
 mobile-app/app/login.tsx               | 268 ++++++++++++-------------
 mobile-app/utils/EncryptionUtility.tsx |   2 -
 3 files changed, 136 insertions(+), 138 deletions(-)

diff --git a/mobile-app/app/index.tsx b/mobile-app/app/index.tsx
index b3522bd93..aeb42d546 100644
--- a/mobile-app/app/index.tsx
+++ b/mobile-app/app/index.tsx
@@ -12,7 +12,7 @@ export default function InitialLoadingScreen() {
   const { dbInitialized, dbAvailable } = useDb();
   const { syncVault } = useVaultSync();
   const hasInitialized = useRef(false);
-  const [status, setStatus] = useState('Initializing...');
+  const [status, setStatus] = useState('');
 
   const isFullyInitialized = isAuthInitialized && dbInitialized;
   const requireLoginOrUnlock = isFullyInitialized && (!isLoggedIn || !dbAvailable);
@@ -49,7 +49,7 @@ export default function InitialLoadingScreen() {
 
   return (
     <ThemedView style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
-      <LoadingIndicator status={status} />
+      {isLoggedIn && status ? <LoadingIndicator status={status} /> : null}
     </ThemedView>
   );
 }
\ No newline at end of file
diff --git a/mobile-app/app/login.tsx b/mobile-app/app/login.tsx
index e621edd14..6922ed102 100644
--- a/mobile-app/app/login.tsx
+++ b/mobile-app/app/login.tsx
@@ -51,140 +51,6 @@ export default function LoginScreen() {
     return cleanUrl === 'app.aliasvault.net' ? 'aliasvault.net' : cleanUrl;
   };
 
-  const styles = StyleSheet.create({
-    container: {
-      flex: 1,
-      backgroundColor: colors.background,
-    },
-    headerSection: {
-      backgroundColor: colors.loginHeader,
-      paddingTop: 24,
-      paddingBottom: 24,
-      paddingHorizontal: 16,
-      borderBottomLeftRadius: 24,
-      borderBottomRightRadius: 24,
-    },
-    logoContainer: {
-      alignItems: 'center',
-      marginBottom: 8,
-    },
-    appName: {
-      fontSize: 32,
-      fontWeight: 'bold',
-      color: colors.text,
-      textAlign: 'center',
-    },
-    content: {
-      flex: 1,
-      padding: 16,
-      backgroundColor: colors.background,
-    },
-    titleContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      gap: 8,
-      marginBottom: 16,
-    },
-    formContainer: {
-      gap: 16,
-    },
-    errorContainer: {
-      backgroundColor: colors.errorBackground,
-      borderColor: colors.errorBorder,
-      borderWidth: 1,
-      padding: 12,
-      borderRadius: 8,
-      marginBottom: 16,
-    },
-    errorText: {
-      color: colors.errorText,
-      fontSize: 14,
-    },
-    label: {
-      fontSize: 14,
-      fontWeight: '600',
-      marginBottom: 4,
-      color: colors.text,
-    },
-    input: {
-      borderWidth: 1,
-      borderRadius: 8,
-      padding: 12,
-      fontSize: 16,
-      borderColor: colors.accentBorder,
-      color: colors.text,
-      backgroundColor: colors.accentBackground,
-    },
-    buttonContainer: {
-      gap: 8,
-    },
-    button: {
-      padding: 12,
-      borderRadius: 8,
-      alignItems: 'center',
-    },
-    primaryButton: {
-      backgroundColor: colors.primary,
-    },
-    secondaryButton: {
-      backgroundColor: colors.secondary,
-    },
-    buttonText: {
-      color: colors.text,
-      fontSize: 16,
-      fontWeight: '600',
-    },
-    rememberMeContainer: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      gap: 8,
-    },
-    checkbox: {
-      width: 20,
-      height: 20,
-      borderWidth: 2,
-      borderRadius: 4,
-      justifyContent: 'center',
-      alignItems: 'center',
-      borderColor: colors.accentBorder,
-    },
-    checkboxInner: {
-      width: 12,
-      height: 12,
-      borderRadius: 2,
-    },
-    checkboxChecked: {
-      backgroundColor: colors.primary,
-    },
-    rememberMeText: {
-      fontSize: 14,
-      color: colors.text,
-    },
-    noteText: {
-      fontSize: 14,
-      textAlign: 'center',
-      marginTop: 16,
-      color: colors.textMuted,
-    },
-    headerContainer: {
-      marginBottom: 24,
-    },
-    headerTitle: {
-      fontSize: 24,
-      fontWeight: 'bold',
-      color: colors.text,
-      marginBottom: 4,
-    },
-    headerSubtitle: {
-      fontSize: 14,
-      color: colors.textMuted,
-    },
-    clickableDomain: {
-      color: colors.primary,
-      textDecorationLine: 'underline',
-    },
-  });
-
   const [credentials, setCredentials] = useState({
     username: '',
     password: '',
@@ -351,6 +217,140 @@ export default function LoginScreen() {
     }
   };
 
+  const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      backgroundColor: colors.background,
+    },
+    headerSection: {
+      backgroundColor: colors.loginHeader,
+      paddingTop: 24,
+      paddingBottom: 24,
+      paddingHorizontal: 16,
+      borderBottomLeftRadius: 24,
+      borderBottomRightRadius: 24,
+    },
+    logoContainer: {
+      alignItems: 'center',
+      marginBottom: 8,
+    },
+    appName: {
+      fontSize: 32,
+      fontWeight: 'bold',
+      color: colors.text,
+      textAlign: 'center',
+    },
+    content: {
+      flex: 1,
+      padding: 16,
+      backgroundColor: colors.background,
+    },
+    titleContainer: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      gap: 8,
+      marginBottom: 16,
+    },
+    formContainer: {
+      gap: 16,
+    },
+    errorContainer: {
+      backgroundColor: colors.errorBackground,
+      borderColor: colors.errorBorder,
+      borderWidth: 1,
+      padding: 12,
+      borderRadius: 8,
+      marginBottom: 16,
+    },
+    errorText: {
+      color: colors.errorText,
+      fontSize: 14,
+    },
+    label: {
+      fontSize: 14,
+      fontWeight: '600',
+      marginBottom: 4,
+      color: colors.text,
+    },
+    input: {
+      borderWidth: 1,
+      borderRadius: 8,
+      padding: 12,
+      fontSize: 16,
+      borderColor: colors.accentBorder,
+      color: colors.text,
+      backgroundColor: colors.accentBackground,
+    },
+    buttonContainer: {
+      gap: 8,
+    },
+    button: {
+      padding: 12,
+      borderRadius: 8,
+      alignItems: 'center',
+    },
+    primaryButton: {
+      backgroundColor: colors.primary,
+    },
+    secondaryButton: {
+      backgroundColor: colors.secondary,
+    },
+    buttonText: {
+      color: colors.text,
+      fontSize: 16,
+      fontWeight: '600',
+    },
+    rememberMeContainer: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      gap: 8,
+    },
+    checkbox: {
+      width: 20,
+      height: 20,
+      borderWidth: 2,
+      borderRadius: 4,
+      justifyContent: 'center',
+      alignItems: 'center',
+      borderColor: colors.accentBorder,
+    },
+    checkboxInner: {
+      width: 12,
+      height: 12,
+      borderRadius: 2,
+    },
+    checkboxChecked: {
+      backgroundColor: colors.primary,
+    },
+    rememberMeText: {
+      fontSize: 14,
+      color: colors.text,
+    },
+    noteText: {
+      fontSize: 14,
+      textAlign: 'center',
+      marginTop: 16,
+      color: colors.textMuted,
+    },
+    headerContainer: {
+      marginBottom: 24,
+    },
+    headerTitle: {
+      fontSize: 24,
+      fontWeight: 'bold',
+      color: colors.text,
+      marginBottom: 4,
+    },
+    headerSubtitle: {
+      fontSize: 14,
+      color: colors.textMuted,
+    },
+    clickableDomain: {
+      color: colors.primary,
+      textDecorationLine: 'underline',
+    },
+  });
+
   return (
     <View style={styles.container}>
       <SafeAreaView style={{ backgroundColor: colors.loginHeader }}>
diff --git a/mobile-app/utils/EncryptionUtility.tsx b/mobile-app/utils/EncryptionUtility.tsx
index c4de1ee63..592a576cf 100644
--- a/mobile-app/utils/EncryptionUtility.tsx
+++ b/mobile-app/utils/EncryptionUtility.tsx
@@ -28,7 +28,6 @@ class EncryptionUtility {
         throw new Error('Unsupported encryption type');
       }
 
-      console.log('trying to hash password');
       const result = await argon2(
         password,
         salt,
@@ -40,7 +39,6 @@ class EncryptionUtility {
           mode: 'argon2id'
         }
       );
-      console.log('result', result);
 
       // Convert the hex string to Uint8Array
       const bytes = new Uint8Array(32);