@stream-io/video-react-native-sdk 1.36.1 → 1.37.0

package/ios/StreamVideoReactNative.m

@@ -4,7 +4,6 @@
 #import <React/RCTUIManagerUtils.h>
 #import <UIKit/UIKit.h>
 #import <CallKit/CallKit.h>
-#import <PushKit/PushKit.h>
 #import "StreamVideoReactNative.h"
 #import "WebRTCModule.h"
 #import "WebRTCModuleOptions.h"
@@ -25,8 +24,6 @@
 NSNotificationName const kBroadcastStartedNotification = @"iOS_BroadcastStarted";
 NSNotificationName const kBroadcastStoppedNotification = @"iOS_BroadcastStopped";
 
-static NSString *const DEFAULT_DISPLAY_NAME = @"Unknown Caller";
-
 static dispatch_queue_t _dictionaryQueue = nil;
 
 void broadcastNotificationCallback(CFNotificationCenterRef center,
@@ -49,9 +46,6 @@ void broadcastNotificationCallback(CFNotificationCenterRef center,
     AVAudioPlayer *_busyTonePlayer; // Instance variable
 }
 
-// necessary for addUIBlock usage https://github.com/facebook/react-native/issues/50800#issuecomment-2823327307
-@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
-
 RCT_EXPORT_MODULE();
 
 +(BOOL)requiresMainQueueSetup {
@@ -72,77 +66,6 @@ RCT_EXPORT_MODULE();
     });
 }
 
