From 9fbbf980aefe0605857df5ea0d9fb8a183a964c8 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Thu, 7 Aug 2025 23:55:20 +0530
Subject: [PATCH 01/13] add displayed API for multiple offers

---
 .../app/OptimizeView.tsx                      | 39 ++++++++++--
 .../app/_layout.tsx                           |  5 +-
 .../optimize/RCTAEPOptimizeModule.java        | 62 +++++++++++++++++++
 packages/optimize/src/Optimize.ts             |  7 ++-
 4 files changed, 105 insertions(+), 8 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index a28ea79b8..6d29e4515 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -67,13 +67,19 @@ export default () => {
     'eyJ4ZG06YWN0aXZpdHlJZCI6Inhjb3JlOm9mZmVyLWFjdGl2aXR5OjE0MWM4NTg2MmRiMDQ4YzkiLCJ4ZG06cGxhY2VtZW50SWQiOiJ4Y29yZTpvZmZlci1wbGFjZW1lbnQ6MTQxYzZkN2VjOTZmOTg2ZCJ9',
   );
   const decisionScopeTargetMbox = new DecisionScope('demoLoc3');
+  const decistionScopeTest = new DecisionScope('ishita-test');
+  const decisisionScopeODE = new DecisionScope('eyJ4ZG06YWN0aXZpdHlJZCI6ImRwczpvZmZlci1hY3Rpdml0eToxOWEyYzMyYzQ4MzliNmRjIiwieGRtOnBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjE4ZTBlZTA0OTRkZDE3YzQifQ==');
+  const decistionScopeTest2 = new DecisionScope('akhil-test-mbox');
 
   const decisionScopes = [
-    decisionScopeText,
-    decisionScopeImage,
-    decisionScopeHtml,
-    decisionScopeJson,
-    decisionScopeTargetMbox,
+    // decisionScopeText,
+    // decisionScopeImage,
+    // decisionScopeHtml,
+    // decisionScopeJson,
+    // decisionScopeTargetMbox,
+    decistionScopeTest,
+    decisisionScopeODE,
+    decistionScopeTest2
   ];
 
   const optimizeExtensionVersion = async () => {
@@ -90,13 +96,14 @@ 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()));
+      console.log('propositions', propositions);
     }
   };
 
@@ -118,6 +125,20 @@ export default () => {
       },
     });
 
