Address review: route EntitlementsUpdateListener through onDeferredPurchaseCompleted

- Rename `transaction` -> `purchaseResult` in Android and iOS bridges
- Remove extra `// endregion` in Mapper.ts
- Reorder `deferredPurchasesListener` after `entitlementsUpdateListener` in config and builder
- Route deprecated EntitlementsUpdateListener through onDeferredPurchaseCompleted
  (same pattern as native SDKs), eliminating logic duplication

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: NickSxti

android/src/main/java/com/qonversion/reactnativesdk/QonversionModule.kt

@@ -299,9 +299,9 @@ class QonversionModule(reactContext: ReactApplicationContext) : NativeQonversion
         emitOnEntitlementsUpdated(mappedEntitlements)
     }
 
-    override fun onDeferredPurchaseCompleted(transaction: BridgeData) {
-        val mappedTransaction = EntitiesConverter.convertMapToWritableMap(transaction)
-        emitOnDeferredPurchaseCompleted(mappedTransaction)
+    override fun onDeferredPurchaseCompleted(purchaseResult: BridgeData) {
+        val mappedPurchaseResult = EntitiesConverter.convertMapToWritableMap(purchaseResult)
+        emitOnDeferredPurchaseCompleted(mappedPurchaseResult)
     }
 
     companion object {

ios/RNQonversion.mm

@@ -317,9 +317,9 @@ - (void)qonversionDidReceiveUpdatedEntitlements:(NSDictionary<NSString *,id> * _
     }
 }
 
-- (void)qonversionDidCompleteDeferredPurchase:(NSDictionary<NSString *,id> * _Nonnull)transaction {
+- (void)qonversionDidCompleteDeferredPurchase:(NSDictionary<NSString *,id> * _Nonnull)purchaseResult {
     @try {
-        [self emitOnDeferredPurchaseCompleted:transaction];
+        [self emitOnDeferredPurchaseCompleted:purchaseResult];
     } @catch (NSException *exception) {
         QNR_LOG_EXCEPTION("qonversionDidCompleteDeferredPurchase", exception);
     }

ios/RNQonversionImpl.swift

@@ -13,7 +13,7 @@ import React
 public protocol QonversionEventDelegate {
     func shouldPurchasePromoProduct(with productId: String)
     func qonversionDidReceiveUpdatedEntitlements(_ entitlements: [String: Any])
-    func qonversionDidCompleteDeferredPurchase(_ transaction: [String: Any])
+    func qonversionDidCompleteDeferredPurchase(_ purchaseResult: [String: Any])
 }
 
 class QonversionEventHandler: QonversionEventListener {
@@ -27,8 +27,8 @@ class QonversionEventHandler: QonversionEventListener {
         delegate?.qonversionDidReceiveUpdatedEntitlements(entitlements)
     }
 
-    func qonversionDidCompleteDeferredPurchase(_ transaction: [String: Any]) {
-        delegate?.qonversionDidCompleteDeferredPurchase(transaction)
+    func qonversionDidCompleteDeferredPurchase(_ purchaseResult: [String: Any]) {
+        delegate?.qonversionDidCompleteDeferredPurchase(purchaseResult)
     }
 }
 

src/QonversionConfig.ts

@@ -9,28 +9,28 @@ class QonversionConfig {
   readonly entitlementsCacheLifetime: EntitlementsCacheLifetime;
   /** @deprecated Use {@link deferredPurchasesListener} instead. */
   readonly entitlementsUpdateListener: EntitlementsUpdateListener | undefined;
+  readonly deferredPurchasesListener: DeferredPurchasesListener | undefined;
   readonly proxyUrl: string | undefined;
   readonly kidsMode: boolean;
-  readonly deferredPurchasesListener: DeferredPurchasesListener | undefined;
 
   constructor(
     projectKey: string,
     launchMode: LaunchMode,
     environment: Environment = Environment.PRODUCTION,
     entitlementsCacheLifetime: EntitlementsCacheLifetime = EntitlementsCacheLifetime.MONTH,
     entitlementsUpdateListener: EntitlementsUpdateListener | undefined = undefined,
+    deferredPurchasesListener: DeferredPurchasesListener | undefined = undefined,
     proxyUrl: string | undefined = undefined,
     kidsMode: boolean = false,
-    deferredPurchasesListener: DeferredPurchasesListener | undefined = undefined,
   ) {
     this.projectKey = projectKey;
     this.launchMode = launchMode;
     this.environment = environment;
     this.entitlementsCacheLifetime = entitlementsCacheLifetime;
     this.entitlementsUpdateListener = entitlementsUpdateListener;
+    this.deferredPurchasesListener = deferredPurchasesListener;
     this.proxyUrl = proxyUrl;
     this.kidsMode = kidsMode;
-    this.deferredPurchasesListener = deferredPurchasesListener;
   }
 }
 

src/QonversionConfigBuilder.ts

@@ -19,6 +19,7 @@ class QonversionConfigBuilder {
   private proxyUrl: string | undefined = undefined;
   private kidsMode: boolean = false;
 
+
   /**
    * Set current application {@link Environment}. Used to distinguish sandbox and production users.
    *
@@ -114,9 +115,9 @@ class QonversionConfigBuilder {
       this.environment,
       this.entitlementsCacheLifetime,
       this.entitlementsUpdateListener,
+      this.deferredPurchasesListener,
       this.proxyUrl,
       this.kidsMode,
-      this.deferredPurchasesListener,
     )
   }
 }

src/internal/Mapper.ts

@@ -1250,8 +1250,6 @@ class Mapper {
   }
 
   // endregion
-
-  // endregion
 }
 
 export default Mapper;

src/internal/QonversionInternal.ts

@@ -33,7 +33,6 @@ export default class QonversionInternal implements QonversionApi {
   private entitlementsUpdateListener: EntitlementsUpdateListener | null = null;
   private deferredPurchasesListener: DeferredPurchasesListener | null = null;
   private promoPurchasesDelegate: PromoPurchasesListener | null = null;
-  private entitlementsEventSubscribed = false;
   private deferredPurchaseEventSubscribed = false;
 
   constructor(qonversionConfig: QonversionConfig) {
@@ -390,31 +389,22 @@ export default class QonversionInternal implements QonversionApi {
     return;
   }
 
-  private subscribeToEntitlementsEvent() {
-    if (!this.entitlementsEventSubscribed) {
-      RNQonversion.onEntitlementsUpdated(this.entitlementsUpdatedEventHandler);
-      this.entitlementsEventSubscribed = true;
-    }
-  }
-
   private subscribeToDeferredPurchaseEvent() {
     if (!this.deferredPurchaseEventSubscribed) {
       RNQonversion.onDeferredPurchaseCompleted(this.deferredPurchaseCompletedEventHandler);
       this.deferredPurchaseEventSubscribed = true;
     }
   }
 
-  private entitlementsUpdatedEventHandler = (payload: Object) => {
-    const entitlements = Mapper.convertEntitlements(payload as Record<string, QEntitlement>);
-
-    this.entitlementsUpdateListener?.onEntitlementsUpdated(entitlements);
-  }
-
   private deferredPurchaseCompletedEventHandler = (payload: Object) => {
     const purchaseResult = Mapper.convertPurchaseResult(payload as Record<string, any>);
 
     if (purchaseResult) {
       this.deferredPurchasesListener?.onDeferredPurchaseCompleted(purchaseResult);
+
+      if (purchaseResult.entitlements) {
+        this.entitlementsUpdateListener?.onEntitlementsUpdated(purchaseResult.entitlements);
+      }
     }
   }
 
@@ -428,7 +418,7 @@ export default class QonversionInternal implements QonversionApi {
   }
 
   setEntitlementsUpdateListener(listener: EntitlementsUpdateListener) {
-    this.subscribeToEntitlementsEvent();
+    this.subscribeToDeferredPurchaseEvent();
     this.entitlementsUpdateListener = listener;
   }
 

src/internal/__tests__/QonversionInternal.test.ts

@@ -1,7 +1,7 @@
 import type { EntitlementsUpdateListener } from '../../dto/EntitlementsUpdateListener';
 import type { DeferredPurchasesListener } from '../../dto/DeferredPurchasesListener';
-import type { QEntitlement } from '../Mapper';
 import PurchaseResult from '../../dto/PurchaseResult';
+import Entitlement from '../../dto/Entitlement';
 import { PurchaseResultStatus, PurchaseResultSource } from '../../dto/enums';
 
 // Capture event handlers registered on the native module mock
@@ -20,9 +20,6 @@ jest.mock('../specs/NativeQonversionModule', () => ({
   default: {
     storeSDKInfo: jest.fn(),
     initializeSdk: jest.fn(),
-    onEntitlementsUpdated: jest.fn((handler: Function) => {
-      eventHandlers['onEntitlementsUpdated'] = handler;
-    }),
     onDeferredPurchaseCompleted: jest.fn((handler: Function) => {
       eventHandlers['onDeferredPurchaseCompleted'] = handler;
     }),
@@ -31,7 +28,19 @@ jest.mock('../specs/NativeQonversionModule', () => ({
   },
 }));
 
+const mockEntitlements = new Map<string, Entitlement>();
+mockEntitlements.set('premium', { id: 'premium', productId: 'premium_product', isActive: true } as unknown as Entitlement);
+
 const mockPurchaseResult = new PurchaseResult(
+  PurchaseResultStatus.SUCCESS,
+  mockEntitlements,
+  null,
+  false,
+  PurchaseResultSource.API,
+  null
+);
+
+const mockPurchaseResultNoEntitlements = new PurchaseResult(
   PurchaseResultStatus.SUCCESS,
   null,
   null,
@@ -60,6 +69,7 @@ import QonversionInternal from '../QonversionInternal';
 import QonversionConfig from '../../QonversionConfig';
 import { Environment, EntitlementsCacheLifetime, LaunchMode } from '../../dto/enums';
 import RNQonversion from '../specs/NativeQonversionModule';
+import Mapper from '../Mapper';
 
 function createConfig() {
   return new QonversionConfig(
@@ -69,24 +79,21 @@ function createConfig() {
     EntitlementsCacheLifetime.MONTH,
     undefined,
     undefined,
+    undefined,
     false,
   );
 }
 
 const samplePurchaseResult = {
   status: 'Success',
-  entitlements: null,
+  entitlements: { premium: { id: 'premium', productId: 'premium_product', isActive: true } },
   error: null,
   isFallbackGenerated: false,
   source: 'Api',
   storeTransaction: null,
 };
 
-const entitlementsPayload: Record<string, QEntitlement> = {
-  premium: { id: 'premium', productId: 'premium_product', isActive: true } as unknown as QEntitlement,
-};
-
-describe('QonversionInternal - DeferredPurchasesListener (native event)', () => {
+describe('QonversionInternal - DeferredPurchasesListener', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     for (const key of Object.keys(eventHandlers)) {
@@ -149,15 +156,6 @@ describe('QonversionInternal - DeferredPurchasesListener (native event)', () =>
 
     expect(RNQonversion.onDeferredPurchaseCompleted).toHaveBeenCalledTimes(1);
   });
-
-  it('deferred listener does NOT subscribe to onEntitlementsUpdated', () => {
-    const instance = new QonversionInternal(createConfig());
-    const listener: DeferredPurchasesListener = { onDeferredPurchaseCompleted: jest.fn() };
-
-    instance.setDeferredPurchasesListener(listener);
-
-    expect(RNQonversion.onEntitlementsUpdated).not.toHaveBeenCalled();
-  });
 });
 
 describe('QonversionInternal - deprecated setEntitlementsUpdateListener', () => {
@@ -168,23 +166,36 @@ describe('QonversionInternal - deprecated setEntitlementsUpdateListener', () =>
     }
   });
 
-  it('subscribes to onEntitlementsUpdated', () => {
+  it('subscribes to onDeferredPurchaseCompleted (same as native SDK)', () => {
     const instance = new QonversionInternal(createConfig());
     const oldListener: EntitlementsUpdateListener = { onEntitlementsUpdated: jest.fn() };
 
     instance.setEntitlementsUpdateListener(oldListener);
 
-    expect(RNQonversion.onEntitlementsUpdated).toHaveBeenCalled();
+    expect(RNQonversion.onDeferredPurchaseCompleted).toHaveBeenCalled();
   });
 
-  it('fires for ALL entitlement updates', () => {
+  it('fires with entitlements extracted from PurchaseResult', () => {
     const instance = new QonversionInternal(createConfig());
     const oldListener: EntitlementsUpdateListener = { onEntitlementsUpdated: jest.fn() };
 
     instance.setEntitlementsUpdateListener(oldListener);
-    fireEvent('onEntitlementsUpdated', entitlementsPayload);
+    fireEvent('onDeferredPurchaseCompleted', samplePurchaseResult);
 
     expect(oldListener.onEntitlementsUpdated).toHaveBeenCalledTimes(1);
+    expect(oldListener.onEntitlementsUpdated).toHaveBeenCalledWith(mockEntitlements);
+  });
+
+  it('does not fire when PurchaseResult has no entitlements', () => {
+    (Mapper.convertPurchaseResult as jest.Mock).mockReturnValueOnce(mockPurchaseResultNoEntitlements);
+
+    const instance = new QonversionInternal(createConfig());
+    const oldListener: EntitlementsUpdateListener = { onEntitlementsUpdated: jest.fn() };
+
+    instance.setEntitlementsUpdateListener(oldListener);
+    fireEvent('onDeferredPurchaseCompleted', samplePurchaseResult);
+
+    expect(oldListener.onEntitlementsUpdated).not.toHaveBeenCalled();
   });
 });
 
@@ -196,7 +207,7 @@ describe('QonversionInternal - both listeners coexist', () => {
     }
   });
 
-  it('both listeners fire independently from their own native events', () => {
+  it('both listeners fire from onDeferredPurchaseCompleted', () => {
     const oldListener: EntitlementsUpdateListener = { onEntitlementsUpdated: jest.fn() };
     const newListener: DeferredPurchasesListener = { onDeferredPurchaseCompleted: jest.fn() };
 
@@ -207,24 +218,21 @@ describe('QonversionInternal - both listeners coexist', () => {
       EntitlementsCacheLifetime.MONTH,
       oldListener,
       undefined,
+      undefined,
       false,
-      newListener,
     );
 
-    void new QonversionInternal(config);
+    const instance = new QonversionInternal(config);
+    instance.setDeferredPurchasesListener(newListener);
 
-    // Entitlements update fires old listener only
-    fireEvent('onEntitlementsUpdated', entitlementsPayload);
-    expect(oldListener.onEntitlementsUpdated).toHaveBeenCalledTimes(1);
-    expect(newListener.onDeferredPurchaseCompleted).not.toHaveBeenCalled();
-
-    // Deferred purchase fires new listener only
     fireEvent('onDeferredPurchaseCompleted', samplePurchaseResult);
-    expect(oldListener.onEntitlementsUpdated).toHaveBeenCalledTimes(1); // still 1
+
     expect(newListener.onDeferredPurchaseCompleted).toHaveBeenCalledTimes(1);
+    expect(oldListener.onEntitlementsUpdated).toHaveBeenCalledTimes(1);
+    expect(oldListener.onEntitlementsUpdated).toHaveBeenCalledWith(mockEntitlements);
   });
 
-  it('subscribes to both native events independently', () => {
+  it('subscribes to onDeferredPurchaseCompleted only once for both listeners', () => {
     const oldListener: EntitlementsUpdateListener = { onEntitlementsUpdated: jest.fn() };
     const newListener: DeferredPurchasesListener = { onDeferredPurchaseCompleted: jest.fn() };
 
@@ -235,13 +243,13 @@ describe('QonversionInternal - both listeners coexist', () => {
       EntitlementsCacheLifetime.MONTH,
       oldListener,
       undefined,
+      undefined,
       false,
-      newListener,
     );
 
-    void new QonversionInternal(config);
+    const instance = new QonversionInternal(config);
+    instance.setDeferredPurchasesListener(newListener);
 
-    expect(RNQonversion.onEntitlementsUpdated).toHaveBeenCalledTimes(1);
     expect(RNQonversion.onDeferredPurchaseCompleted).toHaveBeenCalledTimes(1);
   });
 });