mattrabe · mattrabe · Feb 18, 2026 · Feb 18, 2026
diff --git a/apps/api/src/endpoints/trpc/auth/login.ts b/apps/api/src/endpoints/trpc/auth/login.ts
@@ -17,19 +17,12 @@ export const login = publicProcedure
   .mutation(async ({ input }) => {
     const user = await User.findOne({ email: input.email.toLowerCase().trim() })
 
-    if (!user) {
-      throw new TRPCError({
-        code: 'UNAUTHORIZED',
-        message: 'Invalid email or password',
-      })
-    }
-
-    const isValidPassword = await bcrypt.compare(input.password, user.password)
+    const isValidPassword = user && await bcrypt.compare(input.password, user.password)
 
-    if (!isValidPassword) {
+    if (!user || !isValidPassword) {
       throw new TRPCError({
         code: 'UNAUTHORIZED',
-        message: 'Invalid email or password',
+        message: 'Incorrect email or password',
       })
     }
 

diff --git a/apps/api/src/endpoints/trpc/auth/updatePassword.ts b/apps/api/src/endpoints/trpc/auth/updatePassword.ts
@@ -24,7 +24,7 @@ export const updatePassword = authProcedure
 
     if (!isValidPassword) {
       throw new TRPCError({
-        code: 'UNAUTHORIZED',
+        code: 'BAD_REQUEST',
         message: 'Current password is incorrect',
       })
     }

diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
@@ -46,7 +46,7 @@ app.use(
     router: trpcRouter,
     createContext: ({ req }) => ({ req }),
     onError: ({ error, path }) => {
-      console.error(`❌ [TRPC Error on ${path}]`, error)
+      console.error(`❌ [TRPC Error on ${path}]`, error, error.cause)
     },
   })
 )

diff --git a/apps/api/src/models/User.ts b/apps/api/src/models/User.ts
@@ -41,8 +41,6 @@ export const userSchema = new mongoose.Schema<IUser>({
   phone: {
     type: String,
     required: false,
-    unique: true,
-    sparse: true,
     lowercase: true,
     trim: true,
     match: [/^[0-9]{10}$/, 'Please fill a valid phone number'], // Phone validation

diff --git a/apps/api/src/trpc/index.ts b/apps/api/src/trpc/index.ts
@@ -1,9 +1,11 @@
 import { initTRPC } from '@trpc/server'
 import superjson from 'superjson'
 import type { IncomingMessage } from 'http'
+import { MongoServerError } from 'mongodb'
+import type { Document } from 'mongoose'
+import { ZodError } from 'zod'
 
 import type { IUser } from '../models/User'
-import type { Document } from 'mongoose'
 
 export interface Context {
   req?: IncomingMessage,
@@ -18,6 +20,29 @@ export interface Context {
 export const tRPCContext = initTRPC
   .context<Context>()
   .create({
+    errorFormatter: ({ error, shape }) => {
+      let message = shape.message
+      let fieldErrors = null
+
+      if (error.cause instanceof ZodError && error.code === 'BAD_REQUEST') {
+        message = error.cause.issues.map(issue => issue.message).join(', ')
+        fieldErrors = error.cause.issues
+      }
+
+      if (error.cause instanceof MongoServerError) {
+        // Squelch database errors from being logged to the client
+        message = 'An internal error has occurred'
+      }
+
+      return {
+        ...shape,
+        message,
+        data: {
+          ...shape.data,
+          fieldErrors,
+        },
+      }
+    },
     transformer: superjson,
   })
 

diff --git a/apps/mobile/src/app/(tabs)/fertilizers.tsx b/apps/mobile/src/app/(tabs)/fertilizers.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Modal, ScrollView, StyleSheet, Switch, Text, TextInput, TouchableOpacity, View } from 'react-native'
+import { Modal, ScrollView, StyleSheet, Switch, Text, TouchableOpacity, View } from 'react-native'
 import { useLayoutEffect } from 'react'
 import { useLocalSearchParams, useNavigation } from 'expo-router'
 import { keepPreviousData } from '@tanstack/react-query'
@@ -12,6 +12,7 @@ import { LoadingSkeleton, LoadingSkeletonLine } from '../../components/LoadingSk
 import { ScreenTitle } from '../../components/ScreenTitle'
 import { ScreenWrapper } from '../../components/ScreenWrapper'
 import { SwipeToDelete } from '../../components/SwipeToDelete'
+import { TextInput } from '../../components/TextInput'
 
 import { useAlert } from '../../contexts/AlertContext'
 

diff --git a/apps/mobile/src/app/(tabs)/index.tsx b/apps/mobile/src/app/(tabs)/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useLayoutEffect, useRef, useState } from 'react'
-import { Text, View, ScrollView, TouchableOpacity, TextInput, Modal, Switch, StyleSheet } from 'react-native'
+import { Text, View, ScrollView, TouchableOpacity, Modal, Switch, StyleSheet } from 'react-native'
 import { useNavigation, useRouter } from 'expo-router'
 import { keepPreviousData } from '@tanstack/react-query'
 
@@ -13,6 +13,7 @@ import { ScreenTitle } from '../../components/ScreenTitle'
 import { ScreenWrapper } from '../../components/ScreenWrapper'
 import { SnoozeChoreModal } from '../../components/SnoozeChoreModal'
 import { SwipeToDelete } from '../../components/SwipeToDelete'
+import { TextInput } from '../../components/TextInput'
 
 import { useAlert } from '../../contexts/AlertContext'
 

diff --git a/apps/mobile/src/app/(tabs)/settings.tsx b/apps/mobile/src/app/(tabs)/settings.tsx
@@ -141,20 +141,22 @@ export function SettingsScreen() {
           style: 'destructive',
           onPress: () => {
             // Second confirmation prompt
-            alert(
-              'Just double checking...',
-              'You want to PERMANENTLY delete your account?\n\nWe\'re sorry to see you go but we wish you the best!',
-              [
-                { text: 'Cancel', style: 'cancel' },
-                {
-                  text: 'Yes, Delete',
-                  style: 'destructive',
-                  onPress: () => {
-                    deleteMeMutation.mutate()
+            setTimeout(() => {
+              alert(
+                'Just double checking...',
+                'You want to PERMANENTLY delete your account?\n\nWe\'re sorry to see you go but we wish you the best!',
+                [
+                  { text: 'Cancel', style: 'cancel' },
+                  {
+                    text: 'Yes, Delete',
+                    style: 'destructive',
+                    onPress: () => {
+                      deleteMeMutation.mutate()
+                    },
                   },
-                },
-              ]
-            )
+                ]
+              )
+            }, 1000)
           },
         },
       ]

diff --git a/apps/mobile/src/app/create-account.tsx b/apps/mobile/src/app/create-account.tsx
@@ -1,9 +1,10 @@
 import React, { useEffect, useState } from 'react'
-import { ActivityIndicator, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native'
+import { ActivityIndicator, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import * as Localization from 'expo-localization'
 import { useRouter } from 'expo-router'
 
 import { ScreenWrapper } from '../components/ScreenWrapper'
+import { TextInput } from '../components/TextInput'
 
 import { useAlert } from '../contexts/AlertContext'
 import { useAuth } from '../contexts/AuthContext'
@@ -34,28 +35,31 @@ export default function CreateAccountScreen() {
       router.replace('/(tabs)')
     },
     onError: (error) => {
+      if (
+        error.shape?.data?.fieldErrors?.find(error => error.path.includes('name'))
+        || error.shape?.data?.fieldErrors?.find(error => error.path.includes('email'))
+        || error.shape?.data?.fieldErrors?.find(error => error.path.includes('password'))
+        || error.shape?.data?.fieldErrors?.find(error => error.path.includes('confirmPassword'))
+      ) {
+        // Error is handled by input below, do not show alert
+        return
+      }
+
+      // Unable to handle error on input, show alert
       alert('Account Creation Failed', error.message || 'Failed to create account')
     },
   })
 
   const handleCreateAccount = () => {
     if (!name.trim() || !email.trim() || !password.trim()) {
       alert('Error', 'Please fill in all fields')
-      return
-    }
-
-    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-      alert('Error', 'Please enter a valid email address')
-      return
-    }
 
-    if (password.length < 6) {
-      alert('Error', 'Password must be at least 6 characters')
       return
     }
 
     if (password !== confirmPassword) {
       alert('Error', 'Passwords do not match')
+
       return
     }
 
@@ -74,39 +78,39 @@ export default function CreateAccountScreen() {
         <Text style={localStyles.subtitle}>Sign up for Plannting</Text>
 
         <TextInput
-          style={localStyles.input}
           placeholder="Name"
           value={name}
           onChangeText={setName}
           autoCapitalize="words"
+          fieldError={createAccountMutation.error?.shape?.data?.fieldErrors?.find(error => error.path.includes('name'))}
         />
 
         <TextInput
-          style={localStyles.input}
           placeholder="Email"
           value={email}
           onChangeText={setEmail}
           keyboardType="email-address"
           autoCapitalize="none"
           autoComplete="email"
+          fieldError={createAccountMutation.error?.shape?.data?.fieldErrors?.find(error => error.path.includes('email'))}
         />
 
         <TextInput
-          style={localStyles.input}
           placeholder="Password (min 6 characters)"
           value={password}
           onChangeText={setPassword}
           secureTextEntry
           autoCapitalize="none"
+          fieldError={createAccountMutation.error?.shape?.data?.fieldErrors?.find(error => error.path.includes('password'))}
         />
 
         <TextInput
-          style={localStyles.input}
           placeholder="Confirm Password"
           value={confirmPassword}
           onChangeText={setConfirmPassword}
           secureTextEntry
           autoCapitalize="none"
+          fieldError={createAccountMutation.error?.shape?.data?.fieldErrors?.find(error => error.path.includes('confirmPassword'))}
         />
 
         <TouchableOpacity
@@ -155,15 +159,6 @@ const localStyles = StyleSheet.create({
     textAlign: 'center',
     marginBottom: 32,
   },
-  input: {
-    backgroundColor: '#fff',
-    borderWidth: 1,
-    borderColor: '#ddd',
-    borderRadius: 8,
-    padding: 12,
-    fontSize: 16,
-    marginBottom: 16,
-  },
   button: {
     borderRadius: 8,
     padding: 16,

diff --git a/apps/mobile/src/app/edit-password.tsx b/apps/mobile/src/app/edit-password.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react'
-import { ActivityIndicator, ScrollView, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native'
+import { ActivityIndicator, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import { useRouter } from 'expo-router'
 import { useQueryClient } from '@tanstack/react-query'
 
 import { ScreenWrapper } from '../components/ScreenWrapper'
+import { TextInput } from '../components/TextInput'
 
 import { useAlert } from '../contexts/AlertContext'
 
@@ -28,28 +29,36 @@ export default function EditPasswordScreen() {
       router.back()
     },
     onError: (error) => {
+      if (
+        error.shape?.data?.fieldErrors?.find(error => error.path.includes('currentPassword'))
+        || error.shape?.data?.fieldErrors?.find(error => error.path.includes('newPassword'))
+        || error.shape?.data?.fieldErrors?.find(error => error.path.includes('confirmPassword'))
+      ) {
+        // Error is handled by input below, do not show alert
+        return
+      }
+
+      // Unable to handle error on input, show alert
       alert('Error', error.message || 'Failed to update password')
     },
   })
 
   const handleSubmit = () => {
     if (!currentPassword.trim()) {
       alert('Error', 'Please enter your current password')
+
       return
     }
 
     if (!newPassword.trim()) {
       alert('Error', 'Please enter a new password')
-      return
-    }
 
-    if (newPassword.length < 6) {
-      alert('Error', 'Password must be at least 6 characters')
       return
     }
 
     if (newPassword !== confirmPassword) {
       alert('Error', 'New password and confirm password do not match')
+
       return
     }
 
@@ -68,40 +77,34 @@ export default function EditPasswordScreen() {
 
           <Text style={localStyles.label}>Current Password</Text>
           <TextInput
-            style={localStyles.input}
             placeholder='Current Password'
             value={currentPassword}
             onChangeText={setCurrentPassword}
             secureTextEntry
             autoCapitalize='none'
+            fieldError={updatePasswordMutation.error?.shape?.data?.fieldErrors?.find(error => error.path.includes('currentPassword'))}
           />
 
           <Text style={localStyles.label}>New Password</Text>
           <TextInput
-            style={localStyles.input}
             placeholder='New Password (min 6 characters)'
             value={newPassword}
             onChangeText={setNewPassword}
             secureTextEntry
             autoCapitalize='none'
+            fieldError={updatePasswordMutation.error?.shape?.data?.fieldErrors?.find(error => error.path.includes('newPassword'))}
           />
 
           <Text style={localStyles.label}>Confirm New Password</Text>
           <TextInput
-            style={localStyles.input}
             placeholder='Confirm New Password'
             value={confirmPassword}
             onChangeText={setConfirmPassword}
             secureTextEntry
             autoCapitalize='none'
+            fieldError={updatePasswordMutation.error?.shape?.data?.fieldErrors?.find(error => error.path.includes('confirmPassword'))}
           />
 
-          {updatePasswordMutation.error && (
-            <Text style={localStyles.errorText}>
-              {updatePasswordMutation.error.message}
-            </Text>
-          )}
-
           <TouchableOpacity
             style={[localStyles.button, localStyles.primaryButton]}
             onPress={handleSubmit}
@@ -155,16 +158,6 @@ const localStyles = StyleSheet.create({
     fontWeight: '600',
     color: '#333',
     marginBottom: 8,
-    marginTop: 8,
-  },
-  input: {
-    backgroundColor: '#fff',
-    borderWidth: 1,
-    borderColor: '#ddd',
-    borderRadius: 8,
-    padding: 12,
-    fontSize: 16,
-    marginBottom: 16,
   },
   button: {
     borderRadius: 8,