From 4f3990c85ad6a23127ad9d128e551d5c5505a23f Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Fri, 9 Aug 2024 17:04:42 -0400
Subject: [PATCH 1/6] Implement crashedLastRun

---
 .../java/io/sentry/react/RNSentryModuleImpl.java    |  5 +++++
 .../java/io/sentry/react/RNSentryModule.java        |  5 +++++
 .../java/io/sentry/react/RNSentryModule.java        |  5 +++++
 ios/RNSentry.mm                                     |  6 ++++++
 src/js/NativeRNSentry.ts                            |  1 +
 src/js/client.ts                                    |  7 +++++++
 src/js/index.ts                                     |  1 +
 src/js/sdk.tsx                                      | 11 +++++++++++
 src/js/wrapper.ts                                   | 13 +++++++++++++
 9 files changed, 54 insertions(+)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 7f13e5e21b..0d2792e11b 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -852,6 +852,11 @@ public String fetchNativePackageName() {
         return packageInfo.packageName;
     }
 
+    public void crashedLastRun(Promise promise) {
+        Boolean crashedLastRun = Sentry.isCrashedLastRun();
+        promise.resolve(crashedLastRun != null ? crashedLastRun : false);
+    }
+
     private void setEventOriginTag(SentryEvent event) {
         SdkVersion sdk = event.getSdk();
         if (sdk != null) {
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
index 3d585b6b1a..f5f6ea6080 100644
--- a/android/src/newarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
@@ -168,4 +168,9 @@ public void captureReplay(boolean isHardCrash, Promise promise) {
     public String getCurrentReplayId() {
         return this.impl.getCurrentReplayId();
     }
+
+    @Override
+    public void crashedLastRun(Promise promise) {
+        this.impl.crashedLastRun(promise);
+    }
 }
diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
index 33fa7283bf..656b8c6048 100644
--- a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
@@ -168,4 +168,9 @@ public void captureReplay(boolean isHardCrash, Promise promise) {
     public String getCurrentReplayId() {
         return this.impl.getCurrentReplayId();
     }
+
+    @ReactMethod
+    public void crashedLastRun(Promise promise) {
+        this.impl.crashedLastRun(promise);
+    }
 }
diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 3abfe7c4d4..9193ecee23 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -761,6 +761,12 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
 #endif
 }
 
+RCT_EXPORT_METHOD(crashedLastRun:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    resolve(@([SentrySDK crashedLastRun]));
+}
+
 // Thanks to this guard, we won't compile this code when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index cbe17fdaa4..708a9f13d5 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -46,6 +46,7 @@ export interface Spec extends TurboModule {
   initNativeReactNavigationNewFrameTracking(): Promise<void>;
   captureReplay(isHardCrash: boolean): Promise<string | undefined | null>;
   getCurrentReplayId(): string | undefined | null;
+  crashedLastRun(): Promise<boolean>;
 }
 
 export type NativeStackFrame = {
diff --git a/src/js/client.ts b/src/js/client.ts
index e22eceebd6..615075db85 100644
--- a/src/js/client.ts
+++ b/src/js/client.ts
@@ -119,6 +119,13 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
     this._initNativeSdk();
   }
 
+  /**
+   * Returns if the app crashed in the last run.
+   */
+  public crashedLastRun(): Promise<boolean> {
+    return NATIVE.crashedLastRun();
+  }
+
   /**
    * Sets up the integrations
    */
diff --git a/src/js/index.ts b/src/js/index.ts
index 2864d71e3a..1dee81adf6 100644
--- a/src/js/index.ts
+++ b/src/js/index.ts
@@ -84,6 +84,7 @@ export {
   captureUserFeedback,
   withScope,
   configureScope,
+  crashedLastRun,
 } from './sdk';
 export { TouchEventBoundary, withTouchEventBoundary } from './touchevents';
 
diff --git a/src/js/sdk.tsx b/src/js/sdk.tsx
index 3cb764186d..c2b2bfd359 100644
--- a/src/js/sdk.tsx
+++ b/src/js/sdk.tsx
@@ -246,3 +246,14 @@ export function configureScope(callback: (scope: Scope) => void): ReturnType<Hub
   };
   getCurrentHub().configureScope(safeCallback);
 }
