RU-T47 PR#202 fixes

Author: ucswift

.github/workflows/react-native-cicd.yml

@@ -608,17 +608,15 @@ jobs:
 
       - name: 📦 Prepare Electron release artifacts
         run: |
-          # Find all matching Electron artifacts
-          FILES=$(find electron-artifacts/ -type f \( -name "*.exe" -o -name "*.msi" -o -name "*.dmg" -o -name "*.zip" -o -name "*.AppImage" -o -name "*.deb" -o -name "*.rpm" \))
-          
-          if [ -z "$FILES" ]; then
+          # Find all matching Electron artifacts and check for existence
+          if [ -z "$(find electron-artifacts/ -type f \( -name "*.exe" -o -name "*.msi" -o -name "*.dmg" -o -name "*.zip" -o -name "*.AppImage" -o -name "*.deb" -o -name "*.rpm" \) -print -quit)" ]; then
             echo "Error: No Electron artifacts found in electron-artifacts/ directory."
             exit 1
           fi
           
-          # Create release-artifacts directory and copy files
+          # Create release-artifacts directory and copy files using null-delimited find/xargs
           mkdir -p release-artifacts
-          echo "$FILES" | xargs -I {} cp {} release-artifacts/
+          find electron-artifacts/ -type f \( -name "*.exe" -o -name "*.msi" -o -name "*.dmg" -o -name "*.zip" -o -name "*.AppImage" -o -name "*.deb" -o -name "*.rpm" \) -print0 | xargs -0 cp -t release-artifacts/
           
           echo "Release artifacts prepared:"
           ls -lh release-artifacts/

src/app/(app)/calls.tsx

