ProfileScreen rework: visual refresh, edit UX overhaul, settings expansion

.github/workflows/main.yml

@@ -0,0 +1,21 @@
+name: Lint and Build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: '22.x'
+    - run: npm install
+    - run: npm install -g typescript
+    - run: tsc --noEmit

Build_plan.md

@@ -93,7 +93,7 @@ All Jules prompts are written by the Orchestrator. Copilot reviews every PR. Orc
 ### 🔲 Phase 6 — Profile Screen
 | # | Task | Status | Notes |
 |---|---|---|---|
-| 6.1 | Profile screen | ✅ Done | Name, occupation, custom categories management, view onboarding answers, sign out |
+| 6.1 | Profile screen | ✅ Done | Name, occupation, custom categories management, view onboarding answers, sign out, behaviour settings |
 
 ---
 
@@ -203,8 +203,9 @@ Do not build any of the following until explicitly added to the build plan:
 | 09 | Home screen + LogModal | ✅ Merged |
 | 10 | History screen | ✅ Merged |
 | 11 | Coach screen | ✅ Merged |
-| 12 | Profile screen | 🔲 Pending — prompt ready in handoff document |
+| 12 | Profile screen | ✅ Merged |
 | 13 | ProfileContext — shared profile state | ✅ Merged |
+| 17 | Profile screen rework — edit UX, visual refresh, behaviour settings | ✅ Merged |
 
 | 09 | Home screen + LogModal component | ✅ Merged |
 | 09b | Undo window + deleteLog | ✅ Merged |
@@ -224,6 +225,7 @@ Do not build any of the following until explicitly added to the build plan:
 - ProfileContext silent sign-out removed (was incorrectly signing out new users)
 - `isCreatingAccount` flag added to ProfileContext
 - **HF-01**: Model string updates (Sonnet 4.6, Haiku dated) — ✅ Merged
+- **HF-04**: Profile rework PR fixes — icon paths, LogContext type, LogModal dep array, error handling — ✅ Merged
 - **HF-02**: Dead code cleanup — getLogs filter + deleteLog rename — ✅ Merged
 
 ---

src/components/LogModal.tsx

@@ -13,6 +13,7 @@ import {
 import { Colors, Fonts, FontSizes, Radius, DEFAULT_CATEGORIES } from '../constants/theme';
 import { PillButton } from './PillButton';
 import type { LogContext } from '../lib/types';
+import { useProfile } from '../hooks/useProfile';
 
 interface LogModalProps {
   visible: boolean;
@@ -31,17 +32,21 @@ export const LogModal = ({
   customCategories,
   onAddCategory
 }: LogModalProps) => {
+  const { profile } = useProfile();
+
   const [selectedCategory, setSelectedCategory] = useState<string>('');
   const [note, setNote] = useState<string>('');
-  const [selectedContext, setSelectedContext] = useState<LogContext | undefined>();
+  const [selectedContext, setSelectedContext] = useState<LogContext | undefined>(
+    profile?.default_context ?? undefined
+  );
   const [addingCategory, setAddingCategory] = useState<boolean>(false);
   const [newCategoryInput, setNewCategoryInput] = useState<string>('');
   const [loading, setLoading] = useState<boolean>(false);
 
   const resetState = () => {
     setSelectedCategory('');
     setNote('');
-    setSelectedContext(undefined);
+    setSelectedContext(profile?.default_context ?? undefined);
     setAddingCategory(false);
     setNewCategoryInput('');
   };
@@ -57,7 +62,7 @@ export const LogModal = ({
   // Reset category/context when switching between win and sin.
   useEffect(() => {
     resetState();
-  }, [type]);
+  }, [type, profile?.default_context]);
 
   const isWin = type === 'win';
   const activeColor = isWin ? Colors.primary : Colors.amber;
@@ -78,7 +83,7 @@ export const LogModal = ({
       // Reset state
       setSelectedCategory('');
       setNote('');
-      setSelectedContext(undefined);
+      setSelectedContext(profile?.default_context ?? undefined);
       setAddingCategory(false);
       setNewCategoryInput('');
     } catch (err: unknown) {

src/components/icons/GearIcon.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import Svg, { Path } from 'react-native-svg';
+import { Colors } from '../../constants/theme';
+
+interface Props {
+  size?: number;
+  color?: string;
+}
+
+export const GearIcon: React.FC<Props> = ({ size = 12, color = Colors.primary }) => {
+  return (
+    <Svg
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke={color}
+      strokeWidth={1.5}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <Path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" />
+      <Path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z" />
+    </Svg>
+  );
+};

src/components/icons/TargetIcon.tsx

@@ -0,0 +1,26 @@
+import React from 'react';
+import Svg, { Path } from 'react-native-svg';
+import { Colors } from '../../constants/theme';
+
+interface Props {
+  size?: number;
+  color?: string;
+}
+
+export const TargetIcon: React.FC<Props> = ({ size = 12, color = Colors.primary }) => {
+  return (
+    <Svg
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke={color}
+      strokeWidth={1.5}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    >
+      <Path d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" />
+      <Path d="M12 17C14.7614 17 17 14.7614 17 12C17 9.23858 14.7614 7 12 7C9.23858 7 7 9.23858 7 12C7 14.7614 9.23858 17 12 17Z" />
+    </Svg>
+  );
+};

src/lib/types.ts

@@ -25,6 +25,7 @@ export interface UserProfile {
   custom_categories: string[];
   created_at: string;
   onboarded: boolean;
+  default_context?: LogContext | null;
 }
 
 export interface AppState {