From 3e0b37712dec17edede5e1d5343f9d760a3882c5 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 25 Jun 2025 15:18:03 +0530
Subject: [PATCH 01/16] initial commit for update proposition api enhancement

---
 .../app/OptimizeView.tsx                      | 30 +++++--
 .../app/_layout.tsx                           |  2 +-
 packages/optimize/__tests__/OptimizeTests.ts  | 85 ++++++++++++++++++-
 .../optimize/RCTAEPOptimizeModule.java        | 56 +++++++++++-
 packages/optimize/ios/src/RCTAEPOptimize.m    | 83 +++++++++++++++---
 packages/optimize/src/Optimize.ts             | 42 ++++++++-
 6 files changed, 272 insertions(+), 26 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index a28ea79b8..c89332b99 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -53,6 +53,7 @@ export default () => {
   const [htmlProposition, setHtmlProposition] = useState<Proposition>();
   const [jsonProposition, setJsonProposition] = useState<Proposition>();
   const [targetProposition, setTargetProposition] = useState<Proposition | undefined>();
+  const [callbackLog, setCallbackLog] = useState<string>('');
 
   const decisionScopeText = new DecisionScope(
     'eyJ4ZG06YWN0aXZpdHlJZCI6Inhjb3JlOm9mZmVyLWFjdGl2aXR5OjE0MWM4NTg2MmRiMDQ4YzkiLCJ4ZG06cGxhY2VtZW50SWQiOiJ4Y29yZTpvZmZlci1wbGFjZW1lbnQ6MTQxYzZkNWQzOGYwNDg5NyJ9',
@@ -66,13 +67,9 @@ export default () => {
   const decisionScopeJson = new DecisionScope(
     'eyJ4ZG06YWN0aXZpdHlJZCI6Inhjb3JlOm9mZmVyLWFjdGl2aXR5OjE0MWM4NTg2MmRiMDQ4YzkiLCJ4ZG06cGxhY2VtZW50SWQiOiJ4Y29yZTpvZmZlci1wbGFjZW1lbnQ6MTQxYzZkN2VjOTZmOTg2ZCJ9',
   );
-  const decisionScopeTargetMbox = new DecisionScope('demoLoc3');
+  const decisionScopeTargetMbox = new DecisionScope('akhil-test-mbox');
 
   const decisionScopes = [
-    decisionScopeText,
-    decisionScopeImage,
-    decisionScopeHtml,
-    decisionScopeJson,
     decisionScopeTargetMbox,
   ];
 
@@ -87,6 +84,21 @@ export default () => {
     console.log('Updated Propositions');
   };
 
+  const testUpdatePropositionsCallback = () => {
+    console.log('Testing updatePropositions with callback...');
+    setCallbackLog('Waiting for callback...');
+    
+    Optimize.updatePropositions(
+      decisionScopes,
+      undefined,
+      undefined,
+      (response) => {
+        console.log('Callback received:', response);
+        setCallbackLog(JSON.stringify(response, null, 2));
+      }
+    );
+  };
+
   const getPropositions = async () => {
     const propositions: Map<string, Proposition> =
       await Optimize.getPropositions(decisionScopes);
@@ -102,6 +114,7 @@ export default () => {
 
   const clearCachedProposition = () => {
     Optimize.clearCachedPropositions();
+    setCallbackLog('');
     console.log('Proposition cache cleared');
   };
 
@@ -329,6 +342,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>
@@ -347,6 +363,10 @@ export default () => {
       <Text style={{...styles.welcome, fontSize: 20}}>
         SDK Version:: {version}
       </Text>
+      <Text style={styles.welcome}>Callback Log:</Text>
+      <Text style={{...styles.text, fontFamily: 'monospace', backgroundColor: '#f0f0f0', padding: 10}}>
+        {callbackLog || 'No callback data yet'}
+      </Text>
       <Text style={styles.welcome}>Personalized Offers</Text>
       <RecyclerListView
         style={{width: width}}
diff --git a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
index 6f4ec0456..216c90c77 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
@@ -38,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("YOUR-APP-ID")
+    MobileCore.initializeWithAppId("3149c49c3910/0f12baf27522/launch-0d096c129660-development")
       .then(() => {
         console.log("AEP SDK Initialized");
       })
diff --git a/packages/optimize/__tests__/OptimizeTests.ts b/packages/optimize/__tests__/OptimizeTests.ts
index 202803c6e..4c3a10d20 100644
--- a/packages/optimize/__tests__/OptimizeTests.ts
+++ b/packages/optimize/__tests__/OptimizeTests.ts
@@ -51,18 +51,95 @@ 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
+      undefined, // empty Map becomes undefined
+      undefined // empty Map becomes undefined
+    );
+  });
+
+  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 = (_response: { error?: any; propositions?: { [key: string]: Proposition } | undefined }) => {};
+    await Optimize.updatePropositions(decisionScopes, xdm, data, callback);
+    expect(spy).toHaveBeenCalledWith(
+      decisionScopes.map((decisionScope) => decisionScope.getName()),
+      undefined, // empty Map becomes undefined
+      undefined, // empty Map becomes undefined
+      expect.any(Function)
     );
   });
 
+  it('AEPOptimize updateProposition callback handles successful response', async () => {
+    const mockResponse = {
+      propositions: {
+        'scope1': propositionJson
+      }
+    };
+    
+    // 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: any = null;
+    const callback = (response: { error?: any; propositions?: { [key: string]: Proposition } | undefined }) => {
+      callbackResponse = response;
+    };
+    
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback);
+    
+    expect(callbackResponse).not.toBeNull();
+    expect(callbackResponse.propositions).toBeDefined();
+    expect(callbackResponse.propositions['scope1']).toBeInstanceOf(Proposition);
+    expect(callbackResponse.error).toBeUndefined();
+  });
+
+  it('AEPOptimize updateProposition callback handles error response', async () => {
+    const mockErrorResponse = {
+      error: {
+        message: 'Test error',
+        code: 500
+      }
+    };
+    
+    // Mock the native method to call the callback with error data
+    const mockMethod = jest.fn().mockImplementation((...args: any[]) => {
+      const callback = args[3];
+      if (typeof callback === 'function') {
+        callback(mockErrorResponse);
+      }
+    });
+    NativeModules.AEPOptimize.updatePropositions = mockMethod;
+    
+    let decisionScopes = [new DecisionScope("abcdef")];
+    let callbackResponse: any = null;
+    const callback = (response: { error?: any; propositions?: { [key: string]: Proposition } | undefined }) => {
+      callbackResponse = response;
+    };
+    
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback);
+    
+    expect(callbackResponse).not.toBeNull();
+    expect(callbackResponse.error).toBeDefined();
+    expect(callbackResponse.error.message).toBe('Test error');
+    expect(callbackResponse.error.code).toBe(500);
+    expect(callbackResponse.propositions).toBeUndefined();
+  });
+
   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..741948152 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
@@ -28,7 +28,9 @@
 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;
@@ -72,12 +74,40 @@ public void clearCachedPropositions() {
     }
 
     @ReactMethod
