Merge branch 'develop' into patch-1

rudderlabs · Dec 9, 2024 · 739ad73 · 739ad73
2 parents 1a77509 + 67c6715
commit 739ad73
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/Sources/Classes/RSClient.m b/Sources/Classes/RSClient.m
@@ -236,10 +236,7 @@ - (void) alias:(NSString *)newId options:(RSOption *) options {
     RSContext *rc = [RSElementCache getContext];
     NSMutableDictionary<NSString*,NSObject*>* traits = [rc.traits mutableCopy];
 
-    NSObject *prevId = [traits objectForKey:@"userId"];
-    if(prevId == nil) {
-        prevId =[traits objectForKey:@"id"];
-    }
+    NSObject *prevId = [traits objectForKey:@"userId"] ?: [traits objectForKey:@"id"] ?: self.anonymousId;
 
     traits[@"id"] = newId;
     traits[@"userId"] = newId;