From 885755b179869235300a3b32fc7677ce4726b1fd Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Wed, 18 Feb 2026 19:22:06 -0800
Subject: [PATCH 1/5] RU-T47 Fixing PTT issue

---
 .eslintrc.js                                  |   1 +
 package.json                                  |  12 +-
 plugins/withInCallAudioModule.js              |  48 +-
 .../call-detail-menu-analytics.test.tsx       |   8 +
 .../call-detail-menu-integration.test.tsx     |   9 +
 .../livekit/livekit-bottom-sheet.tsx          |  33 +-
 ...oth-device-selection-bottom-sheet.test.tsx |   2 +-
 .../settings/audio-device-selection.tsx       |  27 +-
 .../settings/bluetooth-device-item.tsx        |   5 +-
 ...luetooth-device-selection-bottom-sheet.tsx |  32 +-
 src/components/sidebar/call-sidebar.tsx       |   5 +-
 .../gps-coordinate-duplication-fix.test.tsx   |   9 +
 .../status-gps-integration-working.test.tsx   |   9 +
 .../__tests__/status-gps-integration.test.tsx |   9 +
 src/components/ui/bottom-sheet.tsx            |   6 +-
 src/components/ui/html-renderer/index.web.tsx |   9 +-
 .../__tests__/useLiveKitCallStore.test.ts     |   6 +
 .../livekit-call/store/useLiveKitCallStore.ts |   5 +
 src/lib/logging/index.tsx                     |   5 +-
 src/services/__tests__/audio.service.test.ts  |   6 +
 .../__tests__/bluetooth-audio.service.test.ts |  49 ++
 src/services/audio.service.ts                 |   8 +-
 src/services/bluetooth-audio.service.ts       | 646 ++++++++++++++++--
 src/services/callkeep.service.android.ts      |  90 ++-
 src/stores/app/livekit-store.ts               |  74 +-
 .../calls/__tests__/detail-store.test.ts      |  32 +-
 src/translations/ar.json                      |   7 +
 src/translations/en.json                      |   7 +
 src/translations/es.json                      |   7 +
 yarn.lock                                     |  77 +--
 30 files changed, 1012 insertions(+), 231 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 96a6bed9..a69187ca 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -44,6 +44,7 @@ module.exports = {
       files: ['src/translations/*.json'],
       extends: ['plugin:i18n-json/recommended'],
       rules: {
+        '@typescript-eslint/consistent-type-imports': 'off',
         'i18n-json/valid-message-syntax': [
           2,
           {
diff --git a/package.json b/package.json
index c1e93dcc..6122de68 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "lint": "eslint src --ext .ts,.tsx --cache --cache-location node_modules/.cache/eslint",
     "type-check": "tsc  --noemit",
     "lint:translations": "eslint ./src/translations/ --fix --ext .json  ",
-    "test": "jest --coverage=true --coverageReporters=cobertura",
+    "test": "jest --runInBand --coverage=true --coverageReporters=cobertura",
     "check-all": "yarn run lint && yarn run type-check && yarn run lint:translations",
     "test:ci": "yarn run test --coverage",
     "test:watch": "yarn run test --watch",
@@ -109,6 +109,7 @@
     "app-icon-badge": "^0.1.2",
     "axios": "~1.12.0",
     "babel-plugin-module-resolver": "^5.0.2",
+    "babel-plugin-transform-import-meta": "^2.3.3",
     "buffer": "^6.0.3",
     "countly-sdk-react-native-bridge": "25.4.1",
     "date-fns": "^4.1.0",
@@ -174,8 +175,7 @@
     "react-query-kit": "~3.3.0",
     "tailwind-variants": "~0.2.1",
     "zod": "~3.23.8",
-    "zustand": "~4.5.5",
-    "babel-plugin-transform-import-meta": "^2.3.3"
+    "zustand": "~4.5.5"
   },
   "devDependencies": {
     "@babel/core": "~7.26.0",
@@ -191,8 +191,8 @@
     "@types/mapbox-gl": "3.4.1",
     "@types/react": "~19.0.10",
     "@types/react-native-base64": "~0.2.2",
-    "@typescript-eslint/eslint-plugin": "~5.62.0",
-    "@typescript-eslint/parser": "~5.62.0",
+    "@typescript-eslint/eslint-plugin": "~7.18.0",
+    "@typescript-eslint/parser": "~7.18.0",
     "babel-jest": "~30.0.0",
     "concurrently": "9.2.1",
     "cross-env": "~7.0.3",
@@ -226,7 +226,7 @@
     "tailwindcss": "3.4.4",
     "ts-jest": "~29.1.2",
     "ts-node": "~10.9.2",
-    "typescript": "~5.8.3",
+    "typescript": "~5.5.4",
     "wait-on": "9.0.3"
   },
   "repository": {
diff --git a/plugins/withInCallAudioModule.js b/plugins/withInCallAudioModule.js
index 5add14d4..51ad5a8d 100644
--- a/plugins/withInCallAudioModule.js
+++ b/plugins/withInCallAudioModule.js
@@ -12,7 +12,6 @@ import android.content.Context
 import android.media.AudioAttributes
 import android.media.AudioManager
 import android.media.SoundPool
-import android.os.Build
 import android.util.Log
 import com.facebook.react.bridge.*
 
@@ -101,6 +100,53 @@ class InCallAudioModule(reactContext: ReactApplicationContext) : ReactContextBas
         }
     }
 
+      @ReactMethod
+      fun setAudioRoute(route: String, promise: Promise) {
+        try {
+          val audioManager = reactApplicationContext.getSystemService(Context.AUDIO_SERVICE) as? AudioManager
+          if (audioManager == null) {
+            promise.reject("AUDIO_MANAGER_UNAVAILABLE", "AudioManager is not available")
+            return
+          }
+
+          val normalizedRoute = route.lowercase()
+          audioManager.mode = AudioManager.MODE_IN_COMMUNICATION
+
+          when (normalizedRoute) {
+            "bluetooth" -> {
+              audioManager.isSpeakerphoneOn = false
+              audioManager.isBluetoothScoOn = true
+              if (audioManager.isBluetoothScoAvailableOffCall) {
+                audioManager.startBluetoothSco()
+              }
+            }
+
+            "speaker" -> {
+              audioManager.stopBluetoothSco()
+              audioManager.isBluetoothScoOn = false
+              audioManager.isSpeakerphoneOn = true
+            }
+
+            "earpiece", "default" -> {
+              audioManager.stopBluetoothSco()
+              audioManager.isBluetoothScoOn = false
+              audioManager.isSpeakerphoneOn = false
+            }
+
+            else -> {
+              promise.reject("INVALID_AUDIO_ROUTE", "Unsupported audio route: $route")
+              return
+            }
+          }
+
+          Log.d(TAG, "Audio route set to: $normalizedRoute")
+          promise.resolve(true)
+        } catch (error: Exception) {
+          Log.e(TAG, "Failed to set audio route: $route", error)
+          promise.reject("SET_AUDIO_ROUTE_FAILED", error.message, error)
+        }
+      }
+
     @ReactMethod
     fun cleanup() {
         soundPool?.release()
diff --git a/src/components/calls/__tests__/call-detail-menu-analytics.test.tsx b/src/components/calls/__tests__/call-detail-menu-analytics.test.tsx
index 575387fe..e76dbd05 100644
--- a/src/components/calls/__tests__/call-detail-menu-analytics.test.tsx
+++ b/src/components/calls/__tests__/call-detail-menu-analytics.test.tsx
@@ -6,6 +6,14 @@ import { useAnalytics } from '@/hooks/use-analytics';
 
 // Mock dependencies
 jest.mock('@/hooks/use-analytics');
+jest.mock('@/lib/logging', () => ({
+  logger: {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
 jest.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string) => key,
diff --git a/src/components/calls/__tests__/call-detail-menu-integration.test.tsx b/src/components/calls/__tests__/call-detail-menu-integration.test.tsx
index 1f1d347b..0adbf937 100644
--- a/src/components/calls/__tests__/call-detail-menu-integration.test.tsx
+++ b/src/components/calls/__tests__/call-detail-menu-integration.test.tsx
@@ -65,6 +65,15 @@ jest.mock('@/components/ui/', () => ({
   },
 }));
 
+jest.mock('@/lib/logging', () => ({
+  logger: {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
 describe('Call Detail Menu Integration Test', () => {
   const mockOnEditCall = jest.fn();
   const mockOnCloseCall = jest.fn();
diff --git a/src/components/livekit/livekit-bottom-sheet.tsx b/src/components/livekit/livekit-bottom-sheet.tsx
index 88e1fdc8..33a37adb 100644
--- a/src/components/livekit/livekit-bottom-sheet.tsx
+++ b/src/components/livekit/livekit-bottom-sheet.tsx
@@ -6,7 +6,6 @@ import { ScrollView, StyleSheet, TouchableOpacity, View } from 'react-native';
 
 import { useAnalytics } from '@/hooks/use-analytics';
 import { type DepartmentVoiceChannelResultData } from '@/models/v4/voice/departmentVoiceResultData';
-import { audioService } from '@/services/audio.service';
 import { useBluetoothAudioStore } from '@/stores/app/bluetooth-audio-store';
 
 import { Card } from '../../components/ui/card';
@@ -35,6 +34,9 @@ export const LiveKitBottomSheet = () => {
   const isConnected = useLiveKitStore((s) => s.isConnected);
   const isConnecting = useLiveKitStore((s) => s.isConnecting);
   const isTalking = useLiveKitStore((s) => s.isTalking);
+  const isMicrophoneEnabled = useLiveKitStore((s) => s.isMicrophoneEnabled);
+  const setMicrophoneEnabled = useLiveKitStore((s) => s.setMicrophoneEnabled);
+  const lastLocalMuteChangeTimestamp = useLiveKitStore((s) => s.lastLocalMuteChangeTimestamp);
 
   const selectedAudioDevices = useBluetoothAudioStore((s) => s.selectedAudioDevices);
   const { colorScheme } = useColorScheme();
@@ -77,11 +79,8 @@ export const LiveKitBottomSheet = () => {
 
   // Sync mute state with LiveKit room
   useEffect(() => {
-    if (currentRoom?.localParticipant) {
-      const micEnabled = currentRoom.localParticipant.isMicrophoneEnabled;
-      setIsMuted(!micEnabled);
-    }
-  }, [currentRoom?.localParticipant, currentRoom?.localParticipant?.isMicrophoneEnabled]);
+    setIsMuted(!isMicrophoneEnabled);
+  }, [isMicrophoneEnabled, lastLocalMuteChangeTimestamp]);
 
   useEffect(() => {
     // If we're showing the sheet, make sure we have the latest rooms
@@ -135,25 +134,11 @@ export const LiveKitBottomSheet = () => {
   );
 
   const handleMuteToggle = useCallback(async () => {
-    if (currentRoom?.localParticipant) {
-      const newMicEnabled = isMuted; // If currently muted, enable mic
-      try {
-        await currentRoom.localParticipant.setMicrophoneEnabled(newMicEnabled);
-        setIsMuted(!newMicEnabled);
-
-        // Play appropriate sound based on mute state
-        if (newMicEnabled) {
-          // Mic is being unmuted
-          await audioService.playStartTransmittingSound();
-        } else {
-          // Mic is being muted
-          await audioService.playStopTransmittingSound();
-        }
-      } catch (error) {
-        console.error('Failed to toggle microphone:', error);
-      }
+    if (isConnected) {
+      const newMicEnabled = isMuted;
+      await setMicrophoneEnabled(newMicEnabled);
     }
-  }, [currentRoom, isMuted]);
+  }, [isConnected, isMuted, setMicrophoneEnabled]);
 
   const handleDisconnect = useCallback(() => {
     disconnectFromRoom();
diff --git a/src/components/settings/__tests__/bluetooth-device-selection-bottom-sheet.test.tsx b/src/components/settings/__tests__/bluetooth-device-selection-bottom-sheet.test.tsx
index b3248a46..a91f01c2 100644
--- a/src/components/settings/__tests__/bluetooth-device-selection-bottom-sheet.test.tsx
+++ b/src/components/settings/__tests__/bluetooth-device-selection-bottom-sheet.test.tsx
@@ -338,7 +338,7 @@ describe('BluetoothDeviceSelectionBottomSheet', () => {
 
     render(<BluetoothDeviceSelectionBottomSheet {...mockProps} />);
 
-    expect(screen.getByText('bluetooth.bluetooth_disabled')).toBeTruthy();
+    expect(screen.getByText('bluetooth.poweredOff')).toBeTruthy();
   });
 
   it('displays connection errors', () => {
diff --git a/src/components/settings/audio-device-selection.tsx b/src/components/settings/audio-device-selection.tsx
index 043c18f6..535aa85f 100644
--- a/src/components/settings/audio-device-selection.tsx
+++ b/src/components/settings/audio-device-selection.tsx
@@ -48,6 +48,25 @@ export const AudioDeviceSelection: React.FC<AudioDeviceSelectionProps> = ({ show
     }
   };
 
+  const getDeviceDisplayName = (device: AudioDeviceInfo) => {
+    const normalizedId = device.id.toLowerCase();
+    const normalizedName = device.name.toLowerCase();
+
+    if (normalizedId === 'system-audio' || normalizedName === 'system audio' || normalizedName === 'system-audio' || normalizedName === 'system_audio') {
+      return t('settings.audio_device_selection.system_audio');
+    }
+
+    if (normalizedId === 'default-mic' || normalizedName === 'default microphone') {
+      return t('settings.audio_device_selection.default_microphone');
+    }
+
+    if (normalizedId === 'default-speaker' || normalizedName === 'default speaker') {
+      return t('settings.audio_device_selection.default_speaker');
+    }
+
+    return device.name;
+  };
+
   const renderDeviceItem = (device: AudioDeviceInfo, isSelected: boolean, onSelect: () => void, deviceType: 'microphone' | 'speaker') => {
     const deviceTypeLabel = getDeviceTypeLabel(device.type);
     const unavailableText = !device.isAvailable ? ` (${t('settings.audio_device_selection.unavailable')})` : '';
@@ -59,7 +78,7 @@ export const AudioDeviceSelection: React.FC<AudioDeviceSelectionProps> = ({ show
             <HStack className="flex-1 items-center" space="md">
               {renderDeviceIcon(device)}
               <VStack className="flex-1">
-                <Text className={`font-medium ${isSelected ? 'text-blue-900 dark:text-blue-100' : 'text-gray-900 dark:text-gray-100'}`}>{device.name}</Text>
+                <Text className={`font-medium ${isSelected ? 'text-blue-900 dark:text-blue-100' : 'text-gray-900 dark:text-gray-100'}`}>{getDeviceDisplayName(device)}</Text>
                 <Text className={`text-sm ${isSelected ? 'text-blue-700 dark:text-blue-300' : 'text-gray-500 dark:text-gray-400'}`}>
                   {deviceTypeLabel}
                   {unavailableText}
@@ -95,12 +114,14 @@ export const AudioDeviceSelection: React.FC<AudioDeviceSelectionProps> = ({ show
 
             <HStack className="items-center justify-between">
               <Text className="text-blue-800 dark:text-blue-200">{t('settings.audio_device_selection.microphone')}:</Text>
-              <Text className="font-medium text-blue-900 dark:text-blue-100">{selectedAudioDevices.microphone?.name || t('settings.audio_device_selection.none_selected')}</Text>
+              <Text className="font-medium text-blue-900 dark:text-blue-100">
+                {selectedAudioDevices.microphone ? getDeviceDisplayName(selectedAudioDevices.microphone) : t('settings.audio_device_selection.none_selected')}
+              </Text>
             </HStack>
 
             <HStack className="items-center justify-between">
               <Text className="text-blue-800 dark:text-blue-200">{t('settings.audio_device_selection.speaker')}:</Text>
-              <Text className="font-medium text-blue-900 dark:text-blue-100">{selectedAudioDevices.speaker?.name || t('settings.audio_device_selection.none_selected')}</Text>
+              <Text className="font-medium text-blue-900 dark:text-blue-100">{selectedAudioDevices.speaker ? getDeviceDisplayName(selectedAudioDevices.speaker) : t('settings.audio_device_selection.none_selected')}</Text>
             </HStack>
           </VStack>
         </Card>
diff --git a/src/components/settings/bluetooth-device-item.tsx b/src/components/settings/bluetooth-device-item.tsx
index e1aee960..6b0d5aa7 100644
--- a/src/components/settings/bluetooth-device-item.tsx
+++ b/src/components/settings/bluetooth-device-item.tsx
@@ -1,4 +1,4 @@
-import { BluetoothIcon, ChevronRightIcon } from 'lucide-react-native';
+import { ChevronRightIcon } from 'lucide-react-native';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -20,6 +20,9 @@ export const BluetoothDeviceItem = () => {
 
   const deviceDisplayName = React.useMemo(() => {
     if (preferredDevice) {
+      if (preferredDevice.id === 'system-audio') {
+        return t('bluetooth.system_audio');
+      }
       return preferredDevice.name;
     }
     return t('bluetooth.no_device_selected');
diff --git a/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx b/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
index 84f9f8e6..ac50b684 100644
--- a/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
+++ b/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
@@ -37,14 +37,7 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
   const connectionError = useBluetoothAudioStore((s) => s.connectionError);
   const [hasScanned, setHasScanned] = useState(false);
   const [connectingDeviceId, setConnectingDeviceId] = useState<string | null>(null);
-
-  // Start scanning when sheet opens
-  useEffect(() => {
-    if (isOpen && !hasScanned) {
-      startScan();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isOpen, hasScanned]);
+  const preferredDeviceDisplayName = preferredDevice?.id === 'system-audio' ? t('bluetooth.system_audio') : preferredDevice?.name;
 
   const startScan = React.useCallback(async () => {
     try {
@@ -61,6 +54,13 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
     }
   }, [t]);
 
+  // Start scanning when sheet opens
+  useEffect(() => {
+    if (isOpen && !hasScanned) {
+      startScan();
+    }
+  }, [isOpen, hasScanned, startScan]);
+
   const handleDeviceSelect = React.useCallback(
     async (device: BluetoothAudioDevice) => {
       try {
@@ -222,7 +222,7 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
   }, [isScanning, hasScanned, startScan, t]);
 
   return (
-    <CustomBottomSheet isOpen={isOpen} onClose={onClose}>
+    <CustomBottomSheet isOpen={isOpen} onClose={onClose} snapPoints={[85]} minHeight="min-h-0">
       <VStack className="flex-1 p-4">
         <Heading className="mb-4 text-lg">{t('bluetooth.select_device')}</Heading>
 
@@ -232,7 +232,7 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
             <HStack className="items-center justify-between">
               <VStack>
                 <Text className="text-sm font-medium text-neutral-900 dark:text-neutral-100">{t('bluetooth.current_selection')}</Text>
-                <Text className="text-sm text-neutral-600 dark:text-neutral-400">{preferredDevice.name}</Text>
+                <Text className="text-sm text-neutral-600 dark:text-neutral-400">{preferredDeviceDisplayName}</Text>
               </VStack>
               <Button onPress={handleClearSelection} size={isLandscape ? 'sm' : 'xs'} variant="outline">
                 <ButtonText className={isLandscape ? '' : 'text-2xs'}>{t('bluetooth.clear')}</ButtonText>
@@ -255,7 +255,7 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
 
                 // Update preferred device manually here to ensure UI reflects it immediately
                 // preventing race conditions with store updates
-                await setPreferredDevice({ id: 'system-audio', name: 'System Audio' });
+                await setPreferredDevice({ id: 'system-audio', name: t('bluetooth.system_audio') });
 
                 onClose();
               } catch (error) {
@@ -277,8 +277,8 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
               <HStack className="items-center">
                 <BluetoothIcon size={16} className="mr-2 text-primary-600" />
                 <VStack>
-                  <Text className={`font-medium ${preferredDevice?.id === 'system-audio' ? 'text-primary-700 dark:text-primary-300' : 'text-neutral-900 dark:text-neutral-100'}`}>{t('bluetooth.systemAudio')}</Text>
-                  <Text className="text-xs text-neutral-500">{t('bluetooth.systemAudioDescription')}</Text>
+                  <Text className={`font-medium ${preferredDevice?.id === 'system-audio' ? 'text-primary-700 dark:text-primary-300' : 'text-neutral-900 dark:text-neutral-100'}`}>{t('bluetooth.system_audio')}</Text>
+                  <Text className="text-xs text-neutral-500">{t('bluetooth.system_audio_description')}</Text>
                 </VStack>
               </HStack>
               {preferredDevice?.id === 'system-audio' && (
@@ -316,11 +316,7 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
         {bluetoothState !== State.PoweredOn && (
           <Box className="mt-4 rounded-lg border border-yellow-200 bg-yellow-50 p-3 dark:border-yellow-700 dark:bg-yellow-900">
             <Text className="text-sm text-yellow-800 dark:text-yellow-200">
-              {bluetoothState === State.PoweredOff
-                ? t('bluetooth.bluetooth_disabled')
-                : bluetoothState === State.Unauthorized
-                  ? t('bluetooth.bluetooth_unauthorized')
-                  : t('bluetooth.bluetooth_not_ready', { state: bluetoothState })}
+              {bluetoothState === State.PoweredOff ? t('bluetooth.poweredOff') : bluetoothState === State.Unauthorized ? t('bluetooth.unauthorized') : t('bluetooth.bluetooth_not_ready', { state: bluetoothState })}
             </Text>
           </Box>
         )}
diff --git a/src/components/sidebar/call-sidebar.tsx b/src/components/sidebar/call-sidebar.tsx
index 8d7a9571..15fc2860 100644
--- a/src/components/sidebar/call-sidebar.tsx
+++ b/src/components/sidebar/call-sidebar.tsx
@@ -169,8 +169,9 @@ export const SidebarCallCard = () => {
                       console.error('Failed to handle call selection:', error);
                     });
                   }}
-                  className={`rounded-lg border p-4 ${colorScheme === 'dark' ? 'border-neutral-800 bg-neutral-800' : 'border-neutral-200 bg-neutral-50'} ${activeCall?.CallId === call.CallId ? (colorScheme === 'dark' ? 'bg-primary-900' : 'bg-primary-50') : ''
-                    }`}
+                  className={`rounded-lg border p-4 ${colorScheme === 'dark' ? 'border-neutral-800 bg-neutral-800' : 'border-neutral-200 bg-neutral-50'} ${
+                    activeCall?.CallId === call.CallId ? (colorScheme === 'dark' ? 'bg-primary-900' : 'bg-primary-50') : ''
+                  }`}
                   testID={`call-item-${call.CallId}`}
                 >
                   <HStack space="md" className="items-center justify-between">
diff --git a/src/components/status/__tests__/gps-coordinate-duplication-fix.test.tsx b/src/components/status/__tests__/gps-coordinate-duplication-fix.test.tsx
index 50f16d13..0320dec3 100644
--- a/src/components/status/__tests__/gps-coordinate-duplication-fix.test.tsx
+++ b/src/components/status/__tests__/gps-coordinate-duplication-fix.test.tsx
@@ -28,6 +28,15 @@ jest.mock('@/stores/app/location-store', () => ({
   useLocationStore: jest.fn(),
 }));
 
+jest.mock('@/lib/logging', () => ({
+  logger: {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
 // Get the mocked functions
 const { saveUnitStatus: mockSaveUnitStatus } = jest.requireMock('@/api/units/unitStatuses');
 const mockUseLocationStore = useLocationStore as jest.MockedFunction<any>;
diff --git a/src/components/status/__tests__/status-gps-integration-working.test.tsx b/src/components/status/__tests__/status-gps-integration-working.test.tsx
index c783b1b9..72f24830 100644
--- a/src/components/status/__tests__/status-gps-integration-working.test.tsx
+++ b/src/components/status/__tests__/status-gps-integration-working.test.tsx
@@ -120,6 +120,15 @@ jest.mock('@/stores/app/location-store', () => ({
   useLocationStore: jest.fn(),
 }));
 
+jest.mock('@/lib/logging', () => ({
+  logger: {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
 const mockOfflineEventManager = offlineEventManager as jest.Mocked<typeof offlineEventManager>;
 const mockUseLocationStore = useLocationStore as jest.MockedFunction<any>;
 const mockUseCoreStore = require('@/stores/app/core-store').useCoreStore as jest.MockedFunction<any>;
diff --git a/src/components/status/__tests__/status-gps-integration.test.tsx b/src/components/status/__tests__/status-gps-integration.test.tsx
index 21b2774e..ecf066f2 100644
--- a/src/components/status/__tests__/status-gps-integration.test.tsx
+++ b/src/components/status/__tests__/status-gps-integration.test.tsx
@@ -29,6 +29,15 @@ jest.mock('@/stores/app/location-store', () => ({
   useLocationStore: jest.fn(),
 }));
 
+jest.mock('@/lib/logging', () => ({
+  logger: {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
 const mockOfflineEventManager = offlineEventManager as jest.Mocked<typeof offlineEventManager>;
 const mockUseLocationStore = useLocationStore as jest.MockedFunction<any>;
 const mockUseCoreStore = require('@/stores/app/core-store').useCoreStore as jest.MockedFunction<any>;
diff --git a/src/components/ui/bottom-sheet.tsx b/src/components/ui/bottom-sheet.tsx
index 6c94db1f..745487e3 100644
--- a/src/components/ui/bottom-sheet.tsx
+++ b/src/components/ui/bottom-sheet.tsx
@@ -1,5 +1,5 @@
 import { useColorScheme } from 'nativewind';
-import React from 'react';
+import type { ReactNode } from 'react';
 
 import { Actionsheet, ActionsheetBackdrop, ActionsheetContent, ActionsheetDragIndicator, ActionsheetDragIndicatorWrapper } from './actionsheet';
 import { Center } from './center';
@@ -8,7 +8,7 @@ import { Text } from './text';
 import { VStack } from './vstack';
 
 interface CustomBottomSheetProps {
-  children: React.ReactNode;
+  children: ReactNode;
   isOpen: boolean;
   onClose: () => void;
   isLoading?: boolean;
@@ -29,7 +29,7 @@ export function CustomBottomSheet({ children, isOpen, onClose, isLoading = false
           <ActionsheetDragIndicator />
         </ActionsheetDragIndicatorWrapper>
 
-        <VStack className={`w-full ${minHeight}`} space="md">
+        <VStack className={`w-full flex-1 ${minHeight}`} space="md">
           {isLoading ? (
             <Center className="h-32">
               <VStack space="sm" className="items-center">
diff --git a/src/components/ui/html-renderer/index.web.tsx b/src/components/ui/html-renderer/index.web.tsx
index dd9cbd9e..e71ecc58 100644
--- a/src/components/ui/html-renderer/index.web.tsx
+++ b/src/components/ui/html-renderer/index.web.tsx
@@ -86,13 +86,14 @@ export const HtmlRenderer: React.FC<HtmlRendererProps> = ({ html, style, scrollE
             line-height: 1.5;
             background-color: ${resolvedBgColor};
           }
-          ${!showsVerticalScrollIndicator
-        ? `
+          ${
+            !showsVerticalScrollIndicator
+              ? `
           ::-webkit-scrollbar { display: none; }
           body { -ms-overflow-style: none; scrollbar-width: none; }
           `
-        : ''
-      }
+              : ''
+          }
           * {
             max-width: 100%;
           }
diff --git a/src/features/livekit-call/store/__tests__/useLiveKitCallStore.test.ts b/src/features/livekit-call/store/__tests__/useLiveKitCallStore.test.ts
index bf8dd160..1f8758f1 100644
--- a/src/features/livekit-call/store/__tests__/useLiveKitCallStore.test.ts
+++ b/src/features/livekit-call/store/__tests__/useLiveKitCallStore.test.ts
@@ -33,6 +33,12 @@ jest.mock('../../../../lib/logging', () => ({
   },
 }));
 
+jest.mock('../../../../services/bluetooth-audio.service', () => ({
+  bluetoothAudioService: {
+    ensurePttInputMonitoring: jest.fn(),
+  },
+}));
+
 // Mock livekit-client
 const mockRoom = {
   on: jest.fn(),
diff --git a/src/features/livekit-call/store/useLiveKitCallStore.ts b/src/features/livekit-call/store/useLiveKitCallStore.ts
index d282d264..0f3a2286 100644
--- a/src/features/livekit-call/store/useLiveKitCallStore.ts
+++ b/src/features/livekit-call/store/useLiveKitCallStore.ts
@@ -3,6 +3,7 @@ import { Platform } from 'react-native';
 import { create } from 'zustand';
 
 import { logger } from '../../../lib/logging';
+import { bluetoothAudioService } from '../../../services/bluetooth-audio.service';
 import { callKeepService } from '../../../services/callkeep.service';
 
 export interface RoomInfo {
@@ -59,6 +60,8 @@ export const useLiveKitCallStore = create<LiveKitCallState>((set, get) => ({
     _clearError: () => set({ error: null }),
 
     connectToRoom: async (roomId, participantIdentity) => {
+      bluetoothAudioService.ensurePttInputMonitoring('useLiveKitCallStore connectToRoom start');
+
       if (get().isConnecting || get().isConnected) {
         logger.warn({
           message: 'Connection attempt while already connecting or connected',
@@ -105,6 +108,8 @@ export const useLiveKitCallStore = create<LiveKitCallState>((set, get) => ({
               newRoom.localParticipant.setMicrophoneEnabled(true);
               newRoom.localParticipant.setCameraEnabled(false); // No video
 
+              bluetoothAudioService.ensurePttInputMonitoring('useLiveKitCallStore connected');
+
               // Start CallKeep call for iOS background audio support
               if (Platform.OS === 'ios') {
                 callKeepService
diff --git a/src/lib/logging/index.tsx b/src/lib/logging/index.tsx
index 3d52d5f7..66bf8304 100644
--- a/src/lib/logging/index.tsx
+++ b/src/lib/logging/index.tsx
@@ -8,6 +8,7 @@ import type { LogEntry, Logger, LogLevel } from './types';
 // Setting async: false on web prevents this. Severity stays 'debug' in dev
 // on all platforms so console output is visible for debugging.
 const isWeb = Platform.OS === 'web';
+const isJest = typeof process !== 'undefined' && typeof process.env?.JEST_WORKER_ID !== 'undefined';
 
 const config = {
   levels: {
@@ -26,12 +27,12 @@ const config = {
       error: 'redBright',
     },
   },
-  async: !isWeb,
+  async: !isWeb && !isJest,
   dateFormat: 'time',
   printLevel: true,
   printDate: true,
   fixedExtLvlLength: false,
-  enabled: true,
+  enabled: !isJest,
 };
 
 class LogService {
diff --git a/src/services/__tests__/audio.service.test.ts b/src/services/__tests__/audio.service.test.ts
index e44a32db..8b41684f 100644
--- a/src/services/__tests__/audio.service.test.ts
+++ b/src/services/__tests__/audio.service.test.ts
@@ -138,6 +138,12 @@ describe('AudioService', () => {
 
     it('should load all audio files', () => {
       expect(mockSoundCreateAsync).toHaveBeenCalledTimes(5);
+
+      expect(mockSoundCreateAsync).toHaveBeenNthCalledWith(1, 'mocked-start-transmitting-sound');
+      expect(mockSoundCreateAsync).toHaveBeenNthCalledWith(2, 'mocked-stop-transmitting-sound');
+      expect(mockSoundCreateAsync).toHaveBeenNthCalledWith(3, 'mocked-connected-device-sound');
+      expect(mockSoundCreateAsync).toHaveBeenNthCalledWith(4, 'mocked-connect-to-audio-room-sound');
+      expect(mockSoundCreateAsync).toHaveBeenNthCalledWith(5, 'mocked-disconnected-from-audio-room-sound');
     });
   });
 
diff --git a/src/services/__tests__/bluetooth-audio.service.test.ts b/src/services/__tests__/bluetooth-audio.service.test.ts
index 6f6159be..ead60400 100644
--- a/src/services/__tests__/bluetooth-audio.service.test.ts
+++ b/src/services/__tests__/bluetooth-audio.service.test.ts
@@ -45,9 +45,33 @@ jest.mock('@/lib/storage', () => ({
   removeItem: jest.fn(),
 }));
 
+jest.mock('@/lib/logging', () => ({
+  logger: {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
 jest.mock('@/services/audio.service', () => ({
   audioService: {
     playConnectedDeviceSound: jest.fn(),
+    playStartTransmittingSound: jest.fn(),
+    playStopTransmittingSound: jest.fn(),
+  },
+}));
+
+jest.mock('@/features/livekit-call/store/useLiveKitCallStore', () => ({
+  useLiveKitCallStore: {
+    getState: jest.fn(() => ({
+      isConnected: false,
+      roomInstance: null,
+      localParticipant: null,
+      actions: {
+        setMicrophoneEnabled: jest.fn(),
+      },
+    })),
   },
 }));
 
@@ -70,6 +94,10 @@ describe('BluetoothAudioService Refactoring', () => {
     jest.clearAllMocks();
   });
 
+  afterEach(() => {
+    bluetoothAudioService.destroy();
+  });
+
   it('should be defined and accessible', () => {
     expect(bluetoothAudioService).toBeDefined();
     expect(typeof bluetoothAudioService.destroy).toBe('function');
@@ -194,5 +222,26 @@ describe('BluetoothAudioService Refactoring', () => {
       await service.setMicrophoneEnabled(false);
       expect(storeMock.setMicrophoneEnabled).toHaveBeenCalledWith(false);
     });
+
+    it('should fall back to legacy livekitStore when feature store is connected but has no local participant', async () => {
+      const service = bluetoothAudioService as any;
+      const featureStore = require('@/features/livekit-call/store/useLiveKitCallStore').useLiveKitCallStore;
+      const mockFeatureSetMicrophoneEnabled = jest.fn();
+
+      featureStore.getState.mockReturnValue({
+        isConnected: true,
+        roomInstance: null,
+        localParticipant: null,
+        actions: {
+          setMicrophoneEnabled: mockFeatureSetMicrophoneEnabled,
+        },
+      });
+
+      await service.setMicrophoneEnabled(true);
+
+      const legacyStore = require('@/stores/app/livekit-store').useLiveKitStore.getState();
+      expect(mockFeatureSetMicrophoneEnabled).not.toHaveBeenCalled();
+      expect(legacyStore.setMicrophoneEnabled).toHaveBeenCalledWith(true);
+    });
   });
 });
diff --git a/src/services/audio.service.ts b/src/services/audio.service.ts
index 54d790a4..62f28ff9 100644
--- a/src/services/audio.service.ts
+++ b/src/services/audio.service.ts
@@ -58,11 +58,11 @@ class AudioService {
         if (InCallAudioModule) {
           // Load sounds into native SoundPool
           // Map functional names to resource names (without extension)
-          InCallAudioModule.loadSound('startTransmitting', 'software_interface_start');
-          InCallAudioModule.loadSound('stopTransmitting', 'software_interface_back');
+          InCallAudioModule.loadSound('startTransmitting', 'space_notification1');
+          InCallAudioModule.loadSound('stopTransmitting', 'space_notification2');
           InCallAudioModule.loadSound('connectedDevice', 'positive_interface_beep');
-          InCallAudioModule.loadSound('connectToAudioRoom', 'space_notification1');
-          InCallAudioModule.loadSound('disconnectedFromAudioRoom', 'space_notification2');
+          InCallAudioModule.loadSound('connectToAudioRoom', 'software_interface_start');
+          InCallAudioModule.loadSound('disconnectedFromAudioRoom', 'software_interface_back');
         }
       }
 
diff --git a/src/services/bluetooth-audio.service.ts b/src/services/bluetooth-audio.service.ts
index ef545ba7..0922ebe7 100644
--- a/src/services/bluetooth-audio.service.ts
+++ b/src/services/bluetooth-audio.service.ts
@@ -1,8 +1,9 @@
 import { Buffer } from 'buffer';
 // @ts-ignore - callkeep service might not be resolvable in all contexts without barrel file updates
-import { Alert, DeviceEventEmitter, PermissionsAndroid, Platform } from 'react-native';
+import { Alert, DeviceEventEmitter, NativeModules, PermissionsAndroid, Platform } from 'react-native';
 import BleManager, { type BleManagerDidUpdateValueForCharacteristicEvent, BleScanCallbackType, BleScanMatchMode, BleScanMode, type BleState, type Peripheral, type PeripheralInfo } from 'react-native-ble-manager';
 
+import { useLiveKitCallStore } from '@/features/livekit-call/store/useLiveKitCallStore';
 import { logger } from '@/lib/logging';
 import { audioService } from '@/services/audio.service';
 import { callKeepService } from '@/services/callkeep.service';
@@ -47,6 +48,17 @@ class BluetoothAudioService {
   private hasAttemptedPreferredDeviceConnection: boolean = false;
   private eventListeners: { remove: () => void }[] = [];
   private readonly isWeb = Platform.OS === 'web';
+  private monitoringStartedAt: number | null = null;
+  private monitoringWatchdogInterval: ReturnType<typeof setInterval> | null = null;
+  private readPollingInterval: ReturnType<typeof setInterval> | null = null;
+  private monitoredReadCharacteristics: { serviceUuid: string; characteristicUuid: string; lastHexValue: string | null }[] = [];
+  private mediaButtonEventListener: { remove: () => void } | null = null;
+  private mediaButtonListeningActive: boolean = false;
+  private pttPressActive: boolean = false;
+  private pttReleaseFallbackTimeout: ReturnType<typeof setTimeout> | null = null;
+  private micApplyRetryTimeout: ReturnType<typeof setTimeout> | null = null;
+  private pendingMicEnabled: boolean | null = null;
+  private isApplyingMicState: boolean = false;
 
   static getInstance(): BluetoothAudioService {
     if (!BluetoothAudioService.instance) {
@@ -73,10 +85,6 @@ class BluetoothAudioService {
     }
 
     try {
-      logger.info({
-        message: 'Initializing Bluetooth Audio Service',
-      });
-
       // Initialize BLE Manager
       await BleManager.start({ showAlert: false });
       this.setupEventListeners();
@@ -200,6 +208,9 @@ class BluetoothAudioService {
     const valueUpdateListener = BleManager.onDidUpdateValueForCharacteristic(this.handleCharacteristicValueUpdate.bind(this));
     this.eventListeners.push(valueUpdateListener);
 
+    const legacyValueUpdateListener = DeviceEventEmitter.addListener('BleManagerDidUpdateValueForCharacteristic', this.handleCharacteristicValueUpdate.bind(this));
+    this.eventListeners.push(legacyValueUpdateListener);
+
     // Stop scan listener
     //const stopScanListener = DeviceEventEmitter.addListener('BleManagerStopScan', this.handleScanStopped.bind(this));
     const stopScanListener = BleManager.onStopScan(this.handleScanStopped.bind(this));
@@ -277,19 +288,12 @@ class BluetoothAudioService {
     // Convert the value array to a base64 string to match the old API
     const value = Buffer.from(data.value).toString('base64');
 
-    logger.debug({
-      message: '[DEBUG_VALUE_UPDATE] Characteristic value updated',
-      context: {
-        peripheral: data.peripheral,
-        service: data.service,
-        characteristic: data.characteristic,
-        valueHex: Buffer.from(data.value).toString('hex'),
-        valueBase64: value,
-      },
-    });
+    if (this.connectedDevice && data.peripheral !== this.connectedDevice.id) {
+      return;
+    }
 
     // Handle button events based on service and characteristic UUIDs
-    this.handleButtonEventFromCharacteristic(data.service, data.characteristic, value);
+    this.handleButtonEventFromCharacteristic(data.peripheral, data.service, data.characteristic, value);
   }
 
   private handleScanStopped(): void {
@@ -299,7 +303,7 @@ class BluetoothAudioService {
     });
   }
 
-  private handleButtonEventFromCharacteristic(serviceUuid: string, characteristicUuid: string, value: string): void {
+  private handleButtonEventFromCharacteristic(peripheralId: string, serviceUuid: string, characteristicUuid: string, value: string): void {
     // Route to appropriate handler based on service/characteristic
     if (this.areUuidsEqual(serviceUuid, AINA_HEADSET_SERVICE) && this.areUuidsEqual(characteristicUuid, AINA_HEADSET_SVC_PROP)) {
       this.handleAinaButtonEvent(value);
@@ -309,6 +313,17 @@ class BluetoothAudioService {
       this.handleHYSButtonEvent(value);
     } else if (BUTTON_CONTROL_UUIDS.some((uuid) => this.areUuidsEqual(characteristicUuid, uuid))) {
       this.handleGenericButtonEvent(value);
+    } else if (this.connectedDevice && this.connectedDevice.id === peripheralId && this.getDeviceType(this.connectedDevice) === 'specialized' && this.isLikelyButtonCharacteristic(serviceUuid, characteristicUuid)) {
+      this.handleGenericButtonEvent(value);
+    } else if (this.connectedDevice && this.connectedDevice.id === peripheralId && this.getDeviceType(this.connectedDevice) === 'specialized') {
+      logger.debug({
+        message: 'Ignoring characteristic update for specialized device (not identified as button control)',
+        context: {
+          peripheralId,
+          serviceUuid,
+          characteristicUuid,
+        },
+      });
     }
   }
 
@@ -965,6 +980,9 @@ class BluetoothAudioService {
       // Set up button event monitoring with peripheral info
       await this.setupButtonEventMonitoring(device, peripheralInfo);
 
+      // Start media-button fallback monitoring for Android headsets/earbuds/PTT devices
+      this.startMediaButtonFallbackMonitoring();
+
       // Integrate with LiveKit audio routing
       await this.setupLiveKitAudioRouting(device);
 
@@ -1069,22 +1087,160 @@ class BluetoothAudioService {
 
   private async setupButtonEventMonitoring(device: Device, peripheralInfo: PeripheralInfo): Promise<void> {
     try {
-      logger.info({
-        message: 'Setting up button event monitoring',
-        context: {
-          deviceId: device.id,
-          deviceName: device.name,
-          availableServices: peripheralInfo?.services?.map((s: any) => s.uuid) || [],
-        },
-      });
+      useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(false);
+      this.monitoringStartedAt = Date.now();
 
       // Start notifications for known button control characteristics
       await this.startNotificationsForButtonControls(device.id, peripheralInfo);
+
+      this.startMonitoringWatchdog(device.id);
     } catch (error) {
       logger.warn({
         message: 'Could not set up button event monitoring',
         context: { deviceId: device.id, error },
       });
+      useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(false);
+      this.stopMonitoringWatchdog();
+    }
+  }
+
+  private startMediaButtonFallbackMonitoring(): void {
+    if (Platform.OS !== 'android') {
+      return;
+    }
+
+    this.stopMediaButtonFallbackMonitoring();
+
+    const module = (NativeModules as { MediaButtonModule?: { startListening?: () => void } }).MediaButtonModule;
+
+    if (module?.startListening) {
+      try {
+        module.startListening();
+        this.mediaButtonListeningActive = true;
+      } catch (error) {
+        logger.debug({
+          message: 'Failed to start Android media-button fallback monitoring',
+          context: { error },
+        });
+      }
+    }
+
+    this.mediaButtonEventListener = DeviceEventEmitter.addListener('onMediaButtonEvent', this.handleMediaButtonFallbackEvent.bind(this));
+    this.eventListeners.push(this.mediaButtonEventListener);
+  }
+
+  private stopMediaButtonFallbackMonitoring(): void {
+    if (this.mediaButtonEventListener) {
+      this.mediaButtonEventListener.remove();
+      this.mediaButtonEventListener = null;
+    }
+
+    if (Platform.OS !== 'android') {
+      this.mediaButtonListeningActive = false;
+      return;
+    }
+
+    if (!this.mediaButtonListeningActive) {
+      return;
+    }
+
+    const module = (NativeModules as { MediaButtonModule?: { stopListening?: () => void } }).MediaButtonModule;
+    if (module?.stopListening) {
+      try {
+        module.stopListening();
+      } catch (error) {
+        logger.debug({
+          message: 'Failed to stop Android media-button fallback monitoring',
+          context: { error },
+        });
+      }
+    }
+
+    this.mediaButtonListeningActive = false;
+  }
+
+  private handleMediaButtonFallbackEvent(event: { keyCode?: number; action?: string; timestamp?: number }): void {
+    const { mediaButtonPTTSettings } = useBluetoothAudioStore.getState();
+    if (!mediaButtonPTTSettings.enabled || !mediaButtonPTTSettings.usePlayPauseForPTT) {
+      return;
+    }
+
+    const keyCode = event?.keyCode;
+    const action = (event?.action || '').toUpperCase();
+
+    // KEYCODE_HEADSETHOOK=79, KEYCODE_MEDIA_PLAY_PAUSE=85, KEYCODE_MEDIA_PLAY=126, KEYCODE_MEDIA_PAUSE=127
+    const isPttCapableKey = keyCode === 79 || keyCode === 85 || keyCode === 126 || keyCode === 127;
+    if (!isPttCapableKey) {
+      return;
+    }
+
+    if (mediaButtonPTTSettings.pttMode === 'push_to_talk') {
+      if (action === 'ACTION_DOWN') {
+        this.processButtonEvent(
+          {
+            type: 'press',
+            button: 'ptt_start',
+            timestamp: Date.now(),
+          },
+          'media'
+        );
+      } else if (action === 'ACTION_UP') {
+        this.processButtonEvent(
+          {
+            type: 'press',
+            button: 'ptt_stop',
+            timestamp: Date.now(),
+          },
+          'media'
+        );
+      }
+
+      return;
+    }
+
+    if (action === 'ACTION_DOWN') {
+      this.processButtonEvent({
+        type: 'press',
+        button: 'mute',
+        timestamp: Date.now(),
+      });
+    }
+  }
+
+  private startMonitoringWatchdog(deviceId: string): void {
+    this.stopMonitoringWatchdog();
+
+    this.monitoringWatchdogInterval = setInterval(() => {
+      if (!this.connectedDevice || this.connectedDevice.id !== deviceId) {
+        this.stopMonitoringWatchdog();
+        return;
+      }
+
+      const monitoring = useBluetoothAudioStore.getState().isHeadsetButtonMonitoring;
+      if (!monitoring) {
+        this.stopMonitoringWatchdog();
+        return;
+      }
+
+      if (!this.monitoringStartedAt) {
+        return;
+      }
+    }, 4000);
+  }
+
+  public ensurePttInputMonitoring(_reason: string): void {
+    if (!this.connectedDevice) {
+      return;
+    }
+
+    this.startMediaButtonFallbackMonitoring();
+    this.startMonitoringWatchdog(this.connectedDevice.id);
+  }
+
+  private stopMonitoringWatchdog(): void {
+    if (this.monitoringWatchdogInterval) {
+      clearInterval(this.monitoringWatchdogInterval);
+      this.monitoringWatchdogInterval = null;
     }
   }
 
@@ -1146,13 +1302,15 @@ class BluetoothAudioService {
   }
 
   private async startNotificationsForButtonControls(deviceId: string, peripheralInfo: PeripheralInfo): Promise<void> {
+    const subscribedPairs = new Set<string>();
+    this.monitoredReadCharacteristics = [];
+    const isSpecializedDevice = Boolean(this.connectedDevice && this.connectedDevice.id === deviceId && this.getDeviceType(this.connectedDevice) === 'specialized');
+
     // Try to start notifications for known button control service/characteristic combinations
     const buttonControlConfigs = [
       { service: AINA_HEADSET_SERVICE, characteristic: AINA_HEADSET_SVC_PROP },
       { service: B01INRICO_HEADSET_SERVICE, characteristic: B01INRICO_HEADSET_SERVICE_CHAR },
       { service: HYS_HEADSET_SERVICE, characteristic: HYS_HEADSET_SERVICE_CHAR },
-      // Add generic button control UUIDs
-      ...BUTTON_CONTROL_UUIDS.map((uuid) => ({ service: '00001800-0000-1000-8000-00805F9B34FB', characteristic: uuid })), // Generic service
     ];
 
     logger.debug({
@@ -1176,6 +1334,8 @@ class BluetoothAudioService {
         }
 
         await BleManager.startNotification(deviceId, config.service, config.characteristic);
+        subscribedPairs.add(`${config.service.toUpperCase()}::${config.characteristic.toUpperCase()}`);
+        this.registerReadPollingCharacteristic(config.service, config.characteristic);
         logger.info({
           message: 'Started notifications for button control',
           context: {
@@ -1197,6 +1357,227 @@ class BluetoothAudioService {
         });
       }
     }
+
+    if (peripheralInfo?.characteristics?.length) {
+      for (const characteristic of peripheralInfo.characteristics) {
+        const serviceUuid = characteristic?.service;
+        const characteristicUuid = characteristic?.characteristic;
+
+        if (!serviceUuid || !characteristicUuid) {
+          continue;
+        }
+
+        const pairKey = `${String(serviceUuid).toUpperCase()}::${String(characteristicUuid).toUpperCase()}`;
+        const shouldSubscribe = isSpecializedDevice ? true : this.isLikelyButtonCharacteristic(serviceUuid, characteristicUuid) || this.hasNotificationOrReadCapability(characteristic?.properties);
+
+        if (!shouldSubscribe || subscribedPairs.has(pairKey)) {
+          continue;
+        }
+
+        try {
+          await BleManager.startNotification(deviceId, serviceUuid, characteristicUuid);
+          subscribedPairs.add(pairKey);
+
+          if (isSpecializedDevice || this.hasReadCapability(characteristic?.properties)) {
+            this.registerReadPollingCharacteristic(serviceUuid, characteristicUuid);
+          }
+
+          logger.info({
+            message: 'Started fallback notification subscription for characteristic',
+            context: {
+              deviceId,
+              serviceUuid,
+              characteristicUuid,
+              properties: characteristic?.properties,
+            },
+          });
+        } catch (error) {
+          logger.debug({
+            message: 'Fallback notification subscription failed for characteristic',
+            context: {
+              deviceId,
+              serviceUuid,
+              characteristicUuid,
+              error,
+            },
+          });
+        }
+      }
+    }
+
+    if (isSpecializedDevice && peripheralInfo?.characteristics?.length) {
+      for (const characteristic of peripheralInfo.characteristics) {
+        const serviceUuid = characteristic?.service;
+        const characteristicUuid = characteristic?.characteristic;
+
+        if (!serviceUuid || !characteristicUuid) {
+          continue;
+        }
+
+        this.registerReadPollingCharacteristic(serviceUuid, characteristicUuid);
+      }
+    }
+
+    if (subscribedPairs.size > 0) {
+      useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(true);
+      this.startReadPollingFallback(deviceId);
+    } else {
+      useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(false);
+    }
+  }
+
+  private registerReadPollingCharacteristic(serviceUuid: string, characteristicUuid: string): void {
+    const exists = this.monitoredReadCharacteristics.some((entry) => this.areUuidsEqual(entry.serviceUuid, serviceUuid) && this.areUuidsEqual(entry.characteristicUuid, characteristicUuid));
+
+    if (exists) {
+      return;
+    }
+
+    this.monitoredReadCharacteristics.push({
+      serviceUuid,
+      characteristicUuid,
+      lastHexValue: null,
+    });
+  }
+
+  private startReadPollingFallback(deviceId: string): void {
+    this.stopReadPollingFallback();
+
+    if (this.monitoredReadCharacteristics.length === 0) {
+      return;
+    }
+
+    this.readPollingInterval = setInterval(() => {
+      if (!this.connectedDevice || this.connectedDevice.id !== deviceId) {
+        this.stopReadPollingFallback();
+        return;
+      }
+
+      const monitoring = useBluetoothAudioStore.getState().isHeadsetButtonMonitoring;
+      if (!monitoring) {
+        this.stopReadPollingFallback();
+        return;
+      }
+
+      void this.pollReadCharacteristics(deviceId);
+    }, 700);
+  }
+
+  private async pollReadCharacteristics(deviceId: string): Promise<void> {
+    for (const entry of this.monitoredReadCharacteristics) {
+      try {
+        const readValue = await BleManager.read(deviceId, entry.serviceUuid, entry.characteristicUuid);
+        const nextHexValue = Buffer.from(readValue).toString('hex');
+
+        if (!nextHexValue || nextHexValue.length === 0) {
+          continue;
+        }
+
+        if (entry.lastHexValue === nextHexValue) {
+          continue;
+        }
+
+        entry.lastHexValue = nextHexValue;
+
+        const valueBase64 = Buffer.from(readValue).toString('base64');
+        this.handleButtonEventFromCharacteristic(deviceId, entry.serviceUuid, entry.characteristicUuid, valueBase64);
+      } catch (error) {
+        logger.debug({
+          message: 'Read polling failed for characteristic',
+          context: {
+            deviceId,
+            serviceUuid: entry.serviceUuid,
+            characteristicUuid: entry.characteristicUuid,
+            error,
+          },
+        });
+      }
+    }
+  }
+
+  private stopReadPollingFallback(): void {
+    if (this.readPollingInterval) {
+      clearInterval(this.readPollingInterval);
+      this.readPollingInterval = null;
+    }
+  }
+
+  private hasReadCapability(properties: unknown): boolean {
+    if (!properties) {
+      return false;
+    }
+
+    if (Array.isArray(properties)) {
+      return properties.some((property) => String(property).toLowerCase().includes('read'));
+    }
+
+    if (typeof properties === 'object') {
+      const entries = Object.entries(properties as Record<string, unknown>);
+      return entries.some(([key, value]) => {
+        const normalizedKey = key.toLowerCase();
+        const normalizedValue = String(value).toLowerCase();
+        const indicatesRead = normalizedKey.includes('read') || normalizedValue.includes('read');
+
+        if (!indicatesRead) {
+          return false;
+        }
+
+        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1' || normalizedValue.length > 0;
+      });
+    }
+
+    return false;
+  }
+
+  private hasNotificationOrReadCapability(properties: unknown): boolean {
+    if (!properties) {
+      return false;
+    }
+
+    if (Array.isArray(properties)) {
+      return properties.some((property) => {
+        const normalized = String(property).toLowerCase();
+        return normalized.includes('notify') || normalized.includes('indicate') || normalized.includes('read');
+      });
+    }
+
+    if (typeof properties === 'object') {
+      const entries = Object.entries(properties as Record<string, unknown>);
+      return entries.some(([key, value]) => {
+        const normalizedKey = key.toLowerCase();
+        const normalizedValue = String(value).toLowerCase();
+        const hasCapabilityToken =
+          normalizedKey.includes('notify') ||
+          normalizedKey.includes('indicate') ||
+          normalizedKey.includes('read') ||
+          normalizedValue.includes('notify') ||
+          normalizedValue.includes('indicate') ||
+          normalizedValue.includes('read');
+
+        if (!hasCapabilityToken) {
+          return false;
+        }
+
+        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1' || normalizedValue.length > 0;
+      });
+    }
+
+    return false;
+  }
+
+  private isLikelyButtonCharacteristic(serviceUuid: string, characteristicUuid: string): boolean {
+    const normalizedService = serviceUuid.replace(/-/g, '').toUpperCase();
+    const normalizedCharacteristic = characteristicUuid.replace(/-/g, '').toUpperCase();
+
+    const knownServiceMatch = [AINA_HEADSET_SERVICE, B01INRICO_HEADSET_SERVICE, HYS_HEADSET_SERVICE].some((uuid) => this.areUuidsEqual(serviceUuid, uuid));
+    const knownCharacteristicMatch = [AINA_HEADSET_SVC_PROP, B01INRICO_HEADSET_SERVICE_CHAR, HYS_HEADSET_SERVICE_CHAR, ...BUTTON_CONTROL_UUIDS].some((uuid) => this.areUuidsEqual(characteristicUuid, uuid));
+
+    if (knownServiceMatch || knownCharacteristicMatch) {
+      return true;
+    }
+
+    const heuristicFragments = ['2A4D', '2A4E', '2A4B', 'FFE0', 'FFE1', 'FFE2', '8888', 'BEEF', 'FE59'];
+    return heuristicFragments.some((fragment) => normalizedService.includes(fragment) || normalizedCharacteristic.includes(fragment));
   }
 
   // Remove all the old button monitoring methods as they're replaced by the event-based approach
@@ -1341,25 +1722,7 @@ class BluetoothAudioService {
   private parseB01InricoButtonData(buffer: Buffer): AudioButtonEvent | null {
     if (buffer.length === 0) return null;
 
-    // Log all raw button data for debugging
     const rawHex = buffer.toString('hex');
-    const allBytes = Array.from(buffer)
-      .map((b) => `0x${b.toString(16).padStart(2, '0')}`)
-      .join(', ');
-
-    logger.info({
-      message: 'B01 Inrico raw button data analysis',
-      context: {
-        bufferLength: buffer.length,
-        rawHex,
-        allBytes,
-        firstByte: `0x${buffer[0].toString(16).padStart(2, '0')}`,
-        secondByte: buffer.length > 1 ? `0x${buffer[1].toString(16).padStart(2, '0')}` : 'N/A',
-      },
-    });
-
-    // FORCE LOG COMPATIBILITY
-    console.log(`[PTT_DEBUG] Raw Buffer: ${rawHex} | Bytes: ${allBytes}`);
 
     // B01 Inrico-specific parsing logic
     const byte = buffer[0];
@@ -1593,7 +1956,7 @@ class BluetoothAudioService {
     };
   }
 
-  private processButtonEvent(buttonEvent: AudioButtonEvent): void {
+  private processButtonEvent(buttonEvent: AudioButtonEvent, source: 'ble' | 'media' = 'ble'): void {
     logger.info({
       message: 'Button event processed',
       context: { buttonEvent },
@@ -1608,17 +1971,38 @@ class BluetoothAudioService {
     }
 
     if (buttonEvent.button === 'ptt_start') {
+      if (this.pttPressActive) {
+        if (source === 'media') {
+          this.schedulePttReleaseFallback();
+        }
+        return;
+      }
+
+      this.pttPressActive = true;
+      if (source === 'media') {
+        this.schedulePttReleaseFallback();
+      } else {
+        this.clearPttReleaseFallback();
+      }
+
       // Proactively lock CallKeep events to prevent HFP interactions/spam
       // when we are explicitly handling PTT via SPP/GATT
       callKeepService.ignoreMuteEvents(1000);
-      this.setMicrophoneEnabled(true);
+      this.requestMicrophoneState(true);
       return;
     }
 
     if (buttonEvent.button === 'ptt_stop') {
+      if (!this.pttPressActive) {
+        return;
+      }
+
+      this.pttPressActive = false;
+      this.clearPttReleaseFallback();
+
       // Keep locked for a bit after release to handle trailing events
       callKeepService.ignoreMuteEvents(1000);
-      this.setMicrophoneEnabled(false);
+      this.requestMicrophoneState(false);
       return;
     }
 
@@ -1650,6 +2034,30 @@ class BluetoothAudioService {
 
   private async handleMuteToggle(): Promise<void> {
     try {
+      const featureLiveKitState = useLiveKitCallStore.getState();
+      const featureRoom = featureLiveKitState.roomInstance;
+      const featureLocalParticipant = featureRoom?.localParticipant ?? featureLiveKitState.localParticipant;
+
+      if (featureLiveKitState.isConnected && featureRoom && featureLocalParticipant) {
+        const nextMicEnabled = !featureLocalParticipant.isMicrophoneEnabled;
+        await featureLiveKitState.actions.setMicrophoneEnabled(nextMicEnabled);
+
+        const updatedState = useLiveKitCallStore.getState();
+        const updatedParticipant = updatedState.roomInstance?.localParticipant ?? updatedState.localParticipant;
+
+        if (updatedParticipant && updatedParticipant.isMicrophoneEnabled === nextMicEnabled) {
+          return;
+        }
+
+        logger.warn({
+          message: 'Feature store microphone toggle did not apply, falling back to legacy store',
+          context: {
+            nextMicEnabled,
+            hasUpdatedParticipant: Boolean(updatedParticipant),
+          },
+        });
+      }
+
       await useLiveKitStore.getState().toggleMicrophone();
     } catch (error) {
       logger.error({
@@ -1659,8 +2067,115 @@ class BluetoothAudioService {
     }
   }
 
+  private schedulePttReleaseFallback(): void {
+    this.clearPttReleaseFallback();
+
+    this.pttReleaseFallbackTimeout = setTimeout(() => {
+      if (!this.pttPressActive) {
+        return;
+      }
+
+      this.pttPressActive = false;
+      callKeepService.ignoreMuteEvents(1000);
+      this.requestMicrophoneState(false);
+    }, 1400);
+  }
+
+  private clearPttReleaseFallback(): void {
+    if (this.pttReleaseFallbackTimeout) {
+      clearTimeout(this.pttReleaseFallbackTimeout);
+      this.pttReleaseFallbackTimeout = null;
+    }
+  }
+
+  private scheduleMicApplyRetry(enabled: boolean): void {
+    if (this.micApplyRetryTimeout) {
+      return;
+    }
+
+    this.micApplyRetryTimeout = setTimeout(() => {
+      this.micApplyRetryTimeout = null;
+      this.requestMicrophoneState(enabled);
+    }, 160);
+  }
+
+  private clearMicApplyRetry(): void {
+    if (this.micApplyRetryTimeout) {
+      clearTimeout(this.micApplyRetryTimeout);
+      this.micApplyRetryTimeout = null;
+    }
+  }
+
+  private requestMicrophoneState(enabled: boolean): void {
+    this.pendingMicEnabled = enabled;
+
+    if (this.isApplyingMicState) {
+      return;
+    }
+
+    this.isApplyingMicState = true;
+
+    void (async () => {
+      try {
+        while (this.pendingMicEnabled !== null) {
+          const targetEnabled = this.pendingMicEnabled;
+          this.pendingMicEnabled = null;
+          await this.applyMicrophoneEnabled(targetEnabled);
+        }
+      } finally {
+        this.isApplyingMicState = false;
+
+        if (this.pendingMicEnabled !== null) {
+          this.requestMicrophoneState(this.pendingMicEnabled);
+        }
+      }
+    })();
+  }
+
   private async setMicrophoneEnabled(enabled: boolean): Promise<void> {
+    await this.applyMicrophoneEnabled(enabled);
+  }
+
+  private async applyMicrophoneEnabled(enabled: boolean): Promise<void> {
     try {
+      const featureLiveKitState = useLiveKitCallStore.getState();
+      const featureRoom = featureLiveKitState.roomInstance;
+      const legacyLiveKitState = useLiveKitStore.getState();
+      const hasFeatureRoom = Boolean(featureLiveKitState.isConnected && featureRoom?.localParticipant);
+      const hasLegacyRoom = Boolean(legacyLiveKitState.currentRoom?.localParticipant);
+      const stillConnecting = featureLiveKitState.isConnecting || legacyLiveKitState.isConnecting;
+
+      if (!hasFeatureRoom && !hasLegacyRoom && stillConnecting) {
+        this.scheduleMicApplyRetry(enabled);
+        return;
+      }
+
+      this.clearMicApplyRetry();
+
+      if (featureLiveKitState.isConnected && featureRoom?.localParticipant) {
+        const currentFeatureMicEnabled = featureRoom.localParticipant.isMicrophoneEnabled;
+        if (currentFeatureMicEnabled === enabled) {
+          return;
+        }
+
+        await featureLiveKitState.actions.setMicrophoneEnabled(enabled);
+
+        const updatedState = useLiveKitCallStore.getState();
+        const updatedParticipant = updatedState.roomInstance?.localParticipant ?? updatedState.localParticipant;
+
+        if (updatedParticipant && updatedParticipant.isMicrophoneEnabled === enabled) {
+          return;
+        }
+
+        logger.warn({
+          message: 'Feature store setMicrophoneEnabled did not apply, falling back to legacy store',
+          context: {
+            enabled,
+            hasUpdatedParticipant: Boolean(updatedParticipant),
+          },
+        });
+      }
+
       await useLiveKitStore.getState().setMicrophoneEnabled(enabled);
     } catch (error) {
       logger.error({
@@ -1734,8 +2249,9 @@ class BluetoothAudioService {
       bluetoothStore.setAvailableAudioDevices(nonBluetoothDevices);
 
       // Revert to default audio devices
-      const defaultMic = nonBluetoothDevices.find((d) => d.type === 'default' && d.id.includes('mic'));
-      const defaultSpeaker = nonBluetoothDevices.find((d) => d.type === 'default' && d.id.includes('speaker'));
+      const defaultMic = nonBluetoothDevices.find((d) => d.type === 'microphone' || d.id.toLowerCase().includes('mic')) || nonBluetoothDevices.find((d) => d.type === 'default');
+
+      const defaultSpeaker = nonBluetoothDevices.find((d) => d.type === 'speaker' || d.id.toLowerCase().includes('speaker')) || nonBluetoothDevices.find((d) => d.type === 'default');
 
       if (defaultMic) {
         bluetoothStore.setSelectedMicrophone(defaultMic);
@@ -1746,6 +2262,14 @@ class BluetoothAudioService {
 
       // Revert audio routing to default (phone speaker/microphone)
       bluetoothStore.setAudioRoutingActive(false);
+      bluetoothStore.setIsHeadsetButtonMonitoring(false);
+      this.pttPressActive = false;
+      this.clearPttReleaseFallback();
+      this.clearMicApplyRetry();
+      this.pendingMicEnabled = null;
+      this.stopMonitoringWatchdog();
+      this.stopReadPollingFallback();
+      this.stopMediaButtonFallbackMonitoring();
     } catch (error) {
       logger.error({
         message: 'Failed to revert LiveKit audio routing',
@@ -1756,6 +2280,14 @@ class BluetoothAudioService {
 
   async disconnectDevice(): Promise<void> {
     if (this.isWeb) return;
+    useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(false);
+    this.pttPressActive = false;
+    this.clearPttReleaseFallback();
+    this.clearMicApplyRetry();
+    this.pendingMicEnabled = null;
+    this.stopMonitoringWatchdog();
+    this.stopReadPollingFallback();
+    this.stopMediaButtonFallbackMonitoring();
     if (this.connectedDevice && this.connectedDevice.id) {
       const deviceId = this.connectedDevice.id;
       try {
@@ -1831,6 +2363,13 @@ class BluetoothAudioService {
   destroy(): void {
     this.stopScanning();
     this.disconnectDevice();
+    useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(false);
+    this.clearPttReleaseFallback();
+    this.clearMicApplyRetry();
+    this.pendingMicEnabled = null;
+    this.stopMonitoringWatchdog();
+    this.stopReadPollingFallback();
+    this.stopMediaButtonFallbackMonitoring();
 
     // Remove all event listeners
     this.eventListeners.forEach((listener) => {
@@ -1876,6 +2415,13 @@ class BluetoothAudioService {
       store.clearConnectionError();
       store.setIsConnecting(false);
       store.setIsScanning(false);
+      store.setIsHeadsetButtonMonitoring(false);
+      this.clearPttReleaseFallback();
+      this.clearMicApplyRetry();
+      this.pendingMicEnabled = null;
+      this.stopMonitoringWatchdog();
+      this.stopReadPollingFallback();
+      this.stopMediaButtonFallbackMonitoring();
     } catch (error) {
       logger.error({
         message: 'Error resetting Bluetooth Audio Service',
diff --git a/src/services/callkeep.service.android.ts b/src/services/callkeep.service.android.ts
index b4c52b86..81a64d52 100644
--- a/src/services/callkeep.service.android.ts
+++ b/src/services/callkeep.service.android.ts
@@ -21,6 +21,9 @@ export class CallKeepService {
   private isCallActive = false;
   private muteStateCallback: ((muted: boolean) => void) | null = null;
   private endCallCallback: (() => void) | null = null;
+  private lastMuteEventTime: number = 0;
+  private muteEventStormEndTime: number = 0;
+  private ignoreEventsUntil: number = 0;
 
   private constructor() {}
 
@@ -215,24 +218,37 @@ export class CallKeepService {
   }
 
   /**
-   * Externally lock/ignore mute events (No-op on Android for now)
+   * Externally lock/ignore mute events for a duration.
+   * Useful when Bluetooth PTT is handled directly and CallKeep/HFP events should be ignored.
    */
   ignoreMuteEvents(durationMs: number): void {
-    // No-op on Android
+    const now = Date.now();
+    this.ignoreEventsUntil = Math.max(this.ignoreEventsUntil, now + durationMs);
+    logger.debug({
+      message: 'CallKeep mute events ignored via external lock (Android)',
+      context: { durationMs, until: this.ignoreEventsUntil },
+    });
   }
 
   /**
-   * Remove the mute listener (interface compatibility)
+   * Remove the mute listener to prevent conflicts with specialized PTT devices
    */
   removeMuteListener(): void {
-    // No-op on Android for now
+    RNCallKeep.removeEventListener('didPerformSetMutedCallAction');
+    logger.debug({
+      message: 'CallKeep mute listener removed (Android)',
+    });
   }
 
   /**
-   * Restore the mute listener (interface compatibility)
+   * Restore the mute listener
    */
   restoreMuteListener(): void {
-    // No-op on Android for now
+    RNCallKeep.removeEventListener('didPerformSetMutedCallAction');
+    RNCallKeep.addEventListener('didPerformSetMutedCallAction', this.handleMutedCallAction);
+    logger.debug({
+      message: 'CallKeep mute listener restored (Android)',
+    });
   }
 
   /**
@@ -280,25 +296,57 @@ export class CallKeepService {
     });
 
     // Mute/unmute events
-    RNCallKeep.addEventListener('didPerformSetMutedCallAction', ({ muted, callUUID }: { muted: boolean; callUUID: string }) => {
+    RNCallKeep.addEventListener('didPerformSetMutedCallAction', this.handleMutedCallAction);
+  }
+
+  private handleMutedCallAction = ({ muted, callUUID }: { muted: boolean; callUUID: string }) => {
+    const now = Date.now();
+
+    if (now < this.ignoreEventsUntil) {
       logger.debug({
-        message: 'CallKeep mute state changed',
-        context: { muted, callUUID },
+        message: 'Ignored CallKeep mute state change (external lock, Android)',
+        context: { muted, callUUID, lockedUntil: this.ignoreEventsUntil },
       });
+      return;
+    }
 
-      // Call the registered callback if available
-      if (this.muteStateCallback) {
-        try {
-          this.muteStateCallback(muted);
-        } catch (error) {
-          logger.warn({
-            message: 'Failed to execute mute state callback',
-            context: { error, muted, callUUID },
-          });
-        }
-      }
+    const timeSinceLastEvent = now - this.lastMuteEventTime;
+    this.lastMuteEventTime = now;
+
+    if (timeSinceLastEvent < 500) {
+      this.muteEventStormEndTime = now + 800;
+      logger.debug({
+        message: 'Ignored CallKeep mute state change (storm detected, Android)',
+        context: { muted, callUUID, timeSinceLastEvent },
+      });
+      return;
+    }
+
+    if (now < this.muteEventStormEndTime) {
+      this.muteEventStormEndTime = now + 800;
+      logger.debug({
+        message: 'Ignored CallKeep mute state change (storm cooldown, Android)',
+        context: { muted, callUUID, stormEndsAt: this.muteEventStormEndTime },
+      });
+      return;
+    }
+
+    logger.debug({
+      message: 'CallKeep mute state changed',
+      context: { muted, callUUID },
     });
-  }
+
+    if (this.muteStateCallback) {
+      try {
+        this.muteStateCallback(muted);
+      } catch (error) {
+        logger.warn({
+          message: 'Failed to execute mute state callback',
+          context: { error, muted, callUUID },
+        });
+      }
+    }
+  };
 
   /**
    * Generate a UUID for CallKeep calls
diff --git a/src/stores/app/livekit-store.ts b/src/stores/app/livekit-store.ts
index 71c50f4c..0e6cc6ed 100644
--- a/src/stores/app/livekit-store.ts
+++ b/src/stores/app/livekit-store.ts
@@ -11,6 +11,7 @@ import { getCanConnectToVoiceSession, getDepartmentVoiceSettings } from '../../a
 import { logger } from '../../lib/logging';
 import { type DepartmentVoiceChannelResultData } from '../../models/v4/voice/departmentVoiceResultData';
 import { audioService } from '../../services/audio.service';
+import { bluetoothAudioService } from '../../services/bluetooth-audio.service';
 import { callKeepService } from '../../services/callkeep.service';
 import { useBluetoothAudioStore } from './bluetooth-audio-store';
 
@@ -20,12 +21,32 @@ export const applyAudioRouting = async (deviceType: 'bluetooth' | 'speaker' | 'e
   if (Platform.OS === 'web') return;
 
   try {
+    const normalizedDeviceType: 'bluetooth' | 'speaker' | 'earpiece' = deviceType === 'default' ? 'earpiece' : deviceType;
+
     if (Platform.OS === 'android') {
       logger.info({
         message: 'Applying Android audio routing',
-        context: { deviceType },
+        context: { deviceType: normalizedDeviceType },
       });
 
+      const { NativeModules } = require('react-native');
+      const inCallAudioModule = NativeModules?.InCallAudioModule;
+
+      if (inCallAudioModule?.setAudioRoute) {
+        try {
+          await inCallAudioModule.setAudioRoute(normalizedDeviceType);
+          logger.debug({
+            message: 'Applied Android route via InCallAudioModule',
+            context: { deviceType: normalizedDeviceType },
+          });
+        } catch (routeError) {
+          logger.warn({
+            message: 'Failed to apply Android route via InCallAudioModule, falling back to Audio.setAudioModeAsync',
+            context: { deviceType: normalizedDeviceType, error: routeError },
+          });
+        }
+      }
+
       // On Android, we use RTCAudioSession for precise control
       // First, ensure the audio session is configured correctly
       await Audio.setAudioModeAsync({
@@ -34,7 +55,7 @@ export const applyAudioRouting = async (deviceType: 'bluetooth' | 'speaker' | 'e
         playsInSilentModeIOS: true,
         shouldDuckAndroid: false,
         // For speaker, we want false (speaker). For others, simple routing.
-        playThroughEarpieceAndroid: deviceType !== 'speaker',
+        playThroughEarpieceAndroid: normalizedDeviceType !== 'speaker',
         interruptionModeIOS: InterruptionModeIOS.MixWithOthers,
       });
 
@@ -52,6 +73,7 @@ export const applyAudioRouting = async (deviceType: 'bluetooth' | 'speaker' | 'e
       */
       logger.info({
         message: 'Android audio routing applied via Audio.setAudioModeAsync',
+        context: { deviceType: normalizedDeviceType },
       });
     } else {
       // iOS handling (Expo AV is usually sufficient, but CallKeep handles the session)
@@ -133,6 +155,7 @@ interface LiveKitState {
   currentRoom: Room | null;
   currentRoomInfo: DepartmentVoiceChannelResultData | null;
   isTalking: boolean;
+  isMicrophoneEnabled: boolean;
   isVoiceEnabled: boolean;
   voipServerWebsocketSslAddress: string;
   callerIdName: string;
@@ -170,6 +193,7 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
   currentRoom: null,
   currentRoomInfo: null,
   isTalking: false,
+  isMicrophoneEnabled: false,
   availableRooms: [],
   isBottomSheetVisible: false,
   isVoiceEnabled: false,
@@ -199,14 +223,22 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
     try {
       const currentMicEnabled = currentRoom.localParticipant.isMicrophoneEnabled;
       // Skip if already in the desired state
-      if (enabled && currentMicEnabled) return;
-      if (!enabled && !currentMicEnabled) return;
-
-      // Update timestamp BEFORE changing state to ensure debounce logic catches it
-      set({ lastLocalMuteChangeTimestamp: Date.now() });
+      if (enabled && currentMicEnabled) {
+        set({ isMicrophoneEnabled: true });
+        return;
+      }
+      if (!enabled && !currentMicEnabled) {
+        set({ isMicrophoneEnabled: false });
+        return;
+      }
 
       await currentRoom.localParticipant.setMicrophoneEnabled(enabled);
 
+      set({
+        isMicrophoneEnabled: enabled,
+        lastLocalMuteChangeTimestamp: Date.now(),
+      });
+
       logger.info({
         message: 'Microphone state set via store',
         context: { enabled },
@@ -338,6 +370,8 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
 
   connectToRoom: async (roomInfo, token) => {
     try {
+      bluetoothAudioService.ensurePttInputMonitoring('livekit-store connectToRoom start');
+
       // Request permissions before connecting (critical for Android foreground service)
       // On Android 14+, the foreground service with microphone type requires RECORD_AUDIO
       // permission to be granted BEFORE the service starts
@@ -397,6 +431,15 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
       await room.localParticipant.setMicrophoneEnabled(false);
       await room.localParticipant.setCameraEnabled(false);
 
+      set({
+        currentRoom: room,
+        currentRoomInfo: roomInfo,
+        isConnected: true,
+        isConnecting: false,
+        isMicrophoneEnabled: false,
+        lastLocalMuteChangeTimestamp: Date.now(),
+      });
+
       // Setup CallKeep mute sync
       callKeepService.setMuteStateCallback(async (muted) => {
         logger.info({
@@ -414,7 +457,13 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
           // if isMicrophoneEnabled (false) and muted (false) -> mismatch, we must unmute.
 
           // Actually effectively: setMicrophoneEnabled(!muted)
-          await room.localParticipant.setMicrophoneEnabled(!muted);
+          const nextMicEnabled = !muted;
+          await room.localParticipant.setMicrophoneEnabled(nextMicEnabled);
+
+          set({
+            isMicrophoneEnabled: nextMicEnabled,
+            lastLocalMuteChangeTimestamp: Date.now(),
+          });
 
           // Play sound
           if (!muted) {
@@ -523,17 +572,13 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
         // Don't fail the connection if CallKeep fails
       }
 
-      set({
-        currentRoom: room,
-        currentRoomInfo: roomInfo,
-        isConnected: true,
-        isConnecting: false,
-      });
+      bluetoothAudioService.ensurePttInputMonitoring('livekit-store connectToRoom connected');
     } catch (error) {
       logger.error({
         message: 'Failed to connect to room',
         context: { error },
       });
+
       set({ isConnecting: false });
     }
   },
@@ -577,6 +622,7 @@ export const useLiveKitStore = create<LiveKitState>((set, get) => ({
         currentRoom: null,
         currentRoomInfo: null,
         isConnected: false,
+        isMicrophoneEnabled: false,
         isTalking: false,
       });
     }
diff --git a/src/stores/calls/__tests__/detail-store.test.ts b/src/stores/calls/__tests__/detail-store.test.ts
index 56130519..1063d1db 100644
--- a/src/stores/calls/__tests__/detail-store.test.ts
+++ b/src/stores/calls/__tests__/detail-store.test.ts
@@ -113,7 +113,7 @@ describe('useCallDetailStore - Notes', () => {
     });
 
     it('should handle loading state correctly', async () => {
-      mockGetCallNotes.mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 100)));
+      mockGetCallNotes.mockImplementation(() => new Promise(() => {}));
 
       const { result } = renderHook(() => useCallDetailStore());
 
@@ -217,7 +217,7 @@ describe('useCallDetailStore - Notes', () => {
     });
 
     it('should handle loading state during add note', async () => {
-      mockSaveCallNote.mockImplementation(() => new Promise((resolve) => setTimeout(resolve, 100)));
+      mockSaveCallNote.mockImplementation(() => new Promise(() => {}));
       mockGetCallNotes.mockResolvedValue({ Data: [] } as any);
 
       const { result } = renderHook(() => useCallDetailStore());
@@ -489,9 +489,9 @@ describe('useCallDetailStore - Notes', () => {
 
       const { result } = renderHook(() => useCallDetailStore());
 
-      await expect(
-        act(async () => {
-          await result.current.updateCall({
+      await act(async () => {
+        await expect(
+          result.current.updateCall({
             callId: 'call123',
             name: 'Test Call',
             nature: 'Test Nature',
@@ -503,9 +503,9 @@ describe('useCallDetailStore - Notes', () => {
             type: 'Medical',
             latitude: 40.7128,
             longitude: -74.006,
-          });
-        })
-      ).rejects.toThrow(errorMessage);
+          })
+        ).rejects.toThrow(errorMessage);
+      });
 
       expect(mockUpdateCall).toHaveBeenCalled();
     });
@@ -567,11 +567,9 @@ describe('useCallDetailStore - Notes', () => {
 
       const { result } = renderHook(() => useCallDetailStore());
 
-      await expect(
-        act(async () => {
-          await result.current.closeCall(closeData);
-        })
-      ).rejects.toThrow(errorMessage);
+      await act(async () => {
+        await expect(result.current.closeCall(closeData)).rejects.toThrow(errorMessage);
+      });
 
       expect(mockCloseCall).toHaveBeenCalledWith(closeData);
     });
@@ -698,11 +696,9 @@ describe('useCallDetailStore - Notes', () => {
       const { result } = renderHook(() => useCallDetailStore());
 
       // Update should fail
-      await expect(
-        act(async () => {
-          await result.current.updateCall(updateData);
-        })
-      ).rejects.toThrow('Update failed');
+      await act(async () => {
+        await expect(result.current.updateCall(updateData)).rejects.toThrow('Update failed');
+      });
 
       // Close should still work
       await act(async () => {
diff --git a/src/translations/ar.json b/src/translations/ar.json
index 622091a4..a6d31e30 100644
--- a/src/translations/ar.json
+++ b/src/translations/ar.json
@@ -37,6 +37,7 @@
     "audio": "صوت",
     "audioActive": "الصوت نشط",
     "audio_device": "سماعة BT",
+    "audio_output": "مخرج الصوت",
     "availableDevices": "الأجهزة المتاحة",
     "available_devices": "الأجهزة المتاحة",
     "bluetooth_not_ready": "البلوتوث {{state}}. يرجى تمكين البلوتوث.",
@@ -76,6 +77,9 @@
     "startScanning": "بدء البحث",
     "stopScan": "إيقاف البحث",
     "supports_mic_control": "تحكم بالمايك",
+    "system_audio": "صوت النظام",
+    "system_audio_description": "استخدم مكبر الصوت والميكروفون الافتراضيين للهاتف",
+    "system_audio_error": "تعذر التبديل إلى صوت النظام",
     "tap_scan_to_find_devices": "اضغط 'بحث' للعثور على أجهزة صوت البلوتوث",
     "title": "صوت البلوتوث",
     "unauthorized": "تم رفض إذن البلوتوث. يرجى منح أذونات البلوتوث في الإعدادات.",
@@ -555,12 +559,15 @@
     "audio_device_selection": {
       "bluetooth_device": "جهاز بلوتوث",
       "current_selection": "الاختيار الحالي",
+      "default_microphone": "الميكروفون الافتراضي",
+      "default_speaker": "مكبر الصوت الافتراضي",
       "microphone": "الميكروفون",
       "no_microphones_available": "لا توجد ميكروفونات متاحة",
       "no_speakers_available": "لا توجد مكبرات صوت متاحة",
       "none_selected": "لم يتم الاختيار",
       "speaker": "مكبر الصوت",
       "speaker_device": "جهاز مكبر صوت",
+      "system_audio": "صوت النظام",
       "title": "اختيار أجهزة الصوت",
       "unavailable": "غير متوفر",
       "wired_device": "جهاز سلكي"
diff --git a/src/translations/en.json b/src/translations/en.json
index 73dc4761..01a32a73 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -37,6 +37,7 @@
     "audio": "Audio",
     "audioActive": "Audio Active",
     "audio_device": "BT Handset",
+    "audio_output": "Audio Output",
     "availableDevices": "Available Devices",
     "available_devices": "Available Devices",
     "bluetooth_not_ready": "Bluetooth is {{state}}. Please enable Bluetooth.",
@@ -76,6 +77,9 @@
     "startScanning": "Start Scanning",
     "stopScan": "Stop Scan",
     "supports_mic_control": "Mic Control",
+    "system_audio": "System Audio",
+    "system_audio_description": "Use your phone's default speaker and microphone",
+    "system_audio_error": "Could not switch to System Audio",
     "tap_scan_to_find_devices": "Tap 'Scan' to find Bluetooth audio devices",
     "title": "Bluetooth Audio",
     "unauthorized": "Bluetooth permission denied. Please grant Bluetooth permissions in Settings.",
@@ -555,12 +559,15 @@
     "audio_device_selection": {
       "bluetooth_device": "Bluetooth Device",
       "current_selection": "Current Selection",
+      "default_microphone": "Default Microphone",
+      "default_speaker": "Default Speaker",
       "microphone": "Microphone",
       "no_microphones_available": "No microphones available",
       "no_speakers_available": "No speakers available",
       "none_selected": "None selected",
       "speaker": "Speaker",
       "speaker_device": "Speaker Device",
+      "system_audio": "System Audio",
       "title": "Audio Device Selection",
       "unavailable": "Unavailable",
       "wired_device": "Wired Device"
diff --git a/src/translations/es.json b/src/translations/es.json
index 8b6f9746..0f270231 100644
--- a/src/translations/es.json
+++ b/src/translations/es.json
@@ -37,6 +37,7 @@
     "audio": "Audio",
     "audioActive": "Audio Activo",
     "audio_device": "Auricular BT",
+    "audio_output": "Salida de audio",
     "availableDevices": "Dispositivos Disponibles",
     "available_devices": "Dispositivos Disponibles",
     "bluetooth_not_ready": "Bluetooth está {{state}}. Por favor habilita Bluetooth.",
@@ -76,6 +77,9 @@
     "startScanning": "Iniciar Escaneo",
     "stopScan": "Parar Escaneo",
     "supports_mic_control": "Control de Micrófono",
+    "system_audio": "Audio del sistema",
+    "system_audio_description": "Usar el altavoz y el micrófono predeterminados del teléfono",
+    "system_audio_error": "No se pudo cambiar al audio del sistema",
     "tap_scan_to_find_devices": "Toca 'Escanear' para encontrar dispositivos de audio Bluetooth",
     "title": "Audio Bluetooth",
     "unauthorized": "Permiso de Bluetooth denegado. Otorga permisos de Bluetooth en Configuración.",
@@ -555,12 +559,15 @@
     "audio_device_selection": {
       "bluetooth_device": "Dispositivo Bluetooth",
       "current_selection": "Selección actual",
+      "default_microphone": "Micrófono predeterminado",
+      "default_speaker": "Altavoz predeterminado",
       "microphone": "Micrófono",
       "no_microphones_available": "No hay micrófonos disponibles",
       "no_speakers_available": "No hay altavoces disponibles",
       "none_selected": "Ninguno seleccionado",
       "speaker": "Altavoz",
       "speaker_device": "Dispositivo de altavoz",
+      "system_audio": "Audio del sistema",
       "title": "Selección de dispositivos de audio",
       "unavailable": "No disponible",
       "wired_device": "Dispositivo con cable"
diff --git a/yarn.lock b/yarn.lock
index 30df8c5d..e06d8d71 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1199,7 +1199,7 @@
   dependencies:
     eslint-visitor-keys "^3.4.3"
 
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
   version "4.12.1"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
   integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
@@ -5398,7 +5398,7 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^7.4.0":
+"@typescript-eslint/eslint-plugin@^7.4.0", "@typescript-eslint/eslint-plugin@~7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3"
   integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==
@@ -5413,23 +5413,7 @@
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/eslint-plugin@~5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
-  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
-  dependencies:
-    "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/type-utils" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
-    debug "^4.3.4"
-    graphemer "^1.4.0"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@^7.4.0":
+"@typescript-eslint/parser@^7.4.0", "@typescript-eslint/parser@~7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0"
   integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==
@@ -5440,16 +5424,6 @@
     "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
 
-"@typescript-eslint/parser@~5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
-  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    debug "^4.3.4"
-
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
@@ -5466,16 +5440,6 @@
     "@typescript-eslint/types" "7.18.0"
     "@typescript-eslint/visitor-keys" "7.18.0"
 
-"@typescript-eslint/type-utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
-  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
-    debug "^4.3.4"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/type-utils@7.18.0":
   version "7.18.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b"
@@ -5523,7 +5487,17 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.58.0":
+"@typescript-eslint/utils@7.18.0", "@typescript-eslint/utils@^7.2.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
+  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+
+"@typescript-eslint/utils@^5.58.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
   integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
@@ -5537,16 +5511,6 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@7.18.0", "@typescript-eslint/utils@^7.2.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
-  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/typescript-estree" "7.18.0"
-
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
@@ -12602,11 +12566,6 @@ nativewind@~4.1.21:
     debug "^4.3.7"
     react-native-css-interop "0.1.22"
 
-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -16074,10 +16033,10 @@ typescript@^5.6.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6"
   integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==
 
-typescript@~5.8.3:
-  version "5.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
-  integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
+typescript@~5.5.4:
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
+  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
 
 ua-parser-js@^0.7.33:
   version "0.7.41"

From 9150ddce7021f07fbd136fa84bfcfa9a30fe2d0a Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Wed, 18 Feb 2026 20:03:43 -0800
Subject: [PATCH 2/5] RU-T47 PR#221 fixes

---
 package.json                                  |  10 +-
 plugins/withInCallAudioModule.js              |  13 +-
 ...luetooth-device-selection-bottom-sheet.tsx |   1 -
 src/lib/utils.ts                              |   6 +-
 .../__tests__/bluetooth-audio.service.test.ts |  38 ++
 src/services/app-lifecycle.ts                 |   4 +-
 src/services/bluetooth-audio.service.ts       |  39 +-
 src/services/callkeep.service.android.ts      |   1 -
 yarn.lock                                     | 442 +++++++++++++-----
 9 files changed, 415 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index 6122de68..8f2f029b 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,6 @@
     "app-icon-badge": "^0.1.2",
     "axios": "~1.12.0",
     "babel-plugin-module-resolver": "^5.0.2",
-    "babel-plugin-transform-import-meta": "^2.3.3",
     "buffer": "^6.0.3",
     "countly-sdk-react-native-bridge": "25.4.1",
     "date-fns": "^4.1.0",
@@ -191,8 +190,9 @@
     "@types/mapbox-gl": "3.4.1",
     "@types/react": "~19.0.10",
     "@types/react-native-base64": "~0.2.2",
-    "@typescript-eslint/eslint-plugin": "~7.18.0",
-    "@typescript-eslint/parser": "~7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "babel-plugin-transform-import-meta": "^2.3.3",
     "babel-jest": "~30.0.0",
     "concurrently": "9.2.1",
     "cross-env": "~7.0.3",
@@ -201,7 +201,7 @@
     "electron-builder": "26.4.0",
     "electron-squirrel-startup": "^1.0.1",
     "eslint": "~8.57.0",
-    "eslint-config-expo": "~7.1.2",
+    "eslint-config-expo": "~9.2.0",
     "eslint-config-prettier": "~9.1.0",
     "eslint-import-resolver-typescript": "~3.6.3",
     "eslint-plugin-i18n-json": "~4.0.0",
@@ -226,7 +226,7 @@
     "tailwindcss": "3.4.4",
     "ts-jest": "~29.1.2",
     "ts-node": "~10.9.2",
-    "typescript": "~5.5.4",
+    "typescript": "5.8.x",
     "wait-on": "9.0.3"
   },
   "repository": {
diff --git a/plugins/withInCallAudioModule.js b/plugins/withInCallAudioModule.js
index 51ad5a8d..2deb3627 100644
--- a/plugins/withInCallAudioModule.js
+++ b/plugins/withInCallAudioModule.js
@@ -115,9 +115,18 @@ class InCallAudioModule(reactContext: ReactApplicationContext) : ReactContextBas
           when (normalizedRoute) {
             "bluetooth" -> {
               audioManager.isSpeakerphoneOn = false
+              if (!audioManager.isBluetoothScoAvailableOffCall) {
+                audioManager.isBluetoothScoOn = false
+                promise.reject("BLUETOOTH_SCO_UNAVAILABLE", "Bluetooth SCO is not available off call")
+                return
+              }
+
+              audioManager.startBluetoothSco()
               audioManager.isBluetoothScoOn = true
-              if (audioManager.isBluetoothScoAvailableOffCall) {
-                audioManager.startBluetoothSco()
+
+              if (!audioManager.isBluetoothScoOn) {
+                promise.reject("BLUETOOTH_SCO_START_FAILED", "Failed to start Bluetooth SCO")
+                return
               }
             }
 
diff --git a/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx b/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
index ac50b684..9f4b86dd 100644
--- a/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
+++ b/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
@@ -44,7 +44,6 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
       setHasScanned(true);
       await bluetoothAudioService.startScanning(10000); // 10 second scan
     } catch (error) {
-      setHasScanned(false); // Reset scan state on error
       logger.error({
         message: 'Failed to start Bluetooth scan',
         context: { error },
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index b1b3d5c2..6633492f 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -63,14 +63,14 @@ export function invertColor(hex: string, bw: boolean): string {
 
 export function padZero(str: string, len: number): string {
   len = len || 2;
-  var zeros = new Array(len).join('0');
+  const zeros = new Array(len).join('0');
   return (zeros + str).slice(-len);
 }
 
 export function uuidv4() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = (Math.random() * 16) | 0,
-      v = c === 'x' ? r : (r & 0x3) | 0x8;
+    const r = (Math.random() * 16) | 0;
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
     return v.toString(16);
   });
 }
diff --git a/src/services/__tests__/bluetooth-audio.service.test.ts b/src/services/__tests__/bluetooth-audio.service.test.ts
index ead60400..220a4a63 100644
--- a/src/services/__tests__/bluetooth-audio.service.test.ts
+++ b/src/services/__tests__/bluetooth-audio.service.test.ts
@@ -244,4 +244,42 @@ describe('BluetoothAudioService Refactoring', () => {
       expect(legacyStore.setMicrophoneEnabled).toHaveBeenCalledWith(true);
     });
   });
+
+  describe('Capability parsing strictness', () => {
+    it('should reject explicit falsy read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasReadCapability({ Read: false })).toBe(false);
+      expect(service.hasReadCapability({ read: 0 })).toBe(false);
+      expect(service.hasReadCapability({ read: 'false' })).toBe(false);
+    });
+
+    it('should accept explicit truthy read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasReadCapability({ Read: true })).toBe(true);
+      expect(service.hasReadCapability({ read: 1 })).toBe(true);
+      expect(service.hasReadCapability({ read: 'true' })).toBe(true);
+      expect(service.hasReadCapability({ read: '1' })).toBe(true);
+      expect(service.hasReadCapability({ read: 'read' })).toBe(true);
+    });
+
+    it('should reject explicit falsy notify/read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasNotificationOrReadCapability({ Notify: false })).toBe(false);
+      expect(service.hasNotificationOrReadCapability({ indicate: 0 })).toBe(false);
+      expect(service.hasNotificationOrReadCapability({ read: 'false' })).toBe(false);
+    });
+
+    it('should accept explicit truthy notify/read capability values', () => {
+      const service = bluetoothAudioService as any;
+
+      expect(service.hasNotificationOrReadCapability({ notify: true })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ indicate: 1 })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ read: 'true' })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ read: '1' })).toBe(true);
+      expect(service.hasNotificationOrReadCapability({ notify: 'notify' })).toBe(true);
+    });
+  });
 });
diff --git a/src/services/app-lifecycle.ts b/src/services/app-lifecycle.ts
index 1a5ae804..43ab3210 100644
--- a/src/services/app-lifecycle.ts
+++ b/src/services/app-lifecycle.ts
@@ -1,6 +1,6 @@
 import { AppState, type AppStateStatus } from 'react-native';
 
-import { useLogger } from '@/lib/logging';
+import { logger } from '@/lib/logging';
 import { useAppLifecycleStore } from '@/stores/app/app-lifecycle';
 
 class AppLifecycleService {
@@ -25,7 +25,7 @@ class AppLifecycleService {
   private handleAppStateChange = (nextAppState: AppStateStatus): void => {
     const currentState = useAppLifecycleStore.getState().appState;
 
-    useLogger().info({
+    logger.info({
       message: 'App state changed',
       context: {
         from: currentState,
diff --git a/src/services/bluetooth-audio.service.ts b/src/services/bluetooth-audio.service.ts
index 0922ebe7..5668f5a7 100644
--- a/src/services/bluetooth-audio.service.ts
+++ b/src/services/bluetooth-audio.service.ts
@@ -187,34 +187,40 @@ class BluetoothAudioService {
     }
   }
 
+  private addEventListener(listener: { remove: () => void }): void {
+    if (!this.eventListeners.includes(listener)) {
+      this.eventListeners.push(listener);
+    }
+  }
+
+  private removeEventListener(listener: { remove: () => void } | null): void {
+    if (!listener) {
+      return;
+    }
+
+    this.eventListeners = this.eventListeners.filter((registeredListener) => registeredListener !== listener);
+  }
+
   private setupEventListeners(): void {
     // Bluetooth state change listener
-    //const stateListener = DeviceEventEmitter.addListener('BleManagerDidUpdateState', this.handleBluetoothStateChange.bind(this));
     const stateListener = BleManager.onDidUpdateState(this.handleBluetoothStateChange.bind(this));
-    this.eventListeners.push(stateListener);
+    this.addEventListener(stateListener);
 
     // Device disconnection listener
-    //const disconnectListener = DeviceEventEmitter.addListener('BleManagerDisconnectPeripheral', this.handleDeviceDisconnected.bind(this));
     const disconnectListener = BleManager.onDisconnectPeripheral(this.handleDeviceDisconnected.bind(this));
-    this.eventListeners.push(disconnectListener);
+    this.addEventListener(disconnectListener);
 
     // Device discovered listener
-    //const discoverListener = DeviceEventEmitter.addListener('BleManagerDiscoverPeripheral', this.handleDeviceDiscovered.bind(this));
     const discoverListener = BleManager.onDiscoverPeripheral(this.handleDeviceDiscovered.bind(this));
-    this.eventListeners.push(discoverListener);
+    this.addEventListener(discoverListener);
 
     // Characteristic value update listener
-    //const valueUpdateListener = DeviceEventEmitter.addListener('BleManagerDidUpdateValueForCharacteristic', this.handleCharacteristicValueUpdate.bind(this));
     const valueUpdateListener = BleManager.onDidUpdateValueForCharacteristic(this.handleCharacteristicValueUpdate.bind(this));
-    this.eventListeners.push(valueUpdateListener);
-
-    const legacyValueUpdateListener = DeviceEventEmitter.addListener('BleManagerDidUpdateValueForCharacteristic', this.handleCharacteristicValueUpdate.bind(this));
-    this.eventListeners.push(legacyValueUpdateListener);
+    this.addEventListener(valueUpdateListener);
 
     // Stop scan listener
-    //const stopScanListener = DeviceEventEmitter.addListener('BleManagerStopScan', this.handleScanStopped.bind(this));
     const stopScanListener = BleManager.onStopScan(this.handleScanStopped.bind(this));
-    this.eventListeners.push(stopScanListener);
+    this.addEventListener(stopScanListener);
   }
 
   private handleBluetoothStateChange(args: { state: BleState }): void {
@@ -1126,11 +1132,12 @@ class BluetoothAudioService {
     }
 
     this.mediaButtonEventListener = DeviceEventEmitter.addListener('onMediaButtonEvent', this.handleMediaButtonFallbackEvent.bind(this));
-    this.eventListeners.push(this.mediaButtonEventListener);
+    this.addEventListener(this.mediaButtonEventListener);
   }
 
   private stopMediaButtonFallbackMonitoring(): void {
     if (this.mediaButtonEventListener) {
+      this.removeEventListener(this.mediaButtonEventListener);
       this.mediaButtonEventListener.remove();
       this.mediaButtonEventListener = null;
     }
@@ -1522,7 +1529,7 @@ class BluetoothAudioService {
           return false;
         }
 
-        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1' || normalizedValue.length > 0;
+        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1';
       });
     }
 
@@ -1558,7 +1565,7 @@ class BluetoothAudioService {
           return false;
         }
 
-        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1' || normalizedValue.length > 0;
+        return value === true || value === 1 || normalizedValue === normalizedKey || normalizedValue === 'true' || normalizedValue === '1';
       });
     }
 
diff --git a/src/services/callkeep.service.android.ts b/src/services/callkeep.service.android.ts
index 81a64d52..afa53248 100644
--- a/src/services/callkeep.service.android.ts
+++ b/src/services/callkeep.service.android.ts
@@ -323,7 +323,6 @@ export class CallKeepService {
     }
 
     if (now < this.muteEventStormEndTime) {
-      this.muteEventStormEndTime = now + 800;
       logger.debug({
         message: 'Ignored CallKeep mute state change (storm cooldown, Android)',
         context: { muted, callUUID, stormEndsAt: this.muteEventStormEndTime },
diff --git a/yarn.lock b/yarn.lock
index e06d8d71..7f185a94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1192,18 +1192,53 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
   integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
 
-"@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+"@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0":
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3"
   integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==
   dependencies:
     eslint-visitor-keys "^3.4.3"
 
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/eslint-utils@^4.8.0", "@eslint-community/eslint-utils@^4.9.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz#4e90af67bc51ddee6cdef5284edf572ec376b595"
+  integrity sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/regexpp@^4.12.1", "@eslint-community/regexpp@^4.12.2":
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
+  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
+
+"@eslint-community/regexpp@^4.6.1":
   version "4.12.1"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
   integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 
+"@eslint/config-array@^0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.1.tgz#7d1b0060fea407f8301e932492ba8c18aff29713"
+  integrity sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==
+  dependencies:
+    "@eslint/object-schema" "^2.1.7"
+    debug "^4.3.1"
+    minimatch "^3.1.2"
+
+"@eslint/config-helpers@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.4.2.tgz#1bd006ceeb7e2e55b2b773ab318d300e1a66aeda"
+  integrity sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==
+  dependencies:
+    "@eslint/core" "^0.17.0"
+
+"@eslint/core@^0.17.0":
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.17.0.tgz#77225820413d9617509da9342190a2019e78761c"
+  integrity sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
 "@eslint/eslintrc@^2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
@@ -1219,11 +1254,44 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/eslintrc@^3.3.1":
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.3.tgz#26393a0806501b5e2b6a43aa588a4d8df67880ac"
+  integrity sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^10.0.1"
+    globals "^14.0.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.1"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
 "@eslint/js@8.57.1":
   version "8.57.1"
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
   integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
+"@eslint/js@9.39.2":
+  version "9.39.2"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.39.2.tgz#2d4b8ec4c3ea13c1b3748e0c97ecd766bdd80599"
+  integrity sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==
+
+"@eslint/object-schema@^2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.7.tgz#6e2126a1347e86a4dedf8706ec67ff8e107ebbad"
+  integrity sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==
+
+"@eslint/plugin-kit@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz#9779e3fd9b7ee33571a57435cf4335a1794a6cb2"
+  integrity sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==
+  dependencies:
+    "@eslint/core" "^0.17.0"
+    levn "^0.4.1"
+
 "@expo/cli@0.24.22":
   version "0.24.22"
   resolved "https://registry.yarnpkg.com/@expo/cli/-/cli-0.24.22.tgz#75bef7ce8df0e239b489b70a396e9ddf9833bad1"
@@ -2406,6 +2474,19 @@
   resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-3.9.1.tgz#a23883c40bfd449cb6c6ab5a0fa0729184c950ff"
   integrity sha512-ud2HqmGBM0P0IABqoskKWI6PEf6ZDDBZkFqe2Vnl+mTHCEHzr3ISjjZyCwTjC/qpL25JC9aIDkloQejvMeq0ug==
 
+"@humanfs/core@^0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
+  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+
+"@humanfs/node@^0.16.6":
+  version "0.16.7"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.7.tgz#822cb7b3a12c5a240a24f621b5a2413e27a45f26"
+  integrity sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==
+  dependencies:
+    "@humanfs/core" "^0.19.1"
+    "@humanwhocodes/retry" "^0.4.0"
+
 "@humanwhocodes/config-array@^0.13.0":
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
@@ -2425,6 +2506,11 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
+"@humanwhocodes/retry@^0.4.0", "@humanwhocodes/retry@^0.4.2":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
+  integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==
+
 "@inquirer/external-editor@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@inquirer/external-editor/-/external-editor-1.0.2.tgz#dc16e7064c46c53be09918db639ff780718c071a"
@@ -5151,6 +5237,11 @@
   dependencies:
     "@types/ms" "*"
 
+"@types/estree@^1.0.6":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
+  integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
+
 "@types/fs-extra@9.0.13", "@types/fs-extra@^9.0.11":
   version "9.0.13"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
@@ -5233,7 +5324,7 @@
     "@types/tough-cookie" "*"
     parse5 "^7.0.0"
 
-"@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.15", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -5398,31 +5489,39 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^7.4.0", "@typescript-eslint/eslint-plugin@~7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3"
-  integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==
-  dependencies:
-    "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/type-utils" "7.18.0"
-    "@typescript-eslint/utils" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
-    graphemer "^1.4.0"
-    ignore "^5.3.1"
+"@typescript-eslint/eslint-plugin@^8.0.0", "@typescript-eslint/eslint-plugin@^8.18.2":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.0.tgz#5aec3db807a6b8437ea5d5ebf7bd16b4119aba8d"
+  integrity sha512-lRyPDLzNCuae71A3t9NEINBiTn7swyOhvUj3MyUOxb8x6g6vPEFoOU+ZRmGMusNC3X3YMhqMIX7i8ShqhT74Pw==
+  dependencies:
+    "@eslint-community/regexpp" "^4.12.2"
+    "@typescript-eslint/scope-manager" "8.56.0"
+    "@typescript-eslint/type-utils" "8.56.0"
+    "@typescript-eslint/utils" "8.56.0"
+    "@typescript-eslint/visitor-keys" "8.56.0"
+    ignore "^7.0.5"
     natural-compare "^1.4.0"
-    ts-api-utils "^1.3.0"
+    ts-api-utils "^2.4.0"
 
-"@typescript-eslint/parser@^7.4.0", "@typescript-eslint/parser@~7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0"
-  integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==
+"@typescript-eslint/parser@^8.0.0", "@typescript-eslint/parser@^8.18.2":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.56.0.tgz#8ecff1678b8b1a742d29c446ccf5eeea7f971d72"
+  integrity sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/typescript-estree" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
-    debug "^4.3.4"
+    "@typescript-eslint/scope-manager" "8.56.0"
+    "@typescript-eslint/types" "8.56.0"
+    "@typescript-eslint/typescript-estree" "8.56.0"
+    "@typescript-eslint/visitor-keys" "8.56.0"
+    debug "^4.4.3"
+
+"@typescript-eslint/project-service@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.56.0.tgz#bb8562fecd8f7922e676fc6a1189c20dd7991d73"
+  integrity sha512-M3rnyL1vIQOMeWxTWIW096/TtVP+8W3p/XnaFflhmcFp+U4zlxUxWj4XwNs6HbDeTtN4yun0GNTTDBw/SvufKg==
+  dependencies:
+    "@typescript-eslint/tsconfig-utils" "^8.56.0"
+    "@typescript-eslint/types" "^8.56.0"
+    debug "^4.4.3"
 
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
@@ -5432,33 +5531,39 @@
     "@typescript-eslint/types" "5.62.0"
     "@typescript-eslint/visitor-keys" "5.62.0"
 
-"@typescript-eslint/scope-manager@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
-  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
+"@typescript-eslint/scope-manager@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.56.0.tgz#604030a4c6433df3728effdd441d47f45a86edb4"
+  integrity sha512-7UiO/XwMHquH+ZzfVCfUNkIXlp/yQjjnlYUyYz7pfvlK3/EyyN6BK+emDmGNyQLBtLGaYrTAI6KOw8tFucWL2w==
   dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
+    "@typescript-eslint/types" "8.56.0"
+    "@typescript-eslint/visitor-keys" "8.56.0"
+
+"@typescript-eslint/tsconfig-utils@8.56.0", "@typescript-eslint/tsconfig-utils@^8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.0.tgz#2538ce83cbc376e685487960cbb24b65fe2abc4e"
+  integrity sha512-bSJoIIt4o3lKXD3xmDh9chZcjCz5Lk8xS7Rxn+6l5/pKrDpkCwtQNQQwZ2qRPk7TkUYhrq3WPIHXOXlbXP0itg==
 
-"@typescript-eslint/type-utils@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b"
-  integrity sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==
+"@typescript-eslint/type-utils@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.56.0.tgz#72b4edc1fc73988998f1632b3ec99c2a66eaac6e"
+  integrity sha512-qX2L3HWOU2nuDs6GzglBeuFXviDODreS58tLY/BALPC7iu3Fa+J7EOTwnX9PdNBxUI7Uh0ntP0YWGnxCkXzmfA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.18.0"
-    "@typescript-eslint/utils" "7.18.0"
-    debug "^4.3.4"
-    ts-api-utils "^1.3.0"
+    "@typescript-eslint/types" "8.56.0"
+    "@typescript-eslint/typescript-estree" "8.56.0"
+    "@typescript-eslint/utils" "8.56.0"
+    debug "^4.4.3"
+    ts-api-utils "^2.4.0"
 
 "@typescript-eslint/types@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
   integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
-"@typescript-eslint/types@7.18.0", "@typescript-eslint/types@^7.2.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
-  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
+"@typescript-eslint/types@8.56.0", "@typescript-eslint/types@^8.29.1", "@typescript-eslint/types@^8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.56.0.tgz#a2444011b9a98ca13d70411d2cbfed5443b3526a"
+  integrity sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==
 
 "@typescript-eslint/typescript-estree@5.62.0":
   version "5.62.0"
@@ -5473,29 +5578,30 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
-  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
-  dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "^9.0.4"
-    semver "^7.6.0"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/utils@7.18.0", "@typescript-eslint/utils@^7.2.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
-  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/typescript-estree" "7.18.0"
+"@typescript-eslint/typescript-estree@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.0.tgz#fadbc74c14c5bac947db04980ff58bb178701c2e"
+  integrity sha512-ex1nTUMWrseMltXUHmR2GAQ4d+WjkZCT4f+4bVsps8QEdh0vlBsaCokKTPlnqBFqqGaxilDNJG7b8dolW2m43Q==
+  dependencies:
+    "@typescript-eslint/project-service" "8.56.0"
+    "@typescript-eslint/tsconfig-utils" "8.56.0"
+    "@typescript-eslint/types" "8.56.0"
+    "@typescript-eslint/visitor-keys" "8.56.0"
+    debug "^4.4.3"
+    minimatch "^9.0.5"
+    semver "^7.7.3"
+    tinyglobby "^0.2.15"
+    ts-api-utils "^2.4.0"
+
+"@typescript-eslint/utils@8.56.0", "@typescript-eslint/utils@^8.29.1":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.56.0.tgz#063ce6f702ec603de1b83ee795ed5e877d6f7841"
+  integrity sha512-RZ3Qsmi2nFGsS+n+kjLAYDPVlrzf7UhTffrDIKr+h2yzAlYP/y5ZulU0yeDEPItos2Ph46JAL5P/On3pe7kDIQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.9.1"
+    "@typescript-eslint/scope-manager" "8.56.0"
+    "@typescript-eslint/types" "8.56.0"
+    "@typescript-eslint/typescript-estree" "8.56.0"
 
 "@typescript-eslint/utils@^5.58.0":
   version "5.62.0"
@@ -5519,13 +5625,13 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
-  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
+"@typescript-eslint/visitor-keys@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.0.tgz#7d6592ab001827d3ce052155edf7ecad19688d7d"
+  integrity sha512-q+SL+b+05Ud6LbEE35qe4A99P+htKTKVbyiNEe45eCbJFyh/HVK9QXwlrbz+Q4L8SOW4roxSVwXYj4DMBT7Ieg==
   dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    eslint-visitor-keys "^3.4.3"
+    "@typescript-eslint/types" "8.56.0"
+    eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.2.0", "@ungap/structured-clone@^1.3.0":
   version "1.3.0"
@@ -7481,7 +7587,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@^4.4.0, debug@^4.4.1, debug@~4.4.0:
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.7, debug@^4.4.0, debug@^4.4.1, debug@^4.4.3, debug@~4.4.0:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -8228,18 +8334,19 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-expo@~7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-config-expo/-/eslint-config-expo-7.1.2.tgz#0ecb2c389b013dc3dfbf8a7401269a0589f03156"
-  integrity sha512-WxrDVNklN43Op0v3fglQfzL2bC7vqacUq9oVwJcGCUEDzdM7kGOR6pfEJiz3i3dQv3cFjHtct0CFEExep5c/dA==
+eslint-config-expo@~9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-expo/-/eslint-config-expo-9.2.0.tgz#5b7d9371950cc8378ccdbf1040176dd5758eb2e4"
+  integrity sha512-TQgmSx+2mRM7qUS0hB5kTDrHcSC35rA1UzOSgK5YRLmSkSMlKLmXkUrhwOpnyo9D/nHdf4ERRAySRYxgA6dlrw==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "^7.4.0"
-    "@typescript-eslint/parser" "^7.4.0"
-    eslint-import-resolver-typescript "^3.6.1"
-    eslint-plugin-expo "^0.0.1"
-    eslint-plugin-import "^2.29.1"
-    eslint-plugin-react "^7.34.0"
-    eslint-plugin-react-hooks "^4.6.0"
+    "@typescript-eslint/eslint-plugin" "^8.18.2"
+    "@typescript-eslint/parser" "^8.18.2"
+    eslint-import-resolver-typescript "^3.6.3"
+    eslint-plugin-expo "^0.1.4"
+    eslint-plugin-import "^2.30.0"
+    eslint-plugin-react "^7.37.3"
+    eslint-plugin-react-hooks "^5.1.0"
+    globals "^16.0.0"
 
 eslint-config-prettier@~9.1.0:
   version "9.1.2"
@@ -8255,7 +8362,7 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-import-resolver-typescript@^3.6.1:
+eslint-import-resolver-typescript@^3.6.3:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.10.1.tgz#23dac32efa86a88e2b8232eb244ac499ad636db2"
   integrity sha512-A1rHYb06zjMGAxdLSkN2fXPBwuSaQ0iO5M/hdyS0Ajj1VBaRp0sPD3dn1FhME3c/JluGFbwSxyCfqdSbtQLAHQ==
@@ -8289,13 +8396,14 @@ eslint-module-utils@^2.12.0, eslint-module-utils@^2.12.1, eslint-module-utils@^2
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-expo@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-expo/-/eslint-plugin-expo-0.0.1.tgz#1164e9593c73619dca26cbc71c58889bd44b4861"
-  integrity sha512-dNri81vunJ3T+N1YWWxjLU6ux6KiukwZ4ECXCOPp8hG7M4kuvPAb9YQSIM63AT0pbtfYH/a6htikhaQcRPjhRA==
+eslint-plugin-expo@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-expo/-/eslint-plugin-expo-0.1.4.tgz#fbeb5f126028b5fad6d977ac5128d774bd8a8144"
+  integrity sha512-YA7yiMacQbLJySuyJA0Eb5V65obqp6fVOWtw1JdYDRWC5MeToPrnNvhGDpk01Bv3Vm4ownuzUfvi89MXi1d6cg==
   dependencies:
-    "@typescript-eslint/types" "^7.2.0"
-    "@typescript-eslint/utils" "^7.2.0"
+    "@typescript-eslint/types" "^8.29.1"
+    "@typescript-eslint/utils" "^8.29.1"
+    eslint "^9.24.0"
 
 eslint-plugin-i18n-json@~4.0.0:
   version "4.0.1"
@@ -8312,7 +8420,7 @@ eslint-plugin-i18n-json@~4.0.0:
     plur "^2.1.2"
     pretty-format "^22.0.3"
 
-eslint-plugin-import@^2.29.1:
+eslint-plugin-import@^2.30.0:
   version "2.32.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980"
   integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==
@@ -8382,12 +8490,12 @@ eslint-plugin-react-compiler@19.0.0-beta-a7bf2bd-20241110:
     zod "^3.22.4"
     zod-validation-error "^3.0.3"
 
-eslint-plugin-react-hooks@^4.6.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
-  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
+eslint-plugin-react-hooks@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz#1be0080901e6ac31ce7971beed3d3ec0a423d9e3"
+  integrity sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==
 
-eslint-plugin-react@^7.34.0:
+eslint-plugin-react@^7.37.3:
   version "7.37.5"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz#2975511472bdda1b272b34d779335c9b0e877065"
   integrity sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==
@@ -8481,11 +8589,69 @@ eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
+eslint-scope@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82"
+  integrity sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
 eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
+eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
+
+eslint-visitor-keys@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.0.tgz#b9aa1a74aa48c44b3ae46c1597ce7171246a94a9"
+  integrity sha512-A0XeIi7CXU7nPlfHS9loMYEKxUaONu/hTEzHTGba9Huu94Cq1hPivf+DE5erJozZOky0LfvXAyrV/tcswpLI0Q==
+
+eslint@^9.24.0:
+  version "9.39.2"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.39.2.tgz#cb60e6d16ab234c0f8369a3fe7cc87967faf4b6c"
+  integrity sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.8.0"
+    "@eslint-community/regexpp" "^4.12.1"
+    "@eslint/config-array" "^0.21.1"
+    "@eslint/config-helpers" "^0.4.2"
+    "@eslint/core" "^0.17.0"
+    "@eslint/eslintrc" "^3.3.1"
+    "@eslint/js" "9.39.2"
+    "@eslint/plugin-kit" "^0.4.1"
+    "@humanfs/node" "^0.16.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.4.2"
+    "@types/estree" "^1.0.6"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.6"
+    debug "^4.3.2"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^8.4.0"
+    eslint-visitor-keys "^4.2.1"
+    espree "^10.4.0"
+    esquery "^1.5.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^8.0.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+
 eslint@~8.57.0:
   version "8.57.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
@@ -8530,6 +8696,15 @@ eslint@~8.57.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
+espree@^10.0.1, espree@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
+  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
+  dependencies:
+    acorn "^8.15.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^4.2.1"
+
 espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
@@ -8551,6 +8726,13 @@ esquery@^1.4.0, esquery@^1.4.2:
   dependencies:
     estraverse "^5.1.0"
 
+esquery@^1.5.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
+  integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -9099,6 +9281,13 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
+  dependencies:
+    flat-cache "^4.0.0"
+
 file-type@^16.5.4:
   version "16.5.4"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd"
@@ -9234,6 +9423,14 @@ flat-cache@^3.0.4:
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
+  dependencies:
+    flatted "^3.2.9"
+    keyv "^4.5.4"
+
 flatted@^3.2.9, flatted@^3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
@@ -9623,6 +9820,16 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
+
+globals@^16.0.0:
+  version "16.5.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-16.5.0.tgz#ccf1594a437b97653b2be13ed4d8f5c9f850cac1"
+  integrity sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==
+
 globalthis@^1.0.1, globalthis@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
@@ -9972,6 +10179,11 @@ ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
+ignore@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9"
+  integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==
+
 image-q@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/image-q/-/image-q-4.0.0.tgz#31e075be7bae3c1f42a85c469b4732c358981776"
@@ -11273,6 +11485,13 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+js-yaml@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
+  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsc-safe-url@^0.2.2, jsc-safe-url@^0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz#141c14fbb43791e88d5dc64e85a374575a83477a"
@@ -11419,7 +11638,7 @@ kdbush@^4.0.2:
   resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-4.0.2.tgz#2f7b7246328b4657dd122b6c7f025fbc2c868e39"
   integrity sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==
 
-keyv@^4.0.0, keyv@^4.5.3:
+keyv@^4.0.0, keyv@^4.5.3, keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -12398,7 +12617,7 @@ minimatch@^8.0.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4:
+minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4, minimatch@^9.0.5:
   version "9.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
   integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
@@ -14649,6 +14868,11 @@ semver@^7.3.2, semver@~7.7.3:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
   integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
+semver@^7.7.3:
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
+  integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==
+
 semver@~7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
@@ -15733,7 +15957,7 @@ tinyexec@^1.0.0:
   resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-1.0.1.tgz#70c31ab7abbb4aea0a24f55d120e5990bfa1e0b1"
   integrity sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==
 
-tinyglobby@^0.2.12, tinyglobby@^0.2.13:
+tinyglobby@^0.2.12, tinyglobby@^0.2.13, tinyglobby@^0.2.15:
   version "0.2.15"
   resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
   integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==
@@ -15824,10 +16048,10 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-api-utils@^1.3.0:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
-  integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==
+ts-api-utils@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.4.0.tgz#2690579f96d2790253bdcf1ca35d569ad78f9ad8"
+  integrity sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==
 
 ts-debounce@^4.0.0:
   version "4.0.0"
@@ -16028,16 +16252,16 @@ typed-emitter@^2.1.0:
   optionalDependencies:
     rxjs "^7.5.2"
 
+typescript@5.8.x:
+  version "5.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
+  integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
+
 typescript@^5.6.3:
   version "5.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6"
   integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==
 
-typescript@~5.5.4:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
-  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
-
 ua-parser-js@^0.7.33:
   version "0.7.41"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.41.tgz#9f6dee58c389e8afababa62a4a2dc22edb69a452"

From 381dce2cf118fcd3744e953a6271df16b68b66a3 Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Wed, 18 Feb 2026 20:22:01 -0800
Subject: [PATCH 3/5] RU-T47 PR#221 fixes

---
 .../bluetooth-device-selection-bottom-sheet.tsx      |  2 +-
 src/services/bluetooth-audio.service.ts              | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx b/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
index 9f4b86dd..0c25fa68 100644
--- a/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
+++ b/src/components/settings/bluetooth-device-selection-bottom-sheet.tsx
@@ -37,7 +37,7 @@ export function BluetoothDeviceSelectionBottomSheet({ isOpen, onClose }: Bluetoo
   const connectionError = useBluetoothAudioStore((s) => s.connectionError);
   const [hasScanned, setHasScanned] = useState(false);
   const [connectingDeviceId, setConnectingDeviceId] = useState<string | null>(null);
-  const preferredDeviceDisplayName = preferredDevice?.id === 'system-audio' ? t('bluetooth.system_audio') : preferredDevice?.name;
+  const preferredDeviceDisplayName = preferredDevice?.id === 'system-audio' ? t('bluetooth.system_audio') : preferredDevice?.name || t('bluetooth.unknown_device');
 
   const startScan = React.useCallback(async () => {
     try {
diff --git a/src/services/bluetooth-audio.service.ts b/src/services/bluetooth-audio.service.ts
index 5668f5a7..28bf9530 100644
--- a/src/services/bluetooth-audio.service.ts
+++ b/src/services/bluetooth-audio.service.ts
@@ -51,6 +51,7 @@ class BluetoothAudioService {
   private monitoringStartedAt: number | null = null;
   private monitoringWatchdogInterval: ReturnType<typeof setInterval> | null = null;
   private readPollingInterval: ReturnType<typeof setInterval> | null = null;
+  private isReadPollingInFlight: boolean = false;
   private monitoredReadCharacteristics: { serviceUuid: string; characteristicUuid: string; lastHexValue: string | null }[] = [];
   private mediaButtonEventListener: { remove: () => void } | null = null;
   private mediaButtonListeningActive: boolean = false;
@@ -1466,7 +1467,14 @@ class BluetoothAudioService {
         return;
       }
 
-      void this.pollReadCharacteristics(deviceId);
+      if (this.isReadPollingInFlight) {
+        return;
+      }
+
+      this.isReadPollingInFlight = true;
+      void this.pollReadCharacteristics(deviceId).finally(() => {
+        this.isReadPollingInFlight = false;
+      });
     }, 700);
   }
 
@@ -1507,6 +1515,8 @@ class BluetoothAudioService {
       clearInterval(this.readPollingInterval);
       this.readPollingInterval = null;
     }
+
+    this.isReadPollingInFlight = false;
   }
 
   private hasReadCapability(properties: unknown): boolean {

From 1cb60c34f53a33a8226d76d0d846f06c3e1a5ca7 Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Wed, 18 Feb 2026 20:38:49 -0800
Subject: [PATCH 4/5] RU-T47 PR#221 fixes

---
 .../__tests__/bluetooth-audio.service.test.ts | 32 +++++++++++++++++++
 src/services/bluetooth-audio.service.ts       | 30 +++++++++++++----
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/services/__tests__/bluetooth-audio.service.test.ts b/src/services/__tests__/bluetooth-audio.service.test.ts
index 220a4a63..10c6ec67 100644
--- a/src/services/__tests__/bluetooth-audio.service.test.ts
+++ b/src/services/__tests__/bluetooth-audio.service.test.ts
@@ -36,6 +36,7 @@ jest.mock('react-native-ble-manager', () => ({
     getDiscoveredPeripherals: jest.fn(),
     removeAllListeners: jest.fn(),
     removePeripheral: jest.fn(),
+    read: jest.fn(),
   },
 }));
 
@@ -282,4 +283,35 @@ describe('BluetoothAudioService Refactoring', () => {
       expect(service.hasNotificationOrReadCapability({ notify: 'notify' })).toBe(true);
     });
   });
+
+  describe('Read polling baseline handling', () => {
+    it('should prime first read and only dispatch after value changes', async () => {
+      const service = bluetoothAudioService as any;
+      const bleManagerMock = require('react-native-ble-manager').default;
+      const mockHandleButtonEvent = jest.fn();
+
+      service.handleButtonEventFromCharacteristic = mockHandleButtonEvent;
+      service.monitoredReadCharacteristics = [
+        {
+          serviceUuid: 'service-1',
+          characteristicUuid: 'characteristic-1',
+          lastHexValue: null,
+        },
+      ];
+
+      bleManagerMock.read = jest.fn().mockResolvedValueOnce([0x00]).mockResolvedValueOnce([0x01]).mockResolvedValueOnce([0x01]);
+
+      await service.pollReadCharacteristics('device-1');
+      expect(service.monitoredReadCharacteristics[0].lastHexValue).toBe('00');
+      expect(mockHandleButtonEvent).not.toHaveBeenCalled();
+
+      await service.pollReadCharacteristics('device-1');
+      expect(service.monitoredReadCharacteristics[0].lastHexValue).toBe('01');
+      expect(mockHandleButtonEvent).toHaveBeenCalledTimes(1);
+      expect(mockHandleButtonEvent).toHaveBeenCalledWith('device-1', 'service-1', 'characteristic-1', 'AQ==');
+
+      await service.pollReadCharacteristics('device-1');
+      expect(mockHandleButtonEvent).toHaveBeenCalledTimes(1);
+    });
+  });
 });
diff --git a/src/services/bluetooth-audio.service.ts b/src/services/bluetooth-audio.service.ts
index 28bf9530..0471cf60 100644
--- a/src/services/bluetooth-audio.service.ts
+++ b/src/services/bluetooth-audio.service.ts
@@ -1310,7 +1310,7 @@ class BluetoothAudioService {
   }
 
   private async startNotificationsForButtonControls(deviceId: string, peripheralInfo: PeripheralInfo): Promise<void> {
-    const subscribedPairs = new Set<string>();
+    const successfullySubscribed = new Set<string>();
     this.monitoredReadCharacteristics = [];
     const isSpecializedDevice = Boolean(this.connectedDevice && this.connectedDevice.id === deviceId && this.getDeviceType(this.connectedDevice) === 'specialized');
 
@@ -1342,7 +1342,7 @@ class BluetoothAudioService {
         }
 
         await BleManager.startNotification(deviceId, config.service, config.characteristic);
-        subscribedPairs.add(`${config.service.toUpperCase()}::${config.characteristic.toUpperCase()}`);
+        successfullySubscribed.add(`${config.service.toUpperCase()}::${config.characteristic.toUpperCase()}`);
         this.registerReadPollingCharacteristic(config.service, config.characteristic);
         logger.info({
           message: 'Started notifications for button control',
@@ -1378,13 +1378,13 @@ class BluetoothAudioService {
         const pairKey = `${String(serviceUuid).toUpperCase()}::${String(characteristicUuid).toUpperCase()}`;
         const shouldSubscribe = isSpecializedDevice ? true : this.isLikelyButtonCharacteristic(serviceUuid, characteristicUuid) || this.hasNotificationOrReadCapability(characteristic?.properties);
 
-        if (!shouldSubscribe || subscribedPairs.has(pairKey)) {
+        if (!shouldSubscribe || successfullySubscribed.has(pairKey)) {
           continue;
         }
 
         try {
           await BleManager.startNotification(deviceId, serviceUuid, characteristicUuid);
-          subscribedPairs.add(pairKey);
+          successfullySubscribed.add(pairKey);
 
           if (isSpecializedDevice || this.hasReadCapability(characteristic?.properties)) {
             this.registerReadPollingCharacteristic(serviceUuid, characteristicUuid);
@@ -1422,11 +1422,16 @@ class BluetoothAudioService {
           continue;
         }
 
+        const pairKey = `${String(serviceUuid).toUpperCase()}::${String(characteristicUuid).toUpperCase()}`;
+        if (!successfullySubscribed.has(pairKey)) {
+          continue;
+        }
+
         this.registerReadPollingCharacteristic(serviceUuid, characteristicUuid);
       }
     }
 
-    if (subscribedPairs.size > 0) {
+    if (successfullySubscribed.size > 0) {
       useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(true);
       this.startReadPollingFallback(deviceId);
     } else {
@@ -1488,6 +1493,11 @@ class BluetoothAudioService {
           continue;
         }
 
+        if (entry.lastHexValue === null) {
+          entry.lastHexValue = nextHexValue;
+          continue;
+        }
+
         if (entry.lastHexValue === nextHexValue) {
           continue;
         }
@@ -2106,13 +2116,21 @@ class BluetoothAudioService {
   }
 
   private scheduleMicApplyRetry(enabled: boolean): void {
+    this.pendingMicEnabled = enabled;
+
     if (this.micApplyRetryTimeout) {
       return;
     }
 
     this.micApplyRetryTimeout = setTimeout(() => {
       this.micApplyRetryTimeout = null;
-      this.requestMicrophoneState(enabled);
+
+      const pendingEnabled = this.pendingMicEnabled;
+      if (pendingEnabled === null) {
+        return;
+      }
+
+      this.requestMicrophoneState(pendingEnabled);
     }, 160);
   }
 

From 6b18cea72c6876e91d46c1c87543ddcf8daed42c Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Wed, 18 Feb 2026 21:13:00 -0800
Subject: [PATCH 5/5] RU-T47 PR#221 fixes

---
 src/services/bluetooth-audio.service.ts | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/services/bluetooth-audio.service.ts b/src/services/bluetooth-audio.service.ts
index 0471cf60..1c232d12 100644
--- a/src/services/bluetooth-audio.service.ts
+++ b/src/services/bluetooth-audio.service.ts
@@ -58,6 +58,7 @@ class BluetoothAudioService {
   private pttPressActive: boolean = false;
   private pttReleaseFallbackTimeout: ReturnType<typeof setTimeout> | null = null;
   private micApplyRetryTimeout: ReturnType<typeof setTimeout> | null = null;
+  private retryMicEnabled: boolean | null = null;
   private pendingMicEnabled: boolean | null = null;
   private isApplyingMicState: boolean = false;
 
@@ -1218,6 +1219,8 @@ class BluetoothAudioService {
   private startMonitoringWatchdog(deviceId: string): void {
     this.stopMonitoringWatchdog();
 
+    const watchdogRecoveryThresholdMs = 12000;
+
     this.monitoringWatchdogInterval = setInterval(() => {
       if (!this.connectedDevice || this.connectedDevice.id !== deviceId) {
         this.stopMonitoringWatchdog();
@@ -1233,6 +1236,14 @@ class BluetoothAudioService {
       if (!this.monitoringStartedAt) {
         return;
       }
+
+      const monitoringDurationMs = Date.now() - this.monitoringStartedAt;
+      if (monitoringDurationMs < watchdogRecoveryThresholdMs) {
+        return;
+      }
+
+      this.monitoringStartedAt = Date.now();
+      this.ensurePttInputMonitoring('watchdog');
     }, 4000);
   }
 
@@ -2116,7 +2127,7 @@ class BluetoothAudioService {
   }
 
   private scheduleMicApplyRetry(enabled: boolean): void {
-    this.pendingMicEnabled = enabled;
+    this.retryMicEnabled = enabled;
 
     if (this.micApplyRetryTimeout) {
       return;
@@ -2125,11 +2136,13 @@ class BluetoothAudioService {
     this.micApplyRetryTimeout = setTimeout(() => {
       this.micApplyRetryTimeout = null;
 
-      const pendingEnabled = this.pendingMicEnabled;
+      const pendingEnabled = this.retryMicEnabled;
+      this.retryMicEnabled = null;
       if (pendingEnabled === null) {
         return;
       }
 
+      this.pendingMicEnabled = pendingEnabled;
       this.requestMicrophoneState(pendingEnabled);
     }, 160);
   }
@@ -2139,6 +2152,8 @@ class BluetoothAudioService {
       clearTimeout(this.micApplyRetryTimeout);
       this.micApplyRetryTimeout = null;
     }
+
+    this.retryMicEnabled = null;
   }
 
   private requestMicrophoneState(enabled: boolean): void {
@@ -2301,6 +2316,7 @@ class BluetoothAudioService {
       this.pttPressActive = false;
       this.clearPttReleaseFallback();
       this.clearMicApplyRetry();
+      this.retryMicEnabled = null;
       this.pendingMicEnabled = null;
       this.stopMonitoringWatchdog();
       this.stopReadPollingFallback();
@@ -2319,6 +2335,7 @@ class BluetoothAudioService {
     this.pttPressActive = false;
     this.clearPttReleaseFallback();
     this.clearMicApplyRetry();
+    this.retryMicEnabled = null;
     this.pendingMicEnabled = null;
     this.stopMonitoringWatchdog();
     this.stopReadPollingFallback();
@@ -2401,6 +2418,7 @@ class BluetoothAudioService {
     useBluetoothAudioStore.getState().setIsHeadsetButtonMonitoring(false);
     this.clearPttReleaseFallback();
     this.clearMicApplyRetry();
+    this.retryMicEnabled = null;
     this.pendingMicEnabled = null;
     this.stopMonitoringWatchdog();
     this.stopReadPollingFallback();
@@ -2453,6 +2471,7 @@ class BluetoothAudioService {
       store.setIsHeadsetButtonMonitoring(false);
       this.clearPttReleaseFallback();
       this.clearMicApplyRetry();
+      this.retryMicEnabled = null;
       this.pendingMicEnabled = null;
       this.stopMonitoringWatchdog();
       this.stopReadPollingFallback();