RR-T40 Logout fix, close call fix, units state fix, contacts fix, pro…

jest.config.js

@@ -8,7 +8,7 @@ module.exports = {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   moduleDirectories: ['node_modules', '<rootDir>/'],
   transformIgnorePatterns: [
-    'node_modules/(?!((jest-)?react-native|@react-native(-community)?|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@sentry/react-native|native-base|react-native-svg|@legendapp/motion|@gluestack-ui|expo-audio/.*|@aptabase/.*))',
+    'node_modules/(?!((jest-)?react-native|@react-native(-community)?|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@sentry/react-native|native-base|react-native-svg|@legendapp/motion|@gluestack-ui|expo-audio/.*|@aptabase/.*|@dev-plugins/.*))',
   ],
   coverageReporters: ['json-summary', ['text', { file: 'coverage.txt' }], 'cobertura'],
   reporters: [

package.json

@@ -61,7 +61,7 @@
     "@gluestack-ui/link": "~0.1.22",
     "@gluestack-ui/menu": "~0.2.43",
     "@gluestack-ui/modal": "^0.1.35",
-    "@gluestack-ui/nativewind-utils": "~1.0.26",
+    "@gluestack-ui/nativewind-utils": "^1.0.28",
     "@gluestack-ui/overlay": "~0.1.16",
     "@gluestack-ui/popover": "~0.1.49",
     "@gluestack-ui/pressable": "~0.1.16",

src/api/calls/callFiles.ts

@@ -126,20 +126,19 @@ export const getCallAudio = async (callId: string, includeData: boolean) => {
 };
 
 export const saveCallFile = async (callId: string, userId: string, note: string, name: string, latitude: number | null, longitude: number | null, file: string, type: number) => {
-  let data = {
+  let data: any = {
     CallId: callId,
     UserId: userId,
     Type: type,
     Name: name,
-    Latitude: '',
-    Longitude: '',
     Note: note,
     Data: file,
   };
 
-  if (latitude && longitude) {
-    data.Latitude = latitude?.toString();
-    data.Longitude = longitude?.toString();
+  // Only include Latitude and Longitude if both are provided
+  if (latitude !== null && longitude !== null) {
+    data.Latitude = latitude.toString();
+    data.Longitude = longitude.toString();
   }
 
   const response = await saveCallFileApi.post<SaveCallFileResult>({

src/app/(app)/__tests__/protocols.test.tsx

@@ -108,7 +108,7 @@ jest.mock('@/components/protocols/protocol-card', () => ({
     const React = require('react');
     return React.createElement(
       'Pressable',
-      { testID: `protocol-card-${protocol.Id}`, onPress: () => onPress(protocol.Id) },
+      { testID: `protocol-card-${protocol.ProtocolId}`, onPress: () => onPress(protocol.ProtocolId) },
       React.createElement('Text', null, protocol.Name)
     );
   },
@@ -215,6 +215,7 @@ import Protocols from '../protocols';
 const mockProtocols: CallProtocolsResultData[] = [
   {
     Id: '1',
+    ProtocolId: '1',
     DepartmentId: 'dept1',
     Name: 'Fire Emergency Response',
     Code: 'FIRE001',
@@ -233,6 +234,7 @@ const mockProtocols: CallProtocolsResultData[] = [
   },
   {
     Id: '2',
+    ProtocolId: '2',
     DepartmentId: 'dept1',
     Name: 'Medical Emergency',
     Code: 'MED001',
@@ -251,6 +253,7 @@ const mockProtocols: CallProtocolsResultData[] = [
   },
   {
     Id: '3',
+    ProtocolId: '3',
     DepartmentId: 'dept1',
     Name: 'Hazmat Response',
     Code: 'HAZ001',
@@ -269,6 +272,7 @@ const mockProtocols: CallProtocolsResultData[] = [
   },
   {
     Id: '', // Empty ID to test the keyExtractor fix
+    ProtocolId: '', // Empty ProtocolId to test the keyExtractor fix
     DepartmentId: 'dept1',
     Name: 'Protocol with Empty ID',
     Code: 'EMPTY001',

src/app/(app)/__tests__/settings.test.tsx

@@ -238,6 +238,63 @@ jest.mock('@/lib/logging', () => ({
   },
 }));
 
+// Mock clear all app data
+const mockClearAllAppData = jest.fn().mockResolvedValue(undefined);
+jest.mock('@/lib/storage/clear-all-data', () => ({
+  clearAllAppData: () => mockClearAllAppData(),
+}));
+
+// Mock AlertDialog components
+jest.mock('@/components/ui/alert-dialog', () => ({
+  AlertDialog: ({ isOpen, onClose, children }: any) => {
+    const { View } = require('react-native');
+    return isOpen ? (
+      <View testID="logout-confirmation-dialog">{children}</View>
+    ) : null;
+  },
+  AlertDialogBackdrop: () => null,
+  AlertDialogContent: ({ children }: any) => {
+    const { View } = require('react-native');
+    return <View testID="alert-dialog-content">{children}</View>;
+  },
+  AlertDialogHeader: ({ children }: any) => {
+    const { View } = require('react-native');
+    return <View testID="alert-dialog-header">{children}</View>;
+  },
+  AlertDialogBody: ({ children }: any) => {
+    const { View } = require('react-native');
+    return <View testID="alert-dialog-body">{children}</View>;
+  },
+  AlertDialogFooter: ({ children }: any) => {
+    const { View } = require('react-native');
+    return <View testID="alert-dialog-footer">{children}</View>;
+  },
+}));
+
+// Mock Button components
+jest.mock('@/components/ui/button', () => ({
+  Button: ({ children, onPress, disabled, testID }: any) => {
+    const { TouchableOpacity } = require('react-native');
+    return (
+      <TouchableOpacity testID={testID} onPress={onPress} disabled={disabled}>
+        {children}
+      </TouchableOpacity>
+    );
+  },
+  ButtonText: ({ children }: any) => {
+    const { Text } = require('react-native');
+    return <Text>{children}</Text>;
+  },
+}));
+
+// Mock Text component
+jest.mock('@/components/ui/text', () => ({
+  Text: ({ children }: any) => {
+    const { Text: RNText } = require('react-native');
+    return <RNText>{children}</RNText>;
+  },
+}));
+
 describe('Settings Screen', () => {
   const mockUseColorScheme = useColorScheme as jest.MockedFunction<typeof useColorScheme>;
   const mockUseFocusEffect = useFocusEffect as jest.MockedFunction<typeof useFocusEffect>;
@@ -347,7 +404,7 @@ describe('Settings Screen', () => {
     expect(loginSheet.props.style.display).toBe('flex');
   });
 
-  it('handles logout press and tracks analytics', () => {
+  it('handles logout press and shows confirmation dialog', () => {
     render(<Settings />);
 
     const logoutItem = screen.getByTestId('item-settings.logout');
@@ -357,7 +414,59 @@ describe('Settings Screen', () => {
       timestamp: expect.any(String),
     });
 
-    expect(mockLogout).toHaveBeenCalledTimes(1);
+    // Confirmation dialog should now be shown
+    expect(screen.getByTestId('logout-confirmation-dialog')).toBeTruthy();
+    expect(screen.getByText('settings.logout_confirm_title')).toBeTruthy();
+    expect(screen.getByText('settings.logout_confirm_message')).toBeTruthy();
+  });
+
+  it('handles logout confirmation and clears all app data', async () => {
+    render(<Settings />);
+
+    // Open logout confirmation dialog
+    const logoutItem = screen.getByTestId('item-settings.logout');
+    fireEvent.press(logoutItem);
+
+    // Find and press the confirm button (Yes, Logout)
+    const confirmButton = screen.getByText('settings.logout_confirm_yes');
+    fireEvent.press(confirmButton);
+
+    await waitFor(() => {
+      expect(mockTrackEvent).toHaveBeenCalledWith('settings_logout_confirmed', {
+        timestamp: expect.any(String),
+      });
+    });
+
+    await waitFor(() => {
+      expect(mockClearAllAppData).toHaveBeenCalled();
+    });
+
+    await waitFor(() => {
+      expect(mockLogout).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('handles logout cancellation and does not clear data', () => {
+    render(<Settings />);
+
+    // Open logout confirmation dialog
+    const logoutItem = screen.getByTestId('item-settings.logout');
+    fireEvent.press(logoutItem);
+
+    // Dialog should be visible
+    expect(screen.getByTestId('logout-confirmation-dialog')).toBeTruthy();
+
+    // Find and press the cancel button
+    const cancelButton = screen.getByText('settings.logout_confirm_cancel');
+    fireEvent.press(cancelButton);
+
+    expect(mockTrackEvent).toHaveBeenCalledWith('settings_logout_cancelled', {
+      timestamp: expect.any(String),
+    });
+
+    // Logout and clear should not be called
+    expect(mockClearAllAppData).not.toHaveBeenCalled();
+    expect(mockLogout).not.toHaveBeenCalled();
   });
 
   it('handles support link presses and tracks analytics', () => {

src/app/(app)/home/units.tsx

@@ -2,6 +2,7 @@ import { useFocusEffect } from '@react-navigation/native';
 import { FlashList } from '@shopify/flash-list';
 import { Filter, Search, Truck, X } from 'lucide-react-native';
 import * as React from 'react';
+import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { View } from 'react-native';
 
@@ -24,7 +25,7 @@ import { useUnitsStore } from '@/stores/units/store';
 
 export default function Units() {
   const { t } = useTranslation();
-  const { units, searchQuery, setSearchQuery, selectUnit, isLoading, fetchUnits, selectedFilters, openFilterSheet } = useUnitsStore();
+  const { units, unitTypeStatuses, searchQuery, setSearchQuery, selectUnit, isLoading, fetchUnits, selectedFilters, openFilterSheet } = useUnitsStore();
   const { trackEvent } = useAnalytics();
   const [refreshing, setRefreshing] = React.useState(false);
 
@@ -47,6 +48,8 @@ export default function Units() {
     setRefreshing(false);
   }, [fetchUnits]);
 
+  const renderUnitItem = useCallback(({ item }: { item: any }) => <UnitCard unit={item} unitTypeStatuses={unitTypeStatuses} onPress={selectUnit} />, [unitTypeStatuses, selectUnit]);
+
   const filteredUnits = React.useMemo(() => {
     if (!searchQuery.trim()) return units;
 
@@ -96,7 +99,7 @@ export default function Units() {
             <FlashList
               data={filteredUnits}
               keyExtractor={(item, index) => item.UnitId || `unit-${index}`}
-              renderItem={({ item }) => <UnitCard unit={item as any} onPress={selectUnit} />}
+              renderItem={renderUnitItem}
               showsVerticalScrollIndicator={false}
               contentContainerStyle={{ paddingBottom: 100 }}
               refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} />}

src/app/(app)/protocols.tsx

@@ -77,7 +77,7 @@ export default function Protocols() {
           <FlashList
             testID="protocols-list"
             data={filteredProtocols}
-            keyExtractor={(item, index) => item.Id || `protocol-${index}`}
+            keyExtractor={(item, index) => item.ProtocolId || `protocol-${index}`}
             renderItem={({ item }) => <ProtocolCard protocol={item} onPress={selectProtocol} />}
             showsVerticalScrollIndicator={false}
             contentContainerStyle={{ paddingBottom: 100 }}

src/app/(app)/settings.tsx

@@ -2,7 +2,7 @@
 import { Env } from '@env';
 import { useFocusEffect } from '@react-navigation/native';
 import { useColorScheme } from 'nativewind';
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { BackgroundGeolocationItem } from '@/components/settings/background-geolocation-item';
@@ -16,14 +16,18 @@ import { ServerUrlBottomSheet } from '@/components/settings/server-url-bottom-sh
 import { ThemeItem } from '@/components/settings/theme-item';
 import { ToggleItem } from '@/components/settings/toggle-item';
 import { FocusAwareStatusBar, ScrollView } from '@/components/ui';
+import { AlertDialog, AlertDialogBackdrop, AlertDialogBody, AlertDialogContent, AlertDialogFooter, AlertDialogHeader } from '@/components/ui/alert-dialog';
 import { Box } from '@/components/ui/box';
+import { Button, ButtonText } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import { Heading } from '@/components/ui/heading';
+import { Text } from '@/components/ui/text';
 import { VStack } from '@/components/ui/vstack';
 import { useAnalytics } from '@/hooks/use-analytics';
 import { useAuth, useAuthStore } from '@/lib';
 import { logger } from '@/lib/logging';
 import { getBaseApiUrl } from '@/lib/storage/app';
+import { clearAllAppData } from '@/lib/storage/clear-all-data';
 import { openLinkInBrowser } from '@/lib/utils';
 import { useUnitsStore } from '@/stores/units/store';
 
@@ -36,6 +40,8 @@ export default function Settings() {
   const { login, status, isAuthenticated } = useAuth();
   const [showServerUrl, setShowServerUrl] = React.useState(false);
   const [showUnitSelection, setShowUnitSelection] = React.useState(false);
+  const [showLogoutConfirm, setShowLogoutConfirm] = useState(false);
+  const [isLoggingOut, setIsLoggingOut] = useState(false);
   const { units } = useUnitsStore();
 
   // Track analytics when view becomes visible
@@ -83,9 +89,54 @@ export default function Settings() {
     trackEvent('settings_logout_pressed', {
       timestamp: new Date().toISOString(),
     });
-    signOut();
+    setShowLogoutConfirm(true);
+  }, [trackEvent]);
+
+  const handleLogoutConfirm = useCallback(async () => {
+    setIsLoggingOut(true);
+    trackEvent('settings_logout_confirmed', {
+      timestamp: new Date().toISOString(),
+    });
+
+    logger.info({
+      message: 'User confirmed logout, clearing all app data',
+    });
+
+    try {
+      // Clear all app data (stores, storage, cached values)
+      await clearAllAppData({
+        resetStores: true,
+        clearStorage: true,
+        clearFilters: true,
+        clearSecure: false, // Keep secure keys for re-login
+      });
+
+      // Sign out the user
+      await signOut();
+
+      logger.info({
+        message: 'Logout completed successfully, all data cleared',
+      });
+    } catch (error) {
+      logger.error({
+        message: 'Error during logout data cleanup',
+        context: { error },
+      });
+      // Still sign out even if cleanup fails
+      await signOut();
+    } finally {
+      setIsLoggingOut(false);
+      setShowLogoutConfirm(false);
+    }
   }, [trackEvent, signOut]);
 
+  const handleLogoutCancel = useCallback(() => {
+    trackEvent('settings_logout_cancelled', {
+      timestamp: new Date().toISOString(),
+    });
+    setShowLogoutConfirm(false);
+  }, [trackEvent]);
+
   const handleSupportLinkPress = useCallback(
     (linkType: string, url: string) => {
       trackEvent('settings_support_link_pressed', {
@@ -160,6 +211,27 @@ export default function Settings() {
 
       <LoginInfoBottomSheet isOpen={showLoginInfo} onClose={() => setShowLoginInfo(false)} onSubmit={handleLoginInfoSubmit} />
       <ServerUrlBottomSheet isOpen={showServerUrl} onClose={() => setShowServerUrl(false)} />
+
+      {/* Logout Confirmation Dialog */}
+      <AlertDialog isOpen={showLogoutConfirm} onClose={handleLogoutCancel}>
+        <AlertDialogBackdrop />
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <Heading size="lg">{t('settings.logout_confirm_title')}</Heading>
+          </AlertDialogHeader>
+          <AlertDialogBody className="mb-4 mt-3">
+            <Text>{t('settings.logout_confirm_message')}</Text>
+          </AlertDialogBody>
+          <AlertDialogFooter>
+            <Button variant="outline" action="secondary" onPress={handleLogoutCancel} disabled={isLoggingOut} className="mr-3">
+              <ButtonText>{t('settings.logout_confirm_cancel')}</ButtonText>
+            </Button>
+            <Button action="negative" onPress={handleLogoutConfirm} disabled={isLoggingOut}>
+              <ButtonText>{isLoggingOut ? '...' : t('settings.logout_confirm_yes')}</ButtonText>
+            </Button>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
     </Box>
   );
 }