fix(ios): resolve device consent new arch build errors

- Move old-arch RCT_EXPORT_METHODs into #else block to avoid duplicate
  declarations when New Architecture is enabled.
- Move consentStateToDictionary onto RNMParticle (was wrongly on RCTConvert).
- Use NSDictionary codegen types for new-arch setDeviceConsentState.

Author: denischilik

ios/RNMParticle/RNMParticle.mm

@@ -19,6 +19,10 @@ @interface MParticleUser ()
 - (void)setUserId:(NSNumber *)userId;
 @end
 
+@interface RNMParticle (DeviceConsent)
++ (NSDictionary *)consentStateToDictionary:(MPConsentState *)consentState;
+@end
+
 // Forward declare so New Arch `logCommerceEvent` can use the same JS→native
 // mappings as `RCTConvert (MPCommerceEvent)` (defined later in this file).
 @interface RCTConvert (MPCommerceEvent)
@@ -109,29 +113,6 @@ + (void)load {
     user.consentState = consentState;
 }
 
-RCT_EXPORT_METHOD(setDeviceConsentState:(NSDictionary *)consentState)
-{
-    if (consentState == nil || consentState == (id)[NSNull null]) {
-        return;
-    }
-    [MParticle sharedInstance].deviceConsentState = [RCTConvert MPConsentState:consentState];
-}
-
-RCT_EXPORT_METHOD(clearDeviceConsentState)
-{
-    [MParticle sharedInstance].deviceConsentState = nil;
-}
-
-RCT_EXPORT_METHOD(getDeviceConsentState:(RCTResponseSenderBlock)callback)
-{
-    MPConsentState *deviceConsent = [MParticle sharedInstance].deviceConsentState;
-    if (deviceConsent == nil) {
-        callback(@[[NSNull null]]);
-        return;
-    }
-    callback(@[[RNMParticle consentStateToDictionary:deviceConsent]]);
-}
-
 #if TARGET_OS_IOS == 1
 RCT_EXPORT_METHOD(logPushRegistration:(NSString *)token senderId:(NSString *)senderId)
 {
@@ -611,49 +592,13 @@ - (void)setCCPAConsentState:(JS::NativeMParticle::CCPAConsent &)consent {
 
 - (void)setDeviceConsentState:(JS::NativeMParticle::DeviceConsentState &)consentState {
     NSMutableDictionary *dict = [NSMutableDictionary dictionary];
-    if (consentState.gdpr().has_value()) {
-        NSMutableDictionary *gdprDict = [NSMutableDictionary dictionary];
-        for (const auto &entry : consentState.gdpr().value()) {
-            const auto &consent = entry.second;
-            NSMutableDictionary *consentDict = [NSMutableDictionary dictionary];
-            if (consent.consented().has_value()) {
-                consentDict[@"consented"] = @(consent.consented().value());
-            }
-            if (consent.document()) {
-                consentDict[@"document"] = consent.document();
-            }
-            if (consent.timestamp().has_value()) {
-                consentDict[@"timestamp"] = @(consent.timestamp().value());
-            }
-            if (consent.location()) {
-                consentDict[@"location"] = consent.location();
-            }
-            if (consent.hardwareId()) {
-                consentDict[@"hardwareId"] = consent.hardwareId();
-            }
-            gdprDict[[NSString stringWithUTF8String:entry.first.c_str()]] = consentDict;
-        }
-        dict[@"gdpr"] = gdprDict;
+    id gdpr = consentState.gdpr();
+    if (gdpr != nil && gdpr != [NSNull null]) {
+        dict[@"gdpr"] = gdpr;
     }
-    if (consentState.ccpa().has_value()) {
-        const auto &ccpa = consentState.ccpa().value();
-        NSMutableDictionary *ccpaDict = [NSMutableDictionary dictionary];
-        if (ccpa.consented().has_value()) {
-            ccpaDict[@"consented"] = @(ccpa.consented().value());
-        }
-        if (ccpa.document()) {
-            ccpaDict[@"document"] = ccpa.document();
-        }
-        if (ccpa.timestamp().has_value()) {
-            ccpaDict[@"timestamp"] = @(ccpa.timestamp().value());
-        }
-        if (ccpa.location()) {
-            ccpaDict[@"location"] = ccpa.location();
-        }
-        if (ccpa.hardwareId()) {
-            ccpaDict[@"hardwareId"] = ccpa.hardwareId();
-        }
-        dict[@"ccpa"] = ccpaDict;
+    id ccpa = consentState.ccpa();
+    if (ccpa != nil && ccpa != [NSNull null]) {
+        dict[@"ccpa"] = ccpa;
     }
     [MParticle sharedInstance].deviceConsentState = [RCTConvert MPConsentState:dict];
 }
@@ -700,6 +645,29 @@ - (void)getDeviceConsentState:(RCTResponseSenderBlock)callback {
     user.consentState = consentState;
 }
 
+RCT_EXPORT_METHOD(setDeviceConsentState:(NSDictionary *)consentState)
+{
+    if (consentState == nil || consentState == (id)[NSNull null]) {
+        return;
+    }
+    [MParticle sharedInstance].deviceConsentState = [RCTConvert MPConsentState:consentState];
+}
+
+RCT_EXPORT_METHOD(clearDeviceConsentState)
+{
+    [MParticle sharedInstance].deviceConsentState = nil;
+}
+
+RCT_EXPORT_METHOD(getDeviceConsentState:(RCTResponseSenderBlock)callback)
+{
+    MPConsentState *deviceConsent = [MParticle sharedInstance].deviceConsentState;
+    if (deviceConsent == nil) {
+        callback(@[[NSNull null]]);
+        return;
+    }
+    callback(@[[RNMParticle consentStateToDictionary:deviceConsent]]);
+}
+
 #endif
 
 // Helper method to create MPProduct from dictionary
@@ -827,6 +795,59 @@ + (BOOL)isNumericIdentityKey:(NSString *)key {
     return [numericSet isSupersetOfSet:keyCharacterSet];
 }
 
++ (NSDictionary *)consentStateToDictionary:(MPConsentState *)consentState
+{
+    if (consentState == nil) {
+        return nil;
+    }
+
+    NSMutableDictionary *result = [NSMutableDictionary dictionary];
+    NSDictionary<NSString *, MPGDPRConsent *> *gdprState = consentState.gdprConsentState;
+    if (gdprState.count > 0) {
+        NSMutableDictionary *gdpr = [NSMutableDictionary dictionaryWithCapacity:gdprState.count];
+        for (NSString *purpose in gdprState) {
+            MPGDPRConsent *consent = gdprState[purpose];
+            NSMutableDictionary *consentDict = [NSMutableDictionary dictionary];
+            consentDict[@"consented"] = @(consent.consented);
+            if (consent.document) {
+                consentDict[@"document"] = consent.document;
+            }
+            if (consent.timestamp) {
+                consentDict[@"timestamp"] = @((long long)([consent.timestamp timeIntervalSince1970] * 1000));
+            }
+            if (consent.location) {
+                consentDict[@"location"] = consent.location;
+            }
+            if (consent.hardwareId) {
+                consentDict[@"hardwareId"] = consent.hardwareId;
+            }
+            gdpr[purpose] = consentDict;
+        }
+        result[@"gdpr"] = gdpr;
+    }
+
+    MPCCPAConsent *ccpa = consentState.ccpaConsentState;
+    if (ccpa != nil) {
+        NSMutableDictionary *ccpaDict = [NSMutableDictionary dictionary];
+        ccpaDict[@"consented"] = @(ccpa.consented);
+        if (ccpa.document) {
+            ccpaDict[@"document"] = ccpa.document;
+        }
+        if (ccpa.timestamp) {
+            ccpaDict[@"timestamp"] = @((long long)([ccpa.timestamp timeIntervalSince1970] * 1000));
+        }
+        if (ccpa.location) {
+            ccpaDict[@"location"] = ccpa.location;
+        }
+        if (ccpa.hardwareId) {
+            ccpaDict[@"hardwareId"] = ccpa.hardwareId;
+        }
+        result[@"ccpa"] = ccpaDict;
+    }
+
+    return result.count > 0 ? result : nil;
+}
+
 @end
 
 // RCTConvert category methods for mParticle types
@@ -993,59 +1014,6 @@ + (MPAliasRequest *)MPAliasRequest:(NSDictionary *)dict {
     return [MPAliasRequest requestWithSourceMPID:sourceMpid destinationMPID:destinationMpid startTime:startTime endTime:endTime];
 }
 
-+ (NSDictionary *)consentStateToDictionary:(MPConsentState *)consentState
-{
-    if (consentState == nil) {
-        return nil;
-    }
-
-    NSMutableDictionary *result = [NSMutableDictionary dictionary];
-    NSDictionary<NSString *, MPGDPRConsent *> *gdprState = consentState.gdprConsentState;
-    if (gdprState.count > 0) {
-        NSMutableDictionary *gdpr = [NSMutableDictionary dictionaryWithCapacity:gdprState.count];
-        for (NSString *purpose in gdprState) {
-            MPGDPRConsent *consent = gdprState[purpose];
-            NSMutableDictionary *consentDict = [NSMutableDictionary dictionary];
-            consentDict[@"consented"] = @(consent.consented);
-            if (consent.document) {
-                consentDict[@"document"] = consent.document;
-            }
-            if (consent.timestamp) {
-                consentDict[@"timestamp"] = @((long long)([consent.timestamp timeIntervalSince1970] * 1000));
-            }
-            if (consent.location) {
-                consentDict[@"location"] = consent.location;
-            }
-            if (consent.hardwareId) {
-                consentDict[@"hardwareId"] = consent.hardwareId;
-            }
-            gdpr[purpose] = consentDict;
-        }
-        result[@"gdpr"] = gdpr;
-    }
-
-    MPCCPAConsent *ccpa = consentState.ccpaConsentState;
-    if (ccpa != nil) {
-        NSMutableDictionary *ccpaDict = [NSMutableDictionary dictionary];
-        ccpaDict[@"consented"] = @(ccpa.consented);
-        if (ccpa.document) {
-            ccpaDict[@"document"] = ccpa.document;
-        }
-        if (ccpa.timestamp) {
-            ccpaDict[@"timestamp"] = @((long long)([ccpa.timestamp timeIntervalSince1970] * 1000));
-        }
-        if (ccpa.location) {
-            ccpaDict[@"location"] = ccpa.location;
-        }
-        if (ccpa.hardwareId) {
-            ccpaDict[@"hardwareId"] = ccpa.hardwareId;
-        }
-        result[@"ccpa"] = ccpaDict;
-    }
-
-    return result.count > 0 ? result : nil;
-}
-
 @end
 
 typedef NS_ENUM(NSUInteger, MPReactCommerceEventAction) {