From 2bce1fcc211358c42906846bb94f934a49b24eff Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Mon, 18 Aug 2025 10:05:51 +0530
Subject: [PATCH 1/2] Optimize - Update Proposition with callback support
 (#496)

* initial commit for update proposition api enhancement

* fixed error on clicking update proposition due to null or undefined callback.

* removed redundant code from RCTAEPOptimize.m

* fixed callback signature in api call in Optimize.ts and updated tests

* used separate callback for success and error case as native android sdk calls success and failure separately.

* tests fix and removed callbacklog from testapp

* fixed iOS bridge code to call both success and error callbacks and test update

* fixed android bridge to use AdobeCallbackWithError to provide error callback with AEPoptimize error response

* removed error parameter from createCallBackResponse

* changed public api signature to pass onSuccess and onError as functions instead of objects

* moved createCallbackResponse method from RCTAEPOptimizeModule to RCTAEPOptimizeUtil

* sending propositions map directly instead of sending under response key in successCallback

* added type for AEPOptimizeError and returned AEpOptimizeError type in errorCallback

* fixed index.js
---
 .../app/OptimizeView.tsx                      |  20 +++-
 packages/optimize/__tests__/OptimizeTests.ts  | 110 +++++++++++++++++-
 .../optimize/RCTAEPOptimizeModule.java        |  31 ++++-
 .../optimize/RCTAEPOptimizeUtil.java          |  41 +++++++
 packages/optimize/ios/src/RCTAEPOptimize.m    |  90 ++++++++++++--
 packages/optimize/src/Optimize.ts             |  32 ++++-
 packages/optimize/src/index.ts                |   4 +-
 .../optimize/src/models/AEPOptimizeError.ts   |  37 ++++++
 8 files changed, 343 insertions(+), 22 deletions(-)
 create mode 100644 packages/optimize/src/models/AEPOptimizeError.ts

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index a28ea79b8..a2a4ac3a0 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -73,7 +73,7 @@ export default () => {
     decisionScopeImage,
     decisionScopeHtml,
     decisionScopeJson,
-    decisionScopeTargetMbox,
+    decisionScopeTargetMbox
   ];
 
   const optimizeExtensionVersion = async () => {
@@ -87,6 +87,21 @@ export default () => {
     console.log('Updated Propositions');
   };
 
+  const testUpdatePropositionsCallback = () => {
+    console.log('Testing updatePropositions with callback...');
+    Optimize.updatePropositions(
+      decisionScopes,
+      undefined,
+      undefined,
+      (response) => {
+        console.log('Callback received:', response);
+      },
+      (error) => {
+        console.log('Error:', error);
+      }
+    );
+  };
+
   const getPropositions = async () => {
     const propositions: Map<string, Proposition> =
       await Optimize.getPropositions(decisionScopes);
@@ -329,6 +344,9 @@ export default () => {
       <View style={{margin: 5}}>
         <Button title="Update Propositions" onPress={updatePropositions} />
       </View>
+      <View style={{margin: 5}}>
+        <Button title="Test Update Propositions Callback" onPress={testUpdatePropositionsCallback} />
+      </View>
       <View style={{margin: 5}}>
         <Button title="Get Propositions" onPress={getPropositions} />
       </View>
diff --git a/packages/optimize/__tests__/OptimizeTests.ts b/packages/optimize/__tests__/OptimizeTests.ts
index 202803c6e..f08295869 100644
--- a/packages/optimize/__tests__/OptimizeTests.ts
+++ b/packages/optimize/__tests__/OptimizeTests.ts
@@ -51,18 +51,122 @@ describe('Optimize', () => {
   });
 
   it('AEPOptimize updateProposition is called', async () => {
-    const spy = jest.spyOn(NativeModules.AEPOptimize, 'updatePropositions');
-    let decisionScopes = [new DecisionScope('abcdef')];
+    let spy = jest.spyOn(NativeModules.AEPOptimize, "updatePropositions");
+    let decisionScopes = [new DecisionScope("abcdef")];
     let xdm = new Map();
     let data = new Map();
     await Optimize.updatePropositions(decisionScopes, xdm, data);
     expect(spy).toHaveBeenCalledWith(
       decisionScopes.map((decisionScope) => decisionScope.getName()),
       xdm,
-      data
+      data,
+      expect.any(Function),
+      expect.any(Function)
+    );
+  });
+
+  it('AEPOptimize updateProposition is called with callback', async () => {
+    let spy = jest.spyOn(NativeModules.AEPOptimize, "updatePropositions");
+    let decisionScopes = [new DecisionScope("abcdef")];
+    let xdm = new Map();
+    let data = new Map();
+    const callback = (_propositions: Map<string, Proposition>) => {};
+    await Optimize.updatePropositions(decisionScopes, xdm, data, callback as any, undefined);
+    expect(spy).toHaveBeenCalledWith(
+      decisionScopes.map((decisionScope) => decisionScope.getName()),
+      xdm,
+      data,
+      expect.any(Function),
+      expect.any(Function)
     );
   });
 
+  it('AEPOptimize updateProposition callback handles successful response', async () => {
+    const mockResponse = new Map<string, Proposition>();
+    mockResponse.set('scope1', new Proposition(propositionJson as any));
+    // Mock the native method to call the callback with mock data
+    const mockMethod = jest.fn().mockImplementation((...args: any[]) => {
+      const callback = args[3];
+      if (typeof callback === 'function') {
+        callback(mockResponse);
+      }
+    });
+    NativeModules.AEPOptimize.updatePropositions = mockMethod;
+    let decisionScopes = [new DecisionScope("abcdef")];
+    let callbackResponse: Map<string, Proposition> | null = null;
+    const callback = (propositions: Map<string, Proposition>) => {
+      callbackResponse = propositions;
+    };
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback as any, undefined);
+    expect(callbackResponse).not.toBeNull();
+    expect(callbackResponse!.get('scope1')).toBeInstanceOf(Proposition);
+  });
+
+  it('AEPOptimize updateProposition callback handles error response', async () => {
+    // For error, the callback may not be called, or may be called with an empty map or undefined. We'll simulate an empty map.
+    const mockErrorResponse = new Error('Test error');
+    // Mock the native method to call the callback with error data
+    const mockMethod = jest.fn().mockImplementation((...args: any[]) => {
+      const onError = args[4];
+      if (typeof onError === 'function') {
+        onError(mockErrorResponse);
+      }
+    });
+    NativeModules.AEPOptimize.updatePropositions = mockMethod;
+    let decisionScopes = [new DecisionScope("abcdef")];
+    let callbackResponse: any = null;
+    const onError = (error: any) => {
+      callbackResponse = error;
+    };
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, undefined, onError as any);
+    expect(callbackResponse).not.toBeNull();
+    expect(callbackResponse!.message).toBe('Test error');
+  });
+
+  it('AEPOptimize updateProposition calls both success and error callbacks', async () => {
+    const mockSuccessResponse = new Map<string, Proposition>();
+    mockSuccessResponse.set('scope1', new Proposition(propositionJson as any));
+    const mockError = { message: 'Test error', code: 500 };
+
+    // Mock the native method to call both callbacks
+    const mockMethod = jest.fn().mockImplementation((...args: any[]) => {
+      const onSuccess = args[3];
+      const onError = args[4];
+      if (typeof onSuccess === 'function') {
+        onSuccess(mockSuccessResponse);
+      }
+      if (typeof onError === 'function') {
+        onError(mockError);
+      }
+    });
+    NativeModules.AEPOptimize.updatePropositions = mockMethod;
+
+    let successCalled = false;
+    let errorCalled = false;
+    let successResponse: Map<string, Proposition> | null = null;
+    let errorResponse: any = null;
+
+    const onSuccess = (propositions: Map<string, Proposition>) => {
+      successCalled = true;
+      successResponse = propositions;
+    };
+    const onError = (error: any) => {
+      errorCalled = true;
+      errorResponse = error;
+    };
+
+    let decisionScopes = [new DecisionScope("abcdef")];
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, onSuccess as any, onError as any);
+
+    expect(successCalled).toBe(true);
+    expect(errorCalled).toBe(true);
+    expect(successResponse).not.toBeNull();
+    expect(successResponse!.get('scope1')).toBeInstanceOf(Proposition);
+    expect(errorResponse).toBeDefined();
+    expect(errorResponse.message).toBe('Test error');
+    expect(errorResponse.code).toBe(500);
+  });
+
   it('Test Offer object state', async () => {
     const offer = new Offer(offerJson);
     //Asserts
diff --git a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java
index fa80defe0..e3f16f516 100644
--- a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java
+++ b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java
@@ -12,6 +12,8 @@
 
 import com.adobe.marketing.mobile.AdobeCallback;
 import com.adobe.marketing.mobile.AdobeCallbackWithError;
+import com.adobe.marketing.mobile.optimize.AdobeCallbackWithOptimizeError;
+import com.adobe.marketing.mobile.optimize.AEPOptimizeError;
 import com.adobe.marketing.mobile.AdobeError;
 import com.adobe.marketing.mobile.LoggingMode;
 import com.adobe.marketing.mobile.MobileCore;
@@ -28,11 +30,14 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import android.util.Log;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import androidx.annotation.Nullable;
 
 public class RCTAEPOptimizeModule extends ReactContextBaseJavaModule {
 
@@ -72,12 +77,34 @@ public void clearCachedPropositions() {
     }
 
     @ReactMethod
-    public void updatePropositions(final ReadableArray decisionScopesArray, ReadableMap xdm, ReadableMap data) {
+    public void updatePropositions(final ReadableArray decisionScopesArray, ReadableMap xdm, ReadableMap data, @Nullable final Callback successCallback, @Nullable final Callback errorCallback) {
+        Log.d(TAG, "updatePropositions called");
         final List<DecisionScope> decisionScopeList = RCTAEPOptimizeUtil.createDecisionScopes(decisionScopesArray);
 
         Map<String, Object> mapXdm = xdm != null ? RCTAEPOptimizeUtil.convertReadableMapToMap(xdm) : Collections.<String, Object>emptyMap();
         Map<String, Object> mapData = data != null ? RCTAEPOptimizeUtil.convertReadableMapToMap(data) : Collections.<String, Object>emptyMap();
-        Optimize.updatePropositions(decisionScopeList, mapXdm, mapData);
+        
+        Optimize.updatePropositions(decisionScopeList, mapXdm, mapData, new AdobeCallbackWithOptimizeError<Map<DecisionScope, OptimizeProposition>>() {
+            @Override
+            public void fail(final AEPOptimizeError adobeError) {
+                Log.e(TAG, "updatePropositions callback failed: " );
+                if (errorCallback != null) {
+                    final WritableMap response = RCTAEPOptimizeUtil.convertAEPOptimizeErrorToWritableMap(adobeError);
+                    Log.d(TAG, "Invoking JS errorCallback with error: ");
+                    errorCallback.invoke(response);
+                }
+            }
+
+            @Override
+            public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+                Log.d(TAG, "updatePropositions callback success.");
+                if (successCallback != null) {
+                    final WritableMap response = RCTAEPOptimizeUtil.createCallbackResponse(decisionScopePropositionMap);
+                    Log.d(TAG, "Invoking JS successCallback with success: " + response.toString());
+                    successCallback.invoke(response);
+                }
+            }
+        });
     }
 
     @ReactMethod
diff --git a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java
index b3779101d..2d13aca77 100644
--- a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java
+++ b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java
@@ -16,6 +16,7 @@
 import com.adobe.marketing.mobile.optimize.DecisionScope;
 import com.adobe.marketing.mobile.optimize.Offer;
 import com.adobe.marketing.mobile.optimize.OptimizeProposition;
+import com.adobe.marketing.mobile.optimize.AEPOptimizeError;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
@@ -185,4 +186,44 @@ private static List<Object> convertReadableArrayToList(final ReadableArray reada
         }
         return list;
     }
+
+    /**
+     * Helper method to create callback response
+     * @param propositionsMap
+     * @return WritableMap
+     */
+    static WritableMap createCallbackResponse(final Map<DecisionScope, OptimizeProposition> propositionsMap) {
+        final WritableMap propositionsWritableMap = new WritableNativeMap();
+        
+        if (propositionsMap != null && !propositionsMap.isEmpty()) {
+            for (final Map.Entry<DecisionScope, OptimizeProposition> entry : propositionsMap.entrySet()) {
+                propositionsWritableMap.putMap(entry.getKey().getName(), RCTAEPOptimizeUtil.convertPropositionToWritableMap(entry.getValue()));
+            }
+        }
+        
+        return propositionsWritableMap;
+    }
+
+    /**
+     * Converts an AEPOptimizeError to a WritableMap for React Native error callback
+     */
+    static WritableMap convertAEPOptimizeErrorToWritableMap(final AEPOptimizeError error) {
+        final WritableMap errorMap = new WritableNativeMap();
+        if (error == null) {
+            return errorMap;
+        }
+        errorMap.putString("type", error.getType());
+        if (error.getStatus() != null) {
+            errorMap.putInt("status", error.getStatus());
+        }
+        errorMap.putString("title", error.getTitle());
+        errorMap.putString("detail", error.getDetail());
+        if (error.getReport() != null && error.getReport() instanceof Map) {
+            errorMap.putMap("report", convertMapToWritableMap((Map<String, Object>) error.getReport()));
+        }
+        if (error.getAdobeError() != null) {
+            errorMap.putString("aepError", error.getAdobeError().getErrorName());
+        }
+        return errorMap;
+    }
 }
\ No newline at end of file
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index f54ade48e..821f57581 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -50,19 +50,47 @@ - (dispatch_queue_t)methodQueue {
   [AEPMobileOptimize clearCachedPropositions];
 }
 
-RCT_EXPORT_METHOD(updatePropositions
-                  : (NSArray<NSString *> *)decisionsScopes xdm
-                  : (NSDictionary<NSString *, id> *)xdm data
-                  : (NSDictionary<NSString *, id> *)data) {
+// Helper method to handle proposition dictionary creation
+- (NSDictionary<NSString *, NSDictionary<NSString *, id> *> *)createPropositionDictionary:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict {
+    NSMutableDictionary<NSString *, NSDictionary<NSString *, id> *> *propositionDictionary = [[NSMutableDictionary alloc] initWithCapacity:decisionScopePropositionDict.count];
+    
+    for (AEPDecisionScope *key in decisionScopePropositionDict) {
+        AEPOptimizeProposition *proposition = decisionScopePropositionDict[key];
+        if (proposition) {
+            [propositionDictionary setValue:[self convertPropositionToDict:proposition] forKey:key.name];
+        }
+    }
+    return propositionDictionary;
+}
 
-  [AEPLog traceWithLabel:TAG message:@"updatePropositions is called."];
-  NSArray<AEPDecisionScope *> *decisionScopesArray =
-      [self createDecisionScopesArray:decisionsScopes];
-  [AEPMobileOptimize updatePropositions:decisionScopesArray
-                                withXdm:xdm
-                                andData:data];
+// Unified method that handles both callback and non-callback cases
+RCT_EXPORT_METHOD(updatePropositions:(NSArray<NSString *> *)decisionScopesArray
+                  withXdm:(NSDictionary *)xdm
+                  andData:(NSDictionary *)data
+                  successCallback:(RCTResponseSenderBlock)successCallback
+                  errorCallback:(RCTResponseSenderBlock)errorCallback) {
+    [AEPLog traceWithLabel:TAG message:@"updatePropositions is called."];
+    NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
+    [AEPMobileOptimize updatePropositions:scopes
+                                   withXdm:xdm
+                                   andData:data
+                                completion:^(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *decisionScopePropositionDict, NSError *error) {
+        if (error) {
+            NSDictionary *errorDict = [self convertNSErrorToOptimizeErrorDict:error];
+            if (errorCallback != nil) {
+                errorCallback(@[errorDict]);
+            }
+        } 
+        if (decisionScopePropositionDict) {
+            NSDictionary *propositions = [self createCallbackResponse:decisionScopePropositionDict];
+            if (successCallback != nil) {
+                successCallback(@[propositions]);
+            }
+        }
+    }];
 }
 
+
 RCT_EXPORT_METHOD(getPropositions
                   : (NSArray<NSString *> *)decisionScopes resolver
                   : (RCTPromiseResolveBlock)resolve rejector
@@ -294,6 +322,48 @@ - (NSString *)convertOfferTypeToString:(AEPOfferType)offerType {
   }
 }
 
+// Helper to convert NSError to a structured error dictionary for JS
+- (NSDictionary *)convertNSErrorToOptimizeErrorDict:(NSError *)error {
+    if (!error) return @{};
+    NSMutableDictionary *errorDict = [NSMutableDictionary dictionary];
+
+    // Log for debugging
+    NSLog(@"[AEPOptimize] NSError.domain: %@", error.domain);
+    NSLog(@"[AEPOptimize] NSError.code: %ld", (long)error.code);
+    NSLog(@"[AEPOptimize] NSError.userInfo: %@", error.userInfo);
+    NSLog(@"[AEPOptimize] NSError.localizedDescription: %@", error.localizedDescription);
+
+    // Extract AEPOptimizeError properties from userInfo (matches Android structure)
+    NSDictionary *userInfo = error.userInfo;
+
+    errorDict[@"type"] = userInfo[@"type"] ?: @"";
+    errorDict[@"status"] = userInfo[@"status"] ?: @(error.code);
+    errorDict[@"title"] = userInfo[@"title"] ?: @"";
+    errorDict[@"detail"] = userInfo[@"detail"] ?: @"";
+    errorDict[@"report"] = userInfo[@"report"] ?: @{};
+    
+    // Handle aepError - check for both nil and NSNull
+    id aepErrorValue = userInfo[@"aepError"];
+    if (aepErrorValue && aepErrorValue != [NSNull null]) {
+        errorDict[@"aepError"] = aepErrorValue;
+    } else {
+        errorDict[@"aepError"] = @"general.unexpected";
+    }
+
+    return errorDict;
+}
+
+// Helper method to create standardized response for callbacks
+- (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict {
+    
+    if (decisionScopePropositionDict && [decisionScopePropositionDict count] > 0) {
+        // Return the propositions map directly
+        return [self createPropositionDictionary:decisionScopePropositionDict];
+    }
+    
+    return @{};
+}
+
 - (void)handleError:(NSError *)error rejecter:(RCTPromiseRejectBlock)reject {
   if (!error || !reject) {
     return;
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 5a301fc7c..4d90a51d9 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -15,13 +15,21 @@ import { NativeEventEmitter } from 'react-native';
 import Proposition from './models/Proposition';
 import DecisionScope from './models/DecisionScope';
 import { AdobePropositionCallback }  from './models/AdobePropositionCallback';
+import AEPOptimizeError from './models/AEPOptimizeError';
+
 
 interface IOptimize {
   extensionVersion: () => Promise<string>;
   onPropositionUpdate: (adobeCallback: AdobePropositionCallback) => void;
   clearCachedPropositions: () => void;
-  getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>
-  updatePropositions: (decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>) => void
+  getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>;
+  updatePropositions: (
+    decisionScopes: Array<DecisionScope>,
+    xdm?: Map<string, any>,
+    data?: Map<string, any>,
+    onSuccess?: (response: Map<string, Proposition>) => void,
+    onError?: (error: AEPOptimizeError) => void
+  ) => void;
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -94,11 +102,25 @@ const Optimize: IOptimize = {
 * @param {Array<DecisionScope>} decisionScopes - containing scopes for which offers need to be updated
 * @param {Map<string, any>} xdm - containing additional XDM-formatted data to be sent in the personalization query request. 
 * @param {Map<string, any>} data - containing additional free-form data to be sent in the personalization query request
+* @param {UpdatePropositionsCallback} callback - optional callback that will be called with the response containing updated propositions and/or error information
 */
-  updatePropositions(decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>) {    
+  updatePropositions(
+    decisionScopes: Array<DecisionScope>,
+    xdm?: Map<string, any>,
+    data?: Map<string, any>,
+    onSuccess?: (response: Map<string, Proposition>) => void,
+    onError?: (error: AEPOptimizeError) => void
+  ) {
     var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
-    RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data);
-  }  
+    
+    RCTAEPOptimize.updatePropositions(
+      decisionScopeNames,
+      xdm,
+      data,
+      typeof onSuccess === 'function' ? onSuccess : () => {},
+      typeof onError === 'function' ? onError : () => {}
+    );
+  },  
 };
 
 export default Optimize;
diff --git a/packages/optimize/src/index.ts b/packages/optimize/src/index.ts
index 144fe8463..c08f00e67 100644
--- a/packages/optimize/src/index.ts
+++ b/packages/optimize/src/index.ts
@@ -12,6 +12,7 @@ governing permissions and limitations under the License.
 
 import Optimize from "./Optimize";
 import { AdobePropositionCallback } from "./models/AdobePropositionCallback";
+import AEPOptimizeError from "./models/AEPOptimizeError";
 import DecisionScope from "./models/DecisionScope";
 import Offer from "./models/Offer";
 import Proposition from "./models/Proposition";
@@ -19,7 +20,8 @@ import Proposition from "./models/Proposition";
 export {
   Optimize,
   AdobePropositionCallback,
+  AEPOptimizeError,
   DecisionScope,
   Offer,
-  Proposition,
+  Proposition
 }
\ No newline at end of file
diff --git a/packages/optimize/src/models/AEPOptimizeError.ts b/packages/optimize/src/models/AEPOptimizeError.ts
new file mode 100644
index 000000000..3f9a75425
--- /dev/null
+++ b/packages/optimize/src/models/AEPOptimizeError.ts
@@ -0,0 +1,37 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+/**
+ * AEPOptimizeError interface representing the error structure returned by 
+ * both iOS and Android native SDK implementations.
+ */
+export interface AEPOptimizeError {
+    /** The type of error that occurred */
+    type?: string;
+    
+    /** The HTTP status code of the error */
+    status?: number;
+    
+    /** The title of the error */
+    title?: string;
+    
+    /** The details of the error */
+    detail?: string;
+    
+    /** Additional error report information */
+    report?: { [key: string]: any };
+    
+    /** The corresponding AEP/Adobe error type */
+    aepError?: string;
+  }
+  
+  export default AEPOptimizeError; 
\ No newline at end of file

From 65b4f2144122e898864d358ae1d9873ab6cbb38d Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Wed, 20 Aug 2025 01:32:16 +0530
Subject: [PATCH 2/2] add displayed and generateDisplayInteractionXDM APIs for
 multiple offers (#508)

* add displayed API for multiple offers

* add proposition id to Offer class

* add ios impl for displayed api

* add generateDisplayInteractionXDM and UTs

* fix android build errors

* use activity id as unique id for caching

* update cache populate and clear logic

* fix typos

* add exception handling for android data reader util

* fix ios bridge

* add activity and placement fields to util methods

* clean up test app

* update documentation
---
 .../app/OptimizeView.tsx                      |  52 ++++++-
 packages/optimize/README.md                   |  56 ++++++++
 packages/optimize/__tests__/OptimizeTests.ts  |  15 ++
 .../optimize/RCTAEPOptimizeConstants.java     |  16 +++
 .../optimize/RCTAEPOptimizeModule.java        |  74 ++++++++++
 .../optimize/RCTAEPOptimizeUtil.java          |  46 +++++++
 packages/optimize/ios/src/RCTAEPOptimize.m    | 129 ++++++++++++++++++
 packages/optimize/src/Optimize.ts             |  23 +++-
 packages/optimize/src/models/Offer.ts         |   3 +
 packages/optimize/src/models/Proposition.ts   |  42 +++++-
 tests/jest/setup.ts                           |   4 +
 11 files changed, 453 insertions(+), 7 deletions(-)
 create mode 100644 packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeConstants.java

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index a2a4ac3a0..0fbce5784 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -15,6 +15,7 @@ import {
   Optimize,
   DecisionScope,
   Proposition,
+  Offer,
 } from '@adobe/react-native-aepoptimize';
 import {WebView} from 'react-native-webview';
 import styles from '../styles/styles';
@@ -73,7 +74,7 @@ export default () => {
     decisionScopeImage,
     decisionScopeHtml,
     decisionScopeJson,
-    decisionScopeTargetMbox
+    decisionScopeTargetMbox,
   ];
 
   const optimizeExtensionVersion = async () => {
@@ -105,13 +106,15 @@ export default () => {
   const getPropositions = async () => {
     const propositions: Map<string, Proposition> =
       await Optimize.getPropositions(decisionScopes);
-    console.log(propositions);
+    console.log(propositions.size, ' propositions size');
     if (propositions) {
       setTextProposition(propositions.get(decisionScopeText.getName()));
       setImageProposition(propositions.get(decisionScopeImage.getName()));
       setHtmlProposition(propositions.get(decisionScopeHtml.getName()));
       setJsonProposition(propositions.get(decisionScopeJson.getName()));
       setTargetProposition(propositions.get(decisionScopeTargetMbox.getName()));
+      const propositionObject = Object.fromEntries(propositions);
+      console.log('propositions', JSON.stringify(propositionObject, null, 2));
     }
   };
 
@@ -133,6 +136,39 @@ export default () => {
       },
     });
 
+  const multipleOffersDisplayed = async () => {
+    const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
+    const offers: Array<Offer> = [];
+    propositionsMap.forEach((proposition: Proposition) => {
+      if (proposition && proposition.items && proposition.items.length > 0) {
+        proposition.items.forEach((offer) => {
+          offers.push(offer);
+        });
+      }
+    });
+    console.log('offers', offers);
+    Optimize.displayed(offers);
+  };
+
+  const multipleOffersGenerateDisplayInteractionXdm = async () => {
+    const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
+    const offers: Array<Offer> = [];
+    propositionsMap.forEach((proposition: Proposition) => {
+      if (proposition && proposition.items && proposition.items.length > 0) {
+        proposition.items.forEach((offer) => {
+          offers.push(offer);
+        });
+      }
+    });
+    console.log('offers', offers);
+    const displayInteractionXdm = await Optimize.generateDisplayInteractionXdm(offers);
+    if (displayInteractionXdm) {
+      console.log('displayInteractionXdm', JSON.stringify(displayInteractionXdm, null, 2));
+    } else {
+      console.log('displayInteractionXdm is null');
+    }
+  };
+
   const renderTargetOffer = () => {
     if (targetProposition?.items) {
       if (targetProposition.items[0].format === TARGET_OFFER_TYPE_JSON) {
@@ -362,6 +398,18 @@ export default () => {
           onPress={onPropositionUpdate}
         />
       </View>
+      <View style={{margin: 5}}>
+        <Button
+          title="Multiple Offers Displayed"
+          onPress={multipleOffersDisplayed}
+        />
+      </View>
+      <View style={{margin: 5}}>
+        <Button
+          title="Multiple Offers Generate Display Interaction XDM"
+          onPress={multipleOffersGenerateDisplayInteractionXdm}
+        />
+      </View>
       <Text style={{...styles.welcome, fontSize: 20}}>
         SDK Version:: {version}
       </Text>
diff --git a/packages/optimize/README.md b/packages/optimize/README.md
index 02c981a1a..379061b8b 100644
--- a/packages/optimize/README.md
+++ b/packages/optimize/README.md
@@ -163,6 +163,62 @@ const decisionScopes = [
 Optimize.updatePropositions(decisionScopes, null, null);
 ```
 
+### Batching display interaction events for multiple Offers:
+
+The Optimize SDK now provides enhanced support for batching display interaction events for multiple Offers. The following APIs are available:
+
+#### displayed
+
+**Syntax**
+
+```typescript
+displayed(offers: Array<Offer>)
+```
+
+**Example**
+
+```typescript
+
+const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
+const offers: Array<Offer> = [];
+
+propositionsMap.forEach((proposition: Proposition) => {
+  if (proposition && proposition.items && proposition.items.length > 0) {
+    proposition.items.forEach((offer) => {
+      offers.push(offer);
+    });
+  }
+});
+
+Optimize.displayed(offers);
+```
+
+#### generateDisplayInteractionXdm
+
+**Syntax**
+
+```typescript
+generateDisplayInteractionXdm(offers: Array<Offer>): Promise<Map<string, any>>;
+```
+
+**Example**
+
+```typescript
+
+const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
+const offers: Array<Offer> = [];
+
+propositionsMap.forEach((proposition: Proposition) => {
+  if (proposition && proposition.items && proposition.items.length > 0) {
+    proposition.items.forEach((offer) => {
+      offers.push(offer);
+    });
+  }
+});
+
+const displayInteractionXdm = await Optimize.generateDisplayInteractionXdm(offers);
+```
+
 ---
 
 ## Public classes
diff --git a/packages/optimize/__tests__/OptimizeTests.ts b/packages/optimize/__tests__/OptimizeTests.ts
index f08295869..d144770af 100644
--- a/packages/optimize/__tests__/OptimizeTests.ts
+++ b/packages/optimize/__tests__/OptimizeTests.ts
@@ -278,4 +278,19 @@ describe('Optimize', () => {
       'eyJhY3Rpdml0eUlkIjoieGNvcmU6b2ZmZXItYWN0aXZpdHk6MTExMTExMTExMTExMTExMSIsInBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjExMTExMTExMTExMTExMTEiLCJpdGVtQ291bnQiOjEwfQ=='
     );
   });
+
+  it('Test Optimize.displayed', async () => {
+    const spy = jest.spyOn(NativeModules.AEPOptimize, 'multipleOffersDisplayed');
+    const offers = [new Offer(offerJson)];
+    await Optimize.displayed(offers);
+    expect(spy).toHaveBeenCalledWith(offers);
+  });
+
+  it('Test Optimize.generateDisplayInteractionXdm', async () => {
+    const spy = jest.spyOn(NativeModules.AEPOptimize, 'multipleOffersGenerateDisplayInteractionXdm');
+    const offers = [new Offer(offerJson)];
+    await Optimize.generateDisplayInteractionXdm(offers);
+    expect(spy).toHaveBeenCalledWith(offers);
+  });
+  
 });
diff --git a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeConstants.java b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeConstants.java
new file mode 100644
index 000000000..000dac1e1
--- /dev/null
+++ b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeConstants.java
@@ -0,0 +1,16 @@
+/*
+    Copyright 2025 Adobe. All rights reserved.
+    This file is licensed to you under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License. You may obtain a copy
+    of the License at http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+    OF ANY KIND, either express or implied. See the License for the specific language
+    governing permissions and limitations under the License.
+ */
+
+package com.adobe.marketing.mobile.reactnative.optimize;
+
+class RCTAEPOptimizeConstants {
+    static final String UNIQUE_PROPOSITION_ID_KEY = "uniquePropositionId";
+ }
diff --git a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java
index e3f16f516..141f40c29 100644
--- a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java
+++ b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java
@@ -10,6 +10,7 @@
  */
 package com.adobe.marketing.mobile.reactnative.optimize;
 
+import android.util.Log;
 import com.adobe.marketing.mobile.AdobeCallback;
 import com.adobe.marketing.mobile.AdobeCallbackWithError;
 import com.adobe.marketing.mobile.optimize.AdobeCallbackWithOptimizeError;
@@ -20,8 +21,11 @@
 import com.adobe.marketing.mobile.optimize.DecisionScope;
 import com.adobe.marketing.mobile.optimize.Offer;
 import com.adobe.marketing.mobile.optimize.OfferType;
+import com.adobe.marketing.mobile.optimize.OfferUtils;
 import com.adobe.marketing.mobile.optimize.Optimize;
 import com.adobe.marketing.mobile.optimize.OptimizeProposition;
+import com.adobe.marketing.mobile.util.DataReader;
+import com.adobe.marketing.mobile.util.DataReaderException;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -34,15 +38,19 @@
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import android.util.Log;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import androidx.annotation.Nullable;
 
 public class RCTAEPOptimizeModule extends ReactContextBaseJavaModule {
 
     private static final String TAG = "RCTAEPOptimizeModule";
     private final ReactApplicationContext reactContext;
+    // Cache of <Proposition ID, Proposition>
+    private final Map<String, OptimizeProposition> propositionCache = new ConcurrentHashMap<>();
 
     public RCTAEPOptimizeModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -73,6 +81,9 @@ public void extensionVersion(final Promise promise) {
 
     @ReactMethod
     public void clearCachedPropositions() {
+        // clear the react native cache
+        clearPropositionsCache();
+        // clear the native cache
         Optimize.clearCachedPropositions();
     }
 
@@ -97,6 +108,7 @@ public void fail(final AEPOptimizeError adobeError) {
 
             @Override
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+                cachePropositionOffers(decisionScopePropositionMap);
                 Log.d(TAG, "updatePropositions callback success.");
                 if (successCallback != null) {
                     final WritableMap response = RCTAEPOptimizeUtil.createCallbackResponse(decisionScopePropositionMap);
@@ -119,6 +131,7 @@ public void fail(final AdobeError adobeError) {
 
             @Override
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+                cachePropositionOffers(decisionScopePropositionMap);
                 final WritableMap writableMap = new WritableNativeMap();
                 for (final Map.Entry<DecisionScope, OptimizeProposition> entry : decisionScopePropositionMap.entrySet()) {
                     writableMap.putMap(entry.getKey().getName(), RCTAEPOptimizeUtil.convertPropositionToWritableMap(entry.getValue()));
@@ -128,11 +141,72 @@ public void call(final Map<DecisionScope, OptimizeProposition> decisionScopeProp
         });
     }
 
+    private void cachePropositionOffers(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+        for (final Map.Entry<DecisionScope, OptimizeProposition> entry : decisionScopePropositionMap.entrySet()) {
+            OptimizeProposition proposition = entry.getValue();
+            if (proposition == null) {
+                continue;
+            }
+
+            String activityId = null;
+            try {
+                Map<String, Object> activity = proposition.getActivity();
+                if (activity != null && activity.containsKey("id")) {
+                    activityId = DataReader.getString(activity, "id");
+                } else {
+                    Map<String, Object> scopeDetails = proposition.getScopeDetails();
+                    if (scopeDetails != null && scopeDetails.containsKey("activity")) {
+                        Map<String, Object> scopeDetailsActivity = DataReader.getTypedMap(Object.class, scopeDetails, "activity");
+                        if (scopeDetailsActivity != null && scopeDetailsActivity.containsKey("id")) {
+                            activityId = DataReader.getString(scopeDetailsActivity, "id");
+                        }
+                    }
+                }
+            } catch (DataReaderException e) {
+                Log.w(TAG, "Failed to extract activity ID from proposition: " + e.getMessage());
+                continue;
+            }
+
+            if (activityId != null) {
+                propositionCache.put(activityId, proposition);
+            }
+        }
+    }
+
+    private void clearPropositionsCache() {
+        propositionCache.clear();
+    }
+
+    @ReactMethod
+    public void multipleOffersDisplayed(final ReadableArray offersArray) {
+        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray, propositionCache);
+
+        if (!nativeOffers.isEmpty()) {
+            Log.d(TAG, "multipleOffersDisplayed: calling display for: " + nativeOffers.size() + " offers: " + nativeOffers.toString());
+            OfferUtils.displayed(nativeOffers);
+        }
+    }
+
+    @ReactMethod
+    public void multipleOffersGenerateDisplayInteractionXdm(final ReadableArray offersArray, final Promise promise) {
+        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray, propositionCache);
+
+        if (!nativeOffers.isEmpty()) {
+            Log.d(TAG, "multipleOffersGenerateDisplayInteractionXdm: calling generateDisplayInteractionXdm for: " + nativeOffers.size() + " offers: " + nativeOffers.toString());
+            final Map<String, Object> interactionXdm = OfferUtils.generateDisplayInteractionXdm(nativeOffers);
+            final WritableMap writableMap = RCTAEPOptimizeUtil.convertMapToWritableMap(interactionXdm);
+            promise.resolve(writableMap);
+        } else {
+            promise.reject("multipleOffersGenerateDisplayInteractionXdm", "Error in generating Display interaction XDM for multiple offers: " + offersArray.toString());
+        }
+    }
+
     @ReactMethod
     public void onPropositionsUpdate() {
         Optimize.onPropositionsUpdate(new AdobeCallback<Map<DecisionScope, OptimizeProposition>>() {
             @Override
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+                cachePropositionOffers(decisionScopePropositionMap);
                 sendUpdatedPropositionsEvent(decisionScopePropositionMap);
             }
         });
diff --git a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java
index 2d13aca77..2ba1b3896 100644
--- a/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java
+++ b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeUtil.java
@@ -48,6 +48,12 @@ static WritableMap convertPropositionToWritableMap(final OptimizeProposition pro
             offersWritableArray.pushMap(convertOfferToWritableMap(offer));
         }
         propositionWritableMap.putArray("items", offersWritableArray);
+        if (proposition.getActivity() != null) {
+            propositionWritableMap.putMap("activity", convertMapToWritableMap(proposition.getActivity()));
+        }
+        if (proposition.getPlacement() != null) {
+            propositionWritableMap.putMap("placement", convertMapToWritableMap(proposition.getPlacement()));
+        }
         return propositionWritableMap;
     }
     static WritableMap convertOfferToWritableMap(final Offer offer) {
@@ -187,6 +193,46 @@ private static List<Object> convertReadableArrayToList(final ReadableArray reada
         return list;
     }
 
+    static List<Offer> getNativeOffers(final ReadableArray offersArray, Map<String, OptimizeProposition> propositionCache) {
+        List<Offer> nativeOffers = new ArrayList<>();
+
+        if (offersArray == null || offersArray.size() == 0) {
+            Log.d(TAG, "getNativeOffers: offersArray is null or empty");
+            return nativeOffers;
+        }
+
+        for (int i = 0; i < offersArray.size(); i++) {
+            ReadableMap offer = offersArray.getMap(i);
+            if (offer == null) {
+                Log.d(TAG, "getNativeOffers: offer is null for index: " + i);
+                continue;
+            }
+
+            String uniquePropositionId = offer.getString(RCTAEPOptimizeConstants.UNIQUE_PROPOSITION_ID_KEY);
+            String offerId = offer.getString("id");
+
+            if (uniquePropositionId == null || offerId == null) {
+                Log.d(TAG, "getNativeOffers: uniquePropositionId or offerId is null for offer: " + offer.toString());
+                continue;
+            }
+
+            OptimizeProposition proposition = propositionCache.get(uniquePropositionId);
+            if (proposition == null) {
+                Log.d(TAG, "getNativeOffers: proposition not found in cache for uniquePropositionId: " + uniquePropositionId);
+                continue;
+            }
+
+            for (Offer propositionOffer : proposition.getOffers()) {
+                if (propositionOffer.getId().equalsIgnoreCase(offerId)) {
+                    nativeOffers.add(propositionOffer);
+                    break;
+                }
+            }
+        }
+
+        return nativeOffers;
+    }
+
     /**
      * Helper method to create callback response
      * @param propositionsMap
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index 821f57581..518f7908a 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -20,11 +20,13 @@
 
 @implementation RCTAEPOptimize {
   bool hasListeners;
+  NSMutableDictionary<NSString *, AEPOptimizeProposition *> *propositionCache;
 }
 
 - (instancetype)init {
   self = [super init];
   hasListeners = false;
+  propositionCache = [[NSMutableDictionary alloc] init];
   return self;
 }
 
@@ -47,6 +49,9 @@ - (dispatch_queue_t)methodQueue {
 
 RCT_EXPORT_METHOD(clearCachedPropositions) {
   [AEPLog traceWithLabel:TAG message:@"clearCachedPropositions is called."];
+  // clear the react native cache
+  [self clearPropositionsCache];
+  // clear the native cache
   [AEPMobileOptimize clearCachedPropositions];
 }
 
@@ -82,6 +87,7 @@ - (dispatch_queue_t)methodQueue {
             }
         } 
         if (decisionScopePropositionDict) {
+            [self cachePropositions:decisionScopePropositionDict];
             NSDictionary *propositions = [self createCallbackResponse:decisionScopePropositionDict];
             if (successCallback != nil) {
                 successCallback(@[propositions]);
@@ -108,6 +114,8 @@ - (dispatch_queue_t)methodQueue {
                reject([NSString stringWithFormat:@"%ld", (long)error.code],
                       error.description, nil);
              } else {
+              [self cachePropositions:decisionScopePropositionDict];
+
                NSDictionary<NSString *, NSDictionary<NSString *, id> *>
                    *propositionDictionary = [[NSMutableDictionary alloc] init];
 
@@ -128,6 +136,8 @@ - (dispatch_queue_t)methodQueue {
   [AEPMobileOptimize onPropositionsUpdate:^(
                          NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *>
                              *decisionScopePropositionDict) {
+
+    [self cachePropositions:decisionScopePropositionDict];
     NSDictionary<NSString *, NSDictionary<NSString *, id> *>
         *propositionDictionary = [[NSMutableDictionary alloc] init];
 
@@ -241,6 +251,118 @@ - (dispatch_queue_t)methodQueue {
   }
 }
 
+RCT_EXPORT_METHOD(multipleOffersDisplayed
+                  : (NSArray<NSDictionary<NSString *, id> *> *)offersArray) {
+                    
+    [AEPLog debugWithLabel:TAG message:@"multipleOffersDisplayed is called."];
+
+    NSMutableArray<AEPOffer *> *nativeOffers = [self getNativeOffersFromOffersArray:offersArray];
+
+    if ([nativeOffers count] > 0) {
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"multipleOffersDisplayed: calling display for: %lu offers", (unsigned long)[nativeOffers count]]];
+      [AEPMobileOptimize displayed:nativeOffers];
+    }
+}
+
+RCT_EXPORT_METHOD(multipleOffersGenerateDisplayInteractionXdm
+                  : (NSArray<NSDictionary<NSString *, id> *> *)offersArray resolver
+                  : (RCTPromiseResolveBlock)resolve rejector
+                  : (RCTPromiseRejectBlock)reject) {
+    
+    [AEPLog debugWithLabel:TAG message:@"multipleOffersGenerateDisplayInteractionXdm is called."];
+    
+    NSMutableArray<AEPOffer *> *nativeOffers = [self getNativeOffersFromOffersArray:offersArray];
+    
+    if ([nativeOffers count] > 0) {
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"multipleOffersGenerateDisplayInteractionXdm: calling display for: %lu offers", (unsigned long)[nativeOffers count]]];
+      NSDictionary<NSString *, id> *displayInteractionXdm = [AEPMobileOptimize generateDisplayInteractionXdm:nativeOffers];
+
+      resolve(displayInteractionXdm);
+    } else {
+      reject(@"generateDisplayInteractionXdmForMultipleOffers", @"Error in generating Display interaction XDM for multiple offers.", nil);
+    }
+}
+
+#pragma mark - Helper methods
+
+- (NSMutableArray<AEPOffer *> *)getNativeOffersFromOffersArray:(NSArray<NSDictionary<NSString *, id> *> *)offersArray {
+  NSMutableArray<AEPOffer *> *nativeOffers = [[NSMutableArray alloc] init];
+
+  if (!offersArray || [offersArray count] == 0) {
+    [AEPLog debugWithLabel:TAG message:@"getNativeOffersFromOffersArray: offersArray is null or empty"];
+    return nativeOffers;
+  }
+
+  for (NSDictionary<NSString *, id> *offerDict in offersArray) {
+    if (!offerDict) {
+      [AEPLog debugWithLabel:TAG message:@"getNativeOffersFromOffersArray: offer is null"];
+      continue;
+    }
+    
+    NSString *uniquePropositionId = [offerDict objectForKey:@"uniquePropositionId"];
+    NSString *offerId = [offerDict objectForKey:@"id"];
+        
+    if (!uniquePropositionId || !offerId) {
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: uniquePropositionId or offerId is null for offer: %@", offerDict]];
+      continue;
+    }
+    
+    AEPOptimizeProposition *proposition = [propositionCache objectForKey:uniquePropositionId];
+    if (!proposition) {
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: proposition not found in cache for uniquePropositionId: %@", uniquePropositionId]];
+      continue;
+    }
+
+    NSArray<AEPOffer *> *offers = [proposition offers];
+    for (AEPOffer *propositionOffer in offers) {
+      if ([[propositionOffer id] isEqualToString:offerId]) {
+        [nativeOffers addObject:propositionOffer];
+        break;
+      }
+    }
+  }
+
+  return nativeOffers;
+}
+
+#pragma mark - Cache Management
+
+- (void)cachePropositions:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict {
+    for (AEPDecisionScope *key in decisionScopePropositionDict) {
+        AEPOptimizeProposition *proposition = decisionScopePropositionDict[key];
+        if (!proposition) {
+            [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"cachePropositions: proposition is null for decisionScope: %@", key]];
+            continue;
+        }
+        
+        NSString *activityId = nil;
+
+        NSDictionary *propositionDict = [self convertPropositionToDict:proposition];
+        NSDictionary *activity = [propositionDict valueForKey:@"activity"];
+        if ([propositionDict objectForKey:@"activity"]) {
+          if (activity && [activity objectForKey:@"id"]) {
+              activityId = [activity objectForKey:@"id"];
+          }
+        } else {
+          NSDictionary *scopeDetails = [propositionDict valueForKey:@"scopeDetails"];
+          if (scopeDetails && [scopeDetails objectForKey:@"activity"]) {
+            NSDictionary *scopeDetailsActivity = [scopeDetails objectForKey:@"activity"];
+            if (scopeDetailsActivity && [scopeDetailsActivity objectForKey:@"id"]) {
+              activityId = [scopeDetailsActivity objectForKey:@"id"];
+            }
+          }
+        }
+
+        if (activityId) {
+          [propositionCache setObject:proposition forKey:activityId];
+        }
+    }
+}
+
+- (void)clearPropositionsCache {
+    [propositionCache removeAllObjects];
+}
+
 #pragma mark - Helper methods
 
 - (NSArray<AEPDecisionScope *> *)createDecisionScopesArray:
@@ -272,6 +394,13 @@ - (dispatch_queue_t)methodQueue {
     [offersArray addObject:[self convertOfferToDict:offer]];
   }
   [propositionDict setValue:offersArray forKey:@"items"];
+
+  if ([proposition activity]) {
+    [propositionDict setValue:[proposition activity] forKey:@"activity"];
+  }
+  if ([proposition placement]) {
+    [propositionDict setValue:[proposition placement] forKey:@"placement"];
+  }
   return propositionDict;
 }
 
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 4d90a51d9..c1e7274ed 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -14,6 +14,7 @@ import { EventSubscription, NativeModules } from 'react-native';
 import { NativeEventEmitter } from 'react-native';
 import Proposition from './models/Proposition';
 import DecisionScope from './models/DecisionScope';
+import Offer from './models/Offer';
 import { AdobePropositionCallback }  from './models/AdobePropositionCallback';
 import AEPOptimizeError from './models/AEPOptimizeError';
 
@@ -30,6 +31,8 @@ interface IOptimize {
     onSuccess?: (response: Map<string, Proposition>) => void,
     onError?: (error: AEPOptimizeError) => void
   ) => void;
+  displayed: (offers: Array<Offer>) => void;
+  generateDisplayInteractionXdm: (offers: Array<Offer>) => Promise<Map<string, any>>;
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -112,7 +115,6 @@ const Optimize: IOptimize = {
     onError?: (error: AEPOptimizeError) => void
   ) {
     var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
-    
     RCTAEPOptimize.updatePropositions(
       decisionScopeNames,
       xdm,
@@ -121,6 +123,25 @@ const Optimize: IOptimize = {
       typeof onError === 'function' ? onError : () => {}
     );
   },  
+
+/**
+   * Dispatches an event for the Edge network extension to send an Experience Event to the Edge network with the display interaction data for the
+   * given list of Proposition offers.
+   * @param {Array<Offer>} offers - an array of Proposition Offers
+   */
+  displayed(offers: Array<Offer>) {
+    RCTAEPOptimize.multipleOffersDisplayed(offers);
+  },
+
+/**
+ * Generates a map containing XDM formatted data for `Experience Event - OptimizeProposition Interactions` 
+ * field group from the provided list of Proposition Offers.
+ * @param {Array<Offer>} offers - an array of Proposition Offers
+ * @return {Promise<Map<string, any>>} - a promise that resolves to xdm map
+ */
+  generateDisplayInteractionXdm(offers: Array<Offer>) {
+    return RCTAEPOptimize.multipleOffersGenerateDisplayInteractionXdm(offers);
+  },
 };
 
 export default Optimize;
diff --git a/packages/optimize/src/models/Offer.ts b/packages/optimize/src/models/Offer.ts
index ca3d622c3..07b1c92ce 100644
--- a/packages/optimize/src/models/Offer.ts
+++ b/packages/optimize/src/models/Offer.ts
@@ -29,6 +29,7 @@ interface OfferEventData {
     data: OfferData;
     score: number;
     meta?: Map<string, any>;
+    uniquePropositionId?: string; // activity Id of the proposition the offer belongs to
 }
 
 class Offer {
@@ -38,6 +39,7 @@ class Offer {
     data: OfferData;  
     score: number;
     meta?: Map<string, any>;
+    protected uniquePropositionId?: string;
 
     get content(): string {
         return this.data.content;
@@ -62,6 +64,7 @@ class Offer {
         this.data = eventData.data;
         this.score = eventData.score;
         this.meta = eventData.meta;
+        this.uniquePropositionId = eventData.uniquePropositionId;
     }
 
     /**
diff --git a/packages/optimize/src/models/Proposition.ts b/packages/optimize/src/models/Proposition.ts
index 6482a6b78..a81ef1912 100644
--- a/packages/optimize/src/models/Proposition.ts
+++ b/packages/optimize/src/models/Proposition.ts
@@ -14,25 +14,59 @@ import Offer from './Offer';
 
 const RCTAEPOptimize = require('react-native').NativeModules.AEPOptimize;
 
+interface Activity {
+    id?: string;
+    etag?: string;
+}
+
+interface Placement {
+    id?: string;
+    etag?: string;
+}
+
 interface PropositionEventData {
     id: string;
     items: Array<Offer>;
     scope: string;
-    scopeDetails: Map<string, any>;
+    scopeDetails?: Map<string, any>;
+    activity?: Activity;
+    placement?: Placement;
 }
 
 class Proposition {
     id: string;
     items: Array<Offer>;
     scope: string;
-    scopeDetails: Map<string, any>;
+    scopeDetails?: Map<string, any>;
+    activity?: Activity;
+    placement?: Placement;
 
     constructor(eventData: PropositionEventData) {
         this.id = eventData['id'];
         this.scope = eventData['scope'];
-        this.scopeDetails = eventData['scopeDetails'];
+        if (eventData['scopeDetails']) {
+            this.scopeDetails = eventData['scopeDetails'];
+        }
+        if (eventData['activity']) {
+            this.activity = {
+                id: eventData['activity']?.['id'],
+                etag: eventData['activity']?.['etag']
+            };
+        }
+        if (eventData['placement']) {
+            this.placement = {
+                id: eventData['placement']?.['id'],
+                etag: eventData['placement']?.['etag']
+            };
+        }
         if(eventData['items']) {
-            this.items = eventData['items'].map((offer) => new Offer(offer));                
+            let uniquePropositionId: string | undefined = undefined;
+            if (this.activity && this.activity['id']) {
+                uniquePropositionId = this.activity['id'];
+            } else if (this.scopeDetails && this.scopeDetails['activity'] && this.scopeDetails['activity']['id']) {
+                uniquePropositionId = this.scopeDetails['activity']['id'];
+            }
+            this.items = eventData['items'].map((offer) => new Offer({ ...offer, uniquePropositionId}));                
         }else {
             this.items = new Array();
         }           
diff --git a/tests/jest/setup.ts b/tests/jest/setup.ts
index dec67f6bf..a1b1de46a 100644
--- a/tests/jest/setup.ts
+++ b/tests/jest/setup.ts
@@ -184,6 +184,10 @@ jest.doMock('react-native', () => {
           ),
           generateReferenceXdm: jest.fn(
             () => new Promise((resolve) => resolve(new Map()))
+          ),
+          multipleOffersDisplayed: jest.fn(),
+          multipleOffersGenerateDisplayInteractionXdm: jest.fn(
+            () => new Promise((resolve) => resolve(new Map()))
           )
         },
         AEPTarget: {