fix: Comprehensive authentication and UI fixes

Authentication & Token Management:
- Add deviceId to token refresh flow (backend requires both refreshToken and deviceId)
- Fix React Strict Mode token clearing race condition with retry logic
- Improve AuthContext to handle all token state combinations properly
- Store deviceId in localStorage alongside tokens

UI/UX Improvements:
- Remove deprecated legacyBehavior from Next.js Link components
- Update primary theme color to WCAG AA compliant #7c3aed
- Fix nested button error in TabBar voice navigation
- Fix invalid Tabs value error in DynamicChildDashboard

Multi-Child Dashboard:
- Load all children into Redux store properly
- Fetch metrics for all children, not just selected one
- Remove mock data to prevent unauthorized API calls

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

maternal-web/app/(auth)/login/page.tsx

@@ -333,11 +333,9 @@ export default function LoginPage() {
           <Box sx={{ mt: 3, textAlign: 'center' }}>
             <Typography variant="body2" color="text.secondary">
               {t('login.noAccount')}{' '}
-              <Link href="/register" passHref legacyBehavior>
+              <MuiLink component={Link} href="/register" sx={{ cursor: 'pointer', fontWeight: 600 }}>
-                <MuiLink sx={{ cursor: 'pointer', fontWeight: 600 }}>
                 {t('login.signUp')}
               </MuiLink>
-              </Link>
             </Typography>
           </Box>
         </Paper>

maternal-web/app/(auth)/register/page.tsx

@@ -484,11 +484,9 @@ export default function RegisterPage() {
           <Box sx={{ mt: 3, textAlign: 'center' }}>
             <Typography variant="body2" color="text.secondary">
               Already have an account?{' '}
-              <Link href="/login" passHref legacyBehavior>
+              <MuiLink component={Link} href="/login" sx={{ cursor: 'pointer', fontWeight: 600 }}>
-                <MuiLink sx={{ cursor: 'pointer', fontWeight: 600 }}>
                 Sign in
               </MuiLink>
-              </Link>
             </Typography>
           </Box>
         </Paper>

maternal-web/app/page.tsx

@@ -47,6 +47,7 @@ export default function HomePage() {
   const [children, setChildren] = useState<Child[]>([]);
   const [recentActivities, setRecentActivities] = useState<any[]>([]);
   const [todaySummary, setTodaySummary] = useState<any>(null);
+  const [allChildMetrics, setAllChildMetrics] = useState<any>({});
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<any>(null);
 
@@ -58,10 +59,21 @@ export default function HomePage() {
   }, [familyId, authLoading]);
 
   const loadChildren = async () => {
-    if (!familyId) return;
+    if (!familyId) {
+      console.warn('[HomePage] No familyId available, cannot load children');
+      return;
+    }
 
     try {
+      console.log('[HomePage] Loading children for familyId:', familyId);
+
+      // Dispatch to Redux to load children into store
+      await dispatch(fetchChildren(familyId)).unwrap();
+
+      // Also get children for local state
       const data = await childrenApi.getChildren(familyId);
+      console.log('[HomePage] Loaded children:', data.map(c => ({ id: c.id, name: c.name, familyId: c.familyId })));
+
       setChildren(data);
       if (data.length > 0 && !selectedChildId) {
         setSelectedChildId(data[0].id);
@@ -72,21 +84,22 @@ export default function HomePage() {
     }
   };
 
-  // Load dashboard data when child selected
+  // Load dashboard data when children are loaded
   useEffect(() => {
-    if (selectedChildId) {
+    if (children.length > 0) {
       loadDashboardData();
     }
-  }, [selectedChildId]);
+  }, [children]);
 
   const loadDashboardData = async () => {
-    if (!selectedChildId) return;
-
     setLoading(true);
     try {
-      // Load recent activities
+      // Load activities for ALL children to populate metrics
-      const activities = await trackingApi.getActivities(selectedChildId);
+      const allMetrics: any = {};
-      setRecentActivities(activities.slice(0, 10));
+
+      for (const child of children) {
+        try {
+          const activities = await trackingApi.getActivities(child.id);
 
           // Calculate today's summary from activities
           const today = new Date();
@@ -96,14 +109,14 @@ export default function HomePage() {
             return activityDate >= today;
           });
 
-      const summary = {
+          allMetrics[child.id] = {
             feedingCount: todayActivities.filter((a: any) => a.type === 'feeding').length,
             sleepCount: todayActivities.filter((a: any) => a.type === 'sleep').length,
             diaperCount: todayActivities.filter((a: any) => a.type === 'diaper').length,
             medicationCount: todayActivities.filter((a: any) => ['medication', 'medicine'].includes(a.type)).length,
             totalFeedingAmount: todayActivities
               .filter((a: any) => a.type === 'feeding')
-          .reduce((sum: number, a: any) => sum + (a.data?.amount || 0), 0),
+              .reduce((sum: number, a: any) => sum + (a.data?.amount || a.metadata?.amount || 0), 0),
             totalSleepDuration: todayActivities
               .filter((a: any) => a.type === 'sleep')
               .reduce((sum: number, a: any) => {
@@ -113,7 +126,26 @@ export default function HomePage() {
               }, 0),
           };
 
-      setTodaySummary(summary);
+          // If this is the selected child, also set recent activities
+          if (child.id === selectedChildId) {
+            setRecentActivities(activities.slice(0, 10));
+            setTodaySummary(allMetrics[child.id]);
+          }
+        } catch (err) {
+          console.error(`Failed to load activities for child ${child.id}:`, err);
+          allMetrics[child.id] = {
+            feedingCount: 0,
+            sleepCount: 0,
+            diaperCount: 0,
+            medicationCount: 0,
+            totalFeedingAmount: 0,
+            totalSleepDuration: 0,
+          };
+        }
+      }
+
+      // Store all metrics in state
+      setAllChildMetrics(allMetrics);
       setError(null);
     } catch (err) {
       console.error('Failed to load dashboard data:', err);
@@ -188,15 +220,15 @@ export default function HomePage() {
 
   const isLoading = authLoading || loading;
 
-  // Build child metrics object for DynamicChildDashboard
+  // Build child metrics object for DynamicChildDashboard from allChildMetrics
   const childMetrics = children.reduce((acc: any, child: any) => {
-    // Use todaySummary for selected child, or zero for others
+    const metrics = allChildMetrics[child.id];
-    if (child.id === selectedChildId && todaySummary) {
+    if (metrics) {
       acc[child.id] = {
-        feedingCount: todaySummary.feedingCount || 0,
+        feedingCount: metrics.feedingCount || 0,
-        sleepDuration: todaySummary.totalSleepDuration || 0,
+        sleepDuration: metrics.totalSleepDuration || 0,
-        diaperCount: todaySummary.diaperCount || 0,
+        diaperCount: metrics.diaperCount || 0,
-        medicationCount: todaySummary.medicationCount || 0,
+        medicationCount: metrics.medicationCount || 0,
       };
     } else {
       acc[child.id] = {

maternal-web/components/dashboard/DynamicChildDashboard.tsx

@@ -49,19 +49,25 @@ export default function DynamicChildDashboard({
   const children = useSelector((state: RootState) => childrenSelectors.selectAll(state));
   const viewMode = useSelector(selectViewMode);
   const selectedChild = useSelector(selectSelectedChild);
-  const [selectedTab, setSelectedTab] = useState<string>('');
+
+  // Initialize selectedTab with first available child ID
+  const [selectedTab, setSelectedTab] = useState<string>(() => {
+    if (selectedChild?.id) return selectedChild.id;
+    if (children.length > 0) return children[0].id;
+    return '';
+  });
 
   // Initialize selected tab
   useEffect(() => {
-    if (selectedChild?.id) {
+    if (selectedChild?.id && selectedTab !== selectedChild.id) {
       setSelectedTab(selectedChild.id);
-    } else if (children.length > 0) {
+    } else if (!selectedTab && children.length > 0) {
       const firstChildId = children[0].id;
       setSelectedTab(firstChildId);
       dispatch(selectChild(firstChildId));
       onChildSelect(firstChildId);
     }
-  }, [selectedChild, children, dispatch, onChildSelect]);
+  }, [selectedChild, children, dispatch, onChildSelect, selectedTab]);
 
   const handleTabChange = (_event: React.SyntheticEvent, newValue: string) => {
     setSelectedTab(newValue);
@@ -180,6 +186,11 @@ export default function DynamicChildDashboard({
 
   // Tab view for 1-3 children
   if (viewMode === 'tabs') {
+    // Don't render tabs if no children or no valid selectedTab
+    if (children.length === 0 || !selectedTab) {
+      return null;
+    }
+
     return (
       <Box>
         <Tabs

maternal-web/components/layouts/TabBar/TabBar.tsx

@@ -71,9 +71,6 @@ export const TabBar = () => {
                   label=""
                   value="voice"
                   showLabel={false}
-                  icon={
-                    <IconButton
-                      aria-label="voice command"
                   onClick={(e) => {
                     e.stopPropagation();
                     const voiceButton = document.querySelector('[aria-label="voice input"]') as HTMLButtonElement;
@@ -81,6 +78,9 @@ export const TabBar = () => {
                       voiceButton.click();
                     }
                   }}
+                  icon={(
+                    <Box
+                      aria-label="voice command"
                       sx={{
                         bgcolor: '#FF69B4',
                         color: 'white',
@@ -89,11 +89,15 @@ export const TabBar = () => {
                         '&:hover': {
                           bgcolor: '#FF1493',
                         },
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        borderRadius: '50%',
                       }}
                     >
                       <Mic />
-                    </IconButton>
+                    </Box>
-                  }
+                  )}
                   sx={{ minWidth: 80 }}
                 />
               );

maternal-web/lib/api/client.ts

@@ -42,19 +42,35 @@ apiClient.interceptors.response.use(
 
       try {
         const refreshToken = tokenStorage.getRefreshToken();
+        const deviceId = tokenStorage.getDeviceId();
+
+        console.log('[API Client] Attempting token refresh, refreshToken exists:', !!refreshToken, 'deviceId exists:', !!deviceId);
+
         if (!refreshToken) {
+          console.error('[API Client] No refresh token found in storage');
           throw new Error('No refresh token');
         }
 
-        const response = await axios.post(
+        if (!deviceId) {
+          console.error('[API Client] No device ID found in storage');
+          throw new Error('No device ID');
+        }
+
+        // Use a plain axios instance without interceptors to avoid loops
+        const refreshResponse = await axios.create().post(
           `${API_BASE_URL}/api/v1/auth/refresh`,
-          { refreshToken },
+          {
+            refreshToken,
+            deviceId
+          },
           {
             headers: { 'Content-Type': 'application/json' },
             withCredentials: true
           }
         );
 
+        const response = refreshResponse;
+
         // Handle different response structures
         let newAccessToken;
         let newRefreshToken;
@@ -81,13 +97,28 @@ apiClient.interceptors.response.use(
         // Retry original request with new token
         originalRequest.headers.Authorization = `Bearer ${newAccessToken}`;
         return apiClient(originalRequest);
-      } catch (refreshError) {
+      } catch (refreshError: any) {
-        console.error('Token refresh failed:', refreshError);
+        console.error('[API Client] Token refresh failed:', refreshError);
-        // Refresh failed, clear tokens and redirect to login
+
+        // Only clear tokens if this is a real auth failure (not a network error)
+        // and not during the initial page load where React Strict Mode might cause issues
+        const isAuthFailure = refreshError?.response?.status === 401 ||
+                            refreshError?.response?.status === 403;
+
+        // Check if this is likely a React Strict Mode double-invocation
+        // by seeing if we're in development mode and the error happened very quickly
+        const isDevelopment = process.env.NODE_ENV === 'development';
+
+        if (isAuthFailure && !isDevelopment) {
+          console.log('[API Client] Auth failure in production, clearing tokens');
           tokenStorage.clearTokens();
+        } else if (isDevelopment) {
+          console.log('[API Client] Development mode - not clearing tokens to avoid React Strict Mode issues');
+        }
 
         // Avoid redirect loop - only redirect if not already on login page
-        if (!window.location.pathname.includes('/login')) {
+        // and only in production or after a real auth failure
+        if (!window.location.pathname.includes('/login') && isAuthFailure && !isDevelopment) {
           window.location.href = '/login';
         }
         return Promise.reject(refreshError);

maternal-web/lib/auth/AuthContext.tsx

@@ -76,13 +76,58 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
 
     try {
       const accessToken = tokenStorage.getAccessToken();
-      if (!accessToken) {
+      const refreshToken = tokenStorage.getRefreshToken();
+
+      console.log('[AuthContext] checkAuth - tokens present:', {
+        hasAccess: !!accessToken,
+        hasRefresh: !!refreshToken
+      });
+
+      if (!accessToken && !refreshToken) {
+        console.log('[AuthContext] No tokens found, user not authenticated');
+        setUser(null);
+        setToken(null);
         setIsLoading(false);
         return;
       }
 
-      // Set token in state
+      // If we only have refresh token but no access token, don't make /me call
+      // The axios interceptor will handle getting a new access token when needed
+      if (!accessToken && refreshToken) {
+        console.log('[AuthContext] Only refresh token present, skipping /me call');
+        setUser(null);
+        setToken(null);
+        setIsLoading(false);
+        return;
+      }
+
+      // If we only have access token but no refresh token, it might be a timing issue
+      // during login (React Strict Mode). Give it a moment and check again.
+      if (accessToken && !refreshToken) {
+        console.log('[AuthContext] Only access token present, checking if this is temporary...');
+
+        // Wait a tiny bit and check again (for React Strict Mode race condition)
+        await new Promise(resolve => setTimeout(resolve, 10));
+        const refreshTokenRetry = tokenStorage.getRefreshToken();
+
+        if (!refreshTokenRetry) {
+          console.log('[AuthContext] Still no refresh token after retry, clearing invalid state');
+          tokenStorage.clearTokens();
+          setUser(null);
+          setToken(null);
+          setIsLoading(false);
+          return;
+        } else {
+          console.log('[AuthContext] Refresh token found on retry, proceeding with auth check');
+          // Update local variable for the rest of the function
+        }
+      }
+
+      // At this point we have both tokens - proceed with auth check
+      // Set token in state if we have one
+      if (accessToken) {
         setToken(accessToken);
+      }
 
       const response = await apiClient.get('/api/v1/auth/me');
 
@@ -104,9 +149,28 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
         throw new Error('Invalid response structure');
       }
     } catch (error: any) {
-      console.error('Auth check failed:', error);
+      console.error('[AuthContext] Auth check failed:', error);
-      // Only clear tokens if it's an actual auth error (401, 403)
+      // Don't clear tokens on 401 during initial auth check
-      if (error?.response?.status === 401 || error?.response?.status === 403) {
+      // The axios interceptor in client.ts will handle token refresh automatically
+      // Only clear tokens if the error is NOT a 401 (e.g., network error, 403, etc.)
+      // Or if there's no refresh token available (meaning refresh already failed)
+      const hasRefreshToken = tokenStorage.getRefreshToken();
+
+      if (!hasRefreshToken) {
+        // No refresh token means we can't recover - clear everything
+        console.log('[AuthContext] No refresh token available, clearing auth state');
+        tokenStorage.clearTokens();
+        setUser(null);
+        setToken(null);
+      } else if (error?.response?.status === 401) {
+        // 401 with refresh token - let axios interceptor handle refresh
+        console.log('[AuthContext] 401 error but refresh token exists, letting axios interceptor handle refresh');
+        // Don't clear tokens - the axios interceptor will attempt refresh
+        setUser(null);
+        setToken(null);
+      } else if (error?.response?.status === 403) {
+        // 403 means forbidden - clear tokens
+        console.log('[AuthContext] 403 Forbidden, clearing auth state');
         tokenStorage.clearTokens();
         setUser(null);
         setToken(null);
@@ -118,8 +182,9 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
 
   const login = async (credentials: LoginCredentials) => {
     try {
+      const deviceId = generateDeviceFingerprint();
       const deviceInfo = {
-        deviceId: generateDeviceFingerprint(),
+        deviceId,
         platform: 'web',
         model: navigator.userAgent,
         osVersion: navigator.platform,
@@ -141,7 +206,8 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
         eulaVersion: userData.eulaVersion,
       });
 
-      tokenStorage.setTokens(tokens.accessToken, tokens.refreshToken);
+      // Store tokens and deviceId
+      tokenStorage.setTokens(tokens.accessToken, tokens.refreshToken, deviceId);
       setToken(tokens.accessToken);
       setUser(userData);
 
@@ -154,8 +220,9 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
 
   const register = async (data: RegisterData) => {
     try {
+      const deviceId = generateDeviceFingerprint();
       const deviceInfo = {
-        deviceId: generateDeviceFingerprint(),
+        deviceId,
         platform: 'web',
         model: navigator.userAgent,
         osVersion: navigator.platform,
@@ -205,7 +272,7 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
         }] : [],
       };
 
-      tokenStorage.setTokens(accessToken, refreshToken);
+      tokenStorage.setTokens(accessToken, refreshToken, deviceId);
       setToken(accessToken);
       setUser(userWithFamily);
 

maternal-web/lib/utils/tokenStorage.ts

@@ -61,12 +61,44 @@ export const tokenStorage = {
     }
   },
 
+  /**
+   * Get device ID from storage
+   */
+  getDeviceId: (): string | null => {
+    if (typeof window === 'undefined') {
+      return null;
+    }
+    try {
+      return localStorage.getItem('deviceId');
+    } catch (error) {
+      console.error('Error reading deviceId:', error);
+      return null;
+    }
+  },
+
+  /**
+   * Set device ID in storage
+   */
+  setDeviceId: (deviceId: string): void => {
+    if (typeof window === 'undefined') {
+      return;
+    }
+    try {
+      localStorage.setItem('deviceId', deviceId);
+    } catch (error) {
+      console.error('Error setting deviceId:', error);
+    }
+  },
+
   /**
    * Set both tokens at once
    */
-  setTokens: (accessToken: string, refreshToken: string): void => {
+  setTokens: (accessToken: string, refreshToken: string, deviceId?: string): void => {
     tokenStorage.setAccessToken(accessToken);
     tokenStorage.setRefreshToken(refreshToken);
+    if (deviceId) {
+      tokenStorage.setDeviceId(deviceId);
+    }
   },
 
   /**
@@ -79,6 +111,7 @@ export const tokenStorage = {
     try {
       localStorage.removeItem('accessToken');
       localStorage.removeItem('refreshToken');
+      localStorage.removeItem('deviceId');
     } catch (error) {
       console.error('Error clearing tokens:', error);
     }

maternal-web/store/slices/childrenSlice.ts

@@ -91,45 +91,18 @@ interface ChildrenState {
   lastSyncTime: string | null;
 }
 
-// Mock children for development (matches real data from andrei@cloudz.ro)
-const MOCK_CHILDREN: Child[] = process.env.NODE_ENV === 'development' ? [
-  {
-    id: 'child_alice123',
-    familyId: 'fam_test123',
-    name: 'Alice',
-    birthDate: '2023-03-15',
-    gender: 'female',
-    displayColor: '#FF6B9D',
-    sortOrder: 1,
-    createdAt: new Date().toISOString(),
-  },
-  {
-    id: 'child_bob456',
-    familyId: 'fam_test123',
-    name: 'Bob',
-    birthDate: '2024-06-20',
-    gender: 'male',
-    displayColor: '#4A90E2',
-    sortOrder: 2,
-    createdAt: new Date().toISOString(),
-  },
-] : [];
-
 const childrenSlice = createSlice({
   name: 'children',
-  initialState: childrenAdapter.getInitialState<ChildrenState>(
+  initialState: childrenAdapter.getInitialState<ChildrenState>({
-    {
     loading: false,
     error: null,
-      selectedChildId: MOCK_CHILDREN.length > 0 ? MOCK_CHILDREN[0].id : null,
+    selectedChildId: null,
-      selectedChildIds: MOCK_CHILDREN.length > 0 ? [MOCK_CHILDREN[0].id] : [],
+    selectedChildIds: [],
-      defaultChildId: MOCK_CHILDREN.length > 0 ? MOCK_CHILDREN[0].id : null,
+    defaultChildId: null,
     viewMode: 'auto',
     lastSelectedPerScreen: {},
     lastSyncTime: null,
-    },
+  }),
-    MOCK_CHILDREN
-  ),
   reducers: {
     // Optimistic operations
     optimisticCreate: (state, action: PayloadAction<Child>) => {

maternal-web/styles/themes/purpleTheme.ts

@@ -6,9 +6,10 @@ import { createTheme } from '@mui/material/styles';
 export const purpleTheme = createTheme({
   palette: {
     primary: {
-      main: '#8b52ff', // Vibrant purple
+      main: '#7c3aed', // Adjusted purple for better contrast (WCAG AA compliant)
-      light: '#d194e6', // Light purple
+      light: '#a78bfa', // Light purple
-      dark: '#6b3cc9', // Dark purple
+      dark: '#5b21b6', // Dark purple
+      contrastText: '#ffffff', // Ensure white text
     },
     secondary: {
       main: '#ff7094', // Pink