+
+/**
+ * Returns if the app crashed in the last run.
+ */
+export async function crashedLastRun(): Promise<boolean> {
+  const client = getCurrentHub().getClient<ReactNativeClient>();
+  if (client) {
+    return client.crashedLastRun();
+  }
+  return false;
+}
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 2e16f89021..0673cd2ca8 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -112,6 +112,8 @@ interface SentryNativeWrapper {
 
   captureReplay(isHardCrash: boolean): Promise<string | null>;
   getCurrentReplayId(): string | null;
+
+  crashedLastRun(): Promise<boolean>;
 }
 
 const EOL = utf8ToBytes('\n');
@@ -642,6 +644,17 @@ export const NATIVE: SentryNativeWrapper = {
     return RNSentry.getCurrentReplayId() || null;
   },
 
+  async crashedLastRun(): Promise<boolean> {
+    if (!this.enableNative) {
+      return false;
+    }
+    if (!this._isModuleLoaded(RNSentry)) {
+      return false;
+    }
+
+    return RNSentry.crashedLastRun();
+  },
+
   /**
    * Gets the event from envelopeItem and applies the level filter to the selected event.
    * @param data An envelope item containing the event.

From 225efc495fdb5551aa83fa5961861e7421964942 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Fri, 9 Aug 2024 17:13:16 -0400
Subject: [PATCH 2/6] Add changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afd42f74e3..37705e14e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Implement crashedLastRun ([#4014](https://github.com/getsentry/sentry-react-native/pull/4014))
+
 ## 5.28.0
 
 ### Fixes

From a7b811f5d1ea2d33d98c7dff6c418e51b1436e20 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Thu, 15 Aug 2024 13:34:04 -0400
Subject: [PATCH 3/6] Allow returning null, add example

---
 .../src/main/java/io/sentry/react/RNSentryModuleImpl.java | 3 +--
 samples/react-native/src/Screens/ErrorsScreen.tsx         | 7 +++++++
 src/js/NativeRNSentry.ts                                  | 2 +-
 src/js/client.ts                                          | 2 +-
 src/js/sdk.tsx                                            | 4 ++--
 src/js/wrapper.ts                                         | 8 ++++----
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 0d2792e11b..2631cf715d 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -853,8 +853,7 @@ public String fetchNativePackageName() {
     }
 
     public void crashedLastRun(Promise promise) {
-        Boolean crashedLastRun = Sentry.isCrashedLastRun();
-        promise.resolve(crashedLastRun != null ? crashedLastRun : false);
+        promise.resolve(Sentry.isCrashedLastRun());
     }
 
     private void setEventOriginTag(SentryEvent event) {
diff --git a/samples/react-native/src/Screens/ErrorsScreen.tsx b/samples/react-native/src/Screens/ErrorsScreen.tsx
index 138ec193d2..6430440295 100644
--- a/samples/react-native/src/Screens/ErrorsScreen.tsx
+++ b/samples/react-native/src/Screens/ErrorsScreen.tsx
@@ -106,6 +106,13 @@ const ErrorsScreen = (_props: Props) => {
             Sentry.nativeCrash();
           }}
         />
+        <Button
+          title="Get Crashed Last Run"
+          onPress={async () => {
+            const crashed = await Sentry.crashedLastRun();
+            console.log('Crashed last run:', crashed);
+          }}
+        />
         <Button
           title="Set Scope Properties"
           onPress={() => {
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index 708a9f13d5..ff18d73ef7 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -46,7 +46,7 @@ export interface Spec extends TurboModule {
   initNativeReactNavigationNewFrameTracking(): Promise<void>;
   captureReplay(isHardCrash: boolean): Promise<string | undefined | null>;
   getCurrentReplayId(): string | undefined | null;
-  crashedLastRun(): Promise<boolean>;
+  crashedLastRun(): Promise<boolean | null>;
 }
 
 export type NativeStackFrame = {
diff --git a/src/js/client.ts b/src/js/client.ts
index 615075db85..732958f5b8 100644
--- a/src/js/client.ts
+++ b/src/js/client.ts
@@ -122,7 +122,7 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
   /**
    * Returns if the app crashed in the last run.
    */