-    public void updatePropositions(final ReadableArray decisionScopesArray, ReadableMap xdm, ReadableMap data) {
+    public void updatePropositions(final ReadableArray decisionScopesArray, ReadableMap xdm, ReadableMap data, final Callback callback) {
+        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);
+        
+        if (callback != null) {
+            Log.d(TAG, "Callback is not null, calling Optimize.updatePropositions with callback.");
+            Optimize.updatePropositions(decisionScopeList, mapXdm, mapData, new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
+                @Override
+                public void fail(final AdobeError adobeError) {
+                    Log.e(TAG, "updatePropositions callback failed: " + adobeError.getErrorName());
+                    if (callback != null) {
+                        final WritableMap response = createCallbackResponse(null, adobeError);
+                        Log.d(TAG, "Invoking JS callback with error: " + response.toString());
+                        callback.invoke(response);
+                    }
+                }
+
+                @Override
+                public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+                    Log.d(TAG, "updatePropositions callback success.");
+                    if (callback != null) {
+                        final WritableMap response = createCallbackResponse(decisionScopePropositionMap, null);
+                        Log.d(TAG, "Invoking JS callback with success: " + response.toString());
+                        callback.invoke(response);
+                    }
+                }
+            });
+        } else {
+            Log.d(TAG, "Callback is null, calling Optimize.updatePropositions without callback.");
+            Optimize.updatePropositions(decisionScopeList, mapXdm, mapData);
+        }
     }
 
     @ReactMethod
@@ -186,6 +216,28 @@ public void addListener(String eventName) {}
     @ReactMethod
     public void removeListeners(Integer count) {}
 
+    // Helper method to create callback response
+    private WritableMap createCallbackResponse(final Map<DecisionScope, OptimizeProposition> propositionsMap, final AdobeError error) {
+        final WritableMap response = new WritableNativeMap();
+        
+        if (error != null) {
+            final WritableMap errorMap = new WritableNativeMap();
+            errorMap.putString("message", error.getErrorName());
+            errorMap.putInt("code", error.getErrorCode());
+            response.putMap("error", errorMap);
+        }
+        
+        if (propositionsMap != null && !propositionsMap.isEmpty()) {
+            final WritableMap propositionsWritableMap = new WritableNativeMap();
+            for (final Map.Entry<DecisionScope, OptimizeProposition> entry : propositionsMap.entrySet()) {
+                propositionsWritableMap.putMap(entry.getKey().getName(), RCTAEPOptimizeUtil.convertPropositionToWritableMap(entry.getValue()));
+            }
+            response.putMap("propositions", propositionsWritableMap);
+        }
+        
+        return response;
+    }
+
     private static Offer createOffer(Map<String, Object> offerEventData) {
         String id = (String) offerEventData.get("id");
         String type = (String) offerEventData.get("type");
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index f54ade48e..50c2cb9eb 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -50,19 +50,82 @@ - (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];
+// Helper method to create standardized response for callbacks
+- (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict 
+                                   error:(NSError *)error {
+    NSMutableDictionary *response = [[NSMutableDictionary alloc] init];
+    
+    if (error) {
+        [response setValue:@{ @"message": error.description, @"code": @(error.code) } forKey:@"error"];
+    }
+    
+    if (decisionScopePropositionDict && [decisionScopePropositionDict count] > 0) {
+        NSDictionary<NSString *, NSDictionary<NSString *, id> *> *propositionDictionary = [self createPropositionDictionary:decisionScopePropositionDict];
+        [response setValue:propositionDictionary forKey:@"propositions"];
+    }
+    
+    return response;
 }
 
+// Method for when we need a callback
+RCT_EXPORT_METHOD(updatePropositionsWithCallback:(NSArray<NSString *> *)decisionScopesArray
+                  withXdm:(NSDictionary *)xdm
+                  andData:(NSDictionary *)data
+                  callback:(RCTResponseSenderBlock)callback) {
+    [AEPLog traceWithLabel:TAG message:@"updatePropositionsWithCallback is called."];
+    NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
+    
+    [AEPMobileOptimize updatePropositions:scopes
+                                   withXdm:xdm
+                                   andData:data
+                                completion:^(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *decisionScopePropositionDict, NSError *error) {
+        NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:error];
+        callback(@[response]);
+    }];
+}
+
+// Method for when we don't need a callback
+RCT_EXPORT_METHOD(updatePropositionsWithoutCallback:(NSArray<NSString *> *)decisionScopesArray
+                  withXdm:(NSDictionary *)xdm
+                  andData:(NSDictionary *)data) {
+    [AEPLog traceWithLabel:TAG message:@"updatePropositionsWithoutCallback is called."];
+    NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
+    
+    [AEPMobileOptimize updatePropositions:scopes
+                                   withXdm:xdm
+                                   andData:data
+                                completion:nil];
+}
+
+// Unified method that handles both callback and non-callback cases (like Android implementation)
+RCT_EXPORT_METHOD(updatePropositions:(NSArray<NSString *> *)decisionScopesArray
+                  withXdm:(NSDictionary *)xdm
+                  andData:(NSDictionary *)data
+                  callback:(RCTResponseSenderBlock)callback) {
+    [AEPLog traceWithLabel:TAG message:@"updatePropositions is called."];
+    NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
+    
+    if (callback != nil && [callback isEqual:[NSNull null]] == NO) {
+        [self updatePropositionsWithCallback:decisionScopesArray withXdm:xdm andData:data callback:callback];
+    } else {
+        [self updatePropositionsWithoutCallback:decisionScopesArray withXdm:xdm andData:data];
+    }
+}
+
+
 RCT_EXPORT_METHOD(getPropositions
                   : (NSArray<NSString *> *)decisionScopes resolver
                   : (RCTPromiseResolveBlock)resolve rejector
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 5a301fc7c..1a2eadf12 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -16,12 +16,21 @@ import Proposition from './models/Proposition';
 import DecisionScope from './models/DecisionScope';
 import { AdobePropositionCallback }  from './models/AdobePropositionCallback';
 
+// Type definition for updatePropositions callback response
+export interface UpdatePropositionsResponse {
+  error?: any;
+  propositions?: { [key: string]: Proposition };
+}
+
+// Type definition for updatePropositions callback
+export type UpdatePropositionsCallback = (response: UpdatePropositionsResponse) => void;
+
 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
+  updatePropositions: (decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>, callback?: UpdatePropositionsCallback) => void
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -94,10 +103,35 @@ 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>) {    
-    var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
-    RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data);
+  updatePropositions(decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>, callback?: UpdatePropositionsCallback) {    
+    const decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
+    
+    const xdmObject = xdm && xdm.size > 0 ? Object.fromEntries(xdm) : undefined;
+    const dataObject = data && data.size > 0 ? Object.fromEntries(data) : undefined;
+    
+    if (callback) {
+      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdmObject, dataObject, (response: any) => {
+        const processedResponse: UpdatePropositionsResponse = {};
+        
+        if (response && response.error) {
+          processedResponse.error = response.error;
+        }
+        
+        if (response && response.propositions) {
+          const propositionMap: { [key: string]: Proposition } = {};
+          for (const [key, value] of Object.entries(response.propositions)) {
+            propositionMap[key] = new Proposition(value as any);
+          }
+          processedResponse.propositions = propositionMap;
+        }
+        
+        callback(processedResponse);
+      });
+    } else {
+      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdmObject, dataObject, null);
+    }
   }  
 };
 

From 4403ddf8c61b9be686ae2c45ff8750f4f621004b Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Fri, 27 Jun 2025 01:41:51 +0530
Subject: [PATCH 02/16] fixed error on clicking update proposition due to null
 or undefined callback.

---
 packages/optimize/src/Optimize.ts | 32 ++++---------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 1a2eadf12..b6ad26514 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -30,7 +30,7 @@ interface IOptimize {
   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>, callback?: UpdatePropositionsCallback) => void
