From d0c0cf7f7ea01942c4feae06053d9f688a669a64 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Thu, 22 Aug 2024 17:49:52 -0300
Subject: [PATCH 01/47] implement fallback system

---
 src/js/tracing/reactnavigation.ts          | 10 ++-
 src/js/utils/sentryeventemitterfallback.ts | 82 ++++++++++++++++++++++
 2 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 src/js/utils/sentryeventemitterfallback.ts

diff --git a/src/js/tracing/reactnavigation.ts b/src/js/tracing/reactnavigation.ts
index f4225d902..afa5158be 100644
--- a/src/js/tracing/reactnavigation.ts
+++ b/src/js/tracing/reactnavigation.ts
@@ -5,6 +5,7 @@ import { logger, timestampInSeconds } from '@sentry/utils';
 
 import type { NewFrameEvent } from '../utils/sentryeventemitter';
 import { type SentryEventEmitter, createSentryEventEmitter, NewFrameEventName } from '../utils/sentryeventemitter';
+import { type SentryEventEmitterFallback, createSentryFallbackEventEmitter } from '../utils/sentryeventemitterfallback';
 import { RN_GLOBAL_OBJ } from '../utils/worldwide';
 import { NATIVE } from '../wrapper';
 import type { OnConfirmRoute, TransactionCreator } from './routingInstrumentation';
@@ -69,7 +70,7 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
 
   private _navigationContainer: NavigationContainer | null = null;
   private _newScreenFrameEventEmitter: SentryEventEmitter | null = null;
-
+  private _newFallbackEventEmitter: SentryEventEmitterFallback | null = null;
   private readonly _maxRecentRouteLen: number = 200;
 
   private _latestRoute?: NavigationRoute;
@@ -92,7 +93,9 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
 
     if (this._options.enableTimeToInitialDisplay) {
       this._newScreenFrameEventEmitter = createSentryEventEmitter();
+      this._newFallbackEventEmitter = createSentryFallbackEventEmitter();
       this._newScreenFrameEventEmitter.initAsync(NewFrameEventName);
+      this._newFallbackEventEmitter.initAsync();
       NATIVE.initNativeReactNavigationNewFrameTracking().catch((reason: unknown) => {
         logger.error(`[ReactNavigationInstrumentation] Failed to initialize native new frame tracking: ${reason}`);
       });
@@ -238,8 +241,8 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
               isAutoInstrumented: true,
             });
 
-          !routeHasBeenSeen &&
-            latestTtidSpan &&
+          if (!routeHasBeenSeen && latestTtidSpan) {
+            this._newFallbackEventEmitter?.startListenerAsync();
             this._newScreenFrameEventEmitter?.once(
               NewFrameEventName,
               ({ newFrameTimestampInSeconds }: NewFrameEvent) => {
@@ -256,6 +259,7 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
                 setSpanDurationAsMeasurementOnTransaction(latestTransaction, 'time_to_initial_display', latestTtidSpan);
               },
             );
+          }
 
           this._navigationProcessingSpan?.updateName(`Processing navigation to ${route.name}`);
           this._navigationProcessingSpan?.setStatus('ok');
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
new file mode 100644
index 000000000..ea68bad51
--- /dev/null
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -0,0 +1,82 @@
+import { logger } from '@sentry/utils';
+import type { EmitterSubscription } from 'react-native';
+import { DeviceEventEmitter } from 'react-native';
+
+import  { NewFrameEventName } from './sentryeventemitter';
+
+export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number, isFallback?: boolean };
+export interface SentryEventEmitterFallback {
+  /**
+   * Initializes the fallback event emitter
+   * This method is synchronous in JS but the event emitter starts asynchronously
+   * https://github.com/facebook/react-native/blob/d09c02f9e2d468e4d0bde51890e312ae7003a3e6/packages/react-native/React/Modules/RCTEventEmitter.m#L95
+   */
+  initAsync: () => void;
+  closeAllAsync: () => void;
+  startListenerAsync: () => void;
+}
+
+function timeNowNanosecond(): number {
+  return Date.now() / 1000; // Convert to nanoseconds
+}
+
+/**
+ * Creates emitter that allows to listen to UI Frame events when ready.
+ */
+export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
+  let  NativeEmitterCalled: boolean = false;
+  let subscription: EmitterSubscription | undefined = undefined;
+  let isListening = false;
+  return {
+    initAsync() {
+
+      subscription = DeviceEventEmitter.addListener(NewFrameEventName, () => {
+        // Avoid noise from pages that we do not want to track.
+        if (isListening) {
+          NativeEmitterCalled = true;
+        }
+      });
+    },
+
+    startListenerAsync() {
+      isListening = true;
+
+      // Schedule the callback to be executed when all UI Frames have flushed.
+      requestAnimationFrame(() => {
+        if (NativeEmitterCalled) {
+          NativeEmitterCalled = false;
+          isListening = false;
+          return;
+        }
+        const timestampInSeconds = timeNowNanosecond();
+        const maxRetries = 3;
+        let retries = 0;
+
+        const retryCheck = (): void => {
+          if (NativeEmitterCalled) {
+            NativeEmitterCalled = false;
+            isListening = false;
+            return; // Native Repplied the bridge with a given timestamp.
+          }
+
+          retries++;
+          if (retries < maxRetries) {
+            setTimeout(retryCheck, 1_000);
+          } else {
+            logger.log('Native timestamp did not reply in time, using fallback.');
+            isListening = false;
+            DeviceEventEmitter.emit(NewFrameEventName, { newFrameTimestampInSeconds: timestampInSeconds, isFallback: true });
+          }
+        };
+
+        // Start the retry process
+        retryCheck();
+
+      });
+    },
+
+    closeAllAsync() {
+      subscription?.remove();
+    }
+  }
+}

From 1a526203d1c9300a925cd70d955cc4362e68712b Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Thu, 22 Aug 2024 23:05:56 -0300
Subject: [PATCH 02/47] clear format

---
 src/js/utils/sentryeventemitterfallback.ts | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index ea68bad51..5fb007872 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -2,17 +2,16 @@ import { logger } from '@sentry/utils';
 import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter } from 'react-native';
 
-import  { NewFrameEventName } from './sentryeventemitter';
+import { NewFrameEventName } from './sentryeventemitter';
 
-export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number, isFallback?: boolean };
+export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number; isFallback?: boolean };
 export interface SentryEventEmitterFallback {
   /**
    * Initializes the fallback event emitter
-   * This method is synchronous in JS but the event emitter starts asynchronously
-   * https://github.com/facebook/react-native/blob/d09c02f9e2d468e4d0bde51890e312ae7003a3e6/packages/react-native/React/Modules/RCTEventEmitter.m#L95
+   * This method is synchronous in JS but the event emitter starts asynchronously.
    */
   initAsync: () => void;
-  closeAllAsync: () => void;
+  closeAll: () => void;
   startListenerAsync: () => void;
 }
 
@@ -24,12 +23,11 @@ function timeNowNanosecond(): number {
  * Creates emitter that allows to listen to UI Frame events when ready.
  */
 export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
-  let  NativeEmitterCalled: boolean = false;
+  let NativeEmitterCalled: boolean = false;
   let subscription: EmitterSubscription | undefined = undefined;
   let isListening = false;
   return {
     initAsync() {
-
       subscription = DeviceEventEmitter.addListener(NewFrameEventName, () => {
         // Avoid noise from pages that we do not want to track.
         if (isListening) {
@@ -56,7 +54,7 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
           if (NativeEmitterCalled) {
             NativeEmitterCalled = false;
             isListening = false;
-            return; // Native Repplied the bridge with a given timestamp.
+            return; // Native Replied the bridge with a given timestamp.
           }
 
           retries++;
@@ -65,18 +63,20 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
           } else {
             logger.log('Native timestamp did not reply in time, using fallback.');
             isListening = false;
-            DeviceEventEmitter.emit(NewFrameEventName, { newFrameTimestampInSeconds: timestampInSeconds, isFallback: true });
+            DeviceEventEmitter.emit(NewFrameEventName, {
+              newFrameTimestampInSeconds: timestampInSeconds,
+              isFallback: true,
+            });
           }
         };
 
         // Start the retry process
         retryCheck();
-
       });
     },
 
-    closeAllAsync() {
+    closeAll() {
       subscription?.remove();
-    }
-  }
+    },
+  };
 }

From 84301f791d811769bbb2ce2afdf3b034f3ce02c7 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Fri, 30 Aug 2024 11:54:39 -0300
Subject: [PATCH 03/47] backup

---
 .../io/sentry/react/RNSentryModuleImpl.java   |  18 +-
 .../java/io/sentry/react/RNSentryModule.java  |   5 +
 .../java/io/sentry/react/RNSentryModule.java  |   5 +
 .../src/Screens/PerformanceScreen.tsx         | 793 +++++++++++++++++-
 src/js/NativeRNSentry.ts                      |   2 +
 src/js/utils/sentryeventemitter.ts            |   2 +
 src/js/utils/sentryeventemitterfallback.ts    |   5 +-
 src/js/wrapper.ts                             |  13 +-
 8 files changed, 839 insertions(+), 4 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 7f13e5e21..4c759ef63 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -1,5 +1,5 @@
 package io.sentry.react;
-
+import android.view.Choreographer;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static io.sentry.android.core.internal.util.ScreenshotUtils.takeScreenshot;
 import static io.sentry.vendor.Base64.NO_PADDING;
@@ -470,6 +470,22 @@ public void captureEnvelope(String rawBytes, ReadableMap options, Promise promis
         promise.resolve(true);
     }
 
+    public void requestAnimationFrame(Promise promise) {
+        Choreographer choreographer = Choreographer.getInstance();
+
+        choreographer.postFrameCallback(new Choreographer.FrameCallback() {
+            @Override
+            public void doFrame(long frameTimeNanos) {
+                final @NotNull SentryDateProvider dateProvider = new SentryAndroidDateProvider();
+
+                // Invoke the callback after the frame is rendered
+                final SentryDate endDate = dateProvider.now();
+
+                promise.resolve(endDate.nanoTimestamp() / 1e9);
+            }
+        });
+    }
+
     public void captureScreenshot(Promise promise) {
 
         final Activity activity = getCurrentActivity();
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
index 3d585b6b1..d148a60af 100644
--- a/android/src/newarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
@@ -43,6 +43,11 @@ public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
         this.impl.initNativeSdk(rnOptions, promise);
     }
 
+    @Override
+    public void requestAnimationFrame(Promise promise) {
+        this.impl.requestAnimationFrame(promise);
+    }
+
     @Override
     public void crash() {
         this.impl.crash();
diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
index 33fa7283b..fc92c6111 100644
--- a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
@@ -38,6 +38,11 @@ public void initNativeReactNavigationNewFrameTracking(Promise promise) {
         this.impl.initNativeReactNavigationNewFrameTracking(promise);
     }
 
+    @ReactMethod
+    public void requestAnimationFrame(Promise promise) {
+        this.impl.requestAnimationFrame(promise);
+    }
+
     @ReactMethod
     public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
         this.impl.initNativeSdk(rnOptions, promise);
diff --git a/samples/react-native/src/Screens/PerformanceScreen.tsx b/samples/react-native/src/Screens/PerformanceScreen.tsx
index c768d4b54..b6bb8d93d 100644
--- a/samples/react-native/src/Screens/PerformanceScreen.tsx
+++ b/samples/react-native/src/Screens/PerformanceScreen.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   StatusBar,
   ScrollView,
@@ -32,6 +32,16 @@ const PerformanceScreen = (props: Props) => {
       }),
     );
   };
+  const [isLoading, setIsLoading] = useState(true);
+  useEffect(() => {
+    // Simulate heavy computation for 5 seconds
+    const start = Date.now();
+    while (Date.now() - start < 5000) {
+      // Perform some meaningless computation to occupy the CPU
+      Math.sqrt(Math.random() * Math.random());
+    }
+    setIsLoading(false);
+  }, []);
 
   return (
     <>
@@ -62,6 +72,787 @@ const PerformanceScreen = (props: Props) => {
             props.navigation.navigate('Redux');
           }}
         />
+        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />        <Button
+        title="Redux Example"
+        onPress={() => {
+          props.navigation.navigate('Redux');
+        }}
+      />        <Button
+      title="Redux Example"
+      onPress={() => {
+        props.navigation.navigate('Redux');
+      }}
+    />        <Button
+    title="Redux Example"
+    onPress={() => {
+      props.navigation.navigate('Redux');
+    }}
+  />        <Button
+  title="Redux Example"
+  onPress={() => {
+    props.navigation.navigate('Redux');
+  }}
+/>        <Button
+          title="Redux Example"
+          onPress={() => {
+            props.navigation.navigate('Redux');
+          }}
+        />
         <View style={styles.mainViewBottomWhiteSpace} />
       </ScrollView>
     </>
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index cbe17fdaa..ef04fd9f0 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -16,10 +16,12 @@ export interface Spec extends TurboModule {
       hardCrashed: boolean;
     },
   ): Promise<boolean>;
+
   captureScreenshot(): Promise<NativeScreenshot[] | undefined | null>;
   clearBreadcrumbs(): void;
   crash(): void;
   closeNativeSdk(): Promise<void>;
+  requestAnimationFrame(): Promise<Date | null>;
   disableNativeFramesTracking(): void;
   fetchNativeRelease(): Promise<NativeReleaseResponse>;
   fetchNativeSdkInfo(): Promise<Package | null>;