@@ -106,7 +106,7 @@ export default function Calls() {
 
         {/* FAB button for creating new call - only show if user has permission */}
         {canUserCreateCalls ? (
-          <Fab placement="bottom right" size="lg" onPress={handleNewCall} testID="new-call-fab">
+          <Fab size="lg" onPress={handleNewCall} testID="new-call-fab">
             <FabIcon as={PlusIcon} size="lg" />
           </Fab>
         ) : null}

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

@@ -262,7 +262,7 @@ const CallImagesModal: React.FC<CallImagesModalProps> = ({ isOpen, onClose, call
     // At this point, imageSource is guaranteed to be non-null
     return (
       <Box className="w-full items-center justify-center px-4" style={{ width }}>
-        <TouchableOpacity onPress={() => handleImagePress(imageSource, item.Name)} testID={`image-${item.Id}-touchable`} activeOpacity={0.7} style={{ width: '100%' }} delayPressIn={0} delayPressOut={0}>
+        <TouchableOpacity onPress={() => handleImagePress(imageSource!, item.Name)} testID={`image-${item.Id}-touchable`} activeOpacity={0.7} style={{ width: '100%' }} delayPressIn={0} delayPressOut={0}>
           <Image
             key={`${item.Id}-${index}`}
             source={imageSource}

src/components/maps/map-view.web.tsx

@@ -14,7 +14,7 @@ import { Env } from '@/lib/env';
 mapboxgl.accessToken = Env.UNIT_MAPBOX_PUBKEY;
 
 // Context to share map instance with child components
-export const MapContext = React.createContext<mapboxgl.Map | null>(null);
+export const MapContext = React.createContext<any | null>(null);
 
 // StyleURL constants matching native Mapbox SDK
 export const StyleURL = {
@@ -76,7 +76,7 @@ export const MapView = forwardRef<any, MapViewProps>(
     ref
   ) => {
     const mapContainer = useRef<HTMLDivElement>(null);
-    const map = useRef<mapboxgl.Map | null>(null);
+    const map = useRef<any | null>(null);
     const [isLoaded, setIsLoaded] = useState(false);
 
     useImperativeHandle(ref, () => ({
@@ -166,7 +166,7 @@ interface CameraProps {
 // Camera component
 export const Camera = forwardRef<any, CameraProps>(({ centerCoordinate, zoomLevel, heading, pitch, animationDuration = 1000, followUserLocation, followZoomLevel }, ref) => {
   const map = React.useContext(MapContext);
-  const geolocateControl = useRef<mapboxgl.GeolocateControl | null>(null);
+  const geolocateControl = useRef<any | null>(null);
 
   useImperativeHandle(ref, () => ({
     setCamera: (options: { centerCoordinate?: [number, number]; zoomLevel?: number; heading?: number; pitch?: number; animationDuration?: number }) => {
@@ -203,6 +203,8 @@ export const Camera = forwardRef<any, CameraProps>(({ centerCoordinate, zoomLeve
   useEffect(() => {
     if (!map || !followUserLocation) return;
 
+    let triggerTimeoutId: any;
+
     // Add geolocate control for following user
     if (!geolocateControl.current) {
       geolocateControl.current = new mapboxgl.GeolocateControl({
@@ -216,11 +218,14 @@ export const Camera = forwardRef<any, CameraProps>(({ centerCoordinate, zoomLeve
     }
 
     // Trigger tracking after control is added
-    setTimeout(() => {
+    triggerTimeoutId = setTimeout(() => {
       geolocateControl.current?.trigger();
     }, 100);
 
     return () => {
+      if (triggerTimeoutId) {
+        clearTimeout(triggerTimeoutId);
+      }
       if (geolocateControl.current) {
         map.removeControl(geolocateControl.current);
         geolocateControl.current = null;
@@ -246,7 +251,7 @@ interface PointAnnotationProps {
 // PointAnnotation component
 export const PointAnnotation: React.FC<PointAnnotationProps> = ({ id, coordinate, title, children, anchor = { x: 0.5, y: 0.5 }, onSelected }) => {
   const map = React.useContext(MapContext);
-  const markerRef = useRef<mapboxgl.Marker | null>(null);
+  const markerRef = useRef<any | null>(null);
   const containerRef = useRef<HTMLDivElement | null>(null);
   const containerRootRef = useRef<any>(null);
 
@@ -266,18 +271,16 @@ export const PointAnnotation: React.FC<PointAnnotationProps> = ({ id, coordinate
     }
 
     // Determine marker options based on anchor prop
-    const markerOptions: mapboxgl.MarkerOptions = {
+    const markerOptions: any = {
       element: container,
     };
 
     // Handle anchor prop - if it's a string, use it as mapbox anchor
     if (typeof anchor === 'string') {
-      markerOptions.anchor = anchor as mapboxgl.Anchor;
+      markerOptions.anchor = anchor as any;
     }
 
-    markerRef.current = new mapboxgl.Marker(markerOptions)
-      .setLngLat(coordinate)
-      .addTo(map);
+    markerRef.current = new mapboxgl.Marker(markerOptions).setLngLat(coordinate).addTo(map);
 
     // If anchor is an {x, y} object, convert to pixel offset
     if (typeof anchor === 'object' && anchor !== null && 'x' in anchor && 'y' in anchor) {

src/components/ui/bottomsheet/index.tsx

@@ -36,14 +36,14 @@ const bottomSheetItemStyle = tva({
 
 const BottomSheetContext = createContext<{
   visible: boolean;
-  bottomSheetRef: React.RefObject<GorhomBottomSheet | null>;
+  bottomSheetRef: React.RefObject<GorhomBottomSheet> | null;
   handleClose: () => void;
   handleOpen: () => void;
 }>({
   visible: false,
-  bottomSheetRef: { current: null },
-  handleClose: () => {},
-  handleOpen: () => {},
+  bottomSheetRef: null,
+  handleClose: () => { },
+  handleOpen: () => { },
 });
 
 type IBottomSheetProps = React.ComponentProps<typeof GorhomBottomSheet>;
@@ -68,7 +68,7 @@ export const BottomSheet = ({ snapToIndex = 1, onOpen, onClose, ...props }: { sn
     <BottomSheetContext.Provider
       value={{
         visible,
-        bottomSheetRef,
+        bottomSheetRef: bottomSheetRef as React.RefObject<GorhomBottomSheet>,
         handleClose,
         handleOpen,
       }}
@@ -166,14 +166,14 @@ export const BottomSheetContent = ({ ...props }: IBottomSheetContent) => {
   const keyDownHandlers = useMemo(() => {
     return Platform.OS === 'web'
       ? {
-          onKeyDown: (e: React.KeyboardEvent) => {
-            if (e.key === 'Escape') {
-              e.preventDefault();
-              handleClose();
-              return;
-            }
-          },
-        }
+        onKeyDown: (e: React.KeyboardEvent) => {
+          if (e.key === 'Escape') {
+            e.preventDefault();
+            handleClose();
+            return;
+          }
+        },
+      }
       : {};
   }, [handleClose]);
 

src/lib/platform.ts

@@ -9,9 +9,7 @@ export const isWeb = Platform.OS === 'web';
 
 // Check if running in Electron (desktop app wrapped around web)
 // Prefer preload-exposed electronAPI for contextIsolation-enabled environments
-export const isElectron = 
-  typeof window !== 'undefined' && 
-  (!!(window as any).electronAPI || window.process?.type === 'renderer');
+export const isElectron = typeof window !== 'undefined' && (!!(window as any).electronAPI || window.process?.type === 'renderer');
 
 // Check if running on a desktop platform (Electron or native desktop)
 export const isDesktop = isElectron || Platform.OS === 'macos' || Platform.OS === 'windows';

src/services/__tests__/callkeep.service.ios.test.ts

@@ -157,9 +157,10 @@ describe('CallKeepService', () => {
       // Register callback
       service.setMuteStateCallback(mockMuteCallback);
 
+      // Simulate mute event
       // Simulate mute event
       const muteEventHandler = mockCallKeep.addEventListener.mock.calls.find(
-        call => call[0] === 'didPerformSetMutedCallAction'
+        (call: any[]) => call[0] === 'didPerformSetMutedCallAction'
       )?.[1] as any;
 
       expect(muteEventHandler).toBeDefined();
@@ -191,7 +192,7 @@ describe('CallKeepService', () => {
       service.setMuteStateCallback(errorCallback);
 
       const muteEventHandler = mockCallKeep.addEventListener.mock.calls.find(
-        call => call[0] === 'didPerformSetMutedCallAction'
+        (call: any[]) => call[0] === 'didPerformSetMutedCallAction'
       )?.[1] as any;
 
       if (muteEventHandler) {
@@ -226,7 +227,7 @@ describe('CallKeepService', () => {
       service.setMuteStateCallback(null);
 
       const muteEventHandler = mockCallKeep.addEventListener.mock.calls.find(
-        call => call[0] === 'didPerformSetMutedCallAction'
+        (call: any[]) => call[0] === 'didPerformSetMutedCallAction'
       )?.[1] as any;
 
       if (muteEventHandler) {

src/services/callkeep.service.ios.ts

@@ -247,7 +247,7 @@ export class CallKeepService {
     });
 
     // Call ended from CallKit UI
-    RNCallKeep.addEventListener('endCall', ({ callUUID }) => {
+    RNCallKeep.addEventListener('endCall', ({ callUUID }: { callUUID: string }) => {
       logger.info({
         message: 'CallKeep call ended from system UI',
         context: { callUUID },
@@ -260,15 +260,15 @@ export class CallKeepService {
     });
 
     // Call answered (not typically used for outgoing calls, but good to handle)
-    RNCallKeep.addEventListener('answerCall', ({ callUUID }) => {
+    RNCallKeep.addEventListener('answerCall', ({ callUUID }: { callUUID: string }) => {
       logger.debug({
         message: 'CallKeep call answered',
         context: { callUUID },
       });
     });
 
     // Mute/unmute events
-    RNCallKeep.addEventListener('didPerformSetMutedCallAction', ({ muted, callUUID }) => {
+    RNCallKeep.addEventListener('didPerformSetMutedCallAction', ({ muted, callUUID }: { muted: boolean; callUUID: string }) => {
       logger.debug({
         message: 'CallKeep mute state changed',
         context: { muted, callUUID },

src/services/push-notification.ts

@@ -109,7 +109,7 @@ class PushNotificationService {
     }
   }
 
-  private handleRemoteMessage = async (remoteMessage: FirebaseMessagingTypes.RemoteMessage): Promise<void> => {
+  private handleRemoteMessage = async (remoteMessage: any): Promise<void> => {
     logger.info({
       message: 'FCM message received',
       context: {
@@ -238,7 +238,7 @@ class PushNotificationService {
 
     // Register background message handler (only once)
     if (!this.backgroundMessageHandlerRegistered) {
-      messaging().setBackgroundMessageHandler(async (remoteMessage) => {
+      messaging().setBackgroundMessageHandler(async (remoteMessage: any) => {
         logger.info({
           message: 'Background FCM message received',
           context: {
@@ -278,7 +278,7 @@ class PushNotificationService {
     this.fcmOnMessageUnsubscribe = messaging().onMessage(this.handleRemoteMessage);
 
     // Listen for notification opened app (when user taps on notification)
-    this.fcmOnNotificationOpenedAppUnsubscribe = messaging().onNotificationOpenedApp((remoteMessage) => {
+    this.fcmOnNotificationOpenedAppUnsubscribe = messaging().onNotificationOpenedApp((remoteMessage: any) => {
       logger.info({
         message: 'Notification opened app (from background)',
         context: {
@@ -319,7 +319,7 @@ class PushNotificationService {
     setTimeout(() => {
       messaging()
         .getInitialNotification()
-        .then((remoteMessage) => {
+        .then((remoteMessage: any) => {
           if (remoteMessage) {
             logger.info({
               message: 'App opened from notification (killed state)',
@@ -356,7 +356,7 @@ class PushNotificationService {
             }, 500);
           }
         })
-        .catch((error) => {
+        .catch((error: any) => {
           logger.error({
             message: 'Error checking initial notification',
             context: { error },
@@ -468,7 +468,7 @@ class PushNotificationService {
       // Register device with backend
       await registerUnitDevice({
         UnitId: unitId,
-        Token: this.pushToken,
+        Token: this.pushToken || '',
         Platform: Platform.OS === 'ios' ? 1 : 2,
         DeviceUuid: getDeviceUuid() || '',
         Prefix: departmentCode,

src/services/push-notification.web.ts

@@ -222,10 +222,10 @@ class WebPushNotificationService {
       }
 
       const success = await this.pushSubscription.unsubscribe();
-      
+
       if (success) {
         this.pushSubscription = null;
-        
+
         // Clear any potential persisted client-side records
         // Explicitly clearing any typical local storage keys as a safety measure
         try {