-+(BOOL)canRegisterCall {
-    Class callingxClass = NSClassFromString(@"Callingx");
-    if (!callingxClass) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][canRegisterCall] Callingx not available");
-        #endif
-        return YES;
-    }
-
-    SEL selector = @selector(canRegisterCall);
-    if (![callingxClass respondsToSelector:selector]) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][canRegisterCall] Callingx does not respond to canRegisterCall selector");
-        #endif
-        return YES;
-    }
-
-    NSMethodSignature *signature = [callingxClass methodSignatureForSelector:selector];
-    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-    [invocation setTarget:callingxClass];
-    [invocation setSelector:selector];
-    [invocation invoke];
-
-    BOOL canRegister = NO;
-    [invocation getReturnValue:&canRegister];
-
-    #if DEBUG
-    NSLog(@"[StreamVideoReactNative][canRegisterCall] canRegisterCall = %@", canRegister ? @"YES" : @"NO");
-    #endif
-
-    return canRegister;
-}
-
-+(BOOL)shouldSkipIncomingPushInForeground {
-    Class callingxClass = NSClassFromString(@"Callingx");
-    if (!callingxClass) {
-        return NO;
-    }
-
-    SEL selector = @selector(shouldSkipIncomingPushInForeground);
-    if (![callingxClass respondsToSelector:selector]) {
-        return NO;
-    }
-
-    NSMethodSignature *signature = [callingxClass methodSignatureForSelector:selector];
-    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-    [invocation setTarget:callingxClass];
-    [invocation setSelector:selector];
-    [invocation invoke];
-
-    BOOL shouldSkip = NO;
-    [invocation getReturnValue:&shouldSkip];
-    return shouldSkip;
-}
-
-+(BOOL)isAppInForeground {
-    // applicationState must be read on the main thread (PushKit delivers on
-    // main, so the common path skips dispatch). Treat Inactive as foreground:
-    // covers brief transitions and system overlays.
-    __block UIApplicationState state = UIApplicationStateActive;
-    void (^readState)(void) = ^{
-        state = [UIApplication sharedApplication].applicationState;
-    };
-    if ([NSThread isMainThread]) {
-        readState();
-    } else {
-        dispatch_sync(dispatch_get_main_queue(), readState);
-    }
-    return state != UIApplicationStateBackground;
-}
-
 +(void)voipRegistration {
     Class voipManagerClass = NSClassFromString(@"Callingx.VoipNotificationsManager");
     if (!voipManagerClass) {
@@ -168,223 +91,6 @@ RCT_EXPORT_MODULE();
     [voipManagerClass voipRegistration];
 }
 
-+(void)didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSString *)type {
-    Class voipManagerClass = NSClassFromString(@"Callingx.VoipNotificationsManager");
-    if (!voipManagerClass) {
-        // Fallback: Try the unmangled name (might work depending on Swift version)
-        voipManagerClass = NSClassFromString(@"VoipNotificationsManager");
-    }
-    
-    if (!voipManagerClass) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didUpdatePushCredentials] VoipNotificationsManager not available");
-        #endif
-        return;
-    }
-    
-    SEL selector = @selector(didUpdatePushCredentials:forType:);
-    if (![voipManagerClass respondsToSelector:selector]) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didUpdatePushCredentials] VoipNotificationsManager does not respond to didUpdatePushCredentials:forType:");
-        #endif
-        return;
-    }
-    
-    [voipManagerClass didUpdatePushCredentials:credentials forType:type];
-}
-
-+(void)didReceiveIncomingPush:(PKPushPayload *)payload forType:(NSString *)type completionHandler: (void (^_Nullable)(void)) completion {
-    NSDictionary *streamPayload = payload.dictionaryPayload[@"stream"];
-    if (!streamPayload) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Stream payload not found");
-        #endif
-        if (completion) {
-            completion();
-        }
-        return;
-    }
-
-    NSString *callCid = streamPayload[@"call_cid"];
-    if (!callCid) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Missing required field: call_cid");
-        #endif
-        if (completion) {
-            completion();
-        }
-        return;
-    }
-
-    if (![StreamVideoReactNative canRegisterCall]) {
-        if (completion) {
-            completion();
-        }
-        return;
-    }
-
-    [StreamVideoReactNative reportNewIncomingCall:streamPayload forType:type completionHandler:completion];
-    [StreamVideoReactNative didReceiveIncomingPushWithPayload:payload forType:type];
-}
-
-+(void)didReceiveIncomingVoIPPush:(PKPushPayload *)payload
-                         metadata:(id _Nullable)metadata
-                completionHandler:(void (^_Nullable)(void))completion {
-    NSDictionary *streamPayload = payload.dictionaryPayload[@"stream"];
-    if (!streamPayload) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingVoIPPush] Stream payload not found");
-        #endif
-        if (completion) {
-            completion();
-        }
-        return;
-    }
-
-    NSString *callCid = streamPayload[@"call_cid"];
-    if (!callCid) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingVoIPPush] Missing required field: call_cid");
-        #endif
-        if (completion) {
-            completion();
-        }
-        return;
-    }
-
-    NSString *type = @"PKPushTypeVoIP";
-    BOOL mustReport = readMustReportFromMetadata(metadata);
-
-    // Both skip paths require mustReport == NO; skipping while YES risks
-    // PushKit terminating the app.
-    if (!mustReport && ![StreamVideoReactNative canRegisterCall]) {
-        // Busy reject: drop without forwarding to JS.
-        if (completion) {
-            completion();
-        }
-        return;
-    }
-
-    if (!mustReport &&
-        [StreamVideoReactNative shouldSkipIncomingPushInForeground] &&
-        [StreamVideoReactNative isAppInForeground]) {
-        // Foreground skip: hide CallKit, let JS render the ringing UI.
-        [StreamVideoReactNative didReceiveIncomingPushWithPayload:payload forType:type];
-        if (completion) {
-            completion();
-        }
-        return;
-    }
-
-    [StreamVideoReactNative reportNewIncomingCall:streamPayload forType:type completionHandler:completion];
-    [StreamVideoReactNative didReceiveIncomingPushWithPayload:payload forType:type];
-}
-
-// Reads `PKVoIPPushMetadata.mustReport` via runtime dispatch. Fail-safe:
-// returns YES on any uncertainty (nil, missing property, wrong return type)
-// so unknown metadata never causes CallKit to be skipped.
-static BOOL readMustReportFromMetadata(id _Nullable metadata) {
-    SEL selector = @selector(mustReport);
-    if (!metadata || ![metadata respondsToSelector:selector]) {
-        return YES;
-    }
-    NSMethodSignature *signature = [metadata methodSignatureForSelector:selector];
-    if (!signature || signature.methodReturnLength != sizeof(BOOL)) {
-        return YES;
-    }
-    // BOOL encodes as "c" (legacy ABIs) or "B" (modern). Reject anything else
-    // so getReturnValue: never reads garbage from an object-returning selector.
-    const char *returnType = signature.methodReturnType;
-    if (!returnType ||
-        (strcmp(returnType, @encode(BOOL)) != 0 &&
-         strcmp(returnType, @encode(bool)) != 0)) {
-        return YES;
-    }
-
-    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-    [invocation setTarget:metadata];
-    [invocation setSelector:selector];
-    [invocation invoke];
-
-    BOOL mustReport = NO;
-    [invocation getReturnValue:&mustReport];
-    return mustReport;
-}
-
-+(void)reportNewIncomingCall:(NSDictionary *)streamPayload forType:(NSString *)type completionHandler: (void (^_Nullable)(void)) completion {
-    Class callingxClass = NSClassFromString(@"Callingx");
-    if (!callingxClass) {
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Callingx not available");
-        return;
-    }
-    
-    SEL selector = @selector(reportNewIncomingCall:handle:handleType:hasVideo:localizedCallerName:supportsHolding:supportsDTMF:supportsGrouping:supportsUngrouping:payload:withCompletionHandler:);
-    if (![callingxClass respondsToSelector:selector]) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPush] Callingx does not respond to selector");
-        #endif
-        return;
-    }
-    
-    NSString *callCid = streamPayload[@"call_cid"];
-    NSString *callDisplayName = streamPayload[@"call_display_name"];
-    NSString *createdByDisplayName = streamPayload[@"created_by_display_name"];
-    NSString *createdCallerName = callDisplayName.length > 0 ? callDisplayName : createdByDisplayName;
-    NSString *localizedCallerName = createdCallerName.length > 0 ? createdCallerName : DEFAULT_DISPLAY_NAME;
-    NSString *createdById = streamPayload[@"created_by_id"];
-    NSString *handle = createdById.length > 0 ? createdById : localizedCallerName;
-    NSString *videoIncluded = streamPayload[@"video"];
-    BOOL hasVideo = [videoIncluded isEqualToString:@"false"] ? NO : YES;
-    NSString *handleType = @"generic";
-    BOOL supportsHolding = NO;
-    BOOL supportsDTMF = NO;
-    BOOL supportsGrouping = NO;
-    BOOL supportsUngrouping = NO;
-    void (^completionHandler)(void) = completion;
-
-    NSMethodSignature *signature = [callingxClass methodSignatureForSelector:selector];
-    NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-    [invocation setTarget:callingxClass];
-    [invocation setSelector:selector];
-    [invocation setArgument:&callCid atIndex:2];
-    [invocation setArgument:&handle atIndex:3];
-    [invocation setArgument:&handleType atIndex:4];
-    [invocation setArgument:&hasVideo atIndex:5];
-    [invocation setArgument:&localizedCallerName atIndex:6];
-    [invocation setArgument:&supportsHolding atIndex:7];
-    [invocation setArgument:&supportsDTMF atIndex:8];
-    [invocation setArgument:&supportsGrouping atIndex:9];
-    [invocation setArgument:&supportsUngrouping atIndex:10];
-    [invocation setArgument:&streamPayload atIndex:11];
-    [invocation setArgument:&completionHandler atIndex:12];
-    [invocation invoke];
-}
-
-+(void)didReceiveIncomingPushWithPayload:(PKPushPayload *)payload forType:(NSString *)type {
-    Class voipManagerClass = NSClassFromString(@"Callingx.VoipNotificationsManager");
-    if (!voipManagerClass) {
-        // Fallback: Try the unmangled name (might work depending on Swift version)
-        voipManagerClass = NSClassFromString(@"VoipNotificationsManager");
-    }
-    
-    if (!voipManagerClass) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPushWithPayload] VoipNotificationsManager not available");
-        #endif
-        return;
-    }
-    
-    SEL selector = @selector(didReceiveIncomingPushWithPayload:forType:);
-    if (![voipManagerClass respondsToSelector:selector]) {
-        #if DEBUG
-        NSLog(@"[StreamVideoReactNative][didReceiveIncomingPushWithPayload] VoipNotificationsManager does not respond to didReceiveIncomingPushWithPayload:forType:");
-        #endif
-        return;
-    }
-    
-    [voipManagerClass didReceiveIncomingPushWithPayload:payload forType:type];
-}
-
 -(instancetype)init {
     if ((self = [super init])) {
         _notificationCenter = CFNotificationCenterGetDarwinNotifyCenter();
@@ -924,7 +630,7 @@ RCT_EXPORT_METHOD(stopInAppScreenCapture:(RCTPromiseResolveBlock)resolve
 RCT_EXPORT_METHOD(startScreenShareAudioMixing:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
-    WebRTCModule *webrtcModule = [self.bridge moduleForClass:[WebRTCModule class]];
+    WebRTCModule *webrtcModule = [self.moduleRegistry moduleForName:"WebRTCModule"];
     WebRTCModuleOptions *options = [WebRTCModuleOptions sharedInstance];
 
     ScreenShareAudioMixer *mixer = webrtcModule.audioDeviceModule.screenShareAudioMixer;
@@ -955,7 +661,7 @@ RCT_EXPORT_METHOD(startScreenShareAudioMixing:(RCTPromiseResolveBlock)resolve
 RCT_EXPORT_METHOD(stopScreenShareAudioMixing:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 {
-    WebRTCModule *webrtcModule = [self.bridge moduleForClass:[WebRTCModule class]];
+    WebRTCModule *webrtcModule = [self.moduleRegistry moduleForName:"WebRTCModule"];
     WebRTCModuleOptions *options = [WebRTCModuleOptions sharedInstance];
 
     // Stop feeding audio to the mixer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "1.36.1",
+  "version": "1.37.0",
   "description": "Stream Video SDK for React Native",
   "author": "https://getstream.io",
   "homepage": "https://getstream.io/video/docs/react-native/",
@@ -50,8 +50,8 @@
     "!**/.*"
   ],
   "dependencies": {
-    "@stream-io/video-client": "1.51.0",
-    "@stream-io/video-react-bindings": "1.16.1",
+    "@stream-io/video-client": "1.52.0",
+    "@stream-io/video-react-bindings": "1.16.2",
     "intl-pluralrules": "2.0.1",
     "react-native-url-polyfill": "^3.0.0",
     "rxjs": "~7.8.2",
@@ -107,38 +107,39 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.28.4",
-    "@expo/config-plugins": "54.0.2",
-    "@expo/config-types": "^54.0.8",
-    "@expo/plist": "^0.4.7",
-    "@react-native-community/netinfo": "11.4.1",
-    "@react-native-firebase/app": "^23.4.0",
-    "@react-native-firebase/messaging": "^23.4.0",
-    "@react-native/babel-preset": "0.81.5",
+    "@babel/core": "^7.29.7",
+    "@expo/config-plugins": "56.0.8",
+    "@expo/config-types": "^56.0.5",
+    "@expo/plist": "^0.7.0",
+    "@react-native-community/netinfo": "12.0.1",
+    "@react-native-firebase/app": "^24.0.0",
+    "@react-native-firebase/messaging": "^24.0.0",
+    "@react-native/babel-preset": "0.85.3",
+    "@react-native/metro-config": "0.85.3",
     "@stream-io/noise-cancellation-react-native": "^0.7.0",
-    "@stream-io/react-native-callingx": "^0.3.1",
+    "@stream-io/react-native-callingx": "^0.4.0",
     "@stream-io/react-native-webrtc": "137.2.0",
-    "@stream-io/video-filters-react-native": "^0.12.3",
+    "@stream-io/video-filters-react-native": "^0.12.4",
     "@testing-library/jest-native": "^5.4.3",
     "@testing-library/react-native": "13.3.3",
-    "@tsconfig/node18": "^18.2.4",
+    "@tsconfig/node18": "^18.2.6",
     "@types/jest": "^29.5.14",
-    "@types/react": "~19.1.17",
+    "@types/react": "~19.2.15",
     "@types/react-test-renderer": "^19.1.0",
-    "expo": "~54.0.12",
-    "expo-build-properties": "^1.0.9",
-    "expo-module-scripts": "^5.0.7",
-    "expo-notifications": "~0.32.12",
+    "expo": "~56.0.8",
+    "expo-build-properties": "~56.0.16",
+    "expo-module-scripts": "^56.0.3",
+    "expo-notifications": "~56.0.15",
     "jest": "^29.7.0",
-    "react": "19.1.0",
-    "react-native": "0.81.5",
+    "react": "19.2.3",
+    "react-native": "0.85.3",
     "react-native-builder-bob": "~0.23",
-    "react-native-gesture-handler": "^2.28.0",
-    "react-native-reanimated": "~4.1.2",
-    "react-native-svg": "^15.14.0",
-    "react-native-worklets": "^0.5.0",
-    "react-test-renderer": "19.1.0",
-    "rimraf": "^6.0.1",
+    "react-native-gesture-handler": "~2.31.2",
+    "react-native-reanimated": "4.3.1",
+    "react-native-svg": "15.15.5",
+    "react-native-worklets": "0.8.3",
+    "react-test-renderer": "19.2.3",
+    "rimraf": "^6.1.3",
     "typescript": "^5.9.3"
   },
   "react-native-builder-bob": {

package/src/components/Call/CallContent/CallContent.tsx

@@ -257,7 +257,11 @@ export const CallContent = ({
       <View style={[styles.container, landscapeStyles, callContent.container]}>
         <View style={[styles.content, callContent.callParticipantsContainer]}>
           <View
-            style={[styles.view, callContent.topContainer]}
+            style={[
+              StyleSheet.absoluteFill,
+              styles.view,
+              callContent.topContainer,
+            ]}
             // "box-none" disallows the container view to be not take up touches
             // and allows only the top and floating view (its child views) to take up the touches
             pointerEvents="box-none"
@@ -310,7 +314,6 @@ const useStyles = () => {
         },
         content: { flex: 1 },
         view: {
-          ...StyleSheet.absoluteFillObject,
           zIndex: Z_INDEX.IN_FRONT,
         },
       }),

package/src/components/Call/Lobby/Lobby.tsx

@@ -99,7 +99,7 @@ export const Lobby = ({
                   mirror={true}
                   streamURL={localVideoStream.toURL()}
                   objectFit="cover"
-                  style={StyleSheet.absoluteFillObject}
+                  style={StyleSheet.absoluteFill}
                 />
               ) : (
                 <View style={[styles.avatarContainer, lobby.avatarContainer]}>

package/src/components/Participant/FloatingParticipantView/index.tsx

@@ -74,6 +74,7 @@ const DefaultLocalParticipantViewVideoFallback = () => {
   return (
     <View
       style={[
+        StyleSheet.absoluteFill,
         styles.videoFallback,
         { backgroundColor: colors.sheetSecondary },
         floatingParticipantsView.videoFallback,
@@ -224,7 +225,6 @@ const styles = StyleSheet.create({
     elevation: 4,
   },
   videoFallback: {
-    ...StyleSheet.absoluteFillObject,
     alignItems: 'center',
     justifyContent: 'center',
   },

package/src/components/Participant/ParticipantView/ParticipantVideoFallback.tsx

@@ -28,6 +28,7 @@ export const ParticipantVideoFallback = ({
   return (
     <View
       style={[
+        StyleSheet.absoluteFill,
         styles.container,
         { backgroundColor: colors.sheetTertiary },
         participantVideoFallback.container,
@@ -61,6 +62,5 @@ const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
     justifyContent: 'center',
-    ...StyleSheet.absoluteFillObject,
   },
 });

package/src/components/Participant/ParticipantView/VideoRenderer/index.tsx

@@ -194,7 +194,7 @@ export const VideoRenderer = ({
   return (
     <View
       onLayout={onLayout}
-      style={[styles.container, videoRenderer.container]}
+      style={[StyleSheet.absoluteFill, videoRenderer.container]}
     >
       {call && !isLocalParticipant && (
         <TrackSubscriber
@@ -209,7 +209,7 @@ export const VideoRenderer = ({
       videoStreamToRender &&
       (objectFit || isVideoDimensionsValid) ? (
         <RTCView
-          style={[styles.videoStream, videoRenderer.videoStream]}
+          style={[StyleSheet.absoluteFill, videoRenderer.videoStream]}
           streamURL={videoStreamToRender.toURL()}
           mirror={mirror}
           ref={viewRef}
@@ -229,12 +229,3 @@ export const VideoRenderer = ({
     </View>
   );
 };
-
-const styles = StyleSheet.create({
-  container: {
-    ...StyleSheet.absoluteFillObject,
-  },
-  videoStream: {
-    ...StyleSheet.absoluteFillObject,
-  },
-});

package/src/utils/internal/callingx/callingx.ts

@@ -2,7 +2,7 @@
  * Internal utils for callingx library usage from video-client.
  * See @./registerSDKGlobals.ts for more usage details.
  */
-import { AppState, NativeModules, Platform } from 'react-native';
+import { Platform } from 'react-native';
 import type { EndCallReason } from '@stream-io/react-native-callingx';
 import { getCallingxLibIfAvailable } from '../../push/libs/callingx';
 import { waitForAudioSessionActivation } from './audioSessionPromise';
@@ -12,17 +12,8 @@ import type {
   StreamVideoParticipant,
 } from '@stream-io/video-client';
 import { CallingState, videoLoggerSystem } from '@stream-io/video-client';
-import { StreamVideoRN } from '../../StreamVideoRN';
-const CallingxModule = getCallingxLibIfAvailable();
 
-async function isAppInForeground(): Promise<boolean> {
-  if (Platform.OS === 'android') {
-    const nativeModule = NativeModules.StreamVideoAppLifecycle;
-    const state = await nativeModule.getCurrentAppState();
-    return state === 'active';
-  }
-  return AppState.currentState !== 'background';
-}
+const CallingxModule = getCallingxLibIfAvailable();
 
 /**
  * Gets the call display name. To be used for display in native call screen.
@@ -148,19 +139,7 @@ export async function joinCallingxCall(call: Call, activeCalls: Call[]) {
     }
   } else if (isIncomingCall) {
     logger.debug(`joinCallingxCall: Joining incoming call ${call.cid}`);
-    let skipIncomingPushInForeground = false;
-    if (Platform.OS === 'ios') {
-      skipIncomingPushInForeground =
-        StreamVideoRN.getConfig().push?.ios?.skipIncomingPushInForeground ??
-        false;
-    } else {
-      skipIncomingPushInForeground =
-        StreamVideoRN.getConfig().push?.android?.skipIncomingPushInForeground ??
-        false;
-    }
-    const shouldSkipDisplayIncoming = skipIncomingPushInForeground
-      ? await isAppInForeground()
-      : false;
+
     try {
       // Leave any existing active ringing calls before joining a new ringing call
       const activeCallsToLeave = activeCalls.filter(
@@ -177,29 +156,25 @@ export async function joinCallingxCall(call: Call, activeCalls: Call[]) {
           logger.error(`failed to leave active call ${activeCall.cid}`, e);
         });
       }
-      if (shouldSkipDisplayIncoming) {
-        await startCallInCallingx();
-      } else {
-        // Awaits native CallKit/Telecom registration before answering.
-        // Safe to call even if the call is already registered (e.g. from VoIP push) --
-        // iOS early-returns with no error, Android sends the registered broadcast.
-        const callDisplayName = getCallDisplayNameFromCall(call);
-        await CallingxModule.displayIncomingCall(
-          call.cid, // unique id for call
-          call.state.createdBy?.id ?? callDisplayName, // handle for native call UI (prefer createdBy user id, fallback to call display name)
-          callDisplayName, // display name for display in call screen
-          call.state.settings?.video?.enabled ?? false, // is video call?
-        );
+      // Awaits native CallKit/Telecom registration before answering.
+      // Safe to call even if the call is already registered (e.g. from VoIP push) --
+      // iOS early-returns with no error, Android sends the registered broadcast.
+      const callDisplayName = getCallDisplayNameFromCall(call);
+      await CallingxModule.displayIncomingCall(
+        call.cid, // unique id for call
+        call.state.createdBy?.id ?? callDisplayName, // handle for native call UI (prefer createdBy user id, fallback to call display name)
+        callDisplayName, // display name for display in call screen
+        call.state.settings?.video?.enabled ?? false, // is video call?
+      );
 
-        await CallingxModule.answerIncomingCall(call.cid);
+      await CallingxModule.answerIncomingCall(call.cid);
 
-        if (Platform.OS === 'ios') {
-          await waitForAudioSessionActivation();
-        }
+      if (Platform.OS === 'ios') {
+        await waitForAudioSessionActivation();
       }
     } catch (error) {
       logger.error(
-        `Error joining incoming call in callingx: ${call.cid} shouldSkipDisplayIncoming: ${shouldSkipDisplayIncoming}`,
+        `Error joining incoming call in callingx: ${call.cid}`,
         error,
       );
     }

package/src/utils/push/internal/ios.ts

@@ -48,10 +48,9 @@ export const onVoipNotificationReceived = async (
   }
 
   const callingx = getCallingxLib();
-  if (callingx.isCallTracked(call_cid)) {
-    //same call_cid is already tracked, so we skip the notification
+  if (pushUnsubscriptionCallbacks.has(call_cid)) {
     logger.debug(
-      `the same call_cid ${call_cid} is already tracked, skipping the call.ring notification`,
+      `the same call_cid ${call_cid} is already being watched, skipping the call.ring notification`,
     );
     return;
   }
@@ -91,6 +90,7 @@ export const onVoipNotificationReceived = async (
           event,
         );
         unsubscribe();
+        pushUnsubscriptionCallbacks.delete(call_cid);
         return;
       }
       const _closed = closeCallIfNecessary();
@@ -100,6 +100,7 @@ export const onVoipNotificationReceived = async (
           event,
         );
         unsubscribe();
+        pushUnsubscriptionCallbacks.delete(call_cid);
       }
     });
 

package/src/version.ts

@@ -1 +1 @@
-export const version = '1.36.1';
+export const version = '1.37.0';