diff --git a/src/js/utils/sentryeventemitter.ts b/src/js/utils/sentryeventemitter.ts
index 63146f30c..728de36cc 100644
--- a/src/js/utils/sentryeventemitter.ts
+++ b/src/js/utils/sentryeventemitter.ts
@@ -58,6 +58,8 @@ export function createSentryEventEmitter(
       }
 
       const nativeListener = nativeEventEmitter.addListener(eventType, (event: NewFrameEvent) => {
+        logger.log(`OLD EVENT!, .${event.newFrameTimestampInSeconds}`);
+
         const listeners = listenersMap.get(eventType);
         if (!listeners) {
           return;
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 5fb007872..245fd3708 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -43,12 +43,15 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
       requestAnimationFrame(() => {
         if (NativeEmitterCalled) {
           NativeEmitterCalled = false;
-          isListening = false;
+          isListening = false;        const timestampInSeconds = timeNowNanosecond();
+          logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
+
           return;
         }
         const timestampInSeconds = timeNowNanosecond();
         const maxRetries = 3;
         let retries = 0;
+        logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
 
         const retryCheck = (): void => {
           if (NativeEmitterCalled) {
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 2e16f8902..1288869ac 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -103,7 +103,7 @@ interface SentryNativeWrapper {
   } | null;
 
   fetchNativePackageName(): string | null;
-
+  requestAnimationFrame(): PromiseLike<Date | null>;
   /**
    * Fetches native stack frames and debug images for the instructions addresses.
    */
@@ -197,6 +197,17 @@ export const NATIVE: SentryNativeWrapper = {
     await RNSentry.captureEnvelope(base64StringFromByteArray(envelopeBytes), { hardCrashed });
   },
 
+  async requestAnimationFrame(): Promise<Date | null> {
+    if (!this.enableNative) {
+      throw this._DisabledNativeError;
+    }
+    if (!this._isModuleLoaded(RNSentry)) {
+      throw this._NativeClientError;
+    }
+
+    const nativeIsReady = await RNSentry.requestAnimationFrame();
+    return nativeIsReady;
+  },
   /**
    * Starts native with the provided options.
    * @param options ReactNativeClientOptions

From 3423a615fc22d4de5cf601492c0280ba45d9e4b6 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 2 Sep 2024 20:06:10 -0300
Subject: [PATCH 04/47] wip

---
 src/js/utils/sentryeventemitterfallback.ts | 7 +++++++
 src/js/wrapper.ts                          | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 245fd3708..3a227f24d 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -3,6 +3,7 @@ import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter } from 'react-native';
 
 import { NewFrameEventName } from './sentryeventemitter';
+import { NATIVE } from '../wrapper';
 
 export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number; isFallback?: boolean };
 export interface SentryEventEmitterFallback {
@@ -39,6 +40,12 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
     startListenerAsync() {
       isListening = true;
 
+
+      NATIVE.requestAnimationFrame()
+        .then((time => {
+          logger.log(`New native logger received with time.${time}`);
+        }));
+
       // Schedule the callback to be executed when all UI Frames have flushed.
       requestAnimationFrame(() => {
         if (NativeEmitterCalled) {
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 1288869ac..ea653e93b 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -205,8 +205,7 @@ export const NATIVE: SentryNativeWrapper = {
       throw this._NativeClientError;
     }
 
-    const nativeIsReady = await RNSentry.requestAnimationFrame();
-    return nativeIsReady;
+    return RNSentry.requestAnimationFrame();
   },
   /**
    * Starts native with the provided options.

From 1e59d5b1fc421694bb605faed7f99e5f317df13b Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 12:15:10 -0300
Subject: [PATCH 05/47] wip iOS

---
 src/js/utils/sentryeventemitterfallback.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 3a227f24d..c7f664286 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -1,9 +1,14 @@
 import { logger } from '@sentry/utils';
 import type { EmitterSubscription } from 'react-native';
-import { DeviceEventEmitter } from 'react-native';
+import { DeviceEventEmitter, NativeModules } from 'react-native';
 
 import { NewFrameEventName } from './sentryeventemitter';
-import { NATIVE } from '../wrapper';
+S
+interface RNSentryTimeToDisplaySpec {
+  requestAnimationFrame(): Promise<number>;
+}
+
+const { RNSentryTimeToDisplay } = NativeModules as { RNSentryTimeToDisplay: RNSentryTimeToDisplaySpec };
 
 export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number; isFallback?: boolean };
 export interface SentryEventEmitterFallback {
@@ -40,8 +45,8 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
     startListenerAsync() {
       isListening = true;
 
-
-      NATIVE.requestAnimationFrame()
+      RNSentryTimeToDisplay.requestAnimationFrame()
+        //        NATIVE.requestAnimationFrame()
         .then((time => {
           logger.log(`New native logger received with time.${time}`);
         }));
@@ -50,7 +55,8 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
       requestAnimationFrame(() => {
         if (NativeEmitterCalled) {
           NativeEmitterCalled = false;
-          isListening = false;        const timestampInSeconds = timeNowNanosecond();
+          isListening = false;
+          const timestampInSeconds = timeNowNanosecond();
           logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
 
           return;

From 885121580c785e8ad32388210917afa76e719c08 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 12:15:42 -0300
Subject: [PATCH 06/47] ioscode

---
 ios/RNSentryTimeToDisplay.h |  8 ++++++++
 ios/RNSentryTimeToDisplay.m | 41 +++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 ios/RNSentryTimeToDisplay.h
 create mode 100644 ios/RNSentryTimeToDisplay.m

diff --git a/ios/RNSentryTimeToDisplay.h b/ios/RNSentryTimeToDisplay.h
new file mode 100644
index 000000000..732656c5f
--- /dev/null
+++ b/ios/RNSentryTimeToDisplay.h
@@ -0,0 +1,8 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RNSentryTimeToDisplay : NSObject <RCTBridgeModule>
+
+- (void)requestAnimationFrame:(RCTPromiseResolveBlock)resolve
+                    rejecter:(RCTPromiseRejectBlock)reject;
+
+@end
diff --git a/ios/RNSentryTimeToDisplay.m b/ios/RNSentryTimeToDisplay.m
new file mode 100644
index 000000000..567db2a94
--- /dev/null
+++ b/ios/RNSentryTimeToDisplay.m
@@ -0,0 +1,41 @@
+#import "RNSentryTimeToDisplay.h"
+#import <QuartzCore/QuartzCore.h>
+#import <React/RCTLog.h>
+
+@implementation RNSentryTimeToDisplay
+{
+  CADisplayLink *displayLink;
+  RCTPromiseResolveBlock resolveBlock;
+}
+
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(requestAnimationFrame:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  // Store the resolve block to use in the callback
+  resolveBlock = resolve;
+
+  // Create and add a display link to get the callback after the screen is rendered
+  displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleDisplayLink:)];
+  [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+}
+
+- (void)handleDisplayLink:(CADisplayLink *)link
+{
+  // Get the current time
+  NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970] * 1000;
+
+  // Resolve the promise
+  if (resolveBlock) {
+    resolveBlock(@(currentTime));
+    resolveBlock = nil;
+  }
+
+  // Invalidate the display link
+  [displayLink invalidate];
+  displayLink = nil;
+}
+
+@end

From 299fb340f97f93faa054689b3a25ff3bc4495c5b Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 12:20:12 -0300
Subject: [PATCH 07/47] fix typo

---
 src/js/utils/sentryeventemitterfallback.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index c7f664286..d3827bf84 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -3,7 +3,7 @@ import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter, NativeModules } from 'react-native';
 
 import { NewFrameEventName } from './sentryeventemitter';
-S
+
 interface RNSentryTimeToDisplaySpec {
   requestAnimationFrame(): Promise<number>;
 }

From 734354dd1d5cdb3f488e93607bb94ade841f7d7e Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 14:15:32 -0300
Subject: [PATCH 08/47] fix-time

---
 ios/RNSentryTimeToDisplay.m | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ios/RNSentryTimeToDisplay.m b/ios/RNSentryTimeToDisplay.m
index 567db2a94..4dc561b62 100644
--- a/ios/RNSentryTimeToDisplay.m
+++ b/ios/RNSentryTimeToDisplay.m
@@ -8,7 +8,6 @@ @implementation RNSentryTimeToDisplay
   RCTPromiseResolveBlock resolveBlock;
 }
 
-
 RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(requestAnimationFrame:(RCTPromiseResolveBlock)resolve
@@ -24,10 +23,8 @@ @implementation RNSentryTimeToDisplay
 
 - (void)handleDisplayLink:(CADisplayLink *)link
 {
-  // Get the current time
-  NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970] * 1000;
+  NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970];
 
-  // Resolve the promise
   if (resolveBlock) {
     resolveBlock(@(currentTime));
     resolveBlock = nil;

From dabf98bb6ae68ed81f8814726e6b461226559d98 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 17:01:05 -0300
Subject: [PATCH 09/47] removed wrapper placeholder, moved java implementation
 to separated file, add js implementation as fallback

---
 .../io/sentry/react/RNSentryModuleImpl.java   |  16 ---
 .../java/io/sentry/react/RNSentryPackage.java |  16 ++-
 .../sentry/react/RNSentryTimeToDisplay.java   |  47 ++++++++
 .../java/io/sentry/react/RNSentryModule.java  |   5 -
 .../java/io/sentry/react/RNSentryModule.java  |   5 -
 src/js/utils/sentryeventemitterfallback.ts    | 103 ++++++++++--------
 src/js/wrapper.ts                             |  12 +-
 7 files changed, 120 insertions(+), 84 deletions(-)
 create mode 100644 android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 8e42186f8..fcfcb4390 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -470,22 +470,6 @@ public void captureEnvelope(String rawBytes, ReadableMap options, Promise promis
         promise.resolve(true);
     }
 
-    public void requestAnimationFrame(Promise promise) {
-        Choreographer choreographer = Choreographer.getInstance();
-
-        choreographer.postFrameCallback(new Choreographer.FrameCallback() {
-            @Override
-            public void doFrame(long frameTimeNanos) {
-                final @NotNull SentryDateProvider dateProvider = new SentryAndroidDateProvider();
-
-                // Invoke the callback after the frame is rendered
-                final SentryDate endDate = dateProvider.now();
-
-                promise.resolve(endDate.nanoTimestamp() / 1e9);
-            }
-        });
-    }
-
     public void captureScreenshot(Promise promise) {
 
         final Activity activity = getCurrentActivity();
diff --git a/android/src/main/java/io/sentry/react/RNSentryPackage.java b/android/src/main/java/io/sentry/react/RNSentryPackage.java
index 8cce37e29..384f0bfe5 100644
--- a/android/src/main/java/io/sentry/react/RNSentryPackage.java
+++ b/android/src/main/java/io/sentry/react/RNSentryPackage.java
@@ -22,7 +22,9 @@ public class RNSentryPackage extends TurboReactPackage {
   public NativeModule getModule(String name, ReactApplicationContext reactContext) {
     if (name.equals(RNSentryModuleImpl.NAME)) {
       return new RNSentryModule(reactContext);
-    } else {
+    } else if (name.equals(RNSentryTimeToDisplay.REACT_CLASS))
+      return new RNSentryTimeToDisplay(reactContext);
+    else {
       return null;
     }
   }
@@ -43,6 +45,18 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
               false, // isCxxModule
               isTurboModule // isTurboModule
       ));
+      // Register RNSentryTimeToDisplay
+      moduleInfos.put(
+              RNSentryTimeToDisplay.REACT_CLASS,
+              new ReactModuleInfo(
+                      RNSentryTimeToDisplay.REACT_CLASS,
+                      RNSentryTimeToDisplay.REACT_CLASS,
+                      false, // canOverrideExistingModule
+                      false, // needsEagerInit
+                      true, // hasConstants
+                      false, // isCxxModule
+                      isTurboModule // isTurboModule
+              ));
       return moduleInfos;
     };
   }
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
new file mode 100644
index 000000000..8e18e4696
--- /dev/null
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -0,0 +1,47 @@
+package io.sentry.react;
+
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.Promise;
+import android.view.Choreographer;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+import io.sentry.SentryDate;
+import io.sentry.SentryDateProvider;
+import io.sentry.android.core.SentryAndroidDateProvider;
+
+
+public class RNSentryTimeToDisplay extends ReactContextBaseJavaModule {
+
+    public static final String REACT_CLASS = "RNSentryTimeToDisplay";
+
+    public RNSentryTimeToDisplay(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @ReactMethod
+    public void requestAnimationFrame(Promise promise) {
+        Choreographer choreographer = Choreographer.getInstance();
+
+        // Invoke the callback after the frame is rendered
+        choreographer.postFrameCallback(new Choreographer.FrameCallback() {
+            @Override
+            public void doFrame(long frameTimeNanos) {
+                final @NotNull SentryDateProvider dateProvider = new SentryAndroidDateProvider();
+
+                final SentryDate endDate = dateProvider.now();
+
+                promise.resolve(endDate.nanoTimestamp() / 1e9);
+            }
+        });
+    }
+}
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
index 402911406..f5f6ea608 100644
--- a/android/src/newarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
@@ -43,11 +43,6 @@ public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
         this.impl.initNativeSdk(rnOptions, promise);
     }
 
-    @Override
-    public void requestAnimationFrame(Promise promise) {
-        this.impl.requestAnimationFrame(promise);
-    }
-
     @Override
     public void crash() {
         this.impl.crash();
diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
index 6c68888b1..656b8c604 100644
--- a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
@@ -38,11 +38,6 @@ public void initNativeReactNavigationNewFrameTracking(Promise promise) {
         this.impl.initNativeReactNavigationNewFrameTracking(promise);
     }
 
-    @ReactMethod
-    public void requestAnimationFrame(Promise promise) {
-        this.impl.requestAnimationFrame(promise);
-    }
-
     @ReactMethod
     public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
         this.impl.initNativeSdk(rnOptions, promise);
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index d3827bf84..c48692619 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -2,6 +2,7 @@ import { logger } from '@sentry/utils';
 import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter, NativeModules } from 'react-native';
 
+import { NATIVE } from '../wrapper';
 import { NewFrameEventName } from './sentryeventemitter';
 
 interface RNSentryTimeToDisplaySpec {
@@ -32,6 +33,47 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   let NativeEmitterCalled: boolean = false;
   let subscription: EmitterSubscription | undefined = undefined;
   let isListening = false;
+
+  function defaultFallbackEventEmitter(): void {
+    // Schedule the callback to be executed when all UI Frames have flushed.
+    requestAnimationFrame(() => {
+      if (NativeEmitterCalled) {
+        NativeEmitterCalled = false;
+        isListening = false;
+        const timestampInSeconds = timeNowNanosecond();
+        logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
+        return;
+      }
+      const timestampInSeconds = timeNowNanosecond();
+      const maxRetries = 3;
+      let retries = 0;
+      logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
+
+      const retryCheck = (): void => {
+        if (NativeEmitterCalled) {
+          NativeEmitterCalled = false;
+          isListening = false;
+          return; // Native Replied the bridge with a given timestamp.
+        }
+
+        retries++;
+        if (retries < maxRetries) {
+          setTimeout(retryCheck, 1_000);
+        } else {
+          logger.log('Native timestamp did not reply in time, using fallback.');
+          isListening = false;
+          DeviceEventEmitter.emit(NewFrameEventName, {
+            newFrameTimestampInSeconds: timestampInSeconds,
+            isFallback: true,
+          });
+        }
+      };
+
+      // Start the retry process
+      retryCheck();
+    });
+  }
+
   return {
     initAsync() {
       subscription = DeviceEventEmitter.addListener(NewFrameEventName, () => {
@@ -43,52 +85,21 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
     },
 
     startListenerAsync() {
-      isListening = true;
-
-      RNSentryTimeToDisplay.requestAnimationFrame()
-        //        NATIVE.requestAnimationFrame()
-        .then((time => {
-          logger.log(`New native logger received with time.${time}`);
-        }));
-
-      // Schedule the callback to be executed when all UI Frames have flushed.
-      requestAnimationFrame(() => {
-        if (NativeEmitterCalled) {
-          NativeEmitterCalled = false;
-          isListening = false;
-          const timestampInSeconds = timeNowNanosecond();
-          logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
-
-          return;
-        }
-        const timestampInSeconds = timeNowNanosecond();
-        const maxRetries = 3;
-        let retries = 0;
-        logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
-
-        const retryCheck = (): void => {
-          if (NativeEmitterCalled) {
-            NativeEmitterCalled = false;
-            isListening = false;
-            return; // Native Replied the bridge with a given timestamp.
-          }
-
-          retries++;
-          if (retries < maxRetries) {
-            setTimeout(retryCheck, 1_000);
-          } else {
-            logger.log('Native timestamp did not reply in time, using fallback.');
-            isListening = false;
-            DeviceEventEmitter.emit(NewFrameEventName, {
-              newFrameTimestampInSeconds: timestampInSeconds,
-              isFallback: true,
-            });
-          }
-        };
-
-        // Start the retry process
-        retryCheck();
-      });
+      if (NATIVE.isNativeAvailable()) {
+        RNSentryTimeToDisplay.requestAnimationFrame()
+          .then(time => {
+            logger.log(`New native logger received with time.${time}`);
+          })
+          .catch(reason => {
+            logger.log('Native Time to display emitter is not using, fallback to JavaScript implementation');
+            logger.debug(reason);
+            isListening = true;
+            defaultFallbackEventEmitter();
+          });
+      } else {
+        isListening = true;
+        defaultFallbackEventEmitter();
+      }
     },
 
     closeAll() {
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 1aa335d2b..164d955a9 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -103,7 +103,7 @@ interface SentryNativeWrapper {
   } | null;
 
   fetchNativePackageName(): string | null;
-  requestAnimationFrame(): PromiseLike<Date | null>;
+
   /**
    * Fetches native stack frames and debug images for the instructions addresses.
    */
@@ -199,16 +199,6 @@ export const NATIVE: SentryNativeWrapper = {
     await RNSentry.captureEnvelope(base64StringFromByteArray(envelopeBytes), { hardCrashed });
   },
 
-  async requestAnimationFrame(): Promise<Date | null> {
-    if (!this.enableNative) {
-      throw this._DisabledNativeError;
-    }
-    if (!this._isModuleLoaded(RNSentry)) {
-      throw this._NativeClientError;
-    }
-
-    return RNSentry.requestAnimationFrame();
-  },
   /**
    * Starts native with the provided options.
    * @param options ReactNativeClientOptions

From 41879c1a7df68d9e9fade6b9f0fb317f2d9fcd92 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 21:25:05 -0300
Subject: [PATCH 10/47] refactored android to use turbo module, refactored
 fallback emitter

---
 .../java/io/sentry/react/RNSentryPackage.java | 21 +----
 ....java => RNSentryTimeToDisplayModule.java} | 13 +---
 .../react/RNSentryTimeToDisplayPackage.java   | 45 +++++++++++
 ...isplay.h => RNSentryTimeToDisplayModule.h} |  2 +-
 ...isplay.m => RNSentryTimeToDisplayModule.m} |  4 +-
 react-native.config.js                        |  4 +-
 src/js/NativeRNSentry.ts                      |  6 +-
 src/js/NativeRNSentryTimeToDisplay.ts         | 11 +++
 src/js/utils/sentryeventemitter.ts            |  2 -
 src/js/utils/sentryeventemitterfallback.ts    | 76 ++++++++++---------
 10 files changed, 114 insertions(+), 70 deletions(-)
 rename android/src/main/java/io/sentry/react/{RNSentryTimeToDisplay.java => RNSentryTimeToDisplayModule.java} (78%)
 create mode 100644 android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
 rename ios/{RNSentryTimeToDisplay.h => RNSentryTimeToDisplayModule.h} (70%)
 rename ios/{RNSentryTimeToDisplay.m => RNSentryTimeToDisplayModule.m} (91%)
 create mode 100644 src/js/NativeRNSentryTimeToDisplay.ts

diff --git a/android/src/main/java/io/sentry/react/RNSentryPackage.java b/android/src/main/java/io/sentry/react/RNSentryPackage.java
index 384f0bfe5..75058c699 100644
--- a/android/src/main/java/io/sentry/react/RNSentryPackage.java
+++ b/android/src/main/java/io/sentry/react/RNSentryPackage.java
@@ -20,11 +20,9 @@ public class RNSentryPackage extends TurboReactPackage {
   @Nullable
   @Override
   public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-    if (name.equals(RNSentryModuleImpl.NAME)) {
-      return new RNSentryModule(reactContext);
-    } else if (name.equals(RNSentryTimeToDisplay.REACT_CLASS))
-      return new RNSentryTimeToDisplay(reactContext);
-    else {
+      if (name.equals(RNSentryModuleImpl.NAME)) {
+        return new RNSentryModule(reactContext);
+      } else {
       return null;
     }
   }
@@ -45,18 +43,6 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
               false, // isCxxModule
               isTurboModule // isTurboModule
       ));
-      // Register RNSentryTimeToDisplay
-      moduleInfos.put(
-              RNSentryTimeToDisplay.REACT_CLASS,
-              new ReactModuleInfo(
-                      RNSentryTimeToDisplay.REACT_CLASS,
-                      RNSentryTimeToDisplay.REACT_CLASS,
-                      false, // canOverrideExistingModule
-                      false, // needsEagerInit
-                      true, // hasConstants
-                      false, // isCxxModule
-                      isTurboModule // isTurboModule
-              ));
       return moduleInfos;
     };
   }
@@ -69,5 +55,4 @@ public List<ViewManager> createViewManagers(
           new RNSentryOnDrawReporterManager(reactContext)
     );
   }
-
 }
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
similarity index 78%
rename from android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
rename to android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
index 8e18e4696..466e1a459 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
@@ -4,6 +4,8 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+
 import android.view.Choreographer;
 
 import androidx.annotation.NonNull;
@@ -14,20 +16,13 @@
 import io.sentry.android.core.SentryAndroidDateProvider;
 
 
-public class RNSentryTimeToDisplay extends ReactContextBaseJavaModule {
+public class RNSentryTimeToDisplayModule extends NativeRNSentryTimeToDisplaySpec {
 
-    public static final String REACT_CLASS = "RNSentryTimeToDisplay";
 
-    public RNSentryTimeToDisplay(ReactApplicationContext reactContext) {
+    public RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
-    @NonNull
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
     @ReactMethod
     public void requestAnimationFrame(Promise promise) {
         Choreographer choreographer = Choreographer.getInstance();
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
new file mode 100644
index 000000000..c0786fbda
--- /dev/null
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
@@ -0,0 +1,45 @@
+package io.sentry.react;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.TurboReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RNSentryTimeToDisplayPackage extends TurboReactPackage {
+
+    @Nullable
+    @Override
+    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (name.equals(RNSentryTimeToDisplayModule.NAME)) {
+            return new RNSentryTimeToDisplayModule(reactContext);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+            moduleInfos.put(
+                    RNSentryTimeToDisplayModule.NAME,
+                    new ReactModuleInfo(
+                            RNSentryTimeToDisplayModule.NAME,
+                            RNSentryTimeToDisplayModule.NAME,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            isTurboModule // isTurboModule
+                    ));
+            return moduleInfos;
+        };
+    }
+}
diff --git a/ios/RNSentryTimeToDisplay.h b/ios/RNSentryTimeToDisplayModule.h
similarity index 70%
rename from ios/RNSentryTimeToDisplay.h
rename to ios/RNSentryTimeToDisplayModule.h
index 732656c5f..868304d27 100644
--- a/ios/RNSentryTimeToDisplay.h
+++ b/ios/RNSentryTimeToDisplayModule.h
@@ -1,6 +1,6 @@
 #import <React/RCTBridgeModule.h>
 
-@interface RNSentryTimeToDisplay : NSObject <RCTBridgeModule>
+@interface RNSentryTimeToDisplayModule : NSObject <RCTBridgeModule>
 
 - (void)requestAnimationFrame:(RCTPromiseResolveBlock)resolve
                     rejecter:(RCTPromiseRejectBlock)reject;
diff --git a/ios/RNSentryTimeToDisplay.m b/ios/RNSentryTimeToDisplayModule.m
similarity index 91%
rename from ios/RNSentryTimeToDisplay.m
rename to ios/RNSentryTimeToDisplayModule.m
index 4dc561b62..f40072fff 100644
--- a/ios/RNSentryTimeToDisplay.m
+++ b/ios/RNSentryTimeToDisplayModule.m
@@ -1,8 +1,8 @@
-#import "RNSentryTimeToDisplay.h"
+#import "RNSentryTimeToDisplayModule.h"
 #import <QuartzCore/QuartzCore.h>
 #import <React/RCTLog.h>
 
-@implementation RNSentryTimeToDisplay
+@implementation RNSentryTimeToDisplayModule
 {
   CADisplayLink *displayLink;
   RCTPromiseResolveBlock resolveBlock;
diff --git a/react-native.config.js b/react-native.config.js
index d307073e1..1fe8f52b8 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -3,8 +3,8 @@ module.exports = {
     platforms: {
       ios: {},
       android: {
-        packageInstance: 'new RNSentryPackage()',
-        packageImportPath: 'import io.sentry.react.RNSentryPackage;'
+        packageInstance: 'new RNSentryPackage(),\n      new RNSentryTimeToDisplayPackage()',
+        packageImportPath: 'import io.sentry.react.RNSentryPackage;\nimport io.sentry.react.RNSentryTimeToDisplayPackage;'
       }
     }
   }
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index b323afafb..42f8a6f83 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -21,7 +21,6 @@ export interface Spec extends TurboModule {
   clearBreadcrumbs(): void;
   crash(): void;
   closeNativeSdk(): Promise<void>;
-  requestAnimationFrame(): Promise<Date | null>;
   disableNativeFramesTracking(): void;
   fetchNativeRelease(): Promise<NativeReleaseResponse>;
   fetchNativeSdkInfo(): Promise<Package | null>;
@@ -155,5 +154,10 @@ export type NativeScreenshot = {
   filename: string;
 };
 
+export interface RNSentryTimeToDisplayModuleSpec {
+  requestAnimationFrame(): Promise<number>;
+}
+
+
 // The export must be here to pass codegen even if not used
 export default TurboModuleRegistry.getEnforcing<Spec>('RNSentry');
diff --git a/src/js/NativeRNSentryTimeToDisplay.ts b/src/js/NativeRNSentryTimeToDisplay.ts
new file mode 100644
index 000000000..02e3e2d9a
--- /dev/null
+++ b/src/js/NativeRNSentryTimeToDisplay.ts
@@ -0,0 +1,11 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+// There has to be only one interface and it has to be named `Spec`
+// Only extra allowed definitions are types (probably codegen bug)
+export interface Spec extends TurboModule {
+  requestAnimationFrame(): Promise<number>;
+}
+
+// The export must be here to pass codegen even if not used
+export default TurboModuleRegistry.getEnforcing<Spec>('RNSentryTimeToDisplay');
diff --git a/src/js/utils/sentryeventemitter.ts b/src/js/utils/sentryeventemitter.ts
index 728de36cc..63146f30c 100644
--- a/src/js/utils/sentryeventemitter.ts
+++ b/src/js/utils/sentryeventemitter.ts
@@ -58,8 +58,6 @@ export function createSentryEventEmitter(
       }
 
       const nativeListener = nativeEventEmitter.addListener(eventType, (event: NewFrameEvent) => {
-        logger.log(`OLD EVENT!, .${event.newFrameTimestampInSeconds}`);
-
         const listeners = listenersMap.get(eventType);
         if (!listeners) {
           return;
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index c48692619..ccfe08753 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -2,14 +2,19 @@ import { logger } from '@sentry/utils';
 import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter, NativeModules } from 'react-native';
 
+import type {  Spec } from '../NativeRNSentryTimeToDisplay';
 import { NATIVE } from '../wrapper';
+import { isTurboModuleEnabled } from './environment';
+import { ReactNativeLibraries } from './rnlibraries';
 import { NewFrameEventName } from './sentryeventemitter';
 
-interface RNSentryTimeToDisplaySpec {
-  requestAnimationFrame(): Promise<number>;
+function getTimeToDisplayModule(): Spec | undefined {
+  return isTurboModuleEnabled()
+    ? ReactNativeLibraries.TurboModuleRegistry && ReactNativeLibraries.TurboModuleRegistry.get<Spec>('RNSentryTimeToDisplay')
+    : NativeModules.RNSentry;
 }
 
-const { RNSentryTimeToDisplay } = NativeModules as { RNSentryTimeToDisplay: RNSentryTimeToDisplaySpec };
+const RNSentryTimeToDisplay: Spec | undefined = getTimeToDisplayModule();
 
 export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number; isFallback?: boolean };
 export interface SentryEventEmitterFallback {
@@ -45,33 +50,36 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
         return;
       }
       const timestampInSeconds = timeNowNanosecond();
-      const maxRetries = 3;
-      let retries = 0;
-      logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
+      waitForNativeResponseOrFallback(timestampInSeconds, 'JavaScript');
+    });
+  }
 
-      const retryCheck = (): void => {
-        if (NativeEmitterCalled) {
-          NativeEmitterCalled = false;
-          isListening = false;
-          return; // Native Replied the bridge with a given timestamp.
-        }
+  function waitForNativeResponseOrFallback(fallbackSeconds: number, origin: string): void {
+    const maxRetries = 3;
+    let retries = 0;
 
-        retries++;
-        if (retries < maxRetries) {
-          setTimeout(retryCheck, 1_000);
-        } else {
-          logger.log('Native timestamp did not reply in time, using fallback.');
-          isListening = false;
-          DeviceEventEmitter.emit(NewFrameEventName, {
-            newFrameTimestampInSeconds: timestampInSeconds,
-            isFallback: true,
-          });
-        }
-      };
+    const retryCheck = (): void => {
+      if (NativeEmitterCalled) {
+        NativeEmitterCalled = false;
+        isListening = false;
+        return; // Native Replied the bridge with a timestamp.
+      }
 
-      // Start the retry process
-      retryCheck();
-    });
+      retries++;
+      if (retries < maxRetries) {
+        setTimeout(retryCheck, 1_000);
+      } else {
+        logger.log(`[Sentry] Native event emitter did not reply in time. Using ${origin} fallback emitter.`);
+        isListening = false;
+        DeviceEventEmitter.emit(NewFrameEventName, {
+          newFrameTimestampInSeconds: fallbackSeconds,
+          isFallback: true,
+        });
+      }
+    };
+
+    // Start the retry process
+    retryCheck();
   }
 
   return {
@@ -85,19 +93,17 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
     },
 
     startListenerAsync() {
-      if (NATIVE.isNativeAvailable()) {
+      isListening = true;
+      if (NATIVE.isNativeAvailable() && RNSentryTimeToDisplay !== undefined) {
         RNSentryTimeToDisplay.requestAnimationFrame()
-          .then(time => {
-            logger.log(`New native logger received with time.${time}`);
+          .then((time: number) => {
+            waitForNativeResponseOrFallback(time, 'Native');
           })
-          .catch(reason => {
-            logger.log('Native Time to display emitter is not using, fallback to JavaScript implementation');
-            logger.debug(reason);
-            isListening = true;
+          .catch((reason: Error) => {
+            logger.error('Failed to recceive Native fallback timestamp.', reason);
             defaultFallbackEventEmitter();
           });
       } else {
-        isListening = true;
         defaultFallbackEventEmitter();
       }
     },

From a181bccc5049c910802c7c64a1338aa8f9c07e63 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 23:03:01 -0300
Subject: [PATCH 11/47] add tests and minor fixes

---
 src/js/utils/sentryeventemitterfallback.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index ccfe08753..eb37f4e90 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -11,7 +11,7 @@ import { NewFrameEventName } from './sentryeventemitter';
 function getTimeToDisplayModule(): Spec | undefined {
   return isTurboModuleEnabled()
     ? ReactNativeLibraries.TurboModuleRegistry && ReactNativeLibraries.TurboModuleRegistry.get<Spec>('RNSentryTimeToDisplay')
-    : NativeModules.RNSentry;
+    : NativeModules.RNSentryTimeToDisplay;
 }
 
 const RNSentryTimeToDisplay: Spec | undefined = getTimeToDisplayModule();
@@ -45,8 +45,6 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
       if (NativeEmitterCalled) {
         NativeEmitterCalled = false;
         isListening = false;
-        const timestampInSeconds = timeNowNanosecond();
-        logger.log(`Native timestamp did not reply in time, using fallback.${timestampInSeconds}`);
         return;
       }
       const timestampInSeconds = timeNowNanosecond();

From 298a0070a256779c3393e025c1d9db7e4da77203 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 23:03:16 -0300
Subject: [PATCH 12/47] missing test file

---
 test/utils/sentryeventemitterfallback.test.ts | 184 ++++++++++++++++++
 1 file changed, 184 insertions(+)
 create mode 100644 test/utils/sentryeventemitterfallback.test.ts

diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
new file mode 100644
index 000000000..92f8a4ae6
--- /dev/null
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -0,0 +1,184 @@
+import { logger } from '@sentry/utils';
+import { DeviceEventEmitter } from 'react-native';
+import * as RN from 'react-native';
+
+import type { Spec } from '../../src/js/NativeRNSentryTimeToDisplay';
+import { NewFrameEventName } from '../../src/js/utils/sentryeventemitter';
+import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryeventemitterfallback';
+
+// Mock dependencies
+jest.mock('react-native', () => {
+  const RNSentryTimeToDisplay: Spec = {
+    requestAnimationFrame: jest.fn(() => Promise.resolve(12345))
+  };
+  return {
+    DeviceEventEmitter: {
+      addListener: jest.fn(),
+      emit: jest.fn(),
+    },
+    NativeModules: {
+      RNSentryTimeToDisplay,
+    },
+    Platform: {
+      OS: 'ios',
+    },
+  }
+});
+
+const RNSentryTimeToDisplay = RN.NativeModules.RNSentryTimeToDisplay as Spec;
+
+jest.mock('../../src/js/utils/environment', () => ({
+  isTurboModuleEnabled: () => false,
+}));
+
+jest.mock('../../src/js/wrapper', () => jest.requireActual('../mockWrapper'));
+
+jest.mock('@sentry/utils', () => ({
+  logger: {
+    log: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
+describe('SentryEventEmitterFallback', () => {
+  let emitter: ReturnType<typeof createSentryFallbackEventEmitter>;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // @ts-expect-error test
+    jest.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => cb());
+    emitter = createSentryFallbackEventEmitter();
+  });
+
+  afterEach(() => {
+    // @ts-expect-error test
+    window.requestAnimationFrame.mockRestore();
+  });
+
+  it('should initialize and add a listener', () => {
+    emitter.initAsync();
+
+    expect(DeviceEventEmitter.addListener).toHaveBeenCalledWith(NewFrameEventName, expect.any(Function));
+  });
+
+  it('should start listener and use fallback when native call returned a value', async () => {
+    const fallbackTime = Date.now() / 1000;
+
+    jest.useFakeTimers();
+
+    (RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock).mockResolvedValueOnce(fallbackTime);
+
+
+    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+
+    emitter.startListenerAsync();
+    await animation; // wait for the Native execution to be completed.
+
+    await expect(RNSentryTimeToDisplay.requestAnimationFrame).toHaveBeenCalled();
+
+    // Simulate retries and timer
+    jest.runAllTimers();
+
+    // Ensure fallback event is emitted
+    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+      newFrameTimestampInSeconds: fallbackTime,
+      isFallback: true,
+    });
+    expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('[Sentry] Native event emitter did not reply in time. Using Native fallback emitter.'));
+  });
+
+  it('should start listener and use fallback when native call fails', async () => {
+    jest.useFakeTimers();
+    const fallbackTime = Date.now() / 1000;
+
+    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+    animation.mockRejectedValueOnce(new Error('Failed'));
+
+    emitter.startListenerAsync();
+    await animation; // wait for the Native execution to be completed.
+
+    await expect(RNSentryTimeToDisplay.requestAnimationFrame).toHaveBeenCalled();
+    expect(logger.error).toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
+
+    // Simulate retries and timer
+    jest.runAllTimers();
+
+    // Ensure fallback event is emitted
+    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+      newFrameTimestampInSeconds: fallbackTime,
+      isFallback: true,
+    });
+    expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.'));
+  });
+
+  it('should start listener and call native when native is available', async () => {
+    const nativeTimestamp = 12345;
+
+    (RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock).mockResolvedValueOnce(nativeTimestamp);
+
+    emitter.startListenerAsync();
+
+    expect(RNSentryTimeToDisplay.requestAnimationFrame).toHaveBeenCalled();
+  });
+
+  it('should not emit if original event emitter was called', async () => {
+    jest.useFakeTimers();
+
+    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+
+    const mockAddListener = jest.fn();
+    DeviceEventEmitter.addListener = mockAddListener;
+
+    // Capture the callback passed to addListener
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/ban-types
+    let callback: Function = () => {};
+    mockAddListener.mockImplementationOnce((eventName, cb) => {
+      if (eventName === NewFrameEventName) {
+        callback = cb;
+      }
+      return {
+        remove: jest.fn(),
+      };
+    });
+
+    emitter.initAsync();
+    emitter.startListenerAsync();
+    callback();
+
+    await animation; // wait for the Native execution to be completed.
+
+    // Simulate retries and timer
+    jest.runAllTimers();
+
+    expect(DeviceEventEmitter.emit).not.toBeCalled();
+    expect(logger.log).not.toBeCalled();
+  });
+
+  it('should retry up to maxRetries and emit fallback if no response', async () => {
+    jest.useFakeTimers();
+
+    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+    emitter.startListenerAsync();
+    await animation; // wait for the Native execution to be completed.
+
+    expect(logger.log).not.toHaveBeenCalled();
+
+    // Simulate retries and timer
+    jest.runAllTimers();
+
+    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, expect.objectContaining({ isFallback: true }));
+    expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('Native event emitter did not reply in time'));
+
+    jest.useRealTimers();
+  });
+
+  it('should remove subscription when closeAll is called', () => {
+    const mockRemove = jest.fn();
+    (DeviceEventEmitter.addListener as jest.Mock).mockReturnValue({ remove: mockRemove });
+
+    emitter.initAsync();
+    emitter.closeAll();
+
+    expect(mockRemove).toHaveBeenCalled();
+  });
+});

From a93b249c1002475d512cdb77937f7426299df516 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 23:04:26 -0300
Subject: [PATCH 13/47] yarn fix

---
 src/js/NativeRNSentry.ts                      |  1 -
 src/js/utils/sentryeventemitterfallback.ts    |  5 +++--
 test/utils/sentryeventemitterfallback.test.ts | 20 +++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index 42f8a6f83..c57a02832 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -158,6 +158,5 @@ export interface RNSentryTimeToDisplayModuleSpec {
   requestAnimationFrame(): Promise<number>;
 }
 
-
 // The export must be here to pass codegen even if not used
 export default TurboModuleRegistry.getEnforcing<Spec>('RNSentry');
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index eb37f4e90..e05420cde 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -2,7 +2,7 @@ import { logger } from '@sentry/utils';
 import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter, NativeModules } from 'react-native';
 
-import type {  Spec } from '../NativeRNSentryTimeToDisplay';
+import type { Spec } from '../NativeRNSentryTimeToDisplay';
 import { NATIVE } from '../wrapper';
 import { isTurboModuleEnabled } from './environment';
 import { ReactNativeLibraries } from './rnlibraries';
@@ -10,7 +10,8 @@ import { NewFrameEventName } from './sentryeventemitter';
 
 function getTimeToDisplayModule(): Spec | undefined {
   return isTurboModuleEnabled()
-    ? ReactNativeLibraries.TurboModuleRegistry && ReactNativeLibraries.TurboModuleRegistry.get<Spec>('RNSentryTimeToDisplay')
+    ? ReactNativeLibraries.TurboModuleRegistry &&
+        ReactNativeLibraries.TurboModuleRegistry.get<Spec>('RNSentryTimeToDisplay')
     : NativeModules.RNSentryTimeToDisplay;
 }
 
diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index 92f8a4ae6..af9253f1f 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -9,7 +9,7 @@ import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryevent
 // Mock dependencies
 jest.mock('react-native', () => {
   const RNSentryTimeToDisplay: Spec = {
-    requestAnimationFrame: jest.fn(() => Promise.resolve(12345))
+    requestAnimationFrame: jest.fn(() => Promise.resolve(12345)),
   };
   return {
     DeviceEventEmitter: {
@@ -22,7 +22,7 @@ jest.mock('react-native', () => {
     Platform: {
       OS: 'ios',
     },
-  }
+  };
 });
 
 const RNSentryTimeToDisplay = RN.NativeModules.RNSentryTimeToDisplay as Spec;
@@ -68,7 +68,6 @@ describe('SentryEventEmitterFallback', () => {
 
     (RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock).mockResolvedValueOnce(fallbackTime);
 
-
     const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
 
     emitter.startListenerAsync();
@@ -84,7 +83,9 @@ describe('SentryEventEmitterFallback', () => {
       newFrameTimestampInSeconds: fallbackTime,
       isFallback: true,
     });
-    expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('[Sentry] Native event emitter did not reply in time. Using Native fallback emitter.'));
+    expect(logger.log).toHaveBeenCalledWith(
+      expect.stringContaining('[Sentry] Native event emitter did not reply in time. Using Native fallback emitter.'),
+    );
   });
 
   it('should start listener and use fallback when native call fails', async () => {
@@ -108,7 +109,11 @@ describe('SentryEventEmitterFallback', () => {
       newFrameTimestampInSeconds: fallbackTime,
       isFallback: true,
     });
-    expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.'));
+    expect(logger.log).toHaveBeenCalledWith(
+      expect.stringContaining(
+        '[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.',
+      ),
+    );
   });
 
   it('should start listener and call native when native is available', async () => {
@@ -166,7 +171,10 @@ describe('SentryEventEmitterFallback', () => {
     // Simulate retries and timer
     jest.runAllTimers();
 
-    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, expect.objectContaining({ isFallback: true }));
+    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(
+      NewFrameEventName,
+      expect.objectContaining({ isFallback: true }),
+    );
     expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('Native event emitter did not reply in time'));
 
     jest.useRealTimers();

From da76e21f334f62e39a21b58cf3bd98347e8860bb Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 23:25:03 -0300
Subject: [PATCH 14/47] fix ios module name

---
 ...{RNSentryTimeToDisplayModule.h => RNSentryTimeToDisplay.h} | 3 +--
 ...{RNSentryTimeToDisplayModule.m => RNSentryTimeToDisplay.m} | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename ios/{RNSentryTimeToDisplayModule.h => RNSentryTimeToDisplay.h} (70%)
 rename ios/{RNSentryTimeToDisplayModule.m => RNSentryTimeToDisplay.m} (91%)

diff --git a/ios/RNSentryTimeToDisplayModule.h b/ios/RNSentryTimeToDisplay.h
similarity index 70%
rename from ios/RNSentryTimeToDisplayModule.h
rename to ios/RNSentryTimeToDisplay.h
index 868304d27..3b3bf4b7e 100644
--- a/ios/RNSentryTimeToDisplayModule.h
+++ b/ios/RNSentryTimeToDisplay.h
@@ -1,8 +1,7 @@
 #import <React/RCTBridgeModule.h>
 
-@interface RNSentryTimeToDisplayModule : NSObject <RCTBridgeModule>
+@interface RNSentryTimeToDisplay : NSObject <RCTBridgeModule>
 
 - (void)requestAnimationFrame:(RCTPromiseResolveBlock)resolve
                     rejecter:(RCTPromiseRejectBlock)reject;
-
 @end
diff --git a/ios/RNSentryTimeToDisplayModule.m b/ios/RNSentryTimeToDisplay.m
similarity index 91%
rename from ios/RNSentryTimeToDisplayModule.m
rename to ios/RNSentryTimeToDisplay.m
index f40072fff..4dc561b62 100644
--- a/ios/RNSentryTimeToDisplayModule.m
+++ b/ios/RNSentryTimeToDisplay.m
@@ -1,8 +1,8 @@
-#import "RNSentryTimeToDisplayModule.h"
+#import "RNSentryTimeToDisplay.h"
 #import <QuartzCore/QuartzCore.h>
 #import <React/RCTLog.h>
 
-@implementation RNSentryTimeToDisplayModule
+@implementation RNSentryTimeToDisplay
 {
   CADisplayLink *displayLink;
   RCTPromiseResolveBlock resolveBlock;

From 53e67bad3867f84facfb9e238eecfd9e1bc08fa0 Mon Sep 17 00:00:00 2001
From: LucasZF <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 23:33:10 -0300
Subject: [PATCH 15/47] Update
 samples/react-native/src/Screens/PerformanceScreen.tsx

---
 .../src/Screens/PerformanceScreen.tsx         | 781 ------------------
 1 file changed, 781 deletions(-)

diff --git a/samples/react-native/src/Screens/PerformanceScreen.tsx b/samples/react-native/src/Screens/PerformanceScreen.tsx
index b6bb8d93d..0e43d78b5 100644
--- a/samples/react-native/src/Screens/PerformanceScreen.tsx
+++ b/samples/react-native/src/Screens/PerformanceScreen.tsx
@@ -72,787 +72,6 @@ const PerformanceScreen = (props: Props) => {
             props.navigation.navigate('Redux');
           }}
         />
-        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />        <Button
-        title="Redux Example"
-        onPress={() => {
-          props.navigation.navigate('Redux');
-        }}
-      />        <Button
-      title="Redux Example"
-      onPress={() => {
-        props.navigation.navigate('Redux');
-      }}
-    />        <Button
-    title="Redux Example"
-    onPress={() => {
-      props.navigation.navigate('Redux');
-    }}
-  />        <Button
-  title="Redux Example"
-  onPress={() => {
-    props.navigation.navigate('Redux');
-  }}
-/>        <Button
-          title="Redux Example"
-          onPress={() => {
-            props.navigation.navigate('Redux');
-          }}
-        />
         <View style={styles.mainViewBottomWhiteSpace} />
       </ScrollView>
     </>

From 0344adbb91a126bdda5937691a666f3685e606ca Mon Sep 17 00:00:00 2001
From: LucasZF <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 23:33:53 -0300
Subject: [PATCH 16/47] Update
 samples/react-native/src/Screens/PerformanceScreen.tsx

---
 samples/react-native/src/Screens/PerformanceScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/react-native/src/Screens/PerformanceScreen.tsx b/samples/react-native/src/Screens/PerformanceScreen.tsx
index 0e43d78b5..c50299e2b 100644
--- a/samples/react-native/src/Screens/PerformanceScreen.tsx
+++ b/samples/react-native/src/Screens/PerformanceScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import {
   StatusBar,
   ScrollView,

From b115fdd53c014e86defb4c592bd2440c14ac4eaf Mon Sep 17 00:00:00 2001
From: LucasZF <lucas-zimerman1@hotmail.com>
Date: Wed, 11 Sep 2024 23:34:00 -0300
Subject: [PATCH 17/47] Update
 samples/react-native/src/Screens/PerformanceScreen.tsx

---
 samples/react-native/src/Screens/PerformanceScreen.tsx | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/samples/react-native/src/Screens/PerformanceScreen.tsx b/samples/react-native/src/Screens/PerformanceScreen.tsx
index c50299e2b..c768d4b54 100644
--- a/samples/react-native/src/Screens/PerformanceScreen.tsx
+++ b/samples/react-native/src/Screens/PerformanceScreen.tsx
@@ -32,16 +32,6 @@ const PerformanceScreen = (props: Props) => {
       }),
     );
   };
-  const [isLoading, setIsLoading] = useState(true);
-  useEffect(() => {
-    // Simulate heavy computation for 5 seconds
-    const start = Date.now();
-    while (Date.now() - start < 5000) {
-      // Perform some meaningless computation to occupy the CPU
-      Math.sqrt(Math.random() * Math.random());
-    }
-    setIsLoading(false);
-  }, []);
 
   return (
     <>

From 99e74cf59a930014c54c4f278b2ce850e9c21d34 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Thu, 12 Sep 2024 09:18:33 -0300
Subject: [PATCH 18/47]  name missing

---
 .../main/java/io/sentry/react/RNSentryTimeToDisplayModule.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
index 466e1a459..364fc8d0b 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
@@ -18,6 +18,7 @@
 
 public class RNSentryTimeToDisplayModule extends NativeRNSentryTimeToDisplaySpec {
 
+    public static final String NAME = "RNSentryTimeToDisplayModule";
 
     public RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
         super(reactContext);

From 65076486f2020387a35b1f738b763715d25770a9 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 18 Sep 2024 22:40:40 -0300
Subject: [PATCH 19/47] fix java module name, add isAvailable to ignore macos

---
 .../react/RNSentryTimeToDisplayModule.java    |  7 ++++-
 ios/RNSentryTimeToDisplay.m                   | 15 +++++++++-
 src/js/NativeRNSentry.ts                      |  1 +
 src/js/NativeRNSentryTimeToDisplay.ts         |  1 +
 src/js/utils/sentryeventemitterfallback.ts    |  3 +-
 test/utils/sentryeventemitterfallback.test.ts | 30 ++++++++++++++++++-
 6 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
index 364fc8d0b..66d62befb 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
@@ -18,7 +18,7 @@
 
 public class RNSentryTimeToDisplayModule extends NativeRNSentryTimeToDisplaySpec {
 
-    public static final String NAME = "RNSentryTimeToDisplayModule";
+    public static final String NAME = "RNSentryTimeToDisplay";
 
     public RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -40,4 +40,9 @@ public void doFrame(long frameTimeNanos) {
             }
         });
     }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public boolean isAvailable() {
+        return true;
+    }
 }
diff --git a/ios/RNSentryTimeToDisplay.m b/ios/RNSentryTimeToDisplay.m
index 4dc561b62..bb4ffbaaa 100644
--- a/ios/RNSentryTimeToDisplay.m
+++ b/ios/RNSentryTimeToDisplay.m
@@ -16,15 +16,18 @@ @implementation RNSentryTimeToDisplay
   // Store the resolve block to use in the callback
   resolveBlock = resolve;
 
+#if TARGET_OS_IOS
   // Create and add a display link to get the callback after the screen is rendered
   displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleDisplayLink:)];
   [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+#else
+#endif
 }
 
+#if TARGET_OS_IOS
 - (void)handleDisplayLink:(CADisplayLink *)link
 {
   NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970];
-
   if (resolveBlock) {
     resolveBlock(@(currentTime));
     resolveBlock = nil;
@@ -34,5 +37,15 @@ - (void)handleDisplayLink:(CADisplayLink *)link
   [displayLink invalidate];
   displayLink = nil;
 }
+#endif
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isAvailable)
+{
+#if TARGET_OS_IOS
+  return @(YES);
+#else
+  return @(NO); // MacOS
+#endif
+}
 
 @end
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index abfd546f6..ddc1a5272 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -156,6 +156,7 @@ export type NativeScreenshot = {
 
 export interface RNSentryTimeToDisplayModuleSpec {
   requestAnimationFrame(): Promise<number>;
+  isAvailable(): boolean;
 }
 
 // The export must be here to pass codegen even if not used
diff --git a/src/js/NativeRNSentryTimeToDisplay.ts b/src/js/NativeRNSentryTimeToDisplay.ts
index 02e3e2d9a..912bc10c0 100644
--- a/src/js/NativeRNSentryTimeToDisplay.ts
+++ b/src/js/NativeRNSentryTimeToDisplay.ts
@@ -5,6 +5,7 @@ import { TurboModuleRegistry } from 'react-native';
 // Only extra allowed definitions are types (probably codegen bug)
 export interface Spec extends TurboModule {
   requestAnimationFrame(): Promise<number>;
+  isAvailable(): boolean;
 }
 
 // The export must be here to pass codegen even if not used
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index e05420cde..c361ccf73 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -3,7 +3,6 @@ import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter, NativeModules } from 'react-native';
 
 import type { Spec } from '../NativeRNSentryTimeToDisplay';
-import { NATIVE } from '../wrapper';
 import { isTurboModuleEnabled } from './environment';
 import { ReactNativeLibraries } from './rnlibraries';
 import { NewFrameEventName } from './sentryeventemitter';
@@ -93,7 +92,7 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
 
     startListenerAsync() {
       isListening = true;
-      if (NATIVE.isNativeAvailable() && RNSentryTimeToDisplay !== undefined) {
+      if (RNSentryTimeToDisplay && RNSentryTimeToDisplay.isAvailable()) {
         RNSentryTimeToDisplay.requestAnimationFrame()
           .then((time: number) => {
             waitForNativeResponseOrFallback(time, 'Native');
diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index af9253f1f..c53f551b9 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -10,6 +10,7 @@ import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryevent
 jest.mock('react-native', () => {
   const RNSentryTimeToDisplay: Spec = {
     requestAnimationFrame: jest.fn(() => Promise.resolve(12345)),
+    isAvailable: () => true,
   };
   return {
     DeviceEventEmitter: {
@@ -53,6 +54,7 @@ describe('SentryEventEmitterFallback', () => {
   afterEach(() => {
     // @ts-expect-error test
     window.requestAnimationFrame.mockRestore();
+    RNSentryTimeToDisplay.isAvailable = () => true;
   });
 
   it('should initialize and add a listener', () => {
@@ -116,7 +118,33 @@ describe('SentryEventEmitterFallback', () => {
     );
   });
 
-  it('should start listener and call native when native is available', async () => {
+  it('should start listener and use fallback when native call is not available', async () => {
+    jest.useFakeTimers();
+    const fallbackTime = Date.now() / 1000;
+
+    RNSentryTimeToDisplay.isAvailable = () => false;
+    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+
+    emitter.startListenerAsync();
+    await animation; // wait for the Native execution to be completed.
+
+    // Simulate retries and timer
+    jest.runAllTimers();
+
+    // Ensure fallback event is emitted
+    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+      newFrameTimestampInSeconds: fallbackTime,
+      isFallback: true,
+    });
+    expect(logger.log).toHaveBeenCalledWith(
+      expect.stringContaining(
+        '[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.',
+      ),
+    );
+  });
+
+
+  it('should start listener and call native when native module is available', async () => {
     const nativeTimestamp = 12345;
 
     (RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock).mockResolvedValueOnce(nativeTimestamp);

From 2f838b87a212954b5729ff8b2a3a8d0d9eb21ccf Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 18 Sep 2024 22:44:22 -0300
Subject: [PATCH 20/47] yarn fix

---
 test/utils/sentryeventemitterfallback.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index c53f551b9..dfd63fe13 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -143,7 +143,6 @@ describe('SentryEventEmitterFallback', () => {
     );
   });
 
-
   it('should start listener and call native when native module is available', async () => {
     const nativeTimestamp = 12345;
 

From a8f512670db9eb5c807a1b69f8f446b787254004 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 18 Sep 2024 23:44:14 -0300
Subject: [PATCH 21/47]  use impl method

---
 ...le.java => RNSentryTimeToDisplayImpl.java} |  7 +--
 .../react/RNSentryTimeToDisplayModule.java    | 43 +++++++++++++++++++
 .../react/RNSentryTimeToDisplayModule.java    | 43 +++++++++++++++++++
 3 files changed, 88 insertions(+), 5 deletions(-)
 rename android/src/main/java/io/sentry/react/{RNSentryTimeToDisplayModule.java => RNSentryTimeToDisplayImpl.java} (82%)
 create mode 100644 android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
 create mode 100644 android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java

diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayImpl.java
similarity index 82%
rename from android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
rename to android/src/main/java/io/sentry/react/RNSentryTimeToDisplayImpl.java
index 66d62befb..bf2bb4660 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayModule.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayImpl.java
@@ -16,15 +16,13 @@
 import io.sentry.android.core.SentryAndroidDateProvider;
 
 
-public class RNSentryTimeToDisplayModule extends NativeRNSentryTimeToDisplaySpec {
+public class RNSentryTimeToDisplayImpl {
 
     public static final String NAME = "RNSentryTimeToDisplay";
 
-    public RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
-        super(reactContext);
+    public RNSentryTimeToDisplayImpl() {
     }
 
-    @ReactMethod
     public void requestAnimationFrame(Promise promise) {
         Choreographer choreographer = Choreographer.getInstance();
 
@@ -41,7 +39,6 @@ public void doFrame(long frameTimeNanos) {
         });
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
     public boolean isAvailable() {
         return true;
     }
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java b/android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
new file mode 100644
index 000000000..434071d90
--- /dev/null
+++ b/android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
@@ -0,0 +1,43 @@
+package io.sentry.react;
+
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+
+import android.view.Choreographer;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+import io.sentry.SentryDate;
+import io.sentry.SentryDateProvider;
+import io.sentry.android.core.SentryAndroidDateProvider;
+
+
+public class RNSentryTimeToDisplayModule extends NativeRNSentryTimeToDisplaySpec {
+
+    private final RNSentryTimeToDisplayImpl impl;
+
+    RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.impl = new RNSentryTimeToDisplayImpl();
+    }
+
+    @Override
+    @NonNull
+    public String getName() {
+        return RNSentryTimeToDisplayImpl.NAME;
+    }
+
+    @Override
+    public void requestAnimationFrame(Promise promise) {
+        this.impl.requestAnimationFrame(promise);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return this.impl.isAvailable();
+    }
+}
diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
new file mode 100644
index 000000000..3e49e5477
--- /dev/null
+++ b/android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
@@ -0,0 +1,43 @@
+package io.sentry.react;
+
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+
+import android.view.Choreographer;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+import io.sentry.SentryDate;
+import io.sentry.SentryDateProvider;
+import io.sentry.android.core.SentryAndroidDateProvider;
+
+
+public class RNSentryTimeToDisplayModule extends ReactContextBaseJavaModule {
+
+    private final RNSentryTimeToDisplayImpl impl;
+
+    RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.impl = new RNSentryTimeToDisplayImpl();
+    }
+
+    @Override
+    @NonNull
+    public String getName() {
+        return RNSentryTimeToDisplayImpl.NAME;
+    }
+
+    @ReactMethod
+    public void requestAnimationFrame(Promise promise) {
+        this.impl.requestAnimationFrame(promise);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public boolean isAvailable() {
+        return this.impl.isAvailable();
+    }
+}

From fa03cc1fb3637b37f6819d5b8fb3d101810582b8 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Wed, 18 Sep 2024 23:47:44 -0300
Subject: [PATCH 22/47] nit impl name

---
 .../io/sentry/react/RNSentryTimeToDisplayPackage.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
index c0786fbda..91c30b300 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
@@ -16,7 +16,7 @@ public class RNSentryTimeToDisplayPackage extends TurboReactPackage {
     @Nullable
     @Override
     public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-        if (name.equals(RNSentryTimeToDisplayModule.NAME)) {
+        if (name.equals(RNSentryTimeToDisplayImpl.NAME)) {
             return new RNSentryTimeToDisplayModule(reactContext);
         } else {
             return null;
@@ -29,10 +29,10 @@ public ReactModuleInfoProvider getReactModuleInfoProvider() {
             final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
             boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
             moduleInfos.put(
-                    RNSentryTimeToDisplayModule.NAME,
+                    RNSentryTimeToDisplayImpl.NAME,
                     new ReactModuleInfo(
-                            RNSentryTimeToDisplayModule.NAME,
-                            RNSentryTimeToDisplayModule.NAME,
+                            RNSentryTimeToDisplayImpl.NAME,
+                            RNSentryTimeToDisplayImpl.NAME,
                             false, // canOverrideExistingModule
                             false, // needsEagerInit
                             true, // hasConstants

From b6093d572ee7df09b53f347b605c1aa82bdd4122 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Fri, 20 Sep 2024 16:44:29 -0300
Subject: [PATCH 23/47] refactor how to use time to display fallback

---
 .../io/sentry/react/RNSentryModuleImpl.java   | 10 +++
 ...ayImpl.java => RNSentryTimeToDisplay.java} | 13 +---
 .../react/RNSentryTimeToDisplayPackage.java   | 45 -----------
 .../java/io/sentry/react/RNSentryModule.java  |  5 ++
 .../react/RNSentryTimeToDisplayModule.java    | 43 ----------
 .../java/io/sentry/react/RNSentryModule.java  |  5 ++
 .../react/RNSentryTimeToDisplayModule.java    | 43 ----------
 ios/RNSentry.mm                               | 19 +++++
 ios/RNSentryTimeToDisplay.h                   |  6 +-
 ios/RNSentryTimeToDisplay.m                   | 38 ++++-----
 react-native.config.js                        |  4 +-
 src/js/NativeRNSentry.ts                      |  6 +-
 src/js/NativeRNSentryTimeToDisplay.ts         | 12 ---
 src/js/utils/sentryeventemitterfallback.ts    | 37 ++++-----
 src/js/wrapper.ts                             |  9 +++
 test/mockWrapper.ts                           |  1 +
 test/utils/sentryeventemitterfallback.test.ts | 78 ++++++++++++-------
 17 files changed, 138 insertions(+), 236 deletions(-)
 rename android/src/main/java/io/sentry/react/{RNSentryTimeToDisplayImpl.java => RNSentryTimeToDisplay.java} (79%)
 delete mode 100644 android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
 delete mode 100644 android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
 delete mode 100644 android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
 delete mode 100644 src/js/NativeRNSentryTimeToDisplay.ts

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 1fcaabb66..89f2af4a6 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -135,10 +135,16 @@ public class RNSentryModuleImpl {
     /** Max trace file size in bytes. */
     private long maxTraceFileSize = 5 * 1024 * 1024;
 
+
+
+  private final RNSentryTimeToDisplay timeToDisplay;
+
+
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
       packageInfo = getPackageInfo(reactApplicationContext);
       this.reactApplicationContext = reactApplicationContext;
       this.emitNewFrameEvent = createEmitNewFrameEvent();
+      this.timeToDisplay = new RNSentryTimeToDisplay();
     }
 
     private ReactApplicationContext getReactApplicationContext() {
@@ -693,6 +699,10 @@ public void disableNativeFramesTracking() {
         }
     }
 
+    public void getNewScreenTimeToDisplay(Promise promise) {
+        timeToDisplay.GetTimeToDisplay(promise);
+    }
+
     private String getProfilingTracesDirPath() {
         if (cacheDirPath == null) {
             cacheDirPath = new File(getReactApplicationContext().getCacheDir(), "sentry/react").getAbsolutePath();
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayImpl.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
similarity index 79%
rename from android/src/main/java/io/sentry/react/RNSentryTimeToDisplayImpl.java
rename to android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index bf2bb4660..c8610c20a 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -16,14 +16,9 @@
 import io.sentry.android.core.SentryAndroidDateProvider;
 
 
-public class RNSentryTimeToDisplayImpl {
+public class RNSentryTimeToDisplay {
 
-    public static final String NAME = "RNSentryTimeToDisplay";
-
-    public RNSentryTimeToDisplayImpl() {
-    }
-
-    public void requestAnimationFrame(Promise promise) {
+    public void GetTimeToDisplay(Promise promise) {
         Choreographer choreographer = Choreographer.getInstance();
 
         // Invoke the callback after the frame is rendered
@@ -38,8 +33,4 @@ public void doFrame(long frameTimeNanos) {
             }
         });
     }
-
-    public boolean isAvailable() {
-        return true;
-    }
 }
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
deleted file mode 100644
index 91c30b300..000000000
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplayPackage.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.sentry.react;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.TurboReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.model.ReactModuleInfo;
-import com.facebook.react.module.model.ReactModuleInfoProvider;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class RNSentryTimeToDisplayPackage extends TurboReactPackage {
-
-    @Nullable
-    @Override
-    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-        if (name.equals(RNSentryTimeToDisplayImpl.NAME)) {
-            return new RNSentryTimeToDisplayModule(reactContext);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public ReactModuleInfoProvider getReactModuleInfoProvider() {
-        return () -> {
-            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
-            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-            moduleInfos.put(
-                    RNSentryTimeToDisplayImpl.NAME,
-                    new ReactModuleInfo(
-                            RNSentryTimeToDisplayImpl.NAME,
-                            RNSentryTimeToDisplayImpl.NAME,
-                            false, // canOverrideExistingModule
-                            false, // needsEagerInit
-                            true, // hasConstants
-                            false, // isCxxModule
-                            isTurboModule // isTurboModule
-                    ));
-            return moduleInfos;
-        };
-    }
-}
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
index fd5b902e5..abfa6d7b5 100644
--- a/android/src/newarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
@@ -173,4 +173,9 @@ public String getCurrentReplayId() {
     public void crashedLastRun(Promise promise) {
         this.impl.crashedLastRun(promise);
     }
+
+      @Override
+     public void getNewScreenTimeToDisplay(Promise promise) {
+        this.impl.getNewScreenTimeToDisplay(promise);
+     }
 }
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java b/android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
deleted file mode 100644
index 434071d90..000000000
--- a/android/src/newarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.sentry.react;
-
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-
-import android.view.Choreographer;
-
-import androidx.annotation.NonNull;
-
-import org.jetbrains.annotations.NotNull;
-import io.sentry.SentryDate;
-import io.sentry.SentryDateProvider;
-import io.sentry.android.core.SentryAndroidDateProvider;
-
-
-public class RNSentryTimeToDisplayModule extends NativeRNSentryTimeToDisplaySpec {
-
-    private final RNSentryTimeToDisplayImpl impl;
-
-    RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.impl = new RNSentryTimeToDisplayImpl();
-    }
-
-    @Override
-    @NonNull
-    public String getName() {
-        return RNSentryTimeToDisplayImpl.NAME;
-    }
-
-    @Override
-    public void requestAnimationFrame(Promise promise) {
-        this.impl.requestAnimationFrame(promise);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return this.impl.isAvailable();
-    }
-}
diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
index 6b135ecb9..d69f330e9 100644
--- a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
@@ -173,4 +173,9 @@ public String getCurrentReplayId() {
     public void crashedLastRun(Promise promise) {
         this.impl.crashedLastRun(promise);
     }
+
+    @ReactMethod()
+    public void getNewScreenTimeToDisplay(Promise promise) {
+        this.impl.getNewScreenTimeToDisplay(promise);
+    }
 }
diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
deleted file mode 100644
index 3e49e5477..000000000
--- a/android/src/oldarch/java/io/sentry/react/RNSentryTimeToDisplayModule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.sentry.react;
-
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-
-import android.view.Choreographer;
-
-import androidx.annotation.NonNull;
-
-import org.jetbrains.annotations.NotNull;
-import io.sentry.SentryDate;
-import io.sentry.SentryDateProvider;
-import io.sentry.android.core.SentryAndroidDateProvider;
-
-
-public class RNSentryTimeToDisplayModule extends ReactContextBaseJavaModule {
-
-    private final RNSentryTimeToDisplayImpl impl;
-
-    RNSentryTimeToDisplayModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.impl = new RNSentryTimeToDisplayImpl();
-    }
-
-    @Override
-    @NonNull
-    public String getName() {
-        return RNSentryTimeToDisplayImpl.NAME;
-    }
-
-    @ReactMethod
-    public void requestAnimationFrame(Promise promise) {
-        this.impl.requestAnimationFrame(promise);
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public boolean isAvailable() {
-        return this.impl.isAvailable();
-    }
-}
diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 1ff85705f..87370ec2f 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -62,6 +62,7 @@ + (void)storeEnvelope:(SentryEnvelope *)envelope;
 @implementation RNSentry {
     bool sentHybridSdkDidBecomeActive;
     bool hasListeners;
+    RNSentryTimeToDisplay *_timeToDisplay;
 }
 
 - (dispatch_queue_t)methodQueue
@@ -106,6 +107,8 @@ + (BOOL)requiresMainQueueSetup {
         sentHybridSdkDidBecomeActive = true;
     }
 
+    _timeToDisplay = [[RNSentryTimeToDisplayModule alloc] init];
+
 #if SENTRY_TARGET_REPLAY_SUPPORTED
     [RNSentryReplay postInit];
 #endif
@@ -776,4 +779,20 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
 }
 #endif
 
+// Expose timeToDisplay to JS as an object with properties
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getTimeToDisplay) {
+    NSMutableDictionary *timeToDisplayDict = [NSMutableDictionary new];
+
+    // Expose the methods as key-value pairs
+    timeToDisplayDict[@"requestAnimationFrame"] = @([_timeToDisplay requestAnimationFrame]);
+    timeToDisplayDict[@"isAvailable"] = @([_timeToDisplay isAvailable]);
+
+    return timeToDisplayDict;
+}
+
+RCT_EXPORT_METHOD(getTimeToDisplay:(RCTResponseSenderBlock)callback) {
+  [_timeToDisplay getNewScreenTimeToDisplay:callback];
+}
+
+
 @end
diff --git a/ios/RNSentryTimeToDisplay.h b/ios/RNSentryTimeToDisplay.h
index 3b3bf4b7e..7e47e3fc8 100644
--- a/ios/RNSentryTimeToDisplay.h
+++ b/ios/RNSentryTimeToDisplay.h
@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 
-@interface RNSentryTimeToDisplay : NSObject <RCTBridgeModule>
+@interface RNSentryTimeToDisplayModule : NSObject
+
+- (void)getTimeToDisplay:(RCTResponseSenderBlock)callback;
 
-- (void)requestAnimationFrame:(RCTPromiseResolveBlock)resolve
-                    rejecter:(RCTPromiseRejectBlock)reject;
 @end
diff --git a/ios/RNSentryTimeToDisplay.m b/ios/RNSentryTimeToDisplay.m
index bb4ffbaaa..88e24eedc 100644
--- a/ios/RNSentryTimeToDisplay.m
+++ b/ios/RNSentryTimeToDisplay.m
@@ -5,47 +5,39 @@
 @implementation RNSentryTimeToDisplay
 {
   CADisplayLink *displayLink;
-  RCTPromiseResolveBlock resolveBlock;
+  RCTResponseSenderBlock resolveBlock;
 }
 
-RCT_EXPORT_MODULE();
-
-RCT_EXPORT_METHOD(requestAnimationFrame:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+// Rename requestAnimationFrame to getTimeToDisplay
+- (void)getTimeToDisplay:(RCTResponseSenderBlock)callback
 {
-  // Store the resolve block to use in the callback
-  resolveBlock = resolve;
+  // Store the resolve block to use in the callback.
+  resolveBlock = callback;
 
 #if TARGET_OS_IOS
-  // Create and add a display link to get the callback after the screen is rendered
+  // Create and add a display link to get the callback after the screen is rendered.
   displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(handleDisplayLink:)];
   [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
 #else
+  resolveBlock(@[]); // Return nothing if not iOS.
 #endif
 }
 
 #if TARGET_OS_IOS
-- (void)handleDisplayLink:(CADisplayLink *)link
-{
-  NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970];
+- (void)handleDisplayLink:(CADisplayLink *)link {
+  // Get the current time
+  NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970] * 1000.0; // Convert to milliseconds
+
+  // Ensure the callback is valid and pass the current time back
   if (resolveBlock) {
-    resolveBlock(@(currentTime));
-    resolveBlock = nil;
+    resolveBlock(@[@(currentTime)]); // Call the callback with the current time
+    resolveBlock = nil; // Clear the block after it's called
   }
 
-  // Invalidate the display link
+  // Invalidate the display link to stop future callbacks
   [displayLink invalidate];
   displayLink = nil;
 }
 #endif
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isAvailable)
-{
-#if TARGET_OS_IOS
-  return @(YES);
-#else
-  return @(NO); // MacOS
-#endif
-}
-
 @end
diff --git a/react-native.config.js b/react-native.config.js
index 1fe8f52b8..d307073e1 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -3,8 +3,8 @@ module.exports = {
     platforms: {
       ios: {},
       android: {
-        packageInstance: 'new RNSentryPackage(),\n      new RNSentryTimeToDisplayPackage()',
-        packageImportPath: 'import io.sentry.react.RNSentryPackage;\nimport io.sentry.react.RNSentryTimeToDisplayPackage;'
+        packageInstance: 'new RNSentryPackage()',
+        packageImportPath: 'import io.sentry.react.RNSentryPackage;'
       }
     }
   }
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index ddc1a5272..5b0880517 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -9,6 +9,7 @@ import type { UnsafeObject } from './utils/rnlibrariesinterface';
 export interface Spec extends TurboModule {
   addListener: (eventType: string) => void;
   removeListeners: (id: number) => void;
+  getNewScreenTimeToDisplay(): Promise<number | undefined | null>;
   addBreadcrumb(breadcrumb: UnsafeObject): void;
   captureEnvelope(
     bytes: string,
@@ -154,10 +155,5 @@ export type NativeScreenshot = {
   filename: string;
 };
 
-export interface RNSentryTimeToDisplayModuleSpec {
-  requestAnimationFrame(): Promise<number>;
-  isAvailable(): boolean;
-}
-
 // The export must be here to pass codegen even if not used
 export default TurboModuleRegistry.getEnforcing<Spec>('RNSentry');
diff --git a/src/js/NativeRNSentryTimeToDisplay.ts b/src/js/NativeRNSentryTimeToDisplay.ts
deleted file mode 100644
index 912bc10c0..000000000
--- a/src/js/NativeRNSentryTimeToDisplay.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { TurboModule } from 'react-native';
-import { TurboModuleRegistry } from 'react-native';
-
-// There has to be only one interface and it has to be named `Spec`
-// Only extra allowed definitions are types (probably codegen bug)
-export interface Spec extends TurboModule {
-  requestAnimationFrame(): Promise<number>;
-  isAvailable(): boolean;
-}
-
-// The export must be here to pass codegen even if not used
-export default TurboModuleRegistry.getEnforcing<Spec>('RNSentryTimeToDisplay');
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index c361ccf73..80bc674db 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -1,20 +1,11 @@
 import { logger } from '@sentry/utils';
 import type { EmitterSubscription } from 'react-native';
-import { DeviceEventEmitter, NativeModules } from 'react-native';
+import { DeviceEventEmitter } from 'react-native';
 
-import type { Spec } from '../NativeRNSentryTimeToDisplay';
-import { isTurboModuleEnabled } from './environment';
-import { ReactNativeLibraries } from './rnlibraries';
+import { NATIVE } from '../wrapper';
 import { NewFrameEventName } from './sentryeventemitter';
 
-function getTimeToDisplayModule(): Spec | undefined {
-  return isTurboModuleEnabled()
-    ? ReactNativeLibraries.TurboModuleRegistry &&
-        ReactNativeLibraries.TurboModuleRegistry.get<Spec>('RNSentryTimeToDisplay')
-    : NativeModules.RNSentryTimeToDisplay;
-}
 
-const RNSentryTimeToDisplay: Spec | undefined = getTimeToDisplayModule();
 
 export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number; isFallback?: boolean };
 export interface SentryEventEmitterFallback {
@@ -92,18 +83,20 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
 
     startListenerAsync() {
       isListening = true;
-      if (RNSentryTimeToDisplay && RNSentryTimeToDisplay.isAvailable()) {
-        RNSentryTimeToDisplay.requestAnimationFrame()
-          .then((time: number) => {
-            waitForNativeResponseOrFallback(time, 'Native');
-          })
-          .catch((reason: Error) => {
-            logger.error('Failed to recceive Native fallback timestamp.', reason);
+
+      NATIVE.getNewScreenTimeToDisplay()
+        .then((resolve => {
+          if (resolve) {
+            waitForNativeResponseOrFallback(resolve, 'Native');
+          }
+          else {
             defaultFallbackEventEmitter();
-          });
-      } else {
-        defaultFallbackEventEmitter();
-      }
+          }
+        }))
+        .catch((reason: Error) => {
+          logger.error('Failed to recceive Native fallback timestamp.', reason);
+          defaultFallbackEventEmitter();
+        });
     },
 
     closeAll() {
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index ed1bd7d1f..84c90f8b2 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -114,6 +114,7 @@ interface SentryNativeWrapper {
   getCurrentReplayId(): string | null;
 
   crashedLastRun(): Promise<boolean | null>;
+  getNewScreenTimeToDisplay(): Promise<number | null | undefined>;
 }
 
 const EOL = utf8ToBytes('\n');
@@ -656,6 +657,14 @@ export const NATIVE: SentryNativeWrapper = {
     return typeof result === 'boolean' ? result : null;
   },
 
+  getNewScreenTimeToDisplay(): Promise<number | null | undefined> {
+    if (!this.enableNative || !this._isModuleLoaded(RNSentry)) {
+      return Promise.resolve(null);
+    }
+
+    return RNSentry.getNewScreenTimeToDisplay();
+  },
+
   /**
    * Gets the event from envelopeItem and applies the level filter to the selected event.
    * @param data An envelope item containing the event.
diff --git a/test/mockWrapper.ts b/test/mockWrapper.ts
index 2d22458a6..8616334e1 100644
--- a/test/mockWrapper.ts
+++ b/test/mockWrapper.ts
@@ -55,6 +55,7 @@ const NATIVE: MockInterface<NativeType> = {
   initNativeReactNavigationNewFrameTracking: jest.fn(),
 
   crashedLastRun: jest.fn(),
+  getNewScreenTimeToDisplay: jest.fn().mockResolvedValue(42),  // Returning a number
 };
 
 NATIVE.isNativeAvailable.mockReturnValue(true);
diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index dfd63fe13..06ba50a5d 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -1,38 +1,28 @@
 import { logger } from '@sentry/utils';
 import { DeviceEventEmitter } from 'react-native';
-import * as RN from 'react-native';
 
-import type { Spec } from '../../src/js/NativeRNSentryTimeToDisplay';
 import { NewFrameEventName } from '../../src/js/utils/sentryeventemitter';
 import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryeventemitterfallback';
 
 // Mock dependencies
+
 jest.mock('react-native', () => {
-  const RNSentryTimeToDisplay: Spec = {
-    requestAnimationFrame: jest.fn(() => Promise.resolve(12345)),
-    isAvailable: () => true,
-  };
   return {
     DeviceEventEmitter: {
       addListener: jest.fn(),
       emit: jest.fn(),
     },
-    NativeModules: {
-      RNSentryTimeToDisplay,
-    },
     Platform: {
       OS: 'ios',
     },
   };
 });
 
-const RNSentryTimeToDisplay = RN.NativeModules.RNSentryTimeToDisplay as Spec;
-
 jest.mock('../../src/js/utils/environment', () => ({
   isTurboModuleEnabled: () => false,
 }));
 
-jest.mock('../../src/js/wrapper', () => jest.requireActual('../mockWrapper'));
+jest.mock('../../src/js/wrapper', () =>  jest.requireActual('../mockWrapper'));
 
 jest.mock('@sentry/utils', () => ({
   logger: {
@@ -41,6 +31,8 @@ jest.mock('@sentry/utils', () => ({
   },
 }));
 
+import { NATIVE } from '../../src/js/wrapper';
+
 describe('SentryEventEmitterFallback', () => {
   let emitter: ReturnType<typeof createSentryFallbackEventEmitter>;
 
@@ -49,12 +41,13 @@ describe('SentryEventEmitterFallback', () => {
     // @ts-expect-error test
     jest.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => cb());
     emitter = createSentryFallbackEventEmitter();
+    NATIVE.getNewScreenTimeToDisplay = jest.fn(() => Promise.resolve(12345))
   });
 
   afterEach(() => {
     // @ts-expect-error test
     window.requestAnimationFrame.mockRestore();
-    RNSentryTimeToDisplay.isAvailable = () => true;
+    NATIVE.getNewScreenTimeToDisplay = jest.fn()
   });
 
   it('should initialize and add a listener', () => {
@@ -63,19 +56,47 @@ describe('SentryEventEmitterFallback', () => {
     expect(DeviceEventEmitter.addListener).toHaveBeenCalledWith(NewFrameEventName, expect.any(Function));
   });
 
-  it('should start listener and use fallback when native call returned a value', async () => {
+  it('should start listener and use fallback when native call returned undefined/null', async () => {
+    jest.useFakeTimers();
     const fallbackTime = Date.now() / 1000;
 
-    jest.useFakeTimers();
+    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
+    animation.mockReturnValue(Promise.resolve());
+
+    emitter.startListenerAsync();
+    await animation; // wait for the Native execution to be completed.
+
+    await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
+    expect(logger.error).not.toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
+
+    // Simulate retries and timer
+    jest.runAllTimers();
+
+    // Ensure fallback event is emitted
+    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+      newFrameTimestampInSeconds: fallbackTime,
+      isFallback: true,
+    });
+    expect(logger.log).toHaveBeenCalledWith(
+      expect.stringContaining(
+        '[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.',
+      ),
+    );
+
+  });
 
-    (RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock).mockResolvedValueOnce(fallbackTime);
+  it('should start listener and use fallback when native call fails', async () => {
+    jest.useFakeTimers();
+    const fallbackTime = Date.now() / 1000;
 
-    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
+    animation.mockRejectedValueOnce(new Error('Failed'));
 
     emitter.startListenerAsync();
     await animation; // wait for the Native execution to be completed.
 
-    await expect(RNSentryTimeToDisplay.requestAnimationFrame).toHaveBeenCalled();
+    await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
+    expect(logger.error).toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
 
     // Simulate retries and timer
     jest.runAllTimers();
@@ -86,21 +107,24 @@ describe('SentryEventEmitterFallback', () => {
       isFallback: true,
     });
     expect(logger.log).toHaveBeenCalledWith(
-      expect.stringContaining('[Sentry] Native event emitter did not reply in time. Using Native fallback emitter.'),
+      expect.stringContaining(
+        '[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.',
+      ),
     );
   });
 
+
   it('should start listener and use fallback when native call fails', async () => {
     jest.useFakeTimers();
     const fallbackTime = Date.now() / 1000;
 
-    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
     animation.mockRejectedValueOnce(new Error('Failed'));
 
     emitter.startListenerAsync();
     await animation; // wait for the Native execution to be completed.
 
-    await expect(RNSentryTimeToDisplay.requestAnimationFrame).toHaveBeenCalled();
+    await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
     expect(logger.error).toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
 
     // Simulate retries and timer
@@ -122,8 +146,8 @@ describe('SentryEventEmitterFallback', () => {
     jest.useFakeTimers();
     const fallbackTime = Date.now() / 1000;
 
-    RNSentryTimeToDisplay.isAvailable = () => false;
-    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+    NATIVE.getNewScreenTimeToDisplay = () => Promise.resolve(null);
+    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
 
     emitter.startListenerAsync();
     await animation; // wait for the Native execution to be completed.
@@ -146,17 +170,17 @@ describe('SentryEventEmitterFallback', () => {
   it('should start listener and call native when native module is available', async () => {
     const nativeTimestamp = 12345;
 
-    (RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock).mockResolvedValueOnce(nativeTimestamp);
+    (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockResolvedValueOnce(nativeTimestamp);
 
     emitter.startListenerAsync();
 
-    expect(RNSentryTimeToDisplay.requestAnimationFrame).toHaveBeenCalled();
+    expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
   });
 
   it('should not emit if original event emitter was called', async () => {
     jest.useFakeTimers();
 
-    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
 
     const mockAddListener = jest.fn();
     DeviceEventEmitter.addListener = mockAddListener;
@@ -189,7 +213,7 @@ describe('SentryEventEmitterFallback', () => {
   it('should retry up to maxRetries and emit fallback if no response', async () => {
     jest.useFakeTimers();
 
-    const animation = RNSentryTimeToDisplay.requestAnimationFrame as jest.Mock;
+    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
     emitter.startListenerAsync();
     await animation; // wait for the Native execution to be completed.
 

From d03004c23b8801e4acbac08f16ca881fd3f25aac Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Fri, 20 Sep 2024 16:50:08 -0300
Subject: [PATCH 24/47] yarn fix

---
 src/js/utils/sentryeventemitterfallback.ts    | 9 +++------
 test/mockWrapper.ts                           | 2 +-
 test/utils/sentryeventemitterfallback.test.ts | 8 +++-----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 80bc674db..d7838f86f 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -5,8 +5,6 @@ import { DeviceEventEmitter } from 'react-native';
 import { NATIVE } from '../wrapper';
 import { NewFrameEventName } from './sentryeventemitter';
 
-
-
 export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number; isFallback?: boolean };
 export interface SentryEventEmitterFallback {
   /**
@@ -85,14 +83,13 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
       isListening = true;
 
       NATIVE.getNewScreenTimeToDisplay()
-        .then((resolve => {
+        .then(resolve => {
           if (resolve) {
             waitForNativeResponseOrFallback(resolve, 'Native');
-          }
-          else {
+          } else {
             defaultFallbackEventEmitter();
           }
-        }))
+        })
         .catch((reason: Error) => {
           logger.error('Failed to recceive Native fallback timestamp.', reason);
           defaultFallbackEventEmitter();
diff --git a/test/mockWrapper.ts b/test/mockWrapper.ts
index 8616334e1..02cb6a675 100644
--- a/test/mockWrapper.ts
+++ b/test/mockWrapper.ts
@@ -55,7 +55,7 @@ const NATIVE: MockInterface<NativeType> = {
   initNativeReactNavigationNewFrameTracking: jest.fn(),
 
   crashedLastRun: jest.fn(),
-  getNewScreenTimeToDisplay: jest.fn().mockResolvedValue(42),  // Returning a number
+  getNewScreenTimeToDisplay: jest.fn().mockResolvedValue(42),
 };
 
 NATIVE.isNativeAvailable.mockReturnValue(true);
diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index 06ba50a5d..88a2685dd 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -22,7 +22,7 @@ jest.mock('../../src/js/utils/environment', () => ({
   isTurboModuleEnabled: () => false,
 }));
 
-jest.mock('../../src/js/wrapper', () =>  jest.requireActual('../mockWrapper'));
+jest.mock('../../src/js/wrapper', () => jest.requireActual('../mockWrapper'));
 
 jest.mock('@sentry/utils', () => ({
   logger: {
@@ -41,13 +41,13 @@ describe('SentryEventEmitterFallback', () => {
     // @ts-expect-error test
     jest.spyOn(window, 'requestAnimationFrame').mockImplementation(cb => cb());
     emitter = createSentryFallbackEventEmitter();
-    NATIVE.getNewScreenTimeToDisplay = jest.fn(() => Promise.resolve(12345))
+    NATIVE.getNewScreenTimeToDisplay = jest.fn(() => Promise.resolve(12345));
   });
 
   afterEach(() => {
     // @ts-expect-error test
     window.requestAnimationFrame.mockRestore();
-    NATIVE.getNewScreenTimeToDisplay = jest.fn()
+    NATIVE.getNewScreenTimeToDisplay = jest.fn();
   });
 
   it('should initialize and add a listener', () => {
@@ -82,7 +82,6 @@ describe('SentryEventEmitterFallback', () => {
         '[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.',
       ),
     );
-
   });
 
   it('should start listener and use fallback when native call fails', async () => {
@@ -113,7 +112,6 @@ describe('SentryEventEmitterFallback', () => {
     );
   });
 
-
   it('should start listener and use fallback when native call fails', async () => {
     jest.useFakeTimers();
     const fallbackTime = Date.now() / 1000;

From 7e5f764b08d5c477f0405a786fa459344bbf4c6d Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Fri, 20 Sep 2024 17:58:51 -0300
Subject: [PATCH 25/47] fix ios reference

---
 ios/RNSentry.mm             | 19 +++++--------------
 ios/RNSentryTimeToDisplay.h |  2 +-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 87370ec2f..05344cd5a 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -1,5 +1,6 @@
 #import <dlfcn.h>
 #import "RNSentry.h"
+#import  "RNSentryTimeToDisplay.h"
 
 #if __has_include(<React/RCTConvert.h>)
 #import <React/RCTConvert.h>
@@ -107,7 +108,7 @@ + (BOOL)requiresMainQueueSetup {
         sentHybridSdkDidBecomeActive = true;
     }
 
-    _timeToDisplay = [[RNSentryTimeToDisplayModule alloc] init];
+    _timeToDisplay = [[RNSentryTimeToDisplay alloc] init];
 
 #if SENTRY_TARGET_REPLAY_SUPPORTED
     [RNSentryReplay postInit];
@@ -779,19 +780,9 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
 }
 #endif
 
-// Expose timeToDisplay to JS as an object with properties
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getTimeToDisplay) {
-    NSMutableDictionary *timeToDisplayDict = [NSMutableDictionary new];
-
-    // Expose the methods as key-value pairs
-    timeToDisplayDict[@"requestAnimationFrame"] = @([_timeToDisplay requestAnimationFrame]);
-    timeToDisplayDict[@"isAvailable"] = @([_timeToDisplay isAvailable]);
-
-    return timeToDisplayDict;
-}
-
-RCT_EXPORT_METHOD(getTimeToDisplay:(RCTResponseSenderBlock)callback) {
-  [_timeToDisplay getNewScreenTimeToDisplay:callback];
+RCT_EXPORT_METHOD(getNewScreenTimeToDisplay:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+  [_timeToDisplay getTimeToDisplay:resolve];
 }
 
 
diff --git a/ios/RNSentryTimeToDisplay.h b/ios/RNSentryTimeToDisplay.h
index 7e47e3fc8..fbb468cb2 100644
--- a/ios/RNSentryTimeToDisplay.h
+++ b/ios/RNSentryTimeToDisplay.h
@@ -1,6 +1,6 @@
 #import <React/RCTBridgeModule.h>
 
-@interface RNSentryTimeToDisplayModule : NSObject
+@interface RNSentryTimeToDisplay : NSObject
 
 - (void)getTimeToDisplay:(RCTResponseSenderBlock)callback;
 

From a22824b207255115ad6f809b7b2aa7fb48df01a4 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 23 Sep 2024 16:52:54 -0300
Subject: [PATCH 26/47] changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 886ec89de..612d54ebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Enhanced accuracy of time-to-display spans. ([#4042](https://github.com/getsentry/sentry-react-native/pull/4042))
+
 ## 5.33.1
 
 ### Internal

From c99200dbd6eaf039b919b36ff840f393303dd5e7 Mon Sep 17 00:00:00 2001
From: LucasZF <lucas-zimerman1@hotmail.com>
Date: Mon, 23 Sep 2024 17:08:44 -0300
Subject: [PATCH 27/47] Apply suggestions from code review

---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java   | 5 +----
 android/src/main/java/io/sentry/react/RNSentryPackage.java  | 6 +++---
 .../main/java/io/sentry/react/RNSentryTimeToDisplay.java    | 1 -
 ios/RNSentry.mm                                             | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 89f2af4a6..2bb38f5e6 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -1,4 +1,5 @@
 package io.sentry.react;
+
 import android.view.Choreographer;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static io.sentry.android.core.internal.util.ScreenshotUtils.takeScreenshot;
@@ -135,11 +136,7 @@ public class RNSentryModuleImpl {
     /** Max trace file size in bytes. */
     private long maxTraceFileSize = 5 * 1024 * 1024;
 
-
-
   private final RNSentryTimeToDisplay timeToDisplay;
-
-
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
       packageInfo = getPackageInfo(reactApplicationContext);
       this.reactApplicationContext = reactApplicationContext;
diff --git a/android/src/main/java/io/sentry/react/RNSentryPackage.java b/android/src/main/java/io/sentry/react/RNSentryPackage.java
index 75058c699..cb62d6369 100644
--- a/android/src/main/java/io/sentry/react/RNSentryPackage.java
+++ b/android/src/main/java/io/sentry/react/RNSentryPackage.java
@@ -20,9 +20,9 @@ public class RNSentryPackage extends TurboReactPackage {
   @Nullable
   @Override
   public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-      if (name.equals(RNSentryModuleImpl.NAME)) {
-        return new RNSentryModule(reactContext);
-      } else {
+    if (name.equals(RNSentryModuleImpl.NAME)) {
+      return new RNSentryModule(reactContext);
+    } else {
       return null;
     }
   }
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index c8610c20a..eaa1c4e7d 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -15,7 +15,6 @@
 import io.sentry.SentryDateProvider;
 import io.sentry.android.core.SentryAndroidDateProvider;
 
-
 public class RNSentryTimeToDisplay {
 
     public void GetTimeToDisplay(Promise promise) {
diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 05344cd5a..18e982ac4 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -785,5 +785,4 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
   [_timeToDisplay getTimeToDisplay:resolve];
 }
 
-
 @end

From 64fd7607e90ccdeee546be2ca327ac31f7065306 Mon Sep 17 00:00:00 2001
From: LucasZF <lucas-zimerman1@hotmail.com>
Date: Tue, 24 Sep 2024 11:42:03 -0300
Subject: [PATCH 28/47] Apply suggestions from code review

Co-authored-by: Antonis Lilis <antonis.lilis@gmail.com>
---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 4 ++--
 .../main/java/io/sentry/react/RNSentryTimeToDisplay.java  | 8 +-------
 .../src/newarch/java/io/sentry/react/RNSentryModule.java  | 6 +++---
 ios/RNSentry.mm                                           | 4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 2bb38f5e6..4eec469f0 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -1,6 +1,5 @@
 package io.sentry.react;
 
-import android.view.Choreographer;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static io.sentry.android.core.internal.util.ScreenshotUtils.takeScreenshot;
 import static io.sentry.vendor.Base64.NO_PADDING;
@@ -136,7 +135,8 @@ public class RNSentryModuleImpl {
     /** Max trace file size in bytes. */
     private long maxTraceFileSize = 5 * 1024 * 1024;
 
-  private final RNSentryTimeToDisplay timeToDisplay;
+     private final RNSentryTimeToDisplay timeToDisplay;
+     
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
       packageInfo = getPackageInfo(reactApplicationContext);
       this.reactApplicationContext = reactApplicationContext;
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index eaa1c4e7d..b1af0a4b1 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -1,10 +1,6 @@
 package io.sentry.react;
 
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.Promise;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 
 import android.view.Choreographer;
 
@@ -21,9 +17,7 @@ public void GetTimeToDisplay(Promise promise) {
         Choreographer choreographer = Choreographer.getInstance();
 
         // Invoke the callback after the frame is rendered
-        choreographer.postFrameCallback(new Choreographer.FrameCallback() {
-            @Override
-            public void doFrame(long frameTimeNanos) {
+        choreographer.postFrameCallback(frameTimeNanos -> {
                 final @NotNull SentryDateProvider dateProvider = new SentryAndroidDateProvider();
 
                 final SentryDate endDate = dateProvider.now();
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
index abfa6d7b5..f5868ce20 100644
--- a/android/src/newarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
@@ -174,8 +174,8 @@ public void crashedLastRun(Promise promise) {
         this.impl.crashedLastRun(promise);
     }
 
-      @Override
-     public void getNewScreenTimeToDisplay(Promise promise) {
+    @Override
+    public void getNewScreenTimeToDisplay(Promise promise) {
         this.impl.getNewScreenTimeToDisplay(promise);
-     }
+    }
 }
diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 18e982ac4..68ac760a5 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -1,6 +1,6 @@
 #import <dlfcn.h>
 #import "RNSentry.h"
-#import  "RNSentryTimeToDisplay.h"
+#import "RNSentryTimeToDisplay.h"
 
 #if __has_include(<React/RCTConvert.h>)
 #import <React/RCTConvert.h>
@@ -782,7 +782,7 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
 
 RCT_EXPORT_METHOD(getNewScreenTimeToDisplay:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-  [_timeToDisplay getTimeToDisplay:resolve];
+    [_timeToDisplay getTimeToDisplay:resolve];
 }
 
 @end

From dc9ca958c867cfc2e03d62dfa66117159bf74974 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Tue, 24 Sep 2024 12:43:01 -0300
Subject: [PATCH 29/47] fix build

---
 android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index b1af0a4b1..f776197a5 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -23,7 +23,6 @@ public void GetTimeToDisplay(Promise promise) {
                 final SentryDate endDate = dateProvider.now();
 
                 promise.resolve(endDate.nanoTimestamp() / 1e9);
-            }
         });
     }
 }

From 471084346acc678dde4124794e90bb60062cce9e Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Wed, 25 Sep 2024 22:00:48 +0300
Subject: [PATCH 30/47] Removes unused java imports (#4119)

---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java    | 5 -----
 .../src/main/java/io/sentry/react/RNSentryTimeToDisplay.java | 2 --
 2 files changed, 7 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 4eec469f0..6226df6e4 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -41,15 +41,11 @@
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
-import io.sentry.Breadcrumb;
-import io.sentry.DateUtils;
 import io.sentry.HubAdapter;
 import io.sentry.ILogger;
 import io.sentry.ISentryExecutorService;
@@ -79,7 +75,6 @@
 import io.sentry.android.core.ViewHierarchyEventProcessor;
 import io.sentry.android.core.internal.debugmeta.AssetsDebugMetaLoader;
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
-import io.sentry.android.core.performance.AppStartMetrics;
 import io.sentry.protocol.SdkVersion;
 import io.sentry.protocol.SentryException;
 import io.sentry.protocol.SentryId;
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index f776197a5..3bfaec9e0 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -4,8 +4,6 @@
 
 import android.view.Choreographer;
 
-import androidx.annotation.NonNull;
-
 import org.jetbrains.annotations.NotNull;
 import io.sentry.SentryDate;
 import io.sentry.SentryDateProvider;

From 45fca09e78233bb6d1106fcb3ac4931ae989a9d9 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Thu, 10 Oct 2024 00:45:33 -0300
Subject: [PATCH 31/47] add missing App Metrics import

---
 android/src/main/java/io/sentry/react/RNSentryModuleImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index ace0694c5..953cae685 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -75,6 +75,7 @@
 import io.sentry.android.core.ViewHierarchyEventProcessor;
 import io.sentry.android.core.internal.debugmeta.AssetsDebugMetaLoader;
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
+import io.sentry.android.core.performance.AppStartMetrics;
 import io.sentry.protocol.SdkVersion;
 import io.sentry.protocol.SentryException;
 import io.sentry.protocol.SentryId;
@@ -131,7 +132,7 @@ public class RNSentryModuleImpl {
     private long maxTraceFileSize = 5 * 1024 * 1024;
 
      private final RNSentryTimeToDisplay timeToDisplay;
-     
+
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
       packageInfo = getPackageInfo(reactApplicationContext);
       this.reactApplicationContext = reactApplicationContext;

From 966ce1e6cd4e322a60f0aeb73a84f2107966451b Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 22:36:24 -0300
Subject: [PATCH 32/47] refactor tests / remove closeAll

---
 src/js/utils/sentryeventemitterfallback.ts    |  6 ---
 test/utils/sentryeventemitterfallback.test.ts | 46 ++++++++-----------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index d7838f86f..89063f7b4 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -12,7 +12,6 @@ export interface SentryEventEmitterFallback {
    * This method is synchronous in JS but the event emitter starts asynchronously.
    */
   initAsync: () => void;
-  closeAll: () => void;
   startListenerAsync: () => void;
 }
 
@@ -25,7 +24,6 @@ function timeNowNanosecond(): number {
  */
 export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   let NativeEmitterCalled: boolean = false;
-  let subscription: EmitterSubscription | undefined = undefined;
   let isListening = false;
 
   function defaultFallbackEventEmitter(): void {
@@ -95,9 +93,5 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
           defaultFallbackEventEmitter();
         });
     },
-
-    closeAll() {
-      subscription?.remove();
-    },
   };
 }
diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index 88a2685dd..3e3fa1525 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -60,11 +60,12 @@ describe('SentryEventEmitterFallback', () => {
     jest.useFakeTimers();
     const fallbackTime = Date.now() / 1000;
 
-    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
-    animation.mockReturnValue(Promise.resolve());
+    (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockReturnValue(Promise.resolve());
 
     emitter.startListenerAsync();
-    await animation; // wait for the Native execution to be completed.
+
+    // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
+    await Promise.resolve();
 
     await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
     expect(logger.error).not.toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
@@ -88,11 +89,12 @@ describe('SentryEventEmitterFallback', () => {
     jest.useFakeTimers();
     const fallbackTime = Date.now() / 1000;
 
-    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
-    animation.mockRejectedValueOnce(new Error('Failed'));
+    (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockRejectedValue(new Error('Failed'));
 
     emitter.startListenerAsync();
-    await animation; // wait for the Native execution to be completed.
+
+    // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
+    await Promise.resolve();
 
     await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
     expect(logger.error).toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
@@ -116,11 +118,12 @@ describe('SentryEventEmitterFallback', () => {
     jest.useFakeTimers();
     const fallbackTime = Date.now() / 1000;
 
-    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
-    animation.mockRejectedValueOnce(new Error('Failed'));
+    (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockRejectedValue(new Error('Failed'));
 
     emitter.startListenerAsync();
-    await animation; // wait for the Native execution to be completed.
+
+    // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
+    await Promise.resolve();
 
     await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
     expect(logger.error).toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
@@ -145,10 +148,11 @@ describe('SentryEventEmitterFallback', () => {
     const fallbackTime = Date.now() / 1000;
 
     NATIVE.getNewScreenTimeToDisplay = () => Promise.resolve(null);
-    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
 
     emitter.startListenerAsync();
-    await animation; // wait for the Native execution to be completed.
+
+    // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
+    await Promise.resolve();
 
     // Simulate retries and timer
     jest.runAllTimers();
@@ -178,8 +182,6 @@ describe('SentryEventEmitterFallback', () => {
   it('should not emit if original event emitter was called', async () => {
     jest.useFakeTimers();
 
-    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
-
     const mockAddListener = jest.fn();
     DeviceEventEmitter.addListener = mockAddListener;
 
@@ -199,7 +201,8 @@ describe('SentryEventEmitterFallback', () => {
     emitter.startListenerAsync();
     callback();
 
-    await animation; // wait for the Native execution to be completed.
+    // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
+    await Promise.resolve();
 
     // Simulate retries and timer
     jest.runAllTimers();
@@ -211,9 +214,10 @@ describe('SentryEventEmitterFallback', () => {
   it('should retry up to maxRetries and emit fallback if no response', async () => {
     jest.useFakeTimers();
 
-    const animation = NATIVE.getNewScreenTimeToDisplay as jest.Mock;
     emitter.startListenerAsync();
-    await animation; // wait for the Native execution to be completed.
+
+    // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
+    await Promise.resolve();
 
     expect(logger.log).not.toHaveBeenCalled();
 
@@ -228,14 +232,4 @@ describe('SentryEventEmitterFallback', () => {
 
     jest.useRealTimers();
   });
-
-  it('should remove subscription when closeAll is called', () => {
-    const mockRemove = jest.fn();
-    (DeviceEventEmitter.addListener as jest.Mock).mockReturnValue({ remove: mockRemove });
-
-    emitter.initAsync();
-    emitter.closeAll();
-
-    expect(mockRemove).toHaveBeenCalled();
-  });
 });

From 4bb643455d579c48128ea58126e24e61881791ce Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 22:37:49 -0300
Subject: [PATCH 33/47] commit java suggestion

---
 android/src/main/java/io/sentry/react/RNSentryModuleImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index dedd9cb9c..41293e9c9 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -131,7 +131,7 @@ public class RNSentryModuleImpl {
     /** Max trace file size in bytes. */
     private long maxTraceFileSize = 5 * 1024 * 1024;
 
-     private final RNSentryTimeToDisplay timeToDisplay;
+    private final RNSentryTimeToDisplay timeToDisplay;
 
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
       packageInfo = getPackageInfo(reactApplicationContext);

From add7f95423fdb166a7502d4642ab0ce53416ceff Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 22:42:32 -0300
Subject: [PATCH 34/47] build fix

---
 src/js/utils/sentryeventemitterfallback.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 89063f7b4..07244c80a 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -69,7 +69,7 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
 
   return {
     initAsync() {
-      subscription = DeviceEventEmitter.addListener(NewFrameEventName, () => {
+      DeviceEventEmitter.addListener(NewFrameEventName, () => {
         // Avoid noise from pages that we do not want to track.
         if (isListening) {
           NativeEmitterCalled = true;

From 55e6589e079b2325a9ca7b03437431a1923ca304 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 22:57:29 -0300
Subject: [PATCH 35/47] small refactor and add clearTimeout

---
 src/js/utils/sentryeventemitterfallback.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 07244c80a..d4a6fcb88 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -1,5 +1,4 @@
 import { logger } from '@sentry/utils';
-import type { EmitterSubscription } from 'react-native';
 import { DeviceEventEmitter } from 'react-native';
 
 import { NATIVE } from '../wrapper';
@@ -25,6 +24,7 @@ function timeNowNanosecond(): number {
 export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   let NativeEmitterCalled: boolean = false;
   let isListening = false;
+  let timeoutId: NodeJS.Timeout | null = null; // Declare a variable to store the timeout ID
 
   function defaultFallbackEventEmitter(): void {
     // Schedule the callback to be executed when all UI Frames have flushed.
@@ -40,19 +40,17 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   }
 
   function waitForNativeResponseOrFallback(fallbackSeconds: number, origin: string): void {
-    const maxRetries = 3;
-    let retries = 0;
+    let firstAttemptCompleted = false;
 
-    const retryCheck = (): void => {
+    const checkNativeResponse = (): void => {
       if (NativeEmitterCalled) {
         NativeEmitterCalled = false;
         isListening = false;
         return; // Native Replied the bridge with a timestamp.
       }
-
-      retries++;
-      if (retries < maxRetries) {
-        setTimeout(retryCheck, 1_000);
+      if (!firstAttemptCompleted) {
+        firstAttemptCompleted = true;
+        timeoutId = setTimeout(checkNativeResponse, 3_000);
       } else {
         logger.log(`[Sentry] Native event emitter did not reply in time. Using ${origin} fallback emitter.`);
         isListening = false;
@@ -64,17 +62,21 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
     };
 
     // Start the retry process
-    retryCheck();
+    checkNativeResponse();
   }
 
   return {
     initAsync() {
       DeviceEventEmitter.addListener(NewFrameEventName, () => {
+        if (timeoutId) {
+          clearTimeout(timeoutId); // Clear the timeout when native responds
+          timeoutId = null;
+        }
         // Avoid noise from pages that we do not want to track.
         if (isListening) {
           NativeEmitterCalled = true;
         }
-      });
+    });
     },
 
     startListenerAsync() {

From 9885a1596fdd0926f3c5cee1e252ff416905febf Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 23:00:07 -0300
Subject: [PATCH 36/47] use sentry timestampInSeconds

---
 src/js/utils/sentryeventemitterfallback.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index d4a6fcb88..fc378a1d4 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -1,4 +1,4 @@
-import { logger } from '@sentry/utils';
+import { logger, timestampInSeconds } from '@sentry/utils';
 import { DeviceEventEmitter } from 'react-native';
 
 import { NATIVE } from '../wrapper';
@@ -14,10 +14,6 @@ export interface SentryEventEmitterFallback {
   startListenerAsync: () => void;
 }
 
-function timeNowNanosecond(): number {
-  return Date.now() / 1000; // Convert to nanoseconds
-}
-
 /**
  * Creates emitter that allows to listen to UI Frame events when ready.
  */
@@ -34,8 +30,8 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
         isListening = false;
         return;
       }
-      const timestampInSeconds = timeNowNanosecond();
-      waitForNativeResponseOrFallback(timestampInSeconds, 'JavaScript');
+      const seconds = timestampInSeconds();
+      waitForNativeResponseOrFallback(seconds, 'JavaScript');
     });
   }
 

From d87b40eb7a328f90c9dc233c8e4c5ec800ef6a35 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 23:23:41 -0300
Subject: [PATCH 37/47] removed fallback from navigation, comment on timeout
 difference

---
 src/js/tracing/reactnavigation.ts          | 5 -----
 src/js/utils/sentryeventemitter.ts         | 7 +++++++
 src/js/utils/sentryeventemitterfallback.ts | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/js/tracing/reactnavigation.ts b/src/js/tracing/reactnavigation.ts
index 580aa90b8..00efde39f 100644
--- a/src/js/tracing/reactnavigation.ts
+++ b/src/js/tracing/reactnavigation.ts
@@ -5,7 +5,6 @@ import { logger, timestampInSeconds } from '@sentry/utils';
 
 import type { NewFrameEvent } from '../utils/sentryeventemitter';
 import { type SentryEventEmitter, createSentryEventEmitter, NewFrameEventName } from '../utils/sentryeventemitter';
-import { type SentryEventEmitterFallback, createSentryFallbackEventEmitter } from '../utils/sentryeventemitterfallback';
 import { RN_GLOBAL_OBJ } from '../utils/worldwide';
 import { NATIVE } from '../wrapper';
 import type { OnConfirmRoute, TransactionCreator } from './routingInstrumentation';
@@ -79,7 +78,6 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
 
   private _navigationContainer: NavigationContainer | null = null;
   private _newScreenFrameEventEmitter: SentryEventEmitter | null = null;
-  private _newFallbackEventEmitter: SentryEventEmitterFallback | null = null;
   private readonly _maxRecentRouteLen: number = 200;
 
   private _latestRoute?: NavigationRoute;
@@ -102,9 +100,7 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
 
     if (this._options.enableTimeToInitialDisplay) {
       this._newScreenFrameEventEmitter = createSentryEventEmitter();
-      this._newFallbackEventEmitter = createSentryFallbackEventEmitter();
       this._newScreenFrameEventEmitter.initAsync(NewFrameEventName);
-      this._newFallbackEventEmitter.initAsync();
       NATIVE.initNativeReactNavigationNewFrameTracking().catch((reason: unknown) => {
         logger.error(`[ReactNavigationInstrumentation] Failed to initialize native new frame tracking: ${reason}`);
       });
@@ -251,7 +247,6 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
             });
 
           if (!routeHasBeenSeen && latestTtidSpan) {
-            this._newFallbackEventEmitter?.startListenerAsync();
             this._newScreenFrameEventEmitter?.once(
               NewFrameEventName,
               ({ newFrameTimestampInSeconds }: NewFrameEvent) => {
diff --git a/src/js/utils/sentryeventemitter.ts b/src/js/utils/sentryeventemitter.ts
index 63146f30c..b9e1ba9e9 100644
--- a/src/js/utils/sentryeventemitter.ts
+++ b/src/js/utils/sentryeventemitter.ts
@@ -3,6 +3,7 @@ import type { EmitterSubscription, NativeModule } from 'react-native';
 import { NativeEventEmitter } from 'react-native';
 
 import { getRNSentryModule } from '../wrapper';
+import { createSentryFallbackEventEmitter } from './sentryeventemitterfallback';
 
 export const NewFrameEventName = 'rn_sentry_new_frame';
 export type NewFrameEventName = typeof NewFrameEventName;
@@ -32,6 +33,7 @@ export function createSentryEventEmitter(
   if (!sentryNativeModule) {
     return createNoopSentryEventEmitter();
   }
+  const fallbackEventEmitter = createSentryFallbackEventEmitter();
 
   const openNativeListeners = new Map<NewFrameEventName, EmitterSubscription>();
   const listenersMap = new Map<NewFrameEventName, Map<(event: NewFrameEvent) => void, true>>();
@@ -70,6 +72,8 @@ export function createSentryEventEmitter(
       openNativeListeners.set(eventType, nativeListener);
 
       listenersMap.set(eventType, new Map());
+
+      fallbackEventEmitter.initAsync();
     },
     closeAllAsync() {
       openNativeListeners.forEach(subscription => {
@@ -81,6 +85,9 @@ export function createSentryEventEmitter(
     addListener,
     removeListener,
     once(eventType: NewFrameEventName, listener: (event: NewFrameEvent) => void) {
+
+      fallbackEventEmitter?.startListenerAsync();
+
       const tmpListener = (event: NewFrameEvent): void => {
         listener(event);
         removeListener(eventType, tmpListener);
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index fc378a1d4..135c1b039 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -20,7 +20,7 @@ export interface SentryEventEmitterFallback {
 export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   let NativeEmitterCalled: boolean = false;
   let isListening = false;
-  let timeoutId: NodeJS.Timeout | null = null; // Declare a variable to store the timeout ID
+  let timeoutId: number | null = null; // Declare a variable to store the timeout ID
 
   function defaultFallbackEventEmitter(): void {
     // Schedule the callback to be executed when all UI Frames have flushed.
@@ -46,6 +46,8 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
       }
       if (!firstAttemptCompleted) {
         firstAttemptCompleted = true;
+        // in React Native, setTimeout returns number, where NodeJS returns NodeJS.Timeout, that is also compatible with number.
+        // the line below is a cosmetic error and will not affect the build.
         timeoutId = setTimeout(checkNativeResponse, 3_000);
       } else {
         logger.log(`[Sentry] Native event emitter did not reply in time. Using ${origin} fallback emitter.`);

From 962bb35e8ecb2825b9832a3bf5fec1249f1ceccb Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 23:48:38 -0300
Subject: [PATCH 38/47] requested changes java

---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 8 +++-----
 .../main/java/io/sentry/react/RNSentryTimeToDisplay.java  | 5 +----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 41293e9c9..e773237a8 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -131,13 +131,13 @@ public class RNSentryModuleImpl {
     /** Max trace file size in bytes. */
     private long maxTraceFileSize = 5 * 1024 * 1024;
 
-    private final RNSentryTimeToDisplay timeToDisplay;
+    private final @NotNull SentryDateProvider dateProvider;
 
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
       packageInfo = getPackageInfo(reactApplicationContext);
       this.reactApplicationContext = reactApplicationContext;
       this.emitNewFrameEvent = createEmitNewFrameEvent();
-      this.timeToDisplay = new RNSentryTimeToDisplay();
+      this.dateProvider = new SentryAndroidDateProvider();
     }
 
     private ReactApplicationContext getReactApplicationContext() {
@@ -149,8 +149,6 @@ private ReactApplicationContext getReactApplicationContext() {
     }
 
     private @NotNull Runnable createEmitNewFrameEvent() {
-        final @NotNull SentryDateProvider dateProvider = new SentryAndroidDateProvider();
-
         return () -> {
           final SentryDate endDate = dateProvider.now();
           WritableMap event = Arguments.createMap();
@@ -701,7 +699,7 @@ public void disableNativeFramesTracking() {
     }
 
     public void getNewScreenTimeToDisplay(Promise promise) {
-        timeToDisplay.GetTimeToDisplay(promise);
+        RNSentryTimeToDisplay.GetTimeToDisplay(promise, dateProvider);
     }
 
     private String getProfilingTracesDirPath() {
diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index 3bfaec9e0..0e54ac592 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -10,14 +10,11 @@
 import io.sentry.android.core.SentryAndroidDateProvider;
 
 public class RNSentryTimeToDisplay {
-
-    public void GetTimeToDisplay(Promise promise) {
+    public static void GetTimeToDisplay(Promise promise, SentryDateProvider dateProvider) {
         Choreographer choreographer = Choreographer.getInstance();
 
         // Invoke the callback after the frame is rendered
         choreographer.postFrameCallback(frameTimeNanos -> {
-                final @NotNull SentryDateProvider dateProvider = new SentryAndroidDateProvider();
-
                 final SentryDate endDate = dateProvider.now();
 
                 promise.resolve(endDate.nanoTimestamp() / 1e9);

From 4b820fe72bbe3b7ca03d07afc3b3d1caccf74b02 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Sun, 13 Oct 2024 23:54:03 -0300
Subject: [PATCH 39/47] yarn fix / remove clearTimeout

---
 src/js/utils/sentryeventemitter.ts         |  1 -
 src/js/utils/sentryeventemitterfallback.ts | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/js/utils/sentryeventemitter.ts b/src/js/utils/sentryeventemitter.ts
index b9e1ba9e9..e89e2a801 100644
--- a/src/js/utils/sentryeventemitter.ts
+++ b/src/js/utils/sentryeventemitter.ts
@@ -85,7 +85,6 @@ export function createSentryEventEmitter(
     addListener,
     removeListener,
     once(eventType: NewFrameEventName, listener: (event: NewFrameEvent) => void) {
-
       fallbackEventEmitter?.startListenerAsync();
 
       const tmpListener = (event: NewFrameEvent): void => {
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 135c1b039..a4d8ab4a6 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -20,7 +20,6 @@ export interface SentryEventEmitterFallback {
 export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   let NativeEmitterCalled: boolean = false;
   let isListening = false;
-  let timeoutId: number | null = null; // Declare a variable to store the timeout ID
 
   function defaultFallbackEventEmitter(): void {
     // Schedule the callback to be executed when all UI Frames have flushed.
@@ -46,9 +45,7 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
       }
       if (!firstAttemptCompleted) {
         firstAttemptCompleted = true;
-        // in React Native, setTimeout returns number, where NodeJS returns NodeJS.Timeout, that is also compatible with number.
-        // the line below is a cosmetic error and will not affect the build.
-        timeoutId = setTimeout(checkNativeResponse, 3_000);
+        setTimeout(checkNativeResponse, 3_000);
       } else {
         logger.log(`[Sentry] Native event emitter did not reply in time. Using ${origin} fallback emitter.`);
         isListening = false;
@@ -66,15 +63,11 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   return {
     initAsync() {
       DeviceEventEmitter.addListener(NewFrameEventName, () => {
-        if (timeoutId) {
-          clearTimeout(timeoutId); // Clear the timeout when native responds
-          timeoutId = null;
-        }
         // Avoid noise from pages that we do not want to track.
         if (isListening) {
           NativeEmitterCalled = true;
         }
-    });
+      });
     },
 
     startListenerAsync() {

From a99c3c16f0dffb552e5b61c685c0a2589dea0161 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 14 Oct 2024 00:17:16 -0300
Subject: [PATCH 40/47] add note and fix time tests

---
 src/js/utils/sentryeventemitterfallback.ts    |  5 +++-
 test/utils/sentryeventemitterfallback.test.ts | 23 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index a4d8ab4a6..ce0b9538a 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -22,7 +22,10 @@ export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
   let isListening = false;
 
   function defaultFallbackEventEmitter(): void {
-    // Schedule the callback to be executed when all UI Frames have flushed.
+    // https://reactnative.dev/docs/timers#timers
+    // NOTE: The current implementation of requestAnimationFrame is the same
+    // as setTimeout(0). This isn't exactly how requestAnimationFrame
+    // is supposed to work on web, so it doesn't get called when UI Frames are rendered.: https://github.com/facebook/react-native/blob/5106933c750fee2ce49fe1945c3e3763eebc92bc/packages/react-native/ReactCommon/react/runtime/TimerManager.cpp#L442-L443
     requestAnimationFrame(() => {
       if (NativeEmitterCalled) {
         NativeEmitterCalled = false;
diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index 3e3fa1525..cea404b60 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -1,4 +1,3 @@
-import { logger } from '@sentry/utils';
 import { DeviceEventEmitter } from 'react-native';
 
 import { NewFrameEventName } from '../../src/js/utils/sentryeventemitter';
@@ -24,12 +23,11 @@ jest.mock('../../src/js/utils/environment', () => ({
 
 jest.mock('../../src/js/wrapper', () => jest.requireActual('../mockWrapper'));
 
-jest.mock('@sentry/utils', () => ({
-  logger: {
-    log: jest.fn(),
-    error: jest.fn(),
-  },
-}));
+jest.spyOn(logger, 'warn');
+jest.spyOn(logger, 'log');
+jest.spyOn(logger, 'error');
+
+import { logger } from '@sentry/utils';
 
 import { NATIVE } from '../../src/js/wrapper';
 
@@ -58,7 +56,9 @@ describe('SentryEventEmitterFallback', () => {
 
   it('should start listener and use fallback when native call returned undefined/null', async () => {
     jest.useFakeTimers();
+    const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds');
     const fallbackTime = Date.now() / 1000;
+    spy.mockReturnValue(fallbackTime);
 
     (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockReturnValue(Promise.resolve());
 
@@ -87,12 +87,15 @@ describe('SentryEventEmitterFallback', () => {
 
   it('should start listener and use fallback when native call fails', async () => {
     jest.useFakeTimers();
-    const fallbackTime = Date.now() / 1000;
 
     (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockRejectedValue(new Error('Failed'));
 
     emitter.startListenerAsync();
 
+    const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds');
+    const fallbackTime = Date.now() / 1000;
+    spy.mockReturnValue(fallbackTime);
+
     // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
     await Promise.resolve();
 
@@ -116,7 +119,9 @@ describe('SentryEventEmitterFallback', () => {
 
   it('should start listener and use fallback when native call fails', async () => {
     jest.useFakeTimers();
+    const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds');
     const fallbackTime = Date.now() / 1000;
+    spy.mockReturnValue(fallbackTime);
 
     (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockRejectedValue(new Error('Failed'));
 
@@ -145,7 +150,9 @@ describe('SentryEventEmitterFallback', () => {
 
   it('should start listener and use fallback when native call is not available', async () => {
     jest.useFakeTimers();
+    const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds');
     const fallbackTime = Date.now() / 1000;
+    spy.mockReturnValue(fallbackTime);
 
     NATIVE.getNewScreenTimeToDisplay = () => Promise.resolve(null);
 

From 4203401ed7c061e28e262cc83e68d72985144d1d Mon Sep 17 00:00:00 2001
From: LucasZF <lucas-zimerman1@hotmail.com>
Date: Mon, 14 Oct 2024 13:42:01 -0300
Subject: [PATCH 41/47] Kw fallback emitter suggestion (#4171)

* Emitter suggestion

* fix tests

---------

Co-authored-by: Krystof Woldrich <krystof.woldrich@sentry.io>
---
 src/js/utils/sentryeventemitter.ts            |   2 +-
 src/js/utils/sentryeventemitterfallback.ts    | 115 +++++++++---------
 test/utils/sentryeventemitterfallback.test.ts |  86 ++++++-------
 3 files changed, 100 insertions(+), 103 deletions(-)

diff --git a/src/js/utils/sentryeventemitter.ts b/src/js/utils/sentryeventemitter.ts
index e89e2a801..d231c787a 100644
--- a/src/js/utils/sentryeventemitter.ts
+++ b/src/js/utils/sentryeventemitter.ts
@@ -85,7 +85,7 @@ export function createSentryEventEmitter(
     addListener,
     removeListener,
     once(eventType: NewFrameEventName, listener: (event: NewFrameEvent) => void) {
-      fallbackEventEmitter?.startListenerAsync();
+      fallbackEventEmitter?.onceNewFrame();
 
       const tmpListener = (event: NewFrameEvent): void => {
         listener(event);
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index ce0b9538a..8bc82c900 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -1,8 +1,10 @@
 import { logger, timestampInSeconds } from '@sentry/utils';
-import { DeviceEventEmitter } from 'react-native';
 
 import { NATIVE } from '../wrapper';
-import { NewFrameEventName } from './sentryeventemitter';
+import type { NewFrameEvent, SentryEventEmitter } from './sentryeventemitter';
+import { createSentryEventEmitter, NewFrameEventName } from './sentryeventemitter';
+
+export const FALLBACK_TIMEOUT_MS = 10_000;
 
 export type FallBackNewFrameEvent = { newFrameTimestampInSeconds: number; isFallback?: boolean };
 export interface SentryEventEmitterFallback {
@@ -11,83 +13,84 @@ export interface SentryEventEmitterFallback {
    * This method is synchronous in JS but the event emitter starts asynchronously.
    */
   initAsync: () => void;
-  startListenerAsync: () => void;
+  onceNewFrame: (listener: (event: FallBackNewFrameEvent) => void) => void;
 }
 
 /**
  * Creates emitter that allows to listen to UI Frame events when ready.
  */
-export function createSentryFallbackEventEmitter(): SentryEventEmitterFallback {
-  let NativeEmitterCalled: boolean = false;
-  let isListening = false;
+export function createSentryFallbackEventEmitter(
+  emitter: SentryEventEmitter = createSentryEventEmitter(),
+  fallbackTimeoutMs = FALLBACK_TIMEOUT_MS,
+): SentryEventEmitterFallback {
+  let fallbackTimeout: ReturnType<typeof setTimeout> | undefined;
+  let animationFrameTimestampSeconds: number | undefined;
+  let nativeNewFrameTimestampSeconds: number | undefined;
 
-  function defaultFallbackEventEmitter(): void {
+  function getAnimationFrameTimestampSeconds(): void {
     // https://reactnative.dev/docs/timers#timers
     // NOTE: The current implementation of requestAnimationFrame is the same
     // as setTimeout(0). This isn't exactly how requestAnimationFrame
     // is supposed to work on web, so it doesn't get called when UI Frames are rendered.: https://github.com/facebook/react-native/blob/5106933c750fee2ce49fe1945c3e3763eebc92bc/packages/react-native/ReactCommon/react/runtime/TimerManager.cpp#L442-L443
     requestAnimationFrame(() => {
-      if (NativeEmitterCalled) {
-        NativeEmitterCalled = false;
-        isListening = false;
+      if (fallbackTimeout === undefined) {
         return;
       }
-      const seconds = timestampInSeconds();
-      waitForNativeResponseOrFallback(seconds, 'JavaScript');
+      animationFrameTimestampSeconds = timestampInSeconds();
     });
   }
 
-  function waitForNativeResponseOrFallback(fallbackSeconds: number, origin: string): void {
-    let firstAttemptCompleted = false;
-
-    const checkNativeResponse = (): void => {
-      if (NativeEmitterCalled) {
-        NativeEmitterCalled = false;
-        isListening = false;
-        return; // Native Replied the bridge with a timestamp.
-      }
-      if (!firstAttemptCompleted) {
-        firstAttemptCompleted = true;
-        setTimeout(checkNativeResponse, 3_000);
-      } else {
-        logger.log(`[Sentry] Native event emitter did not reply in time. Using ${origin} fallback emitter.`);
-        isListening = false;
-        DeviceEventEmitter.emit(NewFrameEventName, {
-          newFrameTimestampInSeconds: fallbackSeconds,
-          isFallback: true,
-        });
-      }
-    };
-
-    // Start the retry process
-    checkNativeResponse();
+  function getNativeNewFrameTimestampSeconds(): void {
+    NATIVE.getNewScreenTimeToDisplay()
+      .then(resolve => {
+        if (fallbackTimeout === undefined) {
+          return;
+        }
+        nativeNewFrameTimestampSeconds = resolve ?? undefined;
+      })
+      .catch(reason => {
+        logger.error('Failed to receive Native fallback timestamp.', reason);
+      });
   }
 
   return {
     initAsync() {
-      DeviceEventEmitter.addListener(NewFrameEventName, () => {
-        // Avoid noise from pages that we do not want to track.
-        if (isListening) {
-          NativeEmitterCalled = true;
-        }
-      });
+      emitter.initAsync(NewFrameEventName);
     },
 
-    startListenerAsync() {
-      isListening = true;
+    onceNewFrame(listener: (event: FallBackNewFrameEvent) => void) {
+      animationFrameTimestampSeconds = undefined;
+      nativeNewFrameTimestampSeconds = undefined;
+
+      const internalListener = (event: NewFrameEvent): void => {
+        clearTimeout(fallbackTimeout);
+        fallbackTimeout = undefined;
+        animationFrameTimestampSeconds = undefined;
+        nativeNewFrameTimestampSeconds = undefined;
+        listener(event);
+      };
+      fallbackTimeout = setTimeout(() => {
+        if (nativeNewFrameTimestampSeconds) {
+          logger.log('Native event emitter did not reply in time');
+          return listener({
+            newFrameTimestampInSeconds: nativeNewFrameTimestampSeconds,
+            isFallback: true,
+          });
+        } else if (animationFrameTimestampSeconds) {
+          logger.log('[Sentry] Native event emitter did not reply in time. Using JavaScript fallback emitter.');
+          return listener({
+            newFrameTimestampInSeconds: animationFrameTimestampSeconds,
+            isFallback: true,
+          });
+        } else {
+          emitter.removeListener(NewFrameEventName, internalListener);
+          logger.error('Failed to receive any fallback timestamp.');
+        }
+      }, fallbackTimeoutMs);
 
-      NATIVE.getNewScreenTimeToDisplay()
-        .then(resolve => {
-          if (resolve) {
-            waitForNativeResponseOrFallback(resolve, 'Native');
-          } else {
-            defaultFallbackEventEmitter();
-          }
-        })
-        .catch((reason: Error) => {
-          logger.error('Failed to recceive Native fallback timestamp.', reason);
-          defaultFallbackEventEmitter();
-        });
+      getNativeNewFrameTimestampSeconds();
+      getAnimationFrameTimestampSeconds();
+      emitter.once(NewFrameEventName, internalListener);
     },
   };
 }
diff --git a/test/utils/sentryeventemitterfallback.test.ts b/test/utils/sentryeventemitterfallback.test.ts
index cea404b60..6f8f9ff0d 100644
--- a/test/utils/sentryeventemitterfallback.test.ts
+++ b/test/utils/sentryeventemitterfallback.test.ts
@@ -1,22 +1,7 @@
-import { DeviceEventEmitter } from 'react-native';
-
 import { NewFrameEventName } from '../../src/js/utils/sentryeventemitter';
 import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryeventemitterfallback';
 
 // Mock dependencies
-
-jest.mock('react-native', () => {
-  return {
-    DeviceEventEmitter: {
-      addListener: jest.fn(),
-      emit: jest.fn(),
-    },
-    Platform: {
-      OS: 'ios',
-    },
-  };
-});
-
 jest.mock('../../src/js/utils/environment', () => ({
   isTurboModuleEnabled: () => false,
 }));
@@ -48,12 +33,6 @@ describe('SentryEventEmitterFallback', () => {
     NATIVE.getNewScreenTimeToDisplay = jest.fn();
   });
 
-  it('should initialize and add a listener', () => {
-    emitter.initAsync();
-
-    expect(DeviceEventEmitter.addListener).toHaveBeenCalledWith(NewFrameEventName, expect.any(Function));
-  });
-
   it('should start listener and use fallback when native call returned undefined/null', async () => {
     jest.useFakeTimers();
     const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds');
@@ -62,19 +41,20 @@ describe('SentryEventEmitterFallback', () => {
 
     (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockReturnValue(Promise.resolve());
 
-    emitter.startListenerAsync();
+    const listener = jest.fn();
+    emitter.onceNewFrame(listener);
 
     // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
     await Promise.resolve();
 
     await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
-    expect(logger.error).not.toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
+    expect(logger.error).not.toHaveBeenCalledWith('Failed to receive Native fallback timestamp.', expect.any(Error));
 
     // Simulate retries and timer
     jest.runAllTimers();
 
     // Ensure fallback event is emitted
-    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+    expect(listener).toHaveBeenCalledWith({
       newFrameTimestampInSeconds: fallbackTime,
       isFallback: true,
     });
@@ -90,23 +70,24 @@ describe('SentryEventEmitterFallback', () => {
 
     (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockRejectedValue(new Error('Failed'));
 
-    emitter.startListenerAsync();
-
     const spy = jest.spyOn(require('@sentry/utils'), 'timestampInSeconds');
     const fallbackTime = Date.now() / 1000;
     spy.mockReturnValue(fallbackTime);
 
+    const listener = jest.fn();
+    emitter.onceNewFrame(listener);
+
     // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
     await Promise.resolve();
 
     await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
-    expect(logger.error).toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
+    expect(logger.error).toHaveBeenCalledWith('Failed to receive Native fallback timestamp.', expect.any(Error));
 
     // Simulate retries and timer
     jest.runAllTimers();
 
     // Ensure fallback event is emitted
-    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+    expect(listener).toHaveBeenCalledWith({
       newFrameTimestampInSeconds: fallbackTime,
       isFallback: true,
     });
@@ -125,19 +106,20 @@ describe('SentryEventEmitterFallback', () => {
 
     (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockRejectedValue(new Error('Failed'));
 
-    emitter.startListenerAsync();
+    const listener = jest.fn();
+    emitter.onceNewFrame(listener);
 
     // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
     await Promise.resolve();
 
     await expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
-    expect(logger.error).toHaveBeenCalledWith('Failed to recceive Native fallback timestamp.', expect.any(Error));
+    expect(logger.error).toHaveBeenCalledWith('Failed to receive Native fallback timestamp.', expect.any(Error));
 
     // Simulate retries and timer
     jest.runAllTimers();
 
     // Ensure fallback event is emitted
-    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+    expect(listener).toHaveBeenCalledWith({
       newFrameTimestampInSeconds: fallbackTime,
       isFallback: true,
     });
@@ -156,7 +138,8 @@ describe('SentryEventEmitterFallback', () => {
 
     NATIVE.getNewScreenTimeToDisplay = () => Promise.resolve(null);
 
-    emitter.startListenerAsync();
+    const listener = jest.fn();
+    emitter.onceNewFrame(listener);
 
     // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
     await Promise.resolve();
@@ -165,7 +148,7 @@ describe('SentryEventEmitterFallback', () => {
     jest.runAllTimers();
 
     // Ensure fallback event is emitted
-    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(NewFrameEventName, {
+    expect(listener).toHaveBeenCalledWith({
       newFrameTimestampInSeconds: fallbackTime,
       isFallback: true,
     });
@@ -181,7 +164,8 @@ describe('SentryEventEmitterFallback', () => {
 
     (NATIVE.getNewScreenTimeToDisplay as jest.Mock).mockResolvedValueOnce(nativeTimestamp);
 
-    emitter.startListenerAsync();
+    const listener = jest.fn();
+    emitter.onceNewFrame(listener);
 
     expect(NATIVE.getNewScreenTimeToDisplay).toHaveBeenCalled();
   });
@@ -189,13 +173,10 @@ describe('SentryEventEmitterFallback', () => {
   it('should not emit if original event emitter was called', async () => {
     jest.useFakeTimers();
 
-    const mockAddListener = jest.fn();
-    DeviceEventEmitter.addListener = mockAddListener;
-
     // Capture the callback passed to addListener
     // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/ban-types
     let callback: Function = () => {};
-    mockAddListener.mockImplementationOnce((eventName, cb) => {
+    const mockOnce = jest.fn().mockImplementationOnce((eventName, cb) => {
       if (eventName === NewFrameEventName) {
         callback = cb;
       }
@@ -204,9 +185,20 @@ describe('SentryEventEmitterFallback', () => {
       };
     });
 
+    emitter = createSentryFallbackEventEmitter({
+      addListener: jest.fn(),
+      initAsync: jest.fn(),
+      closeAllAsync: jest.fn(),
+      removeListener: jest.fn(),
+      once: mockOnce,
+    });
+
     emitter.initAsync();
-    emitter.startListenerAsync();
-    callback();
+    const listener = jest.fn();
+    emitter.onceNewFrame(listener);
+    callback({
+      newFrameTimestampInSeconds: 67890,
+    });
 
     // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
     await Promise.resolve();
@@ -214,14 +206,19 @@ describe('SentryEventEmitterFallback', () => {
     // Simulate retries and timer
     jest.runAllTimers();
 
-    expect(DeviceEventEmitter.emit).not.toBeCalled();
+    // Ensure fallback event is emitted
+    expect(listener).toHaveBeenCalledWith({
+      newFrameTimestampInSeconds: 67890,
+      isFallback: undefined,
+    });
     expect(logger.log).not.toBeCalled();
   });
 
   it('should retry up to maxRetries and emit fallback if no response', async () => {
     jest.useFakeTimers();
 
-    emitter.startListenerAsync();
+    const listener = jest.fn();
+    emitter.onceNewFrame(listener);
 
     // Wait for the next event loop to allow startListenerAsync to call NATIVE.getNewScreenTimeToDisplay
     await Promise.resolve();
@@ -231,10 +228,7 @@ describe('SentryEventEmitterFallback', () => {
     // Simulate retries and timer
     jest.runAllTimers();
 
-    expect(DeviceEventEmitter.emit).toHaveBeenCalledWith(
-      NewFrameEventName,
-      expect.objectContaining({ isFallback: true }),
-    );
+    expect(listener).toHaveBeenCalledWith(expect.objectContaining({ isFallback: true }));
     expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('Native event emitter did not reply in time'));
 
     jest.useRealTimers();

From 4557f7a348eb7d49aa326436201e0e246944a4c5 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 14 Oct 2024 14:11:42 -0300
Subject: [PATCH 42/47] fix build

---
 src/js/tracing/reactnavigation.ts          | 14 +++++++-------
 src/js/utils/sentryeventemitter.ts         |  6 ------
 src/js/utils/sentryeventemitterfallback.ts |  8 +++++---
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/js/tracing/reactnavigation.ts b/src/js/tracing/reactnavigation.ts
index 00efde39f..6991939d6 100644
--- a/src/js/tracing/reactnavigation.ts
+++ b/src/js/tracing/reactnavigation.ts
@@ -4,7 +4,8 @@ import type { Span, Transaction as TransactionType, TransactionContext } from '@
 import { logger, timestampInSeconds } from '@sentry/utils';
 
 import type { NewFrameEvent } from '../utils/sentryeventemitter';
-import { type SentryEventEmitter, createSentryEventEmitter, NewFrameEventName } from '../utils/sentryeventemitter';
+import type { SentryEventEmitterFallback } from '../utils/sentryeventemitterfallback';
+import { createSentryFallbackEventEmitter } from '../utils/sentryeventemitterfallback';
 import { RN_GLOBAL_OBJ } from '../utils/worldwide';
 import { NATIVE } from '../wrapper';
 import type { OnConfirmRoute, TransactionCreator } from './routingInstrumentation';
@@ -77,7 +78,7 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
   public readonly name: string = ReactNavigationInstrumentation.instrumentationName;
 
   private _navigationContainer: NavigationContainer | null = null;
-  private _newScreenFrameEventEmitter: SentryEventEmitter | null = null;
+  private _newScreenFrameEventEmitter: SentryEventEmitterFallback | null = null;
   private readonly _maxRecentRouteLen: number = 200;
 
   private _latestRoute?: NavigationRoute;
@@ -85,7 +86,7 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
   private _navigationProcessingSpan?: Span;
 
   private _initialStateHandled: boolean = false;
-  private _stateChangeTimeout?: number | undefined;
+  private _stateChangeTimeout?:  ReturnType<typeof setTimeout>  | undefined;
   private _recentRouteKeys: string[] = [];
 
   private _options: ReactNavigationOptions;
@@ -99,8 +100,8 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
     };
 
     if (this._options.enableTimeToInitialDisplay) {
-      this._newScreenFrameEventEmitter = createSentryEventEmitter();
-      this._newScreenFrameEventEmitter.initAsync(NewFrameEventName);
+      this._newScreenFrameEventEmitter = createSentryFallbackEventEmitter();
+      this._newScreenFrameEventEmitter.initAsync();
       NATIVE.initNativeReactNavigationNewFrameTracking().catch((reason: unknown) => {
         logger.error(`[ReactNavigationInstrumentation] Failed to initialize native new frame tracking: ${reason}`);
       });
@@ -247,8 +248,7 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
             });
 
           if (!routeHasBeenSeen && latestTtidSpan) {
-            this._newScreenFrameEventEmitter?.once(
-              NewFrameEventName,
+            this._newScreenFrameEventEmitter?.onceNewFrame(
               ({ newFrameTimestampInSeconds }: NewFrameEvent) => {
                 const activeSpan = getActiveSpan();
                 if (activeSpan && manualInitialDisplaySpans.has(activeSpan)) {
diff --git a/src/js/utils/sentryeventemitter.ts b/src/js/utils/sentryeventemitter.ts
index d231c787a..63146f30c 100644
--- a/src/js/utils/sentryeventemitter.ts
+++ b/src/js/utils/sentryeventemitter.ts
@@ -3,7 +3,6 @@ import type { EmitterSubscription, NativeModule } from 'react-native';
 import { NativeEventEmitter } from 'react-native';
 
 import { getRNSentryModule } from '../wrapper';
-import { createSentryFallbackEventEmitter } from './sentryeventemitterfallback';
 
 export const NewFrameEventName = 'rn_sentry_new_frame';
 export type NewFrameEventName = typeof NewFrameEventName;
@@ -33,7 +32,6 @@ export function createSentryEventEmitter(
   if (!sentryNativeModule) {
     return createNoopSentryEventEmitter();
   }
-  const fallbackEventEmitter = createSentryFallbackEventEmitter();
 
   const openNativeListeners = new Map<NewFrameEventName, EmitterSubscription>();
   const listenersMap = new Map<NewFrameEventName, Map<(event: NewFrameEvent) => void, true>>();
@@ -72,8 +70,6 @@ export function createSentryEventEmitter(
       openNativeListeners.set(eventType, nativeListener);
 
       listenersMap.set(eventType, new Map());
-
-      fallbackEventEmitter.initAsync();
     },
     closeAllAsync() {
       openNativeListeners.forEach(subscription => {
@@ -85,8 +81,6 @@ export function createSentryEventEmitter(
     addListener,
     removeListener,
     once(eventType: NewFrameEventName, listener: (event: NewFrameEvent) => void) {
-      fallbackEventEmitter?.onceNewFrame();
-
       const tmpListener = (event: NewFrameEvent): void => {
         listener(event);
         removeListener(eventType, tmpListener);
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 8bc82c900..60fe8928a 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -23,7 +23,7 @@ export function createSentryFallbackEventEmitter(
   emitter: SentryEventEmitter = createSentryEventEmitter(),
   fallbackTimeoutMs = FALLBACK_TIMEOUT_MS,
 ): SentryEventEmitterFallback {
-  let fallbackTimeout: ReturnType<typeof setTimeout> | undefined;
+  let fallbackTimeout: ReturnType<typeof setTimeout>  | undefined;
   let animationFrameTimestampSeconds: number | undefined;
   let nativeNewFrameTimestampSeconds: number | undefined;
 
@@ -63,8 +63,10 @@ export function createSentryFallbackEventEmitter(
       nativeNewFrameTimestampSeconds = undefined;
 
       const internalListener = (event: NewFrameEvent): void => {
-        clearTimeout(fallbackTimeout);
-        fallbackTimeout = undefined;
+        if (fallbackTimeout !== undefined) {
+          clearTimeout(fallbackTimeout);
+          fallbackTimeout = undefined;
+        }
         animationFrameTimestampSeconds = undefined;
         nativeNewFrameTimestampSeconds = undefined;
         listener(event);

From 9a5ce6da414d8f6cf41d5177ea060d14ef913f27 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 14 Oct 2024 15:22:32 -0300
Subject: [PATCH 43/47] fix test

---
 test/tracing/reactnavigation.ttid.test.tsx | 14 ++++----
 test/utils/mockedSentryeventemitter.ts     | 39 ----------------------
 2 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 test/utils/mockedSentryeventemitter.ts

diff --git a/test/tracing/reactnavigation.ttid.test.tsx b/test/tracing/reactnavigation.ttid.test.tsx
index b1357dcdd..b86689bc8 100644
--- a/test/tracing/reactnavigation.ttid.test.tsx
+++ b/test/tracing/reactnavigation.ttid.test.tsx
@@ -1,9 +1,9 @@
 import * as mockWrapper from '../mockWrapper';
-import * as mockedSentryEventEmitter from '../utils/mockedSentryeventemitter';
+import * as mockedSentryEventEmitter from '../utils/mockedSentryeventemitterfallback';
 import * as mockedtimetodisplaynative from './mockedtimetodisplaynative';
 jest.mock('../../src/js/wrapper', () => mockWrapper);
 jest.mock('../../src/js/utils/environment');
-jest.mock('../../src/js/utils/sentryeventemitter', () => mockedSentryEventEmitter);
+jest.mock('../../src/js/utils/sentryeventemitterfallback', () => mockedSentryEventEmitter);
 jest.mock('../../src/js/tracing/timetodisplaynative', () => mockedtimetodisplaynative);
 
 import { Span } from '@sentry/core';
@@ -16,16 +16,16 @@ import * as Sentry from '../../src/js';
 import { ReactNavigationInstrumentation } from '../../src/js';
 import { TimeToFullDisplay, TimeToInitialDisplay } from '../../src/js/tracing';
 import { isHermesEnabled, notWeb } from '../../src/js/utils/environment';
-import { createSentryEventEmitter } from '../../src/js/utils/sentryeventemitter';
+import { createSentryFallbackEventEmitter } from '../../src/js/utils/sentryeventemitterfallback';
 import { RN_GLOBAL_OBJ } from '../../src/js/utils/worldwide';
 import { MOCK_DSN } from '../mockDsn';
 import { secondInFutureTimestampMs } from '../testutils';
-import type { MockedSentryEventEmitter } from '../utils/mockedSentryeventemitter';
+import type { MockedSentryEventEmitterFallback } from '../utils/mockedSentryeventemitterfallback';
 import { emitNativeFullDisplayEvent, emitNativeInitialDisplayEvent } from './mockedtimetodisplaynative';
 import { createMockNavigationAndAttachTo } from './reactnavigationutils';
 
 describe('React Navigation - TTID', () => {
-  let mockedEventEmitter: MockedSentryEventEmitter;
+  let mockedEventEmitter: MockedSentryEventEmitterFallback;
   let transportSendMock: jest.Mock<ReturnType<Transport['send']>, Parameters<Transport['send']>>;
   let mockedNavigation: ReturnType<typeof createMockNavigationAndAttachTo>;
   const mockedAppStartTimeSeconds: number = timestampInSeconds();
@@ -43,8 +43,8 @@ describe('React Navigation - TTID', () => {
         spans: [],
       });
 
-      mockedEventEmitter = mockedSentryEventEmitter.createMockedSentryEventEmitter();
-      (createSentryEventEmitter as jest.Mock).mockReturnValue(mockedEventEmitter);
+      mockedEventEmitter = mockedSentryEventEmitter.createMockedSentryFallbackEventEmitter();
+      (createSentryFallbackEventEmitter as jest.Mock).mockReturnValue(mockedEventEmitter);
 
       const sut = createTestedInstrumentation({ enableTimeToInitialDisplay: true });
       transportSendMock = initSentry(sut).transportSendMock;
diff --git a/test/utils/mockedSentryeventemitter.ts b/test/utils/mockedSentryeventemitter.ts
deleted file mode 100644
index 3efc901b5..000000000
--- a/test/utils/mockedSentryeventemitter.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { timestampInSeconds } from '@sentry/utils';
-import EventEmitter from 'events';
-
-import type { NewFrameEvent, SentryEventEmitter } from '../../src/js/utils/sentryeventemitter';
-import type { MockInterface } from '../testutils';
-
-export const NewFrameEventName = 'rn_sentry_new_frame';
-export type NewFrameEventName = typeof NewFrameEventName;
-
-export interface MockedSentryEventEmitter extends MockInterface<SentryEventEmitter> {
-  emitNewFrameEvent: (timestampSeconds?: number) => void;
-}
-
-export function createMockedSentryEventEmitter(): MockedSentryEventEmitter {
-  const emitter = new EventEmitter();
-
-  return {
-    emitNewFrameEvent: jest.fn((timestampSeconds?: number) => {
-      emitter.emit('rn_sentry_new_frame', <NewFrameEvent>{
-        newFrameTimestampInSeconds: timestampSeconds || timestampInSeconds(),
-      });
-    }),
-    once: jest.fn((event: NewFrameEventName, listener: (event: NewFrameEvent) => void) => {
-      emitter.once(event, listener);
-    }),
-    removeListener: jest.fn((event: NewFrameEventName, listener: (event: NewFrameEvent) => void) => {
-      emitter.removeListener(event, listener);
-    }),
-    addListener: jest.fn((event: NewFrameEventName, listener: (event: NewFrameEvent) => void) => {
-      emitter.addListener(event, listener);
-    }),
-    initAsync: jest.fn(),
-    closeAllAsync: jest.fn(() => {
-      emitter.removeAllListeners();
-    }),
-  };
-}
-
-export const createSentryEventEmitter = jest.fn(() => createMockedSentryEventEmitter());

From 342961d10d26d5398196bebeb73d6b2961d4d1a8 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 14 Oct 2024 15:22:50 -0300
Subject: [PATCH 44/47] forgot git add for mocked file

---
 .../utils/mockedSentryeventemitterfallback.ts | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 test/utils/mockedSentryeventemitterfallback.ts

diff --git a/test/utils/mockedSentryeventemitterfallback.ts b/test/utils/mockedSentryeventemitterfallback.ts
new file mode 100644
index 000000000..50d5fbcc2
--- /dev/null
+++ b/test/utils/mockedSentryeventemitterfallback.ts
@@ -0,0 +1,26 @@
+import { timestampInSeconds } from '@sentry/utils';
+import EventEmitter from 'events';
+
+import type { NewFrameEvent } from '../../src/js/utils/sentryeventemitter';
+import type { SentryEventEmitterFallback } from '../../src/js/utils/sentryeventemitterfallback';
+import type { MockInterface } from '../testutils';
+export const NewFrameEventName = 'rn_sentry_new_frame';
+export type NewFrameEventName = typeof NewFrameEventName;
+export interface MockedSentryEventEmitterFallback extends MockInterface<SentryEventEmitterFallback> {
+  emitNewFrameEvent: (timestampSeconds?: number) => void;
+}
+export function createMockedSentryFallbackEventEmitter(): MockedSentryEventEmitterFallback {
+  const emitter = new EventEmitter();
+  return {
+    initAsync: jest.fn(),
+    emitNewFrameEvent: jest.fn((timestampSeconds?: number) => {
+      emitter.emit(NewFrameEventName, <NewFrameEvent>{
+        newFrameTimestampInSeconds: timestampSeconds || timestampInSeconds(),
+      });
+    }),
+    onceNewFrame: jest.fn((listener: (event: NewFrameEvent) => void) => {
+      emitter.once(NewFrameEventName, listener);
+    }),
+  };
+}
+export const createSentryFallbackEventEmitter = jest.fn(() => createMockedSentryFallbackEventEmitter());

From 427e1c63a05fb62abf78ea64d9df8d704c4652e2 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 14 Oct 2024 15:53:35 -0300
Subject: [PATCH 45/47] add try/catch block on java code

---
 .../java/io/sentry/react/RNSentryTimeToDisplay.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index 0e54ac592..985c44249 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -11,13 +11,18 @@
 
 public class RNSentryTimeToDisplay {
     public static void GetTimeToDisplay(Promise promise, SentryDateProvider dateProvider) {
-        Choreographer choreographer = Choreographer.getInstance();
+        try {
+            Choreographer choreographer = Choreographer.getInstance();
 
-        // Invoke the callback after the frame is rendered
-        choreographer.postFrameCallback(frameTimeNanos -> {
+            // Invoke the callback after the frame is rendered
+            choreographer.postFrameCallback(frameTimeNanos -> {
                 final SentryDate endDate = dateProvider.now();
 
                 promise.resolve(endDate.nanoTimestamp() / 1e9);
-        });
+            });
+        }
+        catch (Exception exception) {
+            promise.reject("Failed to receive the instance of Choreographer" ,exception);
+        }
     }
 }

From fcb99358865929ced0ee57a711c2d996638c2e42 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Mon, 14 Oct 2024 16:24:07 -0300
Subject: [PATCH 46/47] fix lint

---
 src/js/tracing/reactnavigation.ts          | 30 ++++++++++------------
 src/js/utils/sentryeventemitterfallback.ts |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/js/tracing/reactnavigation.ts b/src/js/tracing/reactnavigation.ts
index 6991939d6..39572419e 100644
--- a/src/js/tracing/reactnavigation.ts
+++ b/src/js/tracing/reactnavigation.ts
@@ -86,7 +86,7 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
   private _navigationProcessingSpan?: Span;
 
   private _initialStateHandled: boolean = false;
-  private _stateChangeTimeout?:  ReturnType<typeof setTimeout>  | undefined;
+  private _stateChangeTimeout?: ReturnType<typeof setTimeout> | undefined;
   private _recentRouteKeys: string[] = [];
 
   private _options: ReactNavigationOptions;
@@ -248,21 +248,19 @@ export class ReactNavigationInstrumentation extends InternalRoutingInstrumentati
             });
 
           if (!routeHasBeenSeen && latestTtidSpan) {
-            this._newScreenFrameEventEmitter?.onceNewFrame(
-              ({ newFrameTimestampInSeconds }: NewFrameEvent) => {
-                const activeSpan = getActiveSpan();
-                if (activeSpan && manualInitialDisplaySpans.has(activeSpan)) {
-                  logger.warn(
-                    '[ReactNavigationInstrumentation] Detected manual instrumentation for the current active span.',
-                  );
-                  return;
-                }
-
-                latestTtidSpan.setStatus('ok');
-                latestTtidSpan.end(newFrameTimestampInSeconds);
-                setSpanDurationAsMeasurementOnTransaction(latestTransaction, 'time_to_initial_display', latestTtidSpan);
-              },
-            );
+            this._newScreenFrameEventEmitter?.onceNewFrame(({ newFrameTimestampInSeconds }: NewFrameEvent) => {
+              const activeSpan = getActiveSpan();
+              if (activeSpan && manualInitialDisplaySpans.has(activeSpan)) {
+                logger.warn(
+                  '[ReactNavigationInstrumentation] Detected manual instrumentation for the current active span.',
+                );
+                return;
+              }
+
+              latestTtidSpan.setStatus('ok');
+              latestTtidSpan.end(newFrameTimestampInSeconds);
+              setSpanDurationAsMeasurementOnTransaction(latestTransaction, 'time_to_initial_display', latestTtidSpan);
+            });
           }
 
           this._navigationProcessingSpan?.updateName(`Processing navigation to ${route.name}`);
diff --git a/src/js/utils/sentryeventemitterfallback.ts b/src/js/utils/sentryeventemitterfallback.ts
index 60fe8928a..8eaeb947a 100644
--- a/src/js/utils/sentryeventemitterfallback.ts
+++ b/src/js/utils/sentryeventemitterfallback.ts
@@ -23,7 +23,7 @@ export function createSentryFallbackEventEmitter(
   emitter: SentryEventEmitter = createSentryEventEmitter(),
   fallbackTimeoutMs = FALLBACK_TIMEOUT_MS,
 ): SentryEventEmitterFallback {
-  let fallbackTimeout: ReturnType<typeof setTimeout>  | undefined;
+  let fallbackTimeout: ReturnType<typeof setTimeout> | undefined;
   let animationFrameTimestampSeconds: number | undefined;
   let nativeNewFrameTimestampSeconds: number | undefined;
 

From 2a7c8faadf298643d89dfa2b8b9d9fdcf30247f5 Mon Sep 17 00:00:00 2001
From: lucas <lucas-zimerman1@hotmail.com>
Date: Tue, 15 Oct 2024 13:13:54 -0300
Subject: [PATCH 47/47] always use main thread on ttid

---
 .../sentry/react/RNSentryTimeToDisplay.java   | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
index 985c44249..9a31f182e 100644
--- a/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
+++ b/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java
@@ -2,6 +2,8 @@
 
 import com.facebook.react.bridge.Promise;
 
+import android.os.Handler;
+import android.os.Looper;
 import android.view.Choreographer;
 
 import org.jetbrains.annotations.NotNull;
@@ -11,18 +13,27 @@
 
 public class RNSentryTimeToDisplay {
     public static void GetTimeToDisplay(Promise promise, SentryDateProvider dateProvider) {
-        try {
-            Choreographer choreographer = Choreographer.getInstance();
+        Looper mainLooper = Looper.getMainLooper();
 
-            // Invoke the callback after the frame is rendered
-            choreographer.postFrameCallback(frameTimeNanos -> {
-                final SentryDate endDate = dateProvider.now();
+        if (mainLooper == null) {
+            promise.reject("GetTimeToDisplay is not able to measure the time to display: Main looper not available.");
+            return;
+        }
+        
+        // Ensure the code runs on the main thread
+        new Handler(mainLooper)
+            .post(() -> {
+                try {
+                    Choreographer choreographer = Choreographer.getInstance();
 
-                promise.resolve(endDate.nanoTimestamp() / 1e9);
+                    // Invoke the callback after the frame is rendered
+                    choreographer.postFrameCallback(frameTimeNanos -> {
+                        final SentryDate endDate = dateProvider.now();
+                        promise.resolve(endDate.nanoTimestamp() / 1e9);
+                    });
+                } catch (Exception exception) {
+                    promise.reject("Failed to receive the instance of Choreographer", exception);
+                }
             });
-        }
-        catch (Exception exception) {
-            promise.reject("Failed to receive the instance of Choreographer" ,exception);
-        }
     }
 }