From 7205c2ad1eece22971a75876daffc08117add4f2 Mon Sep 17 00:00:00 2001
From: Sergei <sergei@Sergeis-MacBook-Pro.local>
Date: Mon, 12 Jan 2026 11:55:31 -0800
Subject: [PATCH] Fix Apple Review issues: Login cleanup + Account Deletion

Apple App Store Review - Submission ID: 0992528e-4ce9-4167-9a1b-07f4334a8055

Fix #2: Login Screen Cleanup (Guideline 2.1)
- Removed non-functional "Create Account" button
- Removed "Forgot Password" button (not needed)
- Added actual logo image instead of text
- Streamlined login screen to focus on core functionality

Fix #3: Account Deletion Feature (Guideline 5.1.1(v))
- Added "Delete Account" button to Profile screen
- Implemented confirmation dialog with clear warning
- API integration: deleteAccount() method in api.ts
- Automatically logs out and clears data after deletion
- Redirects to login screen after successful deletion

Updated APPLE_REVIEW_RESPONSE.md with full documentation.
---
 APPLE_REVIEW_RESPONSE.md | 50 ++++++++++++++++++++++++++------
 app/(auth)/login.tsx     | 62 +++++++---------------------------------
 app/(tabs)/profile.tsx   | 50 ++++++++++++++++++++++++++++++++
 services/api.ts          | 22 ++++++++++++++
 4 files changed, 125 insertions(+), 59 deletions(-)

diff --git a/APPLE_REVIEW_RESPONSE.md b/APPLE_REVIEW_RESPONSE.md
index e8374af..5d95cea 100644
--- a/APPLE_REVIEW_RESPONSE.md
+++ b/APPLE_REVIEW_RESPONSE.md
@@ -78,27 +78,61 @@ The paid digital content, services, or subscriptions included in or accessed by
 
 ---
 
-### Fix #2: Account Creation Button
+### ✅ Fix #2: Account Creation Button (Login Screen Cleanup)
 
-**Date Fixed:** [PENDING]
+**Date Fixed:** January 12, 2026
 
 **Changes Made:**
-- [TO BE FILLED AFTER INVESTIGATION & FIX]
+- Removed "Create Account" button from login screen footer (not functional, not needed)
+- Removed "Forgot Password" button from login screen (not needed for initial release)
+- Replaced text-based logo with actual app logo image (`icon.png`)
+- Cleaned up login screen to focus on core functionality
 
 **Technical Details:**
-- [TO BE FILLED AFTER IMPLEMENTATION]
+- File modified: `app/(auth)/login.tsx`
+- Removed footer section containing "Create Account" and "Sign Up" link (lines 123-128)
+- Removed "Forgot Password" TouchableOpacity (lines 109-111)
+- Changed logo from `<Text>WellNuo</Text>` to `<Image source={require('@/assets/images/icon.png')}`
+- Added logo style: 120x120px with bottom margin
+- Removed unused styles: `logoContainer`, `logoText`, `forgotPassword`, `forgotPasswordText`, `footer`, `footerText`, `footerLink`
+- Login screen now shows only: Logo, "Welcome Back" title, Username/Password inputs, and Sign In button
 
 ---
 
-### Fix #3: Account Deletion Feature
+### ✅ Fix #3: Account Deletion Feature
 
-**Date Fixed:** [PENDING]
+**Date Fixed:** January 12, 2026
 
 **Changes Made:**
-- [TO BE FILLED AFTER IMPLEMENTATION]
+- Added "Delete Account" button to Profile screen
+- Implemented confirmation dialog with clear warning message
+- API method calls `delete_account` function with proper authentication
+- Automatically logs out user after successful deletion
+- Redirects to login screen after account deletion
 
 **Technical Details:**