+  const multipleOffersDisplayed = async () => {
+    const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
+    const offerIds: Array<string> = [];
+    propositionsMap.forEach((proposition: Proposition) => {
+      if (proposition && proposition.items && proposition.items.length > 0) {
+        proposition.items.forEach((offer) => {
+          offerIds.push(offer.id);
+        });
+      }
+    });
+    console.log('offerIds', offerIds);
+    Optimize.displayed(offerIds);
+  };
+
   const renderTargetOffer = () => {
     if (targetProposition?.items) {
       if (targetProposition.items[0].format === TARGET_OFFER_TYPE_JSON) {
@@ -344,6 +365,12 @@ export default () => {
           onPress={onPropositionUpdate}
         />
       </View>
+      <View style={{margin: 5}}>
+        <Button
+          title="Multiple Offers Displayed"
+          onPress={multipleOffersDisplayed}
+        />
+      </View>
       <Text style={{...styles.welcome, fontSize: 20}}>
         SDK Version:: {version}
       </Text>
diff --git a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
index 6f4ec0456..ef6fc5195 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
@@ -10,6 +10,9 @@ import { useEffect } from 'react';
 
 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
+const ENV_ID_Optimize = "3149c49c3910/0f12baf27522/launch-c219c0fa9543";
+const ENV_ID_Optimize_Dev = "3149c49c3910/0f12baf27522/launch-0d096c129660-development";
+const ENV_ID_Messaging = "3149c49c3910/4f6b2fbf2986/launch-7d78a5fd1de3-development";
 
 export default function RootLayout() {
   const scheme = useColorScheme();
@@ -38,7 +41,7 @@ export default function RootLayout() {
     // For functional components, use useEffect with an empty dependency array.
     // For class components, call initializeWithAppId inside componentDidMount.
     MobileCore.setLogLevel(LogLevel.DEBUG);
-    MobileCore.initializeWithAppId("YOUR-APP-ID")
+    MobileCore.initializeWithAppId(ENV_ID_Optimize_Dev)
       .then(() => {
         console.log("AEP SDK Initialized");
       })
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..4160f8b05 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.AdobeError;
@@ -18,6 +19,7 @@
 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.facebook.react.bridge.Promise;
@@ -30,14 +32,20 @@
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class RCTAEPOptimizeModule extends ReactContextBaseJavaModule {
 
     private static final String TAG = "RCTAEPOptimizeModule";
     private final ReactApplicationContext reactContext;
+    // Cache of <Offer ID, Proposition>
+    private final Map<String, OptimizeProposition> propositionCache = new ConcurrentHashMap<>();
+    // Cache of <Offer ID, Offer>
+    private final Map<String, Offer> offerCache = new ConcurrentHashMap<>();
 
     public RCTAEPOptimizeModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -92,6 +100,8 @@ public void fail(final AdobeError adobeError) {
 
             @Override
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+                clearPropositionOffersCache();
+                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()));
@@ -101,6 +111,58 @@ public void call(final Map<DecisionScope, OptimizeProposition> decisionScopeProp
         });
     }
 
+    public void cachePropositionOffers(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+        for (final Map.Entry<DecisionScope, OptimizeProposition> entry : decisionScopePropositionMap.entrySet()) {
+            OptimizeProposition proposition = entry.getValue();
+            if (proposition == null) {
+                continue;
+            }
+
+            for (Offer offer : proposition.getOffers()) {
+                if (offer == null) {
+                    continue;
+                }
+
+                offerCache.put(offer.getId(), offer);
+                propositionCache.put(offer.getId(), proposition);
+            }
+        }
+    }
+
+    public void clearPropositionOffersCache() {
+        offerCache.clear();
+        propositionCache.clear();
+    }
+
+    @ReactMethod
+    public void multipleOffersDisplayed(final ReadableArray offerIds) {
+        if (offerIds == null || offerIds.size() == 0) {
+            return;
+        }
+
+        List<Offer> nativeOffers = new ArrayList<>();
+
+        for (int i = 0; i < offerIds.size(); i++) {
+            String offerId = offerIds.getString(i);
+            if (offerId == null) {
+                continue;
+            }
+
+            Offer offer = offerCache.get(offerId);
+            if (offer == null) {
+                Log.d(TAG, "multipleOffersDisplayed: offer not found in cache for offerId: " + offerId);
+                continue;
+            }
+
+            nativeOffers.add(offer);
+        }
+
+        if (!nativeOffers.isEmpty()) {
+            Log.d(TAG, "multipleOffersDisplayed: calling display for: " + nativeOffers.size() + " offers");
+            OfferUtils.displayed(nativeOffers);
+        }
+    }
+
     @ReactMethod
     public void onPropositionsUpdate() {
         Optimize.onPropositionsUpdate(new AdobeCallback<Map<DecisionScope, OptimizeProposition>>() {
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 5a301fc7c..138b7332b 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -22,6 +22,7 @@ interface IOptimize {
   clearCachedPropositions: () => void;
   getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>
   updatePropositions: (decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>) => void
+  displayed: (offerIds: Array<string>) => void
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -98,7 +99,11 @@ const Optimize: IOptimize = {
   updatePropositions(decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>) {    
     var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
     RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data);
-  }  
+  },  
+
+  displayed(offerIds: Array<string>) {
+    RCTAEPOptimize.multipleOffersDisplayed(offerIds);
+  }
 };
 
 export default Optimize;

From 1563c0f32423483b622cb65fe2f2561ce1f62f9f Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Fri, 8 Aug 2025 02:52:06 +0530
Subject: [PATCH 02/13] add proposition id to Offer class

---
 .../app/OptimizeView.tsx                      |  9 ++--
 .../optimize/RCTAEPOptimizeModule.java        | 50 +++++++++++--------
 packages/optimize/src/Optimize.ts             |  7 +--
 packages/optimize/src/models/Offer.ts         |  3 ++
 packages/optimize/src/models/Proposition.ts   |  2 +-
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index 6d29e4515..f08af9720 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';
@@ -127,16 +128,16 @@ export default () => {
 
   const multipleOffersDisplayed = async () => {
     const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
-    const offerIds: Array<string> = [];
+    const offers: Array<Offer> = [];
     propositionsMap.forEach((proposition: Proposition) => {
       if (proposition && proposition.items && proposition.items.length > 0) {
         proposition.items.forEach((offer) => {
-          offerIds.push(offer.id);
+          offers.push(offer);
         });
       }
     });
-    console.log('offerIds', offerIds);
-    Optimize.displayed(offerIds);
+    console.log('offers', offers);
+    Optimize.displayed(offers);
   };
 
   const renderTargetOffer = () => {
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 4160f8b05..855d286d7 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
@@ -42,10 +42,8 @@ public class RCTAEPOptimizeModule extends ReactContextBaseJavaModule {
 
     private static final String TAG = "RCTAEPOptimizeModule";
     private final ReactApplicationContext reactContext;
-    // Cache of <Offer ID, Proposition>
+    // Cache of <Proposition ID, Proposition>
     private final Map<String, OptimizeProposition> propositionCache = new ConcurrentHashMap<>();
-    // Cache of <Offer ID, Offer>
-    private final Map<String, Offer> offerCache = new ConcurrentHashMap<>();
 
     public RCTAEPOptimizeModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -118,47 +116,55 @@ public void cachePropositionOffers(final Map<DecisionScope, OptimizeProposition>
                 continue;
             }
 
-            for (Offer offer : proposition.getOffers()) {
-                if (offer == null) {
-                    continue;
-                }
-
-                offerCache.put(offer.getId(), offer);
-                propositionCache.put(offer.getId(), proposition);
-            }
+            String propositionId = proposition.getId();
+            propositionCache.put(propositionId, proposition);
         }
     }
 
     public void clearPropositionOffersCache() {
-        offerCache.clear();
         propositionCache.clear();
     }
 
     @ReactMethod
-    public void multipleOffersDisplayed(final ReadableArray offerIds) {
-        if (offerIds == null || offerIds.size() == 0) {
+    public void multipleOffersDisplayed(final ReadableArray offersArray) {
+        if (offersArray == null || offersArray.size() == 0) {
+            Log.d(TAG, "multipleOffersDisplayed: offersArray is null or empty");
             return;
         }
 
         List<Offer> nativeOffers = new ArrayList<>();
 
-        for (int i = 0; i < offerIds.size(); i++) {
-            String offerId = offerIds.getString(i);
-            if (offerId == null) {
+        for (int i = 0; i < offersArray.size(); i++) {
+            ReadableMap offer = offersArray.getMap(i);
+            if (offer == null) {
+                Log.d(TAG, "multipleOffersDisplayed: offer is null for index: " + i);
                 continue;
             }
 
-            Offer offer = offerCache.get(offerId);
-            if (offer == null) {
-                Log.d(TAG, "multipleOffersDisplayed: offer not found in cache for offerId: " + offerId);
+            String propositionId = offer.getString("propositionId");
+            String offerId = offer.getString("id");
+
+            if (propositionId == null || offerId == null) {
+                Log.d(TAG, "multipleOffersDisplayed: propositionId or offerId is null for offer: " + offer.toString());
                 continue;
             }
 
-            nativeOffers.add(offer);
+            OptimizeProposition proposition = propositionCache.get(propositionId);
+            if (proposition == null) {
+                Log.d(TAG, "multipleOffersDisplayed: proposition not found in cache for propositionId: " + propositionId);
+                continue;
+            }
+
+            for (Offer propositionOffer : proposition.getOffers()) {
+                if (propositionOffer.getId().equalsIgnoreCase(offerId)) {
+                    nativeOffers.add(propositionOffer);
+                    break;
+                }
+            }
         }
 
         if (!nativeOffers.isEmpty()) {
-            Log.d(TAG, "multipleOffersDisplayed: calling display for: " + nativeOffers.size() + " offers");
+            Log.d(TAG, "multipleOffersDisplayed: calling display for: " + nativeOffers.size() + " offers: " + nativeOffers.toString());
             OfferUtils.displayed(nativeOffers);
         }
     }
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 138b7332b..4022412a8 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';
 
 interface IOptimize {
@@ -22,7 +23,7 @@ interface IOptimize {
   clearCachedPropositions: () => void;
   getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>
   updatePropositions: (decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>) => void
-  displayed: (offerIds: Array<string>) => void
+  displayed: (offers: Array<Offer>) => void
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -101,8 +102,8 @@ const Optimize: IOptimize = {
     RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data);
   },  
 
-  displayed(offerIds: Array<string>) {
-    RCTAEPOptimize.multipleOffersDisplayed(offerIds);
+  displayed(offers: Array<Offer>) {
+    RCTAEPOptimize.multipleOffersDisplayed(offers);
   }
 };
 
diff --git a/packages/optimize/src/models/Offer.ts b/packages/optimize/src/models/Offer.ts
index ca3d622c3..8745fd3c8 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>;
+    propositionId?: string;
 }
 
 class Offer {
@@ -38,6 +39,7 @@ class Offer {
     data: OfferData;  
     score: number;
     meta?: Map<string, any>;
+    propositionId?: 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.propositionId = eventData.propositionId || '';
     }
 
     /**
diff --git a/packages/optimize/src/models/Proposition.ts b/packages/optimize/src/models/Proposition.ts
index 6482a6b78..cd22348fb 100644
--- a/packages/optimize/src/models/Proposition.ts
+++ b/packages/optimize/src/models/Proposition.ts
@@ -32,7 +32,7 @@ class Proposition {
         this.scope = eventData['scope'];
         this.scopeDetails = eventData['scopeDetails'];
         if(eventData['items']) {
-            this.items = eventData['items'].map((offer) => new Offer(offer));                
+            this.items = eventData['items'].map((offer) => new Offer({ ...offer, propositionId: this.id }));                
         }else {
             this.items = new Array();
         }           

From 559a0e71ab8699a054b781c92f657eb3f7973595 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Fri, 8 Aug 2025 13:54:13 +0530
Subject: [PATCH 03/13] add ios impl for displayed api

---
 .../optimize/RCTAEPOptimizeModule.java        |  4 +-
 packages/optimize/ios/src/RCTAEPOptimize.m    | 71 +++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)

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 855d286d7..7d9cb72d8 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
@@ -98,7 +98,7 @@ public void fail(final AdobeError adobeError) {
 
             @Override
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
-                clearPropositionOffersCache();
+                clearPropositionsCache();
                 cachePropositionOffers(decisionScopePropositionMap);
                 final WritableMap writableMap = new WritableNativeMap();
                 for (final Map.Entry<DecisionScope, OptimizeProposition> entry : decisionScopePropositionMap.entrySet()) {
@@ -121,7 +121,7 @@ public void cachePropositionOffers(final Map<DecisionScope, OptimizeProposition>
         }
     }
 
-    public void clearPropositionOffersCache() {
+    public void clearPropositionsCache() {
         propositionCache.clear();
     }
 
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index f54ade48e..e3fb2e803 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;
 }
 
@@ -80,6 +82,9 @@ - (dispatch_queue_t)methodQueue {
                reject([NSString stringWithFormat:@"%ld", (long)error.code],
                       error.description, nil);
              } else {
+              [self clearPropositionsCache];
+              [self cachePropositions:decisionScopePropositionDict];
+
                NSDictionary<NSString *, NSDictionary<NSString *, id> *>
                    *propositionDictionary = [[NSMutableDictionary alloc] init];
 
@@ -213,6 +218,72 @@ - (dispatch_queue_t)methodQueue {
   }
 }
 
+RCT_EXPORT_METHOD(multipleOffersDisplayed
+                  : (NSArray<NSDictionary<NSString *, id> *> *)offersArray) {
+    
+    [AEPLog debugWithLabel:TAG message:@"multipleOffersDisplayed is called."];
+    
+    if (!offersArray || [offersArray count] == 0) {
+        [AEPLog debugWithLabel:TAG message:@"multipleOffersDisplayed: offersArray is null or empty"];
+        return;
+    }
+    
+    NSMutableArray<AEPOffer *> *nativeOffers = [[NSMutableArray alloc] init];
+    
+    for (NSDictionary<NSString *, id> *offerDict in offersArray) {
+        if (!offerDict) {
+            [AEPLog debugWithLabel:TAG message:@"multipleOffersDisplayed: offer is null"];
+            continue;
+        }
+        
+        NSString *propositionId = [offerDict objectForKey:@"propositionId"];
+        NSString *offerId = [offerDict objectForKey:@"id"];
+        
+        if (!propositionId || !offerId) {
+            [AEPLog debugWithLabel:TAG 
+                           message:[NSString stringWithFormat:@"multipleOffersDisplayed: propositionId or offerId is null for offer: %@", offerDict]];
+            continue;
+        }
+        
+        AEPOptimizeProposition *proposition = [propositionCache objectForKey:propositionId];
+        if (!proposition) {
+            [AEPLog debugWithLabel:TAG 
+                           message:[NSString stringWithFormat:@"multipleOffersDisplayed: proposition not found in cache for propositionId: %@", propositionId]];
+            continue;
+        }
+        
+        NSArray<AEPOffer *> *offers = [proposition offers];
+        for (AEPOffer *propositionOffer in offers) {
+            if ([[propositionOffer id] isEqualToString:offerId]) {
+                [nativeOffers addObject:propositionOffer];
+                break;
+            }
+        }
+    }
+    
+    if ([nativeOffers count] > 0) {
+        [AEPLog debugWithLabel:TAG 
+                       message:[NSString stringWithFormat:@"multipleOffersDisplayed: calling display for: %lu offers", (unsigned long)[nativeOffers count]]];
+        
+        [AEPMobileOptimize displayed:nativeOffers];
+    }
+}
+
+#pragma mark - Cache Management
+
+- (void)cachePropositions:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict {
+    for (AEPDecisionScope *key in decisionScopePropositionDict) {
+        AEPOptimizeProposition *proposition = decisionScopePropositionDict[key];
+        if (proposition && proposition.id) {
+            [propositionCache setObject:proposition forKey:proposition.id];
+        }
+    }
+}
+
+- (void)clearPropositionsCache {
+    [propositionCache removeAllObjects];
+}
+
 #pragma mark - Helper methods
 
 - (NSArray<AEPDecisionScope *> *)createDecisionScopesArray:

From df9ec6c6f96cc68e3e4687639ea2e6d8e46beee1 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Fri, 8 Aug 2025 15:54:16 +0530
Subject: [PATCH 04/13] add generateDisplayInteractionXDM and UTs

---
 .../app/OptimizeView.tsx                      |  25 +++++
 packages/optimize/__tests__/OptimizeTests.ts  |  15 +++
 .../optimize/RCTAEPOptimizeModule.java        |  50 +++------
 .../optimize/RCTAEPOptimizeUtil.java          |  40 +++++++
 packages/optimize/ios/src/RCTAEPOptimize.m    | 101 +++++++++++-------
 packages/optimize/src/Optimize.ts             |   5 +
 tests/jest/setup.ts                           |   4 +
 7 files changed, 166 insertions(+), 74 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index f08af9720..5498eb5a0 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -140,6 +140,25 @@ export default () => {
     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) {
@@ -372,6 +391,12 @@ export default () => {
           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/__tests__/OptimizeTests.ts b/packages/optimize/__tests__/OptimizeTests.ts
index 202803c6e..37afdda6a 100644
--- a/packages/optimize/__tests__/OptimizeTests.ts
+++ b/packages/optimize/__tests__/OptimizeTests.ts
@@ -174,4 +174,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/RCTAEPOptimizeModule.java b/packages/optimize/android/src/main/java/com/adobe/marketing/mobile/reactnative/optimize/RCTAEPOptimizeModule.java
index 7d9cb72d8..c9e2af456 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
@@ -127,41 +127,7 @@ public void clearPropositionsCache() {
 
     @ReactMethod
     public void multipleOffersDisplayed(final ReadableArray offersArray) {
-        if (offersArray == null || offersArray.size() == 0) {
-            Log.d(TAG, "multipleOffersDisplayed: offersArray is null or empty");
-            return;
-        }
-
-        List<Offer> nativeOffers = new ArrayList<>();
-
-        for (int i = 0; i < offersArray.size(); i++) {
-            ReadableMap offer = offersArray.getMap(i);
-            if (offer == null) {
-                Log.d(TAG, "multipleOffersDisplayed: offer is null for index: " + i);
-                continue;
-            }
-
-            String propositionId = offer.getString("propositionId");
-            String offerId = offer.getString("id");
-
-            if (propositionId == null || offerId == null) {
-                Log.d(TAG, "multipleOffersDisplayed: propositionId or offerId is null for offer: " + offer.toString());
-                continue;
-            }
-
-            OptimizeProposition proposition = propositionCache.get(propositionId);
-            if (proposition == null) {
-                Log.d(TAG, "multipleOffersDisplayed: proposition not found in cache for propositionId: " + propositionId);
-                continue;
-            }
-
-            for (Offer propositionOffer : proposition.getOffers()) {
-                if (propositionOffer.getId().equalsIgnoreCase(offerId)) {
-                    nativeOffers.add(propositionOffer);
-                    break;
-                }
-            }
-        }
+        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray);
 
         if (!nativeOffers.isEmpty()) {
             Log.d(TAG, "multipleOffersDisplayed: calling display for: " + nativeOffers.size() + " offers: " + nativeOffers.toString());
@@ -169,6 +135,20 @@ public void multipleOffersDisplayed(final ReadableArray offersArray) {
         }
     }
 
+    @ReactMethod
+    public void multipleOffersGenerateDisplayInteractionXdm(final ReadableArray offersArray, final Promise promise) {
+        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray);
+
+        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>>() {
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..19acfdfec 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
@@ -185,4 +185,44 @@ private static List<Object> convertReadableArrayToList(final ReadableArray reada
         }
         return list;
     }
+
+    static ArrayList<Offer> getNativeOffers(final ReadableArray offersArray) {
+        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 propositionId = offer.getString("propositionId");
+            String offerId = offer.getString("id");
+
+            if (propositionId == null || offerId == null) {
+                Log.d(TAG, "getNativeOffers: propositionId or offerId is null for offer: " + offer.toString());
+                continue;
+            }
+
+            OptimizeProposition proposition = propositionCache.get(propositionId);
+            if (proposition == null) {
+                Log.d(TAG, "getNativeOffers: proposition not found in cache for propositionId: " + propositionId);
+                continue;
+            }
+
+            for (Offer propositionOffer : proposition.getOffers()) {
+                if (propositionOffer.getId().equalsIgnoreCase(offerId)) {
+                    nativeOffers.add(propositionOffer);
+                    break;
+                }
+            }
+        }
+
+        return nativeOffers;
+    }
 }
\ No newline at end of file
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index e3fb2e803..ff7e9ae59 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -220,53 +220,76 @@ - (dispatch_queue_t)methodQueue {
 
 RCT_EXPORT_METHOD(multipleOffersDisplayed
                   : (NSArray<NSDictionary<NSString *, id> *> *)offersArray) {
-    
+                    
     [AEPLog debugWithLabel:TAG message:@"multipleOffersDisplayed is called."];
-    
-    if (!offersArray || [offersArray count] == 0) {
-        [AEPLog debugWithLabel:TAG message:@"multipleOffersDisplayed: offersArray is null or empty"];
-        return;
+
+    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) {
     
-    NSMutableArray<AEPOffer *> *nativeOffers = [[NSMutableArray alloc] init];
+    [AEPLog debugWithLabel:TAG message:@"multipleOffersGenerateDisplayInteractionXdm is called."];
     
-    for (NSDictionary<NSString *, id> *offerDict in offersArray) {
-        if (!offerDict) {
-            [AEPLog debugWithLabel:TAG message:@"multipleOffersDisplayed: offer is null"];
-            continue;
-        }
-        
-        NSString *propositionId = [offerDict objectForKey:@"propositionId"];
-        NSString *offerId = [offerDict objectForKey:@"id"];
-        
-        if (!propositionId || !offerId) {
-            [AEPLog debugWithLabel:TAG 
-                           message:[NSString stringWithFormat:@"multipleOffersDisplayed: propositionId or offerId is null for offer: %@", offerDict]];
-            continue;
-        }
-        
-        AEPOptimizeProposition *proposition = [propositionCache objectForKey:propositionId];
-        if (!proposition) {
-            [AEPLog debugWithLabel:TAG 
-                           message:[NSString stringWithFormat:@"multipleOffersDisplayed: proposition not found in cache for propositionId: %@", propositionId]];
-            continue;
-        }
-        
-        NSArray<AEPOffer *> *offers = [proposition offers];
-        for (AEPOffer *propositionOffer in offers) {
-            if ([[propositionOffer id] isEqualToString:offerId]) {
-                [nativeOffers addObject:propositionOffer];
-                break;
-            }
-        }
-    }
+    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]]];
+      [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 *propositionId = [offerDict objectForKey:@"propositionId"];
+    NSString *offerId = [offerDict objectForKey:@"id"];
         
-        [AEPMobileOptimize displayed:nativeOffers];
+    if (!propositionId || !offerId) {
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: propositionId or offerId is null for offer: %@", offerDict]];
+      continue;
+    }
+    
+    AEPOptimizeProposition *proposition = [propositionCache objectForKey:propositionId];
+    if (!proposition) {
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: proposition not found in cache for propositionId: %@", propositionId]];
+      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
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 4022412a8..81a8c96b7 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -24,6 +24,7 @@ interface IOptimize {
   getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>
   updatePropositions: (decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>) => void
   displayed: (offers: Array<Offer>) => void
+  generateDisplayInteractionXdm: (offers: Array<Offer>) => Promise<Map<string, any>>
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -104,6 +105,10 @@ const Optimize: IOptimize = {
 
   displayed(offers: Array<Offer>) {
     RCTAEPOptimize.multipleOffersDisplayed(offers);
+  },
+
+  generateDisplayInteractionXdm(offers: Array<Offer>) {
+    return RCTAEPOptimize.multipleOffersGenerateDisplayInteractionXdm(offers);
   }
 };
 
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: {

From 1691af2f0126d4472bcd6f8821d39a79409bccc5 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Fri, 8 Aug 2025 16:23:00 +0530
Subject: [PATCH 05/13] fix android build errors

---
 .../mobile/reactnative/optimize/RCTAEPOptimizeModule.java     | 4 ++--
 .../mobile/reactnative/optimize/RCTAEPOptimizeUtil.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 c9e2af456..7f0207479 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
@@ -127,7 +127,7 @@ public void clearPropositionsCache() {
 
     @ReactMethod
     public void multipleOffersDisplayed(final ReadableArray offersArray) {
-        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray);
+        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray, propositionCache);
 
         if (!nativeOffers.isEmpty()) {
             Log.d(TAG, "multipleOffersDisplayed: calling display for: " + nativeOffers.size() + " offers: " + nativeOffers.toString());
@@ -137,7 +137,7 @@ public void multipleOffersDisplayed(final ReadableArray offersArray) {
 
     @ReactMethod
     public void multipleOffersGenerateDisplayInteractionXdm(final ReadableArray offersArray, final Promise promise) {
-        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray);
+        List<Offer> nativeOffers = RCTAEPOptimizeUtil.getNativeOffers(offersArray, propositionCache);
 
         if (!nativeOffers.isEmpty()) {
             Log.d(TAG, "multipleOffersGenerateDisplayInteractionXdm: calling generateDisplayInteractionXdm for: " + nativeOffers.size() + " offers: " + nativeOffers.toString());
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 19acfdfec..5690fe5b0 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
@@ -186,7 +186,7 @@ private static List<Object> convertReadableArrayToList(final ReadableArray reada
         return list;
     }
 
-    static ArrayList<Offer> getNativeOffers(final ReadableArray offersArray) {
+    static List<Offer> getNativeOffers(final ReadableArray offersArray, Map<String, OptimizeProposition> propositionCache) {
         List<Offer> nativeOffers = new ArrayList<>();
 
         if (offersArray == null || offersArray.size() == 0) {

From 4bbb845cfca8086a47ed0b72322b96b28a816932 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Mon, 18 Aug 2025 15:29:53 +0530
Subject: [PATCH 06/13] use activity id as unique id for caching

---
 .../app/OptimizeView.tsx                      |  3 +-
 .../optimize/RCTAEPOptimizeConstants.java     | 16 +++++++++
 .../optimize/RCTAEPOptimizeModule.java        | 27 +++++++++++---
 .../optimize/RCTAEPOptimizeUtil.java          | 10 +++---
 packages/optimize/ios/src/RCTAEPOptimize.m    | 35 +++++++++++++-----
 packages/optimize/src/Optimize.ts             | 11 ++++++
 packages/optimize/src/models/Offer.ts         |  6 ++--
 packages/optimize/src/models/Proposition.ts   | 36 ++++++++++++++++---
 8 files changed, 118 insertions(+), 26 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 5498eb5a0..e3d8e6d6c 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -104,7 +104,8 @@ export default () => {
       setHtmlProposition(propositions.get(decisionScopeHtml.getName()));
       setJsonProposition(propositions.get(decisionScopeJson.getName()));
       setTargetProposition(propositions.get(decisionScopeTargetMbox.getName()));
-      console.log('propositions', propositions);
+      const propositionObject = Object.fromEntries(propositions);
+      console.log('propositions', JSON.stringify(propositionObject, null, 2));
     }
   };
 
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 7f0207479..c1ddf31e3 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
@@ -22,6 +22,7 @@
 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.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -74,7 +75,10 @@ public void extensionVersion(final Promise promise) {
 
     @ReactMethod
     public void clearCachedPropositions() {
+        // clear the native cache
         Optimize.clearCachedPropositions();
+        // clear the react native cache
+        clearPropositionsCache();
     }
 
     @ReactMethod
@@ -98,7 +102,6 @@ public void fail(final AdobeError adobeError) {
 
             @Override
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
-                clearPropositionsCache();
                 cachePropositionOffers(decisionScopePropositionMap);
                 final WritableMap writableMap = new WritableNativeMap();
                 for (final Map.Entry<DecisionScope, OptimizeProposition> entry : decisionScopePropositionMap.entrySet()) {
@@ -109,19 +112,33 @@ public void call(final Map<DecisionScope, OptimizeProposition> decisionScopeProp
         });
     }
 
-    public void cachePropositionOffers(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+    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 propositionId = proposition.getId();
-            propositionCache.put(propositionId, proposition);
+            String activityId = null;
+
+            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.getMap(scopeDetails, "activity");
+                    if (scopeDetailsActivity != null && scopeDetailsActivity.containsKey("id")) {
+                        activityId = DataReader.getString(scopeDetailsActivity, "id");
+                    }
+                }
+            }
+
+            propositionCache.put(activityId, proposition);
         }
     }
 
-    public void clearPropositionsCache() {
+    private void clearPropositionsCache() {
         propositionCache.clear();
     }
 
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 5690fe5b0..9f5ee8ac0 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
@@ -201,17 +201,17 @@ static List<Offer> getNativeOffers(final ReadableArray offersArray, Map<String,
                 continue;
             }
 
-            String propositionId = offer.getString("propositionId");
+            String uniquePropositionId = offer.getString(RCTAEPOptimizeConstants.UNIQUE_PROPOSITION_ID_KEY);
             String offerId = offer.getString("id");
 
-            if (propositionId == null || offerId == null) {
-                Log.d(TAG, "getNativeOffers: propositionId or offerId is null for offer: " + offer.toString());
+            if (uniquePropositionId == null || offerId == null) {
+                Log.d(TAG, "getNativeOffers: uniquePropositionId or offerId is null for offer: " + offer.toString());
                 continue;
             }
 
-            OptimizeProposition proposition = propositionCache.get(propositionId);
+            OptimizeProposition proposition = propositionCache.get(uniquePropositionId);
             if (proposition == null) {
-                Log.d(TAG, "getNativeOffers: proposition not found in cache for propositionId: " + propositionId);
+                Log.d(TAG, "getNativeOffers: proposition not found in cache for uniquePropositionId: " + uniquePropositionId);
                 continue;
             }
 
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index ff7e9ae59..4323d3118 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -82,7 +82,6 @@ - (dispatch_queue_t)methodQueue {
                reject([NSString stringWithFormat:@"%ld", (long)error.code],
                       error.description, nil);
              } else {
-              [self clearPropositionsCache];
               [self cachePropositions:decisionScopePropositionDict];
 
                NSDictionary<NSString *, NSDictionary<NSString *, id> *>
@@ -266,17 +265,17 @@ - (dispatch_queue_t)methodQueue {
       continue;
     }
     
-    NSString *propositionId = [offerDict objectForKey:@"propositionId"];
+    NSString *uniquePropositionId = [offerDict objectForKey:@"uniquePropositionId"];
     NSString *offerId = [offerDict objectForKey:@"id"];
         
-    if (!propositionId || !offerId) {
-      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: propositionId or offerId is null for offer: %@", offerDict]];
+    if (!uniquePropositionId || !offerId) {
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: uniquePropositionId or offerId is null for offer: %@", offerDict]];
       continue;
     }
     
-    AEPOptimizeProposition *proposition = [propositionCache objectForKey:propositionId];
+    AEPOptimizeProposition *proposition = [propositionCache objectForKey:uniquePropositionId];
     if (!proposition) {
-      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: proposition not found in cache for propositionId: %@", propositionId]];
+      [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"getNativeOffersFromOffersArray: proposition not found in cache for uniquePropositionId: %@", uniquePropositionId]];
       continue;
     }
 
@@ -297,8 +296,28 @@ - (dispatch_queue_t)methodQueue {
 - (void)cachePropositions:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict {
     for (AEPDecisionScope *key in decisionScopePropositionDict) {
         AEPOptimizeProposition *proposition = decisionScopePropositionDict[key];
-        if (proposition && proposition.id) {
-            [propositionCache setObject:proposition forKey:proposition.id];
+        if (!proposition) {
+            [AEPLog debugWithLabel:TAG message:[NSString stringWithFormat:@"cachePropositions: proposition is null for decisionScope: %@", key]];
+            continue;
+        }
+        
+        NSString *activityId = nil;
+
+        NSDictionary *activity = [proposition activity];
+        if (activity && [activity objectForKey:@"id"]) {
+            activityId = [activity objectForKey:@"id"];
+        } else {
+          NSDictionary *scopeDetails = [proposition 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];
         }
     }
 }
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 81a8c96b7..a6632cdf6 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -103,10 +103,21 @@ const Optimize: IOptimize = {
     RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data);
   },  
 
+  /**
+   * 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 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 PropositionOfferPair objects.
+   * @param {offers} offers - the list of Proposition offers
+   * @return {Promise<Map<string, any>>} - a promise that resolves to xdm map
+   */
   generateDisplayInteractionXdm(offers: Array<Offer>) {
     return RCTAEPOptimize.multipleOffersGenerateDisplayInteractionXdm(offers);
   }
diff --git a/packages/optimize/src/models/Offer.ts b/packages/optimize/src/models/Offer.ts
index 8745fd3c8..07b1c92ce 100644
--- a/packages/optimize/src/models/Offer.ts
+++ b/packages/optimize/src/models/Offer.ts
@@ -29,7 +29,7 @@ interface OfferEventData {
     data: OfferData;
     score: number;
     meta?: Map<string, any>;
-    propositionId?: string;
+    uniquePropositionId?: string; // activity Id of the proposition the offer belongs to
 }
 
 class Offer {
@@ -39,7 +39,7 @@ class Offer {
     data: OfferData;  
     score: number;
     meta?: Map<string, any>;
-    propositionId?: string;
+    protected uniquePropositionId?: string;
 
     get content(): string {
         return this.data.content;
@@ -64,7 +64,7 @@ class Offer {
         this.data = eventData.data;
         this.score = eventData.score;
         this.meta = eventData.meta;
-        this.propositionId = eventData.propositionId || '';
+        this.uniquePropositionId = eventData.uniquePropositionId;
     }
 
     /**
diff --git a/packages/optimize/src/models/Proposition.ts b/packages/optimize/src/models/Proposition.ts
index cd22348fb..679b7a6a5 100644
--- a/packages/optimize/src/models/Proposition.ts
+++ b/packages/optimize/src/models/Proposition.ts
@@ -14,25 +14,53 @@ 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 = eventData['activity'];
+        }
+        if (eventData['placement']) {
+            this.placement = eventData['placement'];
+        }
         if(eventData['items']) {
-            this.items = eventData['items'].map((offer) => new Offer({ ...offer, propositionId: this.id }));                
+            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();
         }           

From ccab4e48504973eded51f4c5cd2db0b631c31246 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Mon, 18 Aug 2025 16:08:14 +0530
Subject: [PATCH 07/13] update cache populate and clear logic

---
 apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx        | 2 +-
 .../mobile/reactnative/optimize/RCTAEPOptimizeModule.java   | 6 ++++--
 packages/optimize/ios/src/RCTAEPOptimize.m                  | 6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index 419997c5e..ac7f62473 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -69,7 +69,7 @@ export default () => {
   );
   const decisionScopeTargetMbox = new DecisionScope('demoLoc3');
   const decistionScopeTest = new DecisionScope('ishita-test');
-  const decisisionScopeODE = new DecisionScope('eyJ4ZG06YWN0aXZpdHlJZCI6ImRwczpvZmZlci1hY3Rpdml0eToxOWEyYzMyYzQ4MzliNmRjIiwieGRtOnBsYWNlbWVudElkIjoieGNvcmU6b2ZmZXItcGxhY2VtZW50OjE4ZTBlZTA0OTRkZDE3YzQifQ==');
+  const decisisionScopeODE = new DecisionScope('eyJ4ZG06YWN0aXZpdHlJZCI6ImRwczpvZmZlci1hY3Rpdml0eToxYjI5ZGMyNjAzNDA4YzZkIiwieGRtOnBsYWNlbWVudElkIjoiZHBzOm9mZmVyLXBsYWNlbWVudDoxYjI5ZDhhMzNlZWVlZWRiIn0=');
   const decistionScopeTest2 = new DecisionScope('akhil-test-mbox');
 
   const decisionScopes = [
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 019497353..96e078a57 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
@@ -80,10 +80,10 @@ public void extensionVersion(final Promise promise) {
 
     @ReactMethod
     public void clearCachedPropositions() {
-        // clear the native cache
-        Optimize.clearCachedPropositions();
         // clear the react native cache
         clearPropositionsCache();
+        // clear the native cache
+        Optimize.clearCachedPropositions();
     }
 
     @ReactMethod
@@ -107,6 +107,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);
@@ -198,6 +199,7 @@ 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/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index 669b0b7bd..fdc4442a4 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -49,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];
 }
 
@@ -84,6 +87,7 @@ - (dispatch_queue_t)methodQueue {
             }
         } 
         if (decisionScopePropositionDict) {
+            [self cachePropositions:decisionScopePropositionDict];
             NSDictionary *propositions = [self createCallbackResponse:decisionScopePropositionDict];
             if (successCallback != nil) {
                 successCallback(@[propositions]);
@@ -132,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];
 

From daed8f17f40dc702fd5c0644c095808e80c8679c Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Mon, 18 Aug 2025 16:25:43 +0530
Subject: [PATCH 08/13] fix typos

---
 packages/optimize/src/Optimize.ts           | 10 +++++-----
 packages/optimize/src/models/Proposition.ts | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 3b3932a54..5e206c587 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -23,7 +23,7 @@ interface IOptimize {
   extensionVersion: () => Promise<string>;
   onPropositionUpdate: (adobeCallback: AdobePropositionCallback) => void;
   clearCachedPropositions: () => void;
-  getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>
+  getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>;
   updatePropositions: (
     decisionScopes: Array<DecisionScope>,
     xdm?: Map<string, any>,
@@ -31,8 +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>>
+  displayed: (offers: Array<Offer>) => void;
+  generateDisplayInteractionXdm: (offers: Array<Offer>) => Promise<Map<string, any>>;
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -127,7 +127,7 @@ const Optimize: IOptimize = {
 /**
    * 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 offers - an array of Proposition offers
+   * @param {Array<Offer>} offers - an array of Proposition offers
    */
   displayed(offers: Array<Offer>) {
     RCTAEPOptimize.multipleOffersDisplayed(offers);
@@ -136,7 +136,7 @@ const Optimize: IOptimize = {
 /**
  * Generates a map containing XDM formatted data for `Experience Event - OptimizeProposition Interactions` 
  * field group from the provided list of PropositionOfferPair objects.
- * @param {offers} offers - the list of Proposition offers
+ * @param {Array<Offer>} offers - the list of Proposition offers
  * @return {Promise<Map<string, any>>} - a promise that resolves to xdm map
  */
   generateDisplayInteractionXdm(offers: Array<Offer>) {
diff --git a/packages/optimize/src/models/Proposition.ts b/packages/optimize/src/models/Proposition.ts
index 679b7a6a5..a81ef1912 100644
--- a/packages/optimize/src/models/Proposition.ts
+++ b/packages/optimize/src/models/Proposition.ts
@@ -15,13 +15,13 @@ import Offer from './Offer';
 const RCTAEPOptimize = require('react-native').NativeModules.AEPOptimize;
 
 interface Activity {
-    id: string;
-    etag: string;
+    id?: string;
+    etag?: string;
 }
 
 interface Placement {
-    id: string;
-    etag: string;
+    id?: string;
+    etag?: string;
 }
 
 interface PropositionEventData {
@@ -48,10 +48,16 @@ class Proposition {
             this.scopeDetails = eventData['scopeDetails'];
         }
         if (eventData['activity']) {
-            this.activity = eventData['activity'];
+            this.activity = {
+                id: eventData['activity']?.['id'],
+                etag: eventData['activity']?.['etag']
+            };
         }
         if (eventData['placement']) {
-            this.placement = eventData['placement'];
+            this.placement = {
+                id: eventData['placement']?.['id'],
+                etag: eventData['placement']?.['etag']
+            };
         }
         if(eventData['items']) {
             let uniquePropositionId: string | undefined = undefined;

From 66f4bdd46fd5dcd54345baa95980472350732151 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Mon, 18 Aug 2025 17:41:15 +0530
Subject: [PATCH 09/13] add exception handling for android data reader util

---
 .../optimize/RCTAEPOptimizeModule.java        | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

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 96e078a57..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
@@ -25,6 +25,7 @@
 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;
@@ -148,21 +149,27 @@ private void cachePropositionOffers(final Map<DecisionScope, OptimizeProposition
             }
 
             String activityId = null;
-
-            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.getMap(scopeDetails, "activity");
-                    if (scopeDetailsActivity != null && scopeDetailsActivity.containsKey("id")) {
-                        activityId = DataReader.getString(scopeDetailsActivity, "id");
+            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;
             }
 
-            propositionCache.put(activityId, proposition);
+            if (activityId != null) {
+                propositionCache.put(activityId, proposition);
+            }
         }
     }
 

From f11bf7f31d83c83c62270ee5e01060272db3e60e Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Mon, 18 Aug 2025 19:13:18 +0530
Subject: [PATCH 10/13] fix ios bridge

---
 packages/optimize/ios/src/RCTAEPOptimize.m | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index fdc4442a4..c8f70da7c 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -337,11 +337,14 @@ - (void)cachePropositions:(NSDictionary<AEPDecisionScope *, AEPOptimizePropositi
         
         NSString *activityId = nil;
 
-        NSDictionary *activity = [proposition activity];
-        if (activity && [activity objectForKey:@"id"]) {
-            activityId = [activity objectForKey:@"id"];
+        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 = [proposition scopeDetails];
+          NSDictionary *scopeDetails = [propositionDict valueForKey:@"scopeDetails"];
           if (scopeDetails && [scopeDetails objectForKey:@"activity"]) {
             NSDictionary *scopeDetailsActivity = [scopeDetails objectForKey:@"activity"];
             if (scopeDetailsActivity && [scopeDetailsActivity objectForKey:@"id"]) {

From 96b1bcc317d36e1afd7051ee098642a390d85a08 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Mon, 18 Aug 2025 22:02:10 +0530
Subject: [PATCH 11/13] add activity and placement fields to util methods

---
 .../mobile/reactnative/optimize/RCTAEPOptimizeUtil.java    | 6 ++++++
 packages/optimize/ios/src/RCTAEPOptimize.m                 | 7 +++++++
 2 files changed, 13 insertions(+)

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 c9e43a7d5..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) {
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index c8f70da7c..518f7908a 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -394,6 +394,13 @@ - (void)clearPropositionsCache {
     [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;
 }
 

From 24bb8ea138099142534523634beca5f7bfcedb1c Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Mon, 18 Aug 2025 22:06:34 +0530
Subject: [PATCH 12/13] clean up test app

---
 .../app/OptimizeView.tsx                        | 17 +++++------------
 apps/AEPSampleAppNewArchEnabled/app/_layout.tsx |  5 +----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index ac7f62473..0fbce5784 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -68,20 +68,13 @@ export default () => {
     'eyJ4ZG06YWN0aXZpdHlJZCI6Inhjb3JlOm9mZmVyLWFjdGl2aXR5OjE0MWM4NTg2MmRiMDQ4YzkiLCJ4ZG06cGxhY2VtZW50SWQiOiJ4Y29yZTpvZmZlci1wbGFjZW1lbnQ6MTQxYzZkN2VjOTZmOTg2ZCJ9',
   );
   const decisionScopeTargetMbox = new DecisionScope('demoLoc3');
-  const decistionScopeTest = new DecisionScope('ishita-test');
-  const decisisionScopeODE = new DecisionScope('eyJ4ZG06YWN0aXZpdHlJZCI6ImRwczpvZmZlci1hY3Rpdml0eToxYjI5ZGMyNjAzNDA4YzZkIiwieGRtOnBsYWNlbWVudElkIjoiZHBzOm9mZmVyLXBsYWNlbWVudDoxYjI5ZDhhMzNlZWVlZWRiIn0=');
-  const decistionScopeTest2 = new DecisionScope('akhil-test-mbox');
 
   const decisionScopes = [
-
-    // decisionScopeText,
-    // decisionScopeImage,
-    // decisionScopeHtml,
-    // decisionScopeJson,
-    // decisionScopeTargetMbox,
-    decistionScopeTest,
-    decisisionScopeODE,
-    decistionScopeTest2
+    decisionScopeText,
+    decisionScopeImage,
+    decisionScopeHtml,
+    decisionScopeJson,
+    decisionScopeTargetMbox,
   ];
 
   const optimizeExtensionVersion = async () => {
diff --git a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
index ef6fc5195..6f4ec0456 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
@@ -10,9 +10,6 @@ import { useEffect } from 'react';
 
 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
-const ENV_ID_Optimize = "3149c49c3910/0f12baf27522/launch-c219c0fa9543";
-const ENV_ID_Optimize_Dev = "3149c49c3910/0f12baf27522/launch-0d096c129660-development";
-const ENV_ID_Messaging = "3149c49c3910/4f6b2fbf2986/launch-7d78a5fd1de3-development";
 
 export default function RootLayout() {
   const scheme = useColorScheme();
@@ -41,7 +38,7 @@ export default function RootLayout() {
     // For functional components, use useEffect with an empty dependency array.
     // For class components, call initializeWithAppId inside componentDidMount.
     MobileCore.setLogLevel(LogLevel.DEBUG);
-    MobileCore.initializeWithAppId(ENV_ID_Optimize_Dev)
+    MobileCore.initializeWithAppId("YOUR-APP-ID")
       .then(() => {
         console.log("AEP SDK Initialized");
       })

From a370cfcc44925657713f80ac8058b3baa834f958 Mon Sep 17 00:00:00 2001
From: Ishita Gambhir <igambhir@adobe.com>
Date: Tue, 19 Aug 2025 15:44:31 +0530
Subject: [PATCH 13/13] update documentation

---
 packages/optimize/README.md       | 56 +++++++++++++++++++++++++++++++
 packages/optimize/src/Optimize.ts |  6 ++--
 2 files changed, 59 insertions(+), 3 deletions(-)

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/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 5e206c587..c1e7274ed 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -127,7 +127,7 @@ const Optimize: IOptimize = {
 /**
    * 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
+   * @param {Array<Offer>} offers - an array of Proposition Offers
    */
   displayed(offers: Array<Offer>) {
     RCTAEPOptimize.multipleOffersDisplayed(offers);
@@ -135,8 +135,8 @@ const Optimize: IOptimize = {
 
 /**
  * Generates a map containing XDM formatted data for `Experience Event - OptimizeProposition Interactions` 
- * field group from the provided list of PropositionOfferPair objects.
- * @param {Array<Offer>} offers - the list of Proposition offers
+ * 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>) {