Merge branch 'main' into use-updated-remote-feature-flag-to-handle-ov…

…errides

app/contexts/FeatureFlagOverrideContext.test.tsx

@@ -1265,10 +1265,10 @@ describe('FeatureFlagOverrideContext', () => {
       });
     });
 
-    it('does not call addTraitsToUser when no snapshots are taken', () => {
-      const mockFlags = { stringFlag: 'test' };
-      setupSelectorMocks(mockFlags);
-      mockGetFeatureFlagType.mockReturnValue(FeatureFlagType.FeatureFlagString);
+    it('calls addTraitsToUser in bulk on mount with all feature flags', () => {
+      const mockFlags = { stringFlag: 'test', boolFlag: true };
+      mockUseSelector.mockReturnValue(mockFlags);
+      mockGetFeatureFlagType.mockReturnValue('string');
 
       renderHook(() => useFeatureFlagOverride(), {
         wrapper: createWrapper,

app/contexts/FeatureFlagOverrideContext.tsx

@@ -64,6 +64,16 @@ export const FeatureFlagOverrideProvider: React.FC<
   const toastContext = useContext(ToastContext);
   const toastRef = toastContext?.toastRef;
 
+  // Track remote feature flags and add all flags to user traits in bulk
+  useEffect(() => {
+    if (Object.keys(rawFeatureFlags).length > 0) {
+      addTraitsToUser(rawFeatureFlags);
+    }
+  }, [rawFeatureFlags, addTraitsToUser]);
+
+  // Local state for overrides
+  const [overrides, setOverrides] = useState<FeatureFlagOverrides>({});
+
   const setOverride = useCallback((key: string, value: unknown) => {
     Engine.context?.RemoteFeatureFlagController?.setFlagOverride(
       key,