-- [TO BE FILLED AFTER IMPLEMENTATION]
+- Files modified:
+  - `services/api.ts` - Added `deleteAccount()` method (lines 150-170)
+  - `app/(tabs)/profile.tsx` - Added Delete Account button and handler
+
+**API Integration:**
+- Endpoint: `https://eluxnetworks.net/function/well-api/api`
+- Function: `delete_account`
+- Parameters: `user_name`, `token`
+- Response handling: Success → logout + redirect, Error → show error message
+
+**User Flow:**
+1. User taps "Delete Account" button in Profile
+2. Confirmation alert shown: "Are you sure you want to delete your account? This action cannot be undone. All your data will be permanently deleted."
+3. User confirms → API call to backend
+4. Success: Account deleted, SecureStore cleared, redirected to login
+5. Error: Error message shown, user stays on profile screen
+
+**UI Details:**
+- Button styled with red border and red text (destructive action)
+- Uses trash icon (`trash-outline`)
+- Positioned above Logout button in Profile screen
+- Clear visual distinction from other actions
 
 ---
 
diff --git a/app/(auth)/login.tsx b/app/(auth)/login.tsx
index ed77ae5..50c3dc6 100644
--- a/app/(auth)/login.tsx
+++ b/app/(auth)/login.tsx
@@ -58,9 +58,11 @@ export default function LoginScreen() {
       >
         {/* Logo / Header */}
         <View style={styles.header}>
-          <View style={styles.logoContainer}>
-            <Text style={styles.logoText}>WellNuo</Text>
-          </View>
+          <Image
+            source={require('@/assets/images/icon.png')}
+            style={styles.logo}
+            resizeMode="contain"
+          />
           <Text style={styles.title}>Welcome Back</Text>
           <Text style={styles.subtitle}>Sign in to continue monitoring your loved ones</Text>
         </View>
@@ -106,27 +108,16 @@ export default function LoginScreen() {
             returnKeyType="done"
           />
 
-          <TouchableOpacity style={styles.forgotPassword}>
-            <Text style={styles.forgotPasswordText}>Forgot Password?</Text>
-          </TouchableOpacity>
-
           <Button
             title="Sign In"
             onPress={handleLogin}
             loading={isLoading}
             fullWidth
             size="lg"
+            style={styles.signInButton}
           />
         </View>
 
-        {/* Footer */}
-        <View style={styles.footer}>
-          <Text style={styles.footerText}>Don't have an account? </Text>
-          <TouchableOpacity>
-            <Text style={styles.footerLink}>Create Account</Text>
-          </TouchableOpacity>
-        </View>
-
         {/* Version Info */}
         <Text style={styles.version}>WellNuo v1.0.0</Text>
       </ScrollView>
@@ -149,20 +140,11 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginBottom: Spacing.xl,
   },
-  logoContainer: {
-    width: 80,
-    height: 80,
-    borderRadius: BorderRadius.xl,
-    backgroundColor: AppColors.primary,
-    justifyContent: 'center',
-    alignItems: 'center',
+  logo: {
+    width: 120,
+    height: 120,
     marginBottom: Spacing.lg,
   },
-  logoText: {
-    fontSize: FontSizes.lg,
-    fontWeight: '700',
-    color: AppColors.white,
-  },
   title: {
     fontSize: FontSizes['2xl'],
     fontWeight: '700',
@@ -177,30 +159,8 @@ const styles = StyleSheet.create({
   form: {
     marginBottom: Spacing.xl,
   },
-  forgotPassword: {
-    alignSelf: 'flex-end',
-    marginBottom: Spacing.lg,
-    marginTop: -Spacing.sm,
-  },
-  forgotPasswordText: {
-    fontSize: FontSizes.sm,
-    color: AppColors.primary,
-    fontWeight: '500',
-  },
-  footer: {
-    flexDirection: 'row',
-    justifyContent: 'center',
-    alignItems: 'center',
-    marginBottom: Spacing.xl,
-  },
-  footerText: {
-    fontSize: FontSizes.base,
-    color: AppColors.textSecondary,
-  },
-  footerLink: {
-    fontSize: FontSizes.base,
-    color: AppColors.primary,
-    fontWeight: '600',
+  signInButton: {
+    marginTop: Spacing.lg,
   },
   version: {
     textAlign: 'center',
diff --git a/app/(tabs)/profile.tsx b/app/(tabs)/profile.tsx
index bfd6f98..7955fb6 100644
--- a/app/(tabs)/profile.tsx
+++ b/app/(tabs)/profile.tsx
@@ -11,6 +11,7 @@ import { router } from 'expo-router';
 import { Ionicons } from '@expo/vector-icons';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useAuth } from '@/contexts/AuthContext';
+import { api } from '@/services/api';
 import { AppColors, BorderRadius, FontSizes, Spacing } from '@/constants/theme';
 
 interface MenuItemProps {
@@ -59,6 +60,30 @@ export default function ProfileScreen() {
     router.push('/privacy');
   };
 
+  const handleDeleteAccount = () => {
+    Alert.alert(
+      'Delete Account',
+      'Are you sure you want to delete your account? This action cannot be undone. All your data will be permanently deleted.',
+      [
+        { text: 'Cancel', style: 'cancel' },
+        {
+          text: 'Delete',
+          style: 'destructive',
+          onPress: async () => {
+            const response = await api.deleteAccount();
+            if (response.ok) {
+              Alert.alert('Success', 'Your account has been deleted successfully');
+              router.replace('/(auth)/login');
+            } else {
+              Alert.alert('Error', response.error?.message || 'Failed to delete account');
+            }
+          },
+        },
+      ],
+      { cancelable: true }
+    );
+  };
+
   const handleLogout = () => {
     Alert.alert(
       'Logout',
@@ -116,6 +141,14 @@ export default function ProfileScreen() {
           </View>
         </View>
 
+        {/* Account Actions */}
+        <View style={styles.section}>
+          <TouchableOpacity style={styles.deleteButton} onPress={handleDeleteAccount}>
+            <Ionicons name="trash-outline" size={20} color={AppColors.error} />
+            <Text style={styles.deleteText}>Delete Account</Text>
+          </TouchableOpacity>
+        </View>
+
         {/* Logout Button */}
         <View style={styles.section}>
           <TouchableOpacity style={styles.logoutButton} onPress={handleLogout}>
@@ -231,6 +264,23 @@ const styles = StyleSheet.create({
     backgroundColor: AppColors.border,
     marginLeft: Spacing.lg + 36 + Spacing.md,
   },
+  deleteButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: AppColors.background,
+    paddingVertical: Spacing.md,
+    marginHorizontal: Spacing.lg,
+    borderRadius: BorderRadius.lg,
+    borderWidth: 1,
+    borderColor: AppColors.error,
+  },
+  deleteText: {
+    fontSize: FontSizes.base,
+    fontWeight: '600',
+    color: AppColors.error,
+    marginLeft: Spacing.sm,
+  },
   logoutButton: {
     flexDirection: 'row',
     alignItems: 'center',
diff --git a/services/api.ts b/services/api.ts
index 8c1a543..ffdd04b 100644
--- a/services/api.ts
+++ b/services/api.ts
@@ -147,6 +147,28 @@ class ApiService {
     }
   }
 
+  async deleteAccount(): Promise<ApiResponse<any>> {
+    const token = await this.getToken();
+    const userName = await this.getUserName();
+
+    if (!token || !userName) {
+      return { ok: false, error: { message: 'Not authenticated', code: 'UNAUTHORIZED' } };
+    }
+
+    const response = await this.makeRequest<any>({
+      function: 'delete_account',
+      user_name: userName,
+      token: token,
+    });
+
+    // If successful, logout locally
+    if (response.ok) {
+      await this.logout();
+    }
+
+    return response;
+  }
+
   async logout(): Promise<void> {
     await SecureStore.deleteItemAsync('accessToken');
     await SecureStore.deleteItemAsync('userId');