-  public crashedLastRun(): Promise<boolean> {
+  public crashedLastRun(): Promise<boolean | null> {
     return NATIVE.crashedLastRun();
   }
 
diff --git a/src/js/sdk.tsx b/src/js/sdk.tsx
index c2b2bfd359..810d4b8ffb 100644
--- a/src/js/sdk.tsx
+++ b/src/js/sdk.tsx
@@ -250,10 +250,10 @@ export function configureScope(callback: (scope: Scope) => void): ReturnType<Hub
 /**
  * Returns if the app crashed in the last run.
  */
-export async function crashedLastRun(): Promise<boolean> {
+export async function crashedLastRun(): Promise<boolean | null> {
   const client = getCurrentHub().getClient<ReactNativeClient>();
   if (client) {
     return client.crashedLastRun();
   }
-  return false;
+  return null;
 }
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 0673cd2ca8..500735ace1 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -113,7 +113,7 @@ interface SentryNativeWrapper {
   captureReplay(isHardCrash: boolean): Promise<string | null>;
   getCurrentReplayId(): string | null;
 
-  crashedLastRun(): Promise<boolean>;
+  crashedLastRun(): Promise<boolean | null>;
 }
 
 const EOL = utf8ToBytes('\n');
@@ -644,12 +644,12 @@ export const NATIVE: SentryNativeWrapper = {
     return RNSentry.getCurrentReplayId() || null;
   },
 
-  async crashedLastRun(): Promise<boolean> {
+  async crashedLastRun(): Promise<boolean | null> {
     if (!this.enableNative) {
-      return false;
+      return null;
     }
     if (!this._isModuleLoaded(RNSentry)) {
-      return false;
+      return null;
     }
 
     return RNSentry.crashedLastRun();

From aa112980275756844e7a4de88810338208d1bb4b Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <31292499+krystofwoldrich@users.noreply.github.com>
Date: Mon, 26 Aug 2024 14:18:10 +0200
Subject: [PATCH 4/6] Apply suggestions from code review

---
 src/js/NativeRNSentry.ts | 2 +-
 src/js/wrapper.ts        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index ff18d73ef7..696059f68d 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -46,7 +46,7 @@ export interface Spec extends TurboModule {
   initNativeReactNavigationNewFrameTracking(): Promise<void>;
   captureReplay(isHardCrash: boolean): Promise<string | undefined | null>;
   getCurrentReplayId(): string | undefined | null;
-  crashedLastRun(): Promise<boolean | null>;
+  crashedLastRun(): Promise<boolean | undefined | null>;
 }
 
 export type NativeStackFrame = {
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 500735ace1..164d955a98 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -652,7 +652,8 @@ export const NATIVE: SentryNativeWrapper = {
       return null;
     }
 
-    return RNSentry.crashedLastRun();
+    const result = RNSentry.crashedLastRun();
+    return typeof result === 'boolean' ? result : null;
   },
 
   /**

From 1b0e91d68b81ea98ff73bd824e9f27ee39a75fc0 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 26 Aug 2024 15:21:09 +0200
Subject: [PATCH 5/6] Add tests, remove from client

---
 src/js/client.ts                    |  7 -------
 src/js/sdk.tsx                      |  6 +-----
 src/js/vendor/react-native/index.ts |  1 +
 test/mockWrapper.ts                 |  3 +++
 test/sdk.withclient.test.ts         | 20 +++++++++++++++++++-
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/js/client.ts b/src/js/client.ts
index 732958f5b8..e22eceebd6 100644
--- a/src/js/client.ts
+++ b/src/js/client.ts
@@ -119,13 +119,6 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
     this._initNativeSdk();
   }
 
-  /**
-   * Returns if the app crashed in the last run.
-   */
-  public crashedLastRun(): Promise<boolean | null> {
-    return NATIVE.crashedLastRun();
-  }
-
   /**
    * Sets up the integrations
    */
diff --git a/src/js/sdk.tsx b/src/js/sdk.tsx
index 810d4b8ffb..e99d028b6a 100644
--- a/src/js/sdk.tsx
+++ b/src/js/sdk.tsx
@@ -251,9 +251,5 @@ export function configureScope(callback: (scope: Scope) => void): ReturnType<Hub
  * Returns if the app crashed in the last run.
  */
 export async function crashedLastRun(): Promise<boolean | null> {
-  const client = getCurrentHub().getClient<ReactNativeClient>();
-  if (client) {
-    return client.crashedLastRun();
-  }
-  return null;
+  return NATIVE.crashedLastRun();
 }
diff --git a/src/js/vendor/react-native/index.ts b/src/js/vendor/react-native/index.ts
index 3e15468e3f..7f6069e222 100644
--- a/src/js/vendor/react-native/index.ts
+++ b/src/js/vendor/react-native/index.ts
@@ -67,6 +67,7 @@ export type TurboModuleRegistry = {
 
 // Adapted from https://github.com/facebook/react-native/blob/3f8340975b35767b192e3118f05d2b039676052e/packages/react-native/types/public/ReactNativeTypes.d.ts#L137
 export interface HostComponent<P> extends Pick<React.ComponentClass<P>, Exclude<keyof React.ComponentClass<P>, 'new'>> {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   new (props: P, context?: any): React.Component<P> & Readonly<unknown>;
 }
 
diff --git a/test/mockWrapper.ts b/test/mockWrapper.ts
index 360211a40a..2d22458a61 100644
--- a/test/mockWrapper.ts
+++ b/test/mockWrapper.ts
@@ -53,6 +53,8 @@ const NATIVE: MockInterface<NativeType> = {
   fetchNativeStackFramesBy: jest.fn(),
 
   initNativeReactNavigationNewFrameTracking: jest.fn(),
+
+  crashedLastRun: jest.fn(),
 };
 
 NATIVE.isNativeAvailable.mockReturnValue(true);
@@ -74,6 +76,7 @@ NATIVE.stopProfiling.mockReturnValue(null);
 NATIVE.fetchNativePackageName.mockReturnValue('mock-native-package-name');
 NATIVE.fetchNativeStackFramesBy.mockReturnValue(null);
 NATIVE.initNativeReactNavigationNewFrameTracking.mockReturnValue(Promise.resolve());
+NATIVE.crashedLastRun.mockResolvedValue(false);
 
 export const getRNSentryModule = jest.fn();
 
diff --git a/test/sdk.withclient.test.ts b/test/sdk.withclient.test.ts
index 654b5294e1..b8787a3017 100644
--- a/test/sdk.withclient.test.ts
+++ b/test/sdk.withclient.test.ts
@@ -1,10 +1,12 @@
 jest.spyOn(logger, 'error');
+jest.mock('../src/js/wrapper', () => jest.requireActual('./mockWrapper'));
 
 import { setCurrentClient } from '@sentry/core';
 import { logger } from '@sentry/utils';
 
-import { configureScope, flush } from '../src/js/sdk';
+import { configureScope, crashedLastRun, flush } from '../src/js/sdk';
 import { getDefaultTestClientOptions, TestClient } from './mocks/client';
+import { NATIVE } from './mockWrapper';
 
 describe('Tests the SDK functionality', () => {
   let client: TestClient;
@@ -46,4 +48,20 @@ describe('Tests the SDK functionality', () => {
       expect(mockScopeCallback).toBeCalledTimes(1);
     });
   });
+
+  describe('crashedLastRun', () => {
+    it('Returns Native crashedLastRun', async () => {
+      NATIVE.crashedLastRun.mockClear().mockResolvedValue(true);
+      expect(await crashedLastRun()).toBe(true);
+      expect(NATIVE.crashedLastRun).toBeCalled();
+
+      NATIVE.crashedLastRun.mockClear().mockResolvedValue(false);
+      expect(await crashedLastRun()).toBe(false);
+      expect(NATIVE.crashedLastRun).toBeCalled();
+
+      NATIVE.crashedLastRun.mockClear().mockResolvedValue(null);
+      expect(await crashedLastRun()).toBe(null);
+      expect(NATIVE.crashedLastRun).toBeCalled();
+    });
+  });
 });

From 78d762d2707dad8cd6e4002d28ee845950bf1d9a Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 26 Aug 2024 15:21:53 +0200
Subject: [PATCH 6/6] fix changelog

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94a91442bd..4982720ff9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Features
+
+- Add `Sentry.crashedLastRun()` ([#4014](https://github.com/getsentry/sentry-react-native/pull/4014))
+
 ### Fixes
 
 - Use `install_modules_dependencies` for React iOS dependencies ([#4040](https://github.com/getsentry/sentry-react-native/pull/4040))
@@ -32,7 +36,6 @@
 
 ### Features
 
-- Add `Sentry.crashedLastRun()` ([#4014](https://github.com/getsentry/sentry-react-native/pull/4014))
 - `TimeToInitialDisplay` and `TimeToFullDisplay` start the time to display spans on mount ([#4020](https://github.com/getsentry/sentry-react-native/pull/4020))
 
 ### Fixes