RR-T40 PR#96 fixes

Author: ucswift

src/components/calls/call-images-modal.tsx

@@ -392,10 +392,26 @@ const CallImagesModal: React.FC<CallImagesModalProps> = ({ isOpen, onClose, call
     }
   };
 
-  const handleImageError = (itemId: string, error: any) => {
+  const handleImageError = useCallback((itemId: string, error: any) => {
     console.error(`Image failed to load for ${itemId}:`, error);
     setImageErrors((prev) => new Set([...prev, itemId]));
-  };
+  }, []);
+
+  const handleImagePress = useCallback((imageSource: { uri: string }, itemName?: string) => {
+    setFullScreenImage({ source: imageSource, name: itemName });
+  }, []);
+
+  const handleImageLoadError = useCallback((itemId: string) => {
+    handleImageError(itemId, 'expo-image load error');
+  }, [handleImageError]);
+
+  const handleImageLoadSuccess = useCallback((itemId: string) => {
+    setImageErrors((prev) => {
+      const newSet = new Set(prev);
+      newSet.delete(itemId);
+      return newSet;
+    });
+  }, []);
 
   // Reset active index when valid images change
 
@@ -438,9 +454,7 @@ const CallImagesModal: React.FC<CallImagesModalProps> = ({ isOpen, onClose, call
     return (
       <Box className="w-full items-center justify-center px-4" style={{ width }}>
         <TouchableOpacity
-          onPress={() => {
-            setFullScreenImage({ source: imageSource, name: item.Name });
-          }}
+          onPress={() => handleImagePress(imageSource, item.Name)}
           testID={`image-${item.Id}-touchable`}
           activeOpacity={0.7}
           style={{ width: '100%' }}
@@ -456,17 +470,8 @@ const CallImagesModal: React.FC<CallImagesModalProps> = ({ isOpen, onClose, call
             pointerEvents="none"
             cachePolicy="memory-disk"
             recyclingKey={item.Id}
-            onError={() => {
-              handleImageError(item.Id, 'expo-image load error');
-            }}
-            onLoad={() => {
-              // Remove from error set if it loads successfully
-              setImageErrors((prev) => {
-                const newSet = new Set(prev);
-                newSet.delete(item.Id);
-                return newSet;
-              });
-            }}
+            onError={() => handleImageLoadError(item.Id)}
+            onLoad={() => handleImageLoadSuccess(item.Id)}
           />
         </TouchableOpacity>
         <Text className="mt-2 text-center font-medium">{item.Name || ''}</Text>

src/components/contacts/contact-details-sheet.tsx

@@ -200,6 +200,22 @@ const styles = StyleSheet.create({
   },
 });
 
+/**
+ * Safely formats a timestamp string with error handling.
+ * Returns formatted date string on success, empty string on failure.
+ */
+const safeFormatTimestamp = (timestamp: string | undefined | null, format: string): string => {
+  if (!timestamp) return '';
+
+  try {
+    const parsed = parseDateISOString(timestamp);
+    return formatDateForDisplay(parsed, format);
+  } catch (error) {
+    console.warn('Failed to parse timestamp:', timestamp, error);
+    return '';
+  }
+};
+
 export const ContactDetailsSheet: React.FC = () => {
   const { t } = useTranslation();
   const { width, height } = useWindowDimensions();
@@ -496,13 +512,13 @@ export const ContactDetailsSheet: React.FC = () => {
                     <VStack space="xs">
                       <ContactField
                         label={t('contacts.addedOn')}
-                        value={selectedContact.AddedOn ? formatDateForDisplay(parseDateISOString(selectedContact.AddedOn), 'yyyy-MM-dd HH:mm') : undefined}
+                        value={safeFormatTimestamp(selectedContact.AddedOn, 'yyyy-MM-dd HH:mm') || undefined}
                         icon={<CalendarIcon size={16} color="#6366F1" />}
                       />
                       <ContactField label={t('contacts.addedBy')} value={selectedContact.AddedByUserName} icon={<UserIcon size={16} color="#6366F1" />} />
                       <ContactField
                         label={t('contacts.editedOn')}
-                        value={selectedContact.EditedOn ? formatDateForDisplay(parseDateISOString(selectedContact.EditedOn), 'yyyy-MM-dd HH:mm') : undefined}
+                        value={safeFormatTimestamp(selectedContact.EditedOn, 'yyyy-MM-dd HH:mm') || undefined}
                         icon={<CalendarIcon size={16} color="#6366F1" />}
                       />
                       <ContactField label={t('contacts.editedBy')} value={selectedContact.EditedByUserName} icon={<UserIcon size={16} color="#6366F1" />} />

src/lib/hooks/__tests__/use-headset-button-ptt.test.ts

@@ -44,7 +44,7 @@ describe('useHeadsetButtonPTT', () => {
   // Default mock implementations
   const mockToggleMicrophone = jest.fn();
   const mockSetMicrophoneEnabled = jest.fn();
-  const mockStartHeadsetButtonMonitoring = jest.fn();
+  const mockStartHeadsetButtonMonitoring = jest.fn().mockResolvedValue(undefined);
   const mockStopHeadsetButtonMonitoring = jest.fn();
   const mockSetHeadsetButtonConfig = jest.fn();
 

src/lib/hooks/use-headset-button-ptt.ts

@@ -139,15 +139,19 @@ export function useHeadsetButtonPTT(options: UseHeadsetButtonPTTOptions = {}): U
   // if connectToRoom in the LiveKit store already started monitoring
   useEffect(() => {
     if (autoStartOnConnect && isConnected && !isHeadsetButtonMonitoring) {
-      startHeadsetButtonMonitoring();
+      startHeadsetButtonMonitoring().catch((error) => {
+        console.error('Failed to start headset button monitoring:', error);
+      });
     } else if (autoStopOnDisconnect && !isConnected && isHeadsetButtonMonitoring) {
       stopHeadsetButtonMonitoring();
     }
   }, [isConnected, isHeadsetButtonMonitoring, autoStartOnConnect, autoStopOnDisconnect, startHeadsetButtonMonitoring, stopHeadsetButtonMonitoring]);
 
   // Start monitoring
   const startMonitoring = useCallback(() => {
-    startHeadsetButtonMonitoring();
+    startHeadsetButtonMonitoring().catch((error) => {
+      console.error('Failed to start headset button monitoring:', error);
+    });
   }, [startHeadsetButtonMonitoring]);
 
   // Stop monitoring
@@ -160,7 +164,9 @@ export function useHeadsetButtonPTT(options: UseHeadsetButtonPTTOptions = {}): U
     if (isHeadsetButtonMonitoring) {
       stopHeadsetButtonMonitoring();
     } else {
-      startHeadsetButtonMonitoring();
+      startHeadsetButtonMonitoring().catch((error) => {
+        console.error('Failed to start headset button monitoring:', error);
+      });
     }
   }, [isHeadsetButtonMonitoring, startHeadsetButtonMonitoring, stopHeadsetButtonMonitoring]);
 

src/services/headset-button.service.ts

@@ -435,8 +435,15 @@ class HeadsetButtonService {
 
     // Set timer to process the final action
     this.buttonPressTimer = setTimeout(() => {
-      this.executeButtonAction(event, this.buttonPressCount);
-      this.buttonPressCount = 0;
+      (async () => {
+        try {
+          await this.executeButtonAction(event, this.buttonPressCount);
+        } catch (error) {
+          console.error('Error executing button action:', error);
+        } finally {
+          this.buttonPressCount = 0;
+        }
+      })();
     }, this.DOUBLE_CLICK_THRESHOLD);
   }
 

src/stores/app/livekit-store.ts

@@ -98,7 +98,7 @@ interface LiveKitState {
   setMicrophoneEnabled: (enabled: boolean) => Promise<void>;
 
   // Headset button PTT
-  startHeadsetButtonMonitoring: () => void;
+  startHeadsetButtonMonitoring: () => Promise<void>;
   stopHeadsetButtonMonitoring: () => void;
 }