+  updatePropositions: (decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>, callback?: (propositions: Map<string, Proposition>) => void) => void
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -105,33 +105,9 @@ const Optimize: IOptimize = {
 * @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>, callback?: UpdatePropositionsCallback) {    
-    const decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
-    
-    const xdmObject = xdm && xdm.size > 0 ? Object.fromEntries(xdm) : undefined;
-    const dataObject = data && data.size > 0 ? Object.fromEntries(data) : undefined;
-    
-    if (callback) {
-      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdmObject, dataObject, (response: any) => {
-        const processedResponse: UpdatePropositionsResponse = {};
-        
-        if (response && response.error) {
-          processedResponse.error = response.error;
-        }
-        
-        if (response && response.propositions) {
-          const propositionMap: { [key: string]: Proposition } = {};
-          for (const [key, value] of Object.entries(response.propositions)) {
-            propositionMap[key] = new Proposition(value as any);
-          }
-          processedResponse.propositions = propositionMap;
-        }
-        
-        callback(processedResponse);
-      });
-    } else {
-      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdmObject, dataObject, null);
-    }
+  updatePropositions(decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>, callback?: (propositions: Map<string, Proposition>) => void) {    
+    var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
+    RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data, callback || function() {});
   }  
 };
 

From 2c7b0262b8808848d4a67c751091e50105f45ea0 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 2 Jul 2025 10:38:24 +0530
Subject: [PATCH 03/16] removed redundant code from RCTAEPOptimize.m

---
 .../app/OptimizeView.tsx                      |  4 ++
 .../app/_layout.tsx                           |  2 +-
 packages/optimize/ios/src/RCTAEPOptimize.m    | 45 ++++++-------------
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index c89332b99..ab96bde00 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -70,6 +70,10 @@ export default () => {
   const decisionScopeTargetMbox = new DecisionScope('akhil-test-mbox');
 
   const decisionScopes = [
+    decisionScopeText,
+    decisionScopeImage,
+    decisionScopeHtml,
+    decisionScopeJson,
     decisionScopeTargetMbox,
   ];
 
diff --git a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
index 216c90c77..6f4ec0456 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/_layout.tsx
@@ -38,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("3149c49c3910/0f12baf27522/launch-0d096c129660-development")
+    MobileCore.initializeWithAppId("YOUR-APP-ID")
       .then(() => {
         console.log("AEP SDK Initialized");
       })
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index 50c2cb9eb..f2d498782 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -80,36 +80,6 @@ - (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOp
     return response;
 }
 
-// Method for when we need a callback
-RCT_EXPORT_METHOD(updatePropositionsWithCallback:(NSArray<NSString *> *)decisionScopesArray
-                  withXdm:(NSDictionary *)xdm
-                  andData:(NSDictionary *)data
-                  callback:(RCTResponseSenderBlock)callback) {
-    [AEPLog traceWithLabel:TAG message:@"updatePropositionsWithCallback is called."];
-    NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
-    
-    [AEPMobileOptimize updatePropositions:scopes
-                                   withXdm:xdm
-                                   andData:data
-                                completion:^(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *decisionScopePropositionDict, NSError *error) {
-        NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:error];
-        callback(@[response]);
-    }];
-}
-
-// Method for when we don't need a callback
-RCT_EXPORT_METHOD(updatePropositionsWithoutCallback:(NSArray<NSString *> *)decisionScopesArray
-                  withXdm:(NSDictionary *)xdm
-                  andData:(NSDictionary *)data) {
-    [AEPLog traceWithLabel:TAG message:@"updatePropositionsWithoutCallback is called."];
-    NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
-    
-    [AEPMobileOptimize updatePropositions:scopes
-                                   withXdm:xdm
-                                   andData:data
-                                completion:nil];
-}
-
 // Unified method that handles both callback and non-callback cases (like Android implementation)
 RCT_EXPORT_METHOD(updatePropositions:(NSArray<NSString *> *)decisionScopesArray
                   withXdm:(NSDictionary *)xdm
@@ -119,9 +89,20 @@ - (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOp
     NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
     
     if (callback != nil && [callback isEqual:[NSNull null]] == NO) {
-        [self updatePropositionsWithCallback:decisionScopesArray withXdm:xdm andData:data callback:callback];
+        [AEPLog traceWithLabel:TAG message:@"Callback provided, calling with completion handler."];
+        [AEPMobileOptimize updatePropositions:scopes
+                                       withXdm:xdm
+                                       andData:data
+                                    completion:^(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *decisionScopePropositionDict, NSError *error) {
+            NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:error];
+            callback(@[response]);
+        }];
     } else {
-        [self updatePropositionsWithoutCallback:decisionScopesArray withXdm:xdm andData:data];
+        [AEPLog traceWithLabel:TAG message:@"No callback provided, calling without completion handler."];
+        [AEPMobileOptimize updatePropositions:scopes
+                                       withXdm:xdm
+                                       andData:data
+                                    completion:nil];
     }
 }
 

From 2a12ff8b86c41d8947259ddb4184fa75b5579073 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 2 Jul 2025 16:22:43 +0530
Subject: [PATCH 04/16] fixed callback signature in api call in Optimize.ts and
 updated tests

---
 packages/optimize/__tests__/OptimizeTests.ts |  9 +++++----
 packages/optimize/src/Optimize.ts            | 21 +++++++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/optimize/__tests__/OptimizeTests.ts b/packages/optimize/__tests__/OptimizeTests.ts
index 4c3a10d20..64789d417 100644
--- a/packages/optimize/__tests__/OptimizeTests.ts
+++ b/packages/optimize/__tests__/OptimizeTests.ts
@@ -58,8 +58,9 @@ describe('Optimize', () => {
     await Optimize.updatePropositions(decisionScopes, xdm, data);
     expect(spy).toHaveBeenCalledWith(
       decisionScopes.map((decisionScope) => decisionScope.getName()),
-      undefined, // empty Map becomes undefined
-      undefined // empty Map becomes undefined
+      xdm,
+      data,
+      expect.any(Function) // Now always passes a function, even when no callback provided
     );
   });
 
@@ -72,8 +73,8 @@ describe('Optimize', () => {
     await Optimize.updatePropositions(decisionScopes, xdm, data, callback);
     expect(spy).toHaveBeenCalledWith(
       decisionScopes.map((decisionScope) => decisionScope.getName()),
-      undefined, // empty Map becomes undefined
-      undefined, // empty Map becomes undefined
+      xdm,
+      data,
       expect.any(Function)
     );
   });
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index b6ad26514..6d0f08887 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -30,7 +30,7 @@ interface IOptimize {
   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>, callback?: (propositions: Map<string, Proposition>) => void) => void
+  updatePropositions: (decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>, callback?: UpdatePropositionsCallback) => void
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -105,9 +105,24 @@ const Optimize: IOptimize = {
 * @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>, callback?: (propositions: Map<string, Proposition>) => void) {    
+  updatePropositions(decisionScopes: Array<DecisionScope>, xdm?: Map<string, any>, data?: Map<string, any>, callback?: UpdatePropositionsCallback) {    
     var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
-    RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data, callback || function() {});
+    
+    if (callback) {
+      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data, (response: UpdatePropositionsResponse) => {
+        // Convert raw proposition data to proper Proposition objects with Offer instances
+        if (response.propositions) {
+          const convertedPropositions: { [key: string]: Proposition } = {};
+          for (const [key, value] of Object.entries(response.propositions)) {
+            convertedPropositions[key] = new Proposition(value);
+          }
+          response.propositions = convertedPropositions;
+        }
+        callback(response);
+      });
+    } else {
+      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data, function() {});
+    }
   }  
 };
 

From dbfad8bafcb8b92bfb1c4029c495000aae044f4e Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 16 Jul 2025 15:37:06 +0530
Subject: [PATCH 05/16] used separate callback for success and error case as
 native android sdk calls success and failure separately.

---
 .../optimize/RCTAEPOptimizeModule.java        | 45 ++++++++---------
 packages/optimize/ios/src/RCTAEPOptimize.m    | 36 ++++++-------
 packages/optimize/src/Optimize.ts             | 50 ++++++++-----------
 3 files changed, 60 insertions(+), 71 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 741948152..0892a7b93 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
@@ -35,6 +35,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import androidx.annotation.Nullable;
 
 public class RCTAEPOptimizeModule extends ReactContextBaseJavaModule {
 
@@ -74,40 +75,34 @@ public void clearCachedPropositions() {
     }
 
     @ReactMethod
-    public void updatePropositions(final ReadableArray decisionScopesArray, ReadableMap xdm, ReadableMap data, final Callback callback) {
+    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();
         
-        if (callback != null) {
-            Log.d(TAG, "Callback is not null, calling Optimize.updatePropositions with callback.");
-            Optimize.updatePropositions(decisionScopeList, mapXdm, mapData, new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
-                @Override
-                public void fail(final AdobeError adobeError) {
-                    Log.e(TAG, "updatePropositions callback failed: " + adobeError.getErrorName());
-                    if (callback != null) {
-                        final WritableMap response = createCallbackResponse(null, adobeError);
-                        Log.d(TAG, "Invoking JS callback with error: " + response.toString());
-                        callback.invoke(response);
-                    }
+        Optimize.updatePropositions(decisionScopeList, mapXdm, mapData, new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
+            @Override
+            public void fail(final AdobeError adobeError) {
+                Log.e(TAG, "updatePropositions callback failed: " + adobeError.getErrorName());
+                if (errorCallback != null) {
+                    final WritableMap response = createCallbackResponse(null, adobeError);
+                    Log.d(TAG, "Invoking JS errorCallback with error: " + response.toString());
+                    errorCallback.invoke(response);
                 }
+            }
 
-                @Override
-                public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
-                    Log.d(TAG, "updatePropositions callback success.");
-                    if (callback != null) {
-                        final WritableMap response = createCallbackResponse(decisionScopePropositionMap, null);
-                        Log.d(TAG, "Invoking JS callback with success: " + response.toString());
-                        callback.invoke(response);
-                    }
+            @Override
+            public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
+                Log.d(TAG, "updatePropositions callback success.");
+                if (successCallback != null) {
+                    final WritableMap response = createCallbackResponse(decisionScopePropositionMap, null);
+                    Log.d(TAG, "Invoking JS successCallback with success: " + response.toString());
+                    successCallback.invoke(response);
                 }
-            });
-        } else {
-            Log.d(TAG, "Callback is null, calling Optimize.updatePropositions without callback.");
-            Optimize.updatePropositions(decisionScopeList, mapXdm, mapData);
-        }
+            }
+        });
     }
 
     @ReactMethod
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index f2d498782..2411eb934 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -84,26 +84,26 @@ - (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOp
 RCT_EXPORT_METHOD(updatePropositions:(NSArray<NSString *> *)decisionScopesArray
                   withXdm:(NSDictionary *)xdm
                   andData:(NSDictionary *)data
-                  callback:(RCTResponseSenderBlock)callback) {
+                  successCallback:(RCTResponseSenderBlock)successCallback
+                  errorCallback:(RCTResponseSenderBlock)errorCallback) {
     [AEPLog traceWithLabel:TAG message:@"updatePropositions is called."];
     NSArray<AEPDecisionScope *> *scopes = [self createDecisionScopesArray:decisionScopesArray];
-    
-    if (callback != nil && [callback isEqual:[NSNull null]] == NO) {
-        [AEPLog traceWithLabel:TAG message:@"Callback provided, calling with completion handler."];
-        [AEPMobileOptimize updatePropositions:scopes
-                                       withXdm:xdm
-                                       andData:data
-                                    completion:^(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *decisionScopePropositionDict, NSError *error) {
-            NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:error];
-            callback(@[response]);
-        }];
-    } else {
-        [AEPLog traceWithLabel:TAG message:@"No callback provided, calling without completion handler."];
-        [AEPMobileOptimize updatePropositions:scopes
-                                       withXdm:xdm
-                                       andData:data
-                                    completion:nil];
-    }
+    [AEPMobileOptimize updatePropositions:scopes
+                                   withXdm:xdm
+                                   andData:data
+                                completion:^(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *decisionScopePropositionDict, NSError *error) {
+        if (error) {
+            NSDictionary *response = [self createCallbackResponse:nil error:error];
+            if (errorCallback != nil) {
+                errorCallback(@[response]);
+            }
+        } else {
+            NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:nil];
+            if (successCallback != nil) {
+                successCallback(@[response]);
+            }
+        }
+    }];
 }
 
 
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 6d0f08887..031e7de41 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -16,21 +16,18 @@ import Proposition from './models/Proposition';
 import DecisionScope from './models/DecisionScope';
 import { AdobePropositionCallback }  from './models/AdobePropositionCallback';
 
-// Type definition for updatePropositions callback response
-export interface UpdatePropositionsResponse {
-  error?: any;
-  propositions?: { [key: string]: Proposition };
-}
-
-// Type definition for updatePropositions callback
-export type UpdatePropositionsCallback = (response: UpdatePropositionsResponse) => void;
-
 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>, callback?: UpdatePropositionsCallback) => void
+  getPropositions: (decisionScopes: Array<DecisionScope>) => Promise<Map<string, Proposition>>;
+  updatePropositions: (
+    decisionScopes: Array<DecisionScope>,
+    xdm?: Map<string, any>,
+    data?: Map<string, any>,
+    onSuccess?: Map<string, Proposition> | undefined,
+    onError?: any | undefined
+  ) => void;
 }
 
 const RCTAEPOptimize = NativeModules.AEPOptimize;
@@ -105,24 +102,21 @@ const Optimize: IOptimize = {
 * @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>, callback?: UpdatePropositionsCallback) {    
+  updatePropositions(
+    decisionScopes: Array<DecisionScope>,
+    xdm?: Map<string, any>,
+    data?: Map<string, any>,
+    onSuccess?: Map<string, Proposition> | undefined,
+    onError?: any | undefined
+  ) {
     var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
-    
-    if (callback) {
-      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data, (response: UpdatePropositionsResponse) => {
-        // Convert raw proposition data to proper Proposition objects with Offer instances
-        if (response.propositions) {
-          const convertedPropositions: { [key: string]: Proposition } = {};
-          for (const [key, value] of Object.entries(response.propositions)) {
-            convertedPropositions[key] = new Proposition(value);
-          }
-          response.propositions = convertedPropositions;
-        }
-        callback(response);
-      });
-    } else {
-      RCTAEPOptimize.updatePropositions(decisionScopeNames, xdm, data, function() {});
-    }
+    RCTAEPOptimize.updatePropositions(
+      decisionScopeNames,
+      xdm,
+      data,
+      typeof onSuccess === 'function' ? onSuccess : () => {},
+      typeof onError === 'function' ? onError : () => {}
+    );
   }  
 };
 

From 50640c4be30cd260300a7cc1b2ce20a41ab8417d Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 16 Jul 2025 22:19:25 +0530
Subject: [PATCH 06/16] tests fix and removed callbacklog from testapp

---
 .../app/OptimizeView.tsx                      |  18 +---
 packages/optimize/__tests__/OptimizeTests.ts  | 100 +++++++++++-------
 2 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index ab96bde00..466643ab5 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -53,7 +53,6 @@ export default () => {
   const [htmlProposition, setHtmlProposition] = useState<Proposition>();
   const [jsonProposition, setJsonProposition] = useState<Proposition>();
   const [targetProposition, setTargetProposition] = useState<Proposition | undefined>();
-  const [callbackLog, setCallbackLog] = useState<string>('');
 
   const decisionScopeText = new DecisionScope(
     'eyJ4ZG06YWN0aXZpdHlJZCI6Inhjb3JlOm9mZmVyLWFjdGl2aXR5OjE0MWM4NTg2MmRiMDQ4YzkiLCJ4ZG06cGxhY2VtZW50SWQiOiJ4Y29yZTpvZmZlci1wbGFjZW1lbnQ6MTQxYzZkNWQzOGYwNDg5NyJ9',
@@ -70,11 +69,7 @@ export default () => {
   const decisionScopeTargetMbox = new DecisionScope('akhil-test-mbox');
 
   const decisionScopes = [
-    decisionScopeText,
-    decisionScopeImage,
-    decisionScopeHtml,
-    decisionScopeJson,
-    decisionScopeTargetMbox,
+    decisionScopeTargetMbox
   ];
 
   const optimizeExtensionVersion = async () => {
@@ -90,15 +85,15 @@ export default () => {
 
   const testUpdatePropositionsCallback = () => {
     console.log('Testing updatePropositions with callback...');
-    setCallbackLog('Waiting for callback...');
-    
     Optimize.updatePropositions(
       decisionScopes,
       undefined,
       undefined,
       (response) => {
         console.log('Callback received:', response);
-        setCallbackLog(JSON.stringify(response, null, 2));
+      },
+      (error) => {
+        console.log('Error:', error);
       }
     );
   };
@@ -118,7 +113,6 @@ export default () => {
 
   const clearCachedProposition = () => {
     Optimize.clearCachedPropositions();
-    setCallbackLog('');
     console.log('Proposition cache cleared');
   };
 
@@ -367,10 +361,6 @@ export default () => {
       <Text style={{...styles.welcome, fontSize: 20}}>
         SDK Version:: {version}
       </Text>
-      <Text style={styles.welcome}>Callback Log:</Text>
-      <Text style={{...styles.text, fontFamily: 'monospace', backgroundColor: '#f0f0f0', padding: 10}}>
-        {callbackLog || 'No callback data yet'}
-      </Text>
       <Text style={styles.welcome}>Personalized Offers</Text>
       <RecyclerListView
         style={{width: width}}
diff --git a/packages/optimize/__tests__/OptimizeTests.ts b/packages/optimize/__tests__/OptimizeTests.ts
index 64789d417..78885e2bb 100644
--- a/packages/optimize/__tests__/OptimizeTests.ts
+++ b/packages/optimize/__tests__/OptimizeTests.ts
@@ -60,7 +60,8 @@ describe('Optimize', () => {
       decisionScopes.map((decisionScope) => decisionScope.getName()),
       xdm,
       data,
-      expect.any(Function) // Now always passes a function, even when no callback provided
+      expect.any(Function),
+      expect.any(Function)
     );
   });
 
@@ -69,23 +70,20 @@ describe('Optimize', () => {
     let decisionScopes = [new DecisionScope("abcdef")];
     let xdm = new Map();
     let data = new Map();
-    const callback = (_response: { error?: any; propositions?: { [key: string]: Proposition } | undefined }) => {};
-    await Optimize.updatePropositions(decisionScopes, xdm, data, callback);
+    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 = {
-      propositions: {
-        'scope1': propositionJson
-      }
-    };
-    
+    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];
@@ -94,29 +92,19 @@ describe('Optimize', () => {
       }
     });
     NativeModules.AEPOptimize.updatePropositions = mockMethod;
-    
     let decisionScopes = [new DecisionScope("abcdef")];
-    let callbackResponse: any = null;
-    const callback = (response: { error?: any; propositions?: { [key: string]: Proposition } | undefined }) => {
-      callbackResponse = response;
+    let callbackResponse: Map<string, Proposition> | null = null;
+    const callback = (propositions: Map<string, Proposition>) => {
+      callbackResponse = propositions;
     };
-    
-    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback);
-    
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback as any, undefined);
     expect(callbackResponse).not.toBeNull();
-    expect(callbackResponse.propositions).toBeDefined();
-    expect(callbackResponse.propositions['scope1']).toBeInstanceOf(Proposition);
-    expect(callbackResponse.error).toBeUndefined();
+    expect(callbackResponse!.get('scope1')).toBeInstanceOf(Proposition);
   });
 
   it('AEPOptimize updateProposition callback handles error response', async () => {
-    const mockErrorResponse = {
-      error: {
-        message: 'Test error',
-        code: 500
-      }
-    };
-    
+    // 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 Map<string, Proposition>();
     // Mock the native method to call the callback with error data
     const mockMethod = jest.fn().mockImplementation((...args: any[]) => {
       const callback = args[3];
@@ -125,20 +113,58 @@ describe('Optimize', () => {
       }
     });
     NativeModules.AEPOptimize.updatePropositions = mockMethod;
-    
     let decisionScopes = [new DecisionScope("abcdef")];
-    let callbackResponse: any = null;
-    const callback = (response: { error?: any; propositions?: { [key: string]: Proposition } | undefined }) => {
-      callbackResponse = response;
+    let callbackResponse: Map<string, Proposition> | null = null;
+    const callback = (propositions: Map<string, Proposition>) => {
+      callbackResponse = propositions;
     };
-    
-    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback);
-    
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback as any, undefined);
     expect(callbackResponse).not.toBeNull();
-    expect(callbackResponse.error).toBeDefined();
-    expect(callbackResponse.error.message).toBe('Test error');
-    expect(callbackResponse.error.code).toBe(500);
-    expect(callbackResponse.propositions).toBeUndefined();
+    expect(callbackResponse!.size).toBe(0);
+  });
+
+  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 () => {

From 8a3cae005563d1a87138e340157ad5a4877f2ae9 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 16 Jul 2025 23:26:09 +0530
Subject: [PATCH 07/16] fixed iOS bridge code to call both success and error
 callbacks and test update

---
 packages/optimize/__tests__/OptimizeTests.ts | 18 +++++++++---------
 packages/optimize/ios/src/RCTAEPOptimize.m   |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/optimize/__tests__/OptimizeTests.ts b/packages/optimize/__tests__/OptimizeTests.ts
index 78885e2bb..f08295869 100644
--- a/packages/optimize/__tests__/OptimizeTests.ts
+++ b/packages/optimize/__tests__/OptimizeTests.ts
@@ -104,23 +104,23 @@ describe('Optimize', () => {
 
   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 Map<string, Proposition>();
+    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 callback = args[3];
-      if (typeof callback === 'function') {
-        callback(mockErrorResponse);
+      const onError = args[4];
+      if (typeof onError === 'function') {
+        onError(mockErrorResponse);
       }
     });
     NativeModules.AEPOptimize.updatePropositions = mockMethod;
     let decisionScopes = [new DecisionScope("abcdef")];
-    let callbackResponse: Map<string, Proposition> | null = null;
-    const callback = (propositions: Map<string, Proposition>) => {
-      callbackResponse = propositions;
+    let callbackResponse: any = null;
+    const onError = (error: any) => {
+      callbackResponse = error;
     };
-    await Optimize.updatePropositions(decisionScopes, undefined, undefined, callback as any, undefined);
+    await Optimize.updatePropositions(decisionScopes, undefined, undefined, undefined, onError as any);
     expect(callbackResponse).not.toBeNull();
-    expect(callbackResponse!.size).toBe(0);
+    expect(callbackResponse!.message).toBe('Test error');
   });
 
   it('AEPOptimize updateProposition calls both success and error callbacks', async () => {
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index 2411eb934..bbef7722a 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -97,7 +97,8 @@ - (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOp
             if (errorCallback != nil) {
                 errorCallback(@[response]);
             }
-        } else {
+        } 
+        if (decisionScopePropositionDict) {
             NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:nil];
             if (successCallback != nil) {
                 successCallback(@[response]);

From 263f03dba589950fa3282c91781fdc236b76e7ed Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Thu, 24 Jul 2025 21:23:33 +0530
Subject: [PATCH 08/16] fixed android bridge to use AdobeCallbackWithError to
 provide error callback with AEPoptimize error response

---
 .../app/OptimizeView.tsx                      |  6 +-
 .../optimize/RCTAEPOptimizeModule.java        | 12 ++--
 .../optimize/RCTAEPOptimizeUtil.java          | 23 ++++++++
 packages/optimize/ios/src/RCTAEPOptimize.m    | 55 ++++++++++++-------
 4 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
index 466643ab5..a2a4ac3a0 100644
--- a/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
+++ b/apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx
@@ -66,9 +66,13 @@ export default () => {
   const decisionScopeJson = new DecisionScope(
     'eyJ4ZG06YWN0aXZpdHlJZCI6Inhjb3JlOm9mZmVyLWFjdGl2aXR5OjE0MWM4NTg2MmRiMDQ4YzkiLCJ4ZG06cGxhY2VtZW50SWQiOiJ4Y29yZTpvZmZlci1wbGFjZW1lbnQ6MTQxYzZkN2VjOTZmOTg2ZCJ9',
   );
-  const decisionScopeTargetMbox = new DecisionScope('akhil-test-mbox');
+  const decisionScopeTargetMbox = new DecisionScope('demoLoc3');
 
   const decisionScopes = [
+    decisionScopeText,
+    decisionScopeImage,
+    decisionScopeHtml,
+    decisionScopeJson,
     decisionScopeTargetMbox
   ];
 
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 0892a7b93..a43d97e34 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;
@@ -82,13 +84,13 @@ public void updatePropositions(final ReadableArray decisionScopesArray, Readable
         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, new AdobeCallbackWithError<Map<DecisionScope, OptimizeProposition>>() {
+        Optimize.updatePropositions(decisionScopeList, mapXdm, mapData, new AdobeCallbackWithOptimizeError<Map<DecisionScope, OptimizeProposition>>() {
             @Override
-            public void fail(final AdobeError adobeError) {
-                Log.e(TAG, "updatePropositions callback failed: " + adobeError.getErrorName());
+            public void fail(final AEPOptimizeError adobeError) {
+                Log.e(TAG, "updatePropositions callback failed: " );
                 if (errorCallback != null) {
-                    final WritableMap response = createCallbackResponse(null, adobeError);
-                    Log.d(TAG, "Invoking JS errorCallback with error: " + response.toString());
+                    final WritableMap response = RCTAEPOptimizeUtil.convertAEPOptimizeErrorToWritableMap(adobeError);
+                    Log.d(TAG, "Invoking JS errorCallback with error: ");
                     errorCallback.invoke(response);
                 }
             }
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..0e60f3489 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,26 @@ private static List<Object> convertReadableArrayToList(final ReadableArray reada
         }
         return list;
     }
+    /**
+     * 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 bbef7722a..517369ffa 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -63,24 +63,7 @@ - (dispatch_queue_t)methodQueue {
     return propositionDictionary;
 }
 
-// Helper method to create standardized response for callbacks
-- (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict 
-                                   error:(NSError *)error {
-    NSMutableDictionary *response = [[NSMutableDictionary alloc] init];
-    
-    if (error) {
-        [response setValue:@{ @"message": error.description, @"code": @(error.code) } forKey:@"error"];
-    }
-    
-    if (decisionScopePropositionDict && [decisionScopePropositionDict count] > 0) {
-        NSDictionary<NSString *, NSDictionary<NSString *, id> *> *propositionDictionary = [self createPropositionDictionary:decisionScopePropositionDict];
-        [response setValue:propositionDictionary forKey:@"propositions"];
-    }
-    
-    return response;
-}
-
-// Unified method that handles both callback and non-callback cases (like Android implementation)
+// Unified method that handles both callback and non-callback cases
 RCT_EXPORT_METHOD(updatePropositions:(NSArray<NSString *> *)decisionScopesArray
                   withXdm:(NSDictionary *)xdm
                   andData:(NSDictionary *)data
@@ -93,11 +76,11 @@ - (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOp
                                    andData:data
                                 completion:^(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *decisionScopePropositionDict, NSError *error) {
         if (error) {
-            NSDictionary *response = [self createCallbackResponse:nil error:error];
+            NSDictionary *errorDict = [self convertNSErrorToOptimizeErrorDict:error];
             if (errorCallback != nil) {
-                errorCallback(@[response]);
+                errorCallback(@[errorDict]);
             }
-        } 
+        }
         if (decisionScopePropositionDict) {
             NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:nil];
             if (successCallback != nil) {
@@ -339,6 +322,36 @@ - (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];
+    errorDict[@"type"] = error.domain ?: @"";
+    errorDict[@"status"] = @(error.code);
+    errorDict[@"title"] = error.localizedDescription ?: @"";
+    errorDict[@"detail"] = error.localizedFailureReason ?: @"";
+    // errorDict[@"report"] = ...; // Add if you have extra info
+    errorDict[@"aepError"] = @"unexpected"; // Optionally map code/domain to aepError string
+    return errorDict;
+}
+
+// Helper method to create standardized response for callbacks
+- (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict 
+                                   error:(NSError *)error {
+    NSMutableDictionary *response = [[NSMutableDictionary alloc] init];
+    
+    if (error) {
+        [response setValue:@{ @"message": error.description, @"code": @(error.code) } forKey:@"error"];
+    }
+    
+    if (decisionScopePropositionDict && [decisionScopePropositionDict count] > 0) {
+        NSDictionary<NSString *, NSDictionary<NSString *, id> *> *propositionDictionary = [self createPropositionDictionary:decisionScopePropositionDict];
+        [response setValue:propositionDictionary forKey:@"propositions"];
+    }
+    
+    return response;
+}
+
 - (void)handleError:(NSError *)error rejecter:(RCTPromiseRejectBlock)reject {
   if (!error || !reject) {
     return;

From 5b0999fce39fb16e5e35b263d80cdd96cc854fef Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Thu, 24 Jul 2025 22:34:31 +0530
Subject: [PATCH 09/16] removed error parameter from createCallBackResponse

---
 .../reactnative/optimize/RCTAEPOptimizeModule.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 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 a43d97e34..bef1fea6d 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
@@ -99,7 +99,7 @@ public void fail(final AEPOptimizeError adobeError) {
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
                 Log.d(TAG, "updatePropositions callback success.");
                 if (successCallback != null) {
-                    final WritableMap response = createCallbackResponse(decisionScopePropositionMap, null);
+                    final WritableMap response = createCallbackResponse(decisionScopePropositionMap);
                     Log.d(TAG, "Invoking JS successCallback with success: " + response.toString());
                     successCallback.invoke(response);
                 }
@@ -214,16 +214,9 @@ public void addListener(String eventName) {}
     public void removeListeners(Integer count) {}
 
     // Helper method to create callback response
-    private WritableMap createCallbackResponse(final Map<DecisionScope, OptimizeProposition> propositionsMap, final AdobeError error) {
+    private WritableMap createCallbackResponse(final Map<DecisionScope, OptimizeProposition> propositionsMap) {
         final WritableMap response = new WritableNativeMap();
         
-        if (error != null) {
-            final WritableMap errorMap = new WritableNativeMap();
-            errorMap.putString("message", error.getErrorName());
-            errorMap.putInt("code", error.getErrorCode());
-            response.putMap("error", errorMap);
-        }
-        
         if (propositionsMap != null && !propositionsMap.isEmpty()) {
             final WritableMap propositionsWritableMap = new WritableNativeMap();
             for (final Map.Entry<DecisionScope, OptimizeProposition> entry : propositionsMap.entrySet()) {

From b8149313bc8ea0010d848db724c529bd1052a962 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Mon, 28 Jul 2025 15:52:24 +0530
Subject: [PATCH 10/16] changed public api signature to pass onSuccess and
 onError as functions instead of objects

---
 packages/optimize/ios/src/RCTAEPOptimize.m | 19 +++++++------------
 packages/optimize/src/Optimize.ts          |  8 ++++----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index a883b073e..5891942e1 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -80,11 +80,11 @@ - (dispatch_queue_t)methodQueue {
             if (errorCallback != nil) {
                 errorCallback(@[errorDict]);
             }
-        }
+        } 
         if (decisionScopePropositionDict) {
-            NSDictionary *response = [self createCallbackResponse:decisionScopePropositionDict error:nil];
+            NSDictionary *propositions = [self createCallbackResponse:decisionScopePropositionDict];
             if (successCallback != nil) {
-                successCallback(@[response]);
+                successCallback(@[propositions]);
             }
         }
     }];
@@ -421,19 +421,14 @@ - (NSDictionary *)convertNSErrorToOptimizeErrorDict:(NSError *)error {
 
 // Helper method to create standardized response for callbacks
 - (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict 
-                                   error:(NSError *)error {
-    NSMutableDictionary *response = [[NSMutableDictionary alloc] init];
-    
-    if (error) {
-        [response setValue:@{ @"message": error.description, @"code": @(error.code) } forKey:@"error"];
-    }
+                                  {
     
     if (decisionScopePropositionDict && [decisionScopePropositionDict count] > 0) {
-        NSDictionary<NSString *, NSDictionary<NSString *, id> *> *propositionDictionary = [self createPropositionDictionary:decisionScopePropositionDict];
-        [response setValue:propositionDictionary forKey:@"propositions"];
+        // Return the propositions map directly
+        return [self createPropositionDictionary:decisionScopePropositionDict];
     }
     
-    return response;
+    return @{};
 }
 
 - (void)handleError:(NSError *)error rejecter:(RCTPromiseRejectBlock)reject {
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 38bd16fd5..018f9eecc 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -27,8 +27,8 @@ interface IOptimize {
     decisionScopes: Array<DecisionScope>,
     xdm?: Map<string, any>,
     data?: Map<string, any>,
-    onSuccess?: Map<string, Proposition> | undefined,
-    onError?: any | undefined
+    onSuccess?: (response: Map<string, Proposition>) => void,
+    onError?: (error: any) => void
   ) => void;
   displayed: (propositionOfferPairs: Array<PropositionOfferPair>) => void
   generateDisplayInteractionXdm: (propositionOfferPairs: Array<PropositionOfferPair>) => Promise<Map<string, any>>
@@ -110,8 +110,8 @@ const Optimize: IOptimize = {
     decisionScopes: Array<DecisionScope>,
     xdm?: Map<string, any>,
     data?: Map<string, any>,
-    onSuccess?: Map<string, Proposition> | undefined,
-    onError?: any | undefined
+    onSuccess?: (response: Map<string, Proposition>) => void,
+    onError?: (error: any) => void
   ) {
     var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
     RCTAEPOptimize.updatePropositions(

From fa3ca69ad9d1750e888447d08bdd49966f38f616 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Mon, 28 Jul 2025 16:17:07 +0530
Subject: [PATCH 11/16] moved createCallbackResponse method from
 RCTAEPOptimizeModule to RCTAEPOptimizeUtil

---
 .../optimize/RCTAEPOptimizeModule.java        | 17 +---------------
 .../optimize/RCTAEPOptimizeUtil.java          | 20 +++++++++++++++++++
 packages/optimize/ios/src/RCTAEPOptimize.m    |  3 +--
 3 files changed, 22 insertions(+), 18 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 1afc42524..1da47f28f 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
@@ -138,7 +138,7 @@ public void fail(final AEPOptimizeError adobeError) {
             public void call(final Map<DecisionScope, OptimizeProposition> decisionScopePropositionMap) {
                 Log.d(TAG, "updatePropositions callback success.");
                 if (successCallback != null) {
-                    final WritableMap response = createCallbackResponse(decisionScopePropositionMap);
+                    final WritableMap response = RCTAEPOptimizeUtil.createCallbackResponse(decisionScopePropositionMap);
                     Log.d(TAG, "Invoking JS successCallback with success: " + response.toString());
                     successCallback.invoke(response);
                 }
@@ -288,21 +288,6 @@ public void addListener(String eventName) {}
     @ReactMethod
     public void removeListeners(Integer count) {}
 
-    // Helper method to create callback response
-    private WritableMap createCallbackResponse(final Map<DecisionScope, OptimizeProposition> propositionsMap) {
-        final WritableMap response = new WritableNativeMap();
-        
-        if (propositionsMap != null && !propositionsMap.isEmpty()) {
-            final WritableMap propositionsWritableMap = new WritableNativeMap();
-            for (final Map.Entry<DecisionScope, OptimizeProposition> entry : propositionsMap.entrySet()) {
-                propositionsWritableMap.putMap(entry.getKey().getName(), RCTAEPOptimizeUtil.convertPropositionToWritableMap(entry.getValue()));
-            }
-            response.putMap("propositions", propositionsWritableMap);
-        }
-        
-        return response;
-    }
-
     private static Offer createOffer(Map<String, Object> offerEventData) {
         String id = (String) offerEventData.get("id");
         String type = (String) offerEventData.get("type");
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 0e60f3489..e2296e0ab 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,6 +186,26 @@ 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 response = new WritableNativeMap();
+        
+        if (propositionsMap != null && !propositionsMap.isEmpty()) {
+            final WritableMap propositionsWritableMap = new WritableNativeMap();
+            for (final Map.Entry<DecisionScope, OptimizeProposition> entry : propositionsMap.entrySet()) {
+                propositionsWritableMap.putMap(entry.getKey().getName(), RCTAEPOptimizeUtil.convertPropositionToWritableMap(entry.getValue()));
+            }
+            response.putMap("propositions", propositionsWritableMap);
+        }
+        
+        return response;
+    }
+
     /**
      * Converts an AEPOptimizeError to a WritableMap for React Native error callback
      */
diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index 5891942e1..eaaf98787 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -420,8 +420,7 @@ - (NSDictionary *)convertNSErrorToOptimizeErrorDict:(NSError *)error {
 }
 
 // Helper method to create standardized response for callbacks
-- (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict 
-                                  {
+- (NSDictionary *)createCallbackResponse:(NSDictionary<AEPDecisionScope *, AEPOptimizeProposition *> *)decisionScopePropositionDict {
     
     if (decisionScopePropositionDict && [decisionScopePropositionDict count] > 0) {
         // Return the propositions map directly

From f096057d822f28ca2a44f81622b0eb77487018a0 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Mon, 28 Jul 2025 16:53:26 +0530
Subject: [PATCH 12/16] sending propositions map directly instead of sending
 under response key in successCallback

---
 .../mobile/reactnative/optimize/RCTAEPOptimizeUtil.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 e2296e0ab..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
@@ -193,17 +193,15 @@ private static List<Object> convertReadableArrayToList(final ReadableArray reada
      * @return WritableMap
      */
     static WritableMap createCallbackResponse(final Map<DecisionScope, OptimizeProposition> propositionsMap) {
-        final WritableMap response = new WritableNativeMap();
+        final WritableMap propositionsWritableMap = new WritableNativeMap();
         
         if (propositionsMap != null && !propositionsMap.isEmpty()) {
-            final WritableMap propositionsWritableMap = new WritableNativeMap();
             for (final Map.Entry<DecisionScope, OptimizeProposition> entry : propositionsMap.entrySet()) {
                 propositionsWritableMap.putMap(entry.getKey().getName(), RCTAEPOptimizeUtil.convertPropositionToWritableMap(entry.getValue()));
             }
-            response.putMap("propositions", propositionsWritableMap);
         }
         
-        return response;
+        return propositionsWritableMap;
     }
 
     /**

From 28cccbcbf3eea87f224928682859e489b390285e Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Thu, 31 Jul 2025 16:00:30 +0530
Subject: [PATCH 13/16] added type for AEPOptimizeError and returned
 AEpOptimizeError type in errorCallback

---
 packages/optimize/ios/src/RCTAEPOptimize.m    | 30 ++++++++++++---
 packages/optimize/src/Optimize.ts             |  5 ++-
 packages/optimize/src/index.ts                |  6 +--
 .../optimize/src/models/AEPOptimizeError.ts   | 37 +++++++++++++++++++
 4 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 packages/optimize/src/models/AEPOptimizeError.ts

diff --git a/packages/optimize/ios/src/RCTAEPOptimize.m b/packages/optimize/ios/src/RCTAEPOptimize.m
index eaaf98787..d5d85dd36 100644
--- a/packages/optimize/ios/src/RCTAEPOptimize.m
+++ b/packages/optimize/ios/src/RCTAEPOptimize.m
@@ -410,12 +410,30 @@ - (NSString *)convertOfferTypeToString:(AEPOfferType)offerType {
 - (NSDictionary *)convertNSErrorToOptimizeErrorDict:(NSError *)error {
     if (!error) return @{};
     NSMutableDictionary *errorDict = [NSMutableDictionary dictionary];
-    errorDict[@"type"] = error.domain ?: @"";
-    errorDict[@"status"] = @(error.code);
-    errorDict[@"title"] = error.localizedDescription ?: @"";
-    errorDict[@"detail"] = error.localizedFailureReason ?: @"";
-    // errorDict[@"report"] = ...; // Add if you have extra info
-    errorDict[@"aepError"] = @"unexpected"; // Optionally map code/domain to aepError string
+
+    // 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;
 }
 
diff --git a/packages/optimize/src/Optimize.ts b/packages/optimize/src/Optimize.ts
index 018f9eecc..00829e7ed 100644
--- a/packages/optimize/src/Optimize.ts
+++ b/packages/optimize/src/Optimize.ts
@@ -16,6 +16,7 @@ import Proposition from './models/Proposition';
 import DecisionScope from './models/DecisionScope';
 import { PropositionOfferPair } from './models/PropositionOfferPair';
 import { AdobePropositionCallback }  from './models/AdobePropositionCallback';
+import AEPOptimizeError from './models/AEPOptimizeError';
 import { cleanProposition } from './utils/cleanProposition';
 
 interface IOptimize {
@@ -28,7 +29,7 @@ interface IOptimize {
     xdm?: Map<string, any>,
     data?: Map<string, any>,
     onSuccess?: (response: Map<string, Proposition>) => void,
-    onError?: (error: any) => void
+    onError?: (error: AEPOptimizeError) => void
   ) => void;
   displayed: (propositionOfferPairs: Array<PropositionOfferPair>) => void
   generateDisplayInteractionXdm: (propositionOfferPairs: Array<PropositionOfferPair>) => Promise<Map<string, any>>
@@ -111,7 +112,7 @@ const Optimize: IOptimize = {
     xdm?: Map<string, any>,
     data?: Map<string, any>,
     onSuccess?: (response: Map<string, Proposition>) => void,
-    onError?: (error: any) => void
+    onError?: (error: AEPOptimizeError) => void
   ) {
     var decisionScopeNames: Array<string> = decisionScopes.map(decisionScope => decisionScope.getName());
     RCTAEPOptimize.updatePropositions(
diff --git a/packages/optimize/src/index.ts b/packages/optimize/src/index.ts
index 144fe8463..8fa88651c 100644
--- a/packages/optimize/src/index.ts
+++ b/packages/optimize/src/index.ts
@@ -12,14 +12,14 @@ 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";
 
 export {
   Optimize,
   AdobePropositionCallback,
+  AEPOptimizeError,
   DecisionScope,
-  Offer,
-  Proposition,
+  Offer
 }
\ 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 4a3527c03d5b3d63d2ecf1ce47015b6af0e7ee6e Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Thu, 31 Jul 2025 19:24:43 +0530
Subject: [PATCH 14/16] fixed index.js

---
 packages/optimize/src/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/optimize/src/index.ts b/packages/optimize/src/index.ts
index 8fa88651c..c08f00e67 100644
--- a/packages/optimize/src/index.ts
+++ b/packages/optimize/src/index.ts
@@ -15,11 +15,13 @@ 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";
 
 export {
   Optimize,
   AdobePropositionCallback,
   AEPOptimizeError,
   DecisionScope,
-  Offer
+  Offer,
+  Proposition
 }
\ No newline at end of file

From 59da3a948884458ad82253c104505d097eeb33e4 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 20 Aug 2025 12:59:16 +0530
Subject: [PATCH 15/16] read me update

---
 packages/optimize/README.md                   | 37 +++++++++++++++++--
 .../optimize/src/models/AEPOptimizeError.ts   |  2 +-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/packages/optimize/README.md b/packages/optimize/README.md
index 02c981a1a..cdedc40e8 100644
--- a/packages/optimize/README.md
+++ b/packages/optimize/README.md
@@ -138,20 +138,33 @@ Optimize.onPropositionUpdate({
 
 ### updating the propositions:
 
-This API fetches the propositions for the provided DecisionScope list.
+This API fetches the propositions for the provided DecisionScope list. The API now supports optional callback parameters for successful response and error handling.
 
 **Syntax**
 
 ```typescript
-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
+)
 ```
 
+**Parameters:**
+- `decisionScopes`: Array of decision scopes for which offers need to be updated
+- `xdm`: Optional XDM-formatted data to be sent in the personalization query request
+- `data`: Optional free-form data to be sent in the personalization query request  
+- `onSuccess`: Optional callback function called when propositions are successfully updated
+- `onError`: Optional callback function called when an error occurs during the update
+
 **Example**
 
 ```typescript
 const decisionScopeText = new DecisionScope("{DecisionScope name}");
 const decisionScopeImage = new DecisionScope("{DecisionScope name}");
-const decisionScopeHtml = new DecisionScope("{DecisionScope name{");
+const decisionScopeHtml = new DecisionScope("{DecisionScope name}");
 const decisionScopeJson = new DecisionScope("{DecisionScope name}");
 const decisionScopes = [
   decisionScopeText,
@@ -160,7 +173,23 @@ const decisionScopes = [
   decisionScopeJson,
 ];
 
-Optimize.updatePropositions(decisionScopes, null, null);
+// Update without callbacks
+Optimize.updatePropositions(decisionScopes);
+
+// Update with callbacks
+Optimize.updatePropositions(
+  decisionScopes,
+  undefined, // xdm parameter
+  undefined, // data parameter
+  (response: Map<string, Proposition>) => {
+    console.log('✅ Propositions updated successfully:', response);
+    // Handle the updated propositions
+  },
+  (error: AEPOptimizeError) => {
+    console.error('❌ Error updating propositions:', error);
+    // Handle the error
+  }
+);
 ```
 
 ---
diff --git a/packages/optimize/src/models/AEPOptimizeError.ts b/packages/optimize/src/models/AEPOptimizeError.ts
index 3f9a75425..44f2fe9d8 100644
--- a/packages/optimize/src/models/AEPOptimizeError.ts
+++ b/packages/optimize/src/models/AEPOptimizeError.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2022 Adobe. All rights reserved.
+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

From ae66c31d8e9a27757927ad309258c49bc5144105 Mon Sep 17 00:00:00 2001
From: akhiljain1907 <akhiljain@adobe.com>
Date: Wed, 20 Aug 2025 15:56:04 +0530
Subject: [PATCH 16/16] bumped optimize package version for 7.1.0 release

---
 packages/optimize/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/optimize/package.json b/packages/optimize/package.json
index 5e866ccd9..5332c6eb2 100644
--- a/packages/optimize/package.json
+++ b/packages/optimize/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/react-native-aepoptimize",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "Adobe Experience Platform support for React Native apps.",
   "homepage": "https://developer.adobe.com/client-sdks/documentation/",
   "license": "Apache-2.0",