Merge branch 'antonis/3859-newCaptureFeedbackAPI' into antonis/3859-newCaptureFeedbackAPI-hint

# Conflicts:
#	CHANGELOG.md
#	packages/core/src/js/client.ts
#	packages/core/src/js/sdk.tsx
#	packages/core/test/client.test.ts

Author: antonis

CHANGELOG.md

@@ -12,27 +12,25 @@
 
 - Adds new `captureFeedback` and deprecates the `captureUserFeedback` API ([#4320](https://github.com/getsentry/sentry-react-native/pull/4320), [#4322](https://github.com/getsentry/sentry-react-native/pull/4322))
 
+
   ```jsx
-  import * as Sentry from '@sentry/react-native';
-  import { SendFeedbackParams } from '@sentry/react-native';
+  import * as Sentry from "@sentry/react-native";
 
-  const eventId = Sentry.captureMessage('My Message');
-  // OR: const eventId = Sentry.lastEventId();
+  const eventId = Sentry.lastEventId();
 
-  const userFeedback: SendFeedbackParams = {
-    name: 'John Doe',
-    email: '[email protected]',
-    message: 'Hello World!',
-    associatedEventId: eventId,// Optional
-  };
-  Sentry.captureFeedback(userFeedback, {
+  Sentry.captureFeedback({
+    name: "John Doe",
+    email: "[email protected]",
+    message: "Hello World!",
+    associatedEventId: eventId, // optional
+  }, {
     captureContext: {
-      tags: { 'tag-key': 'tag-value' },
+      tags: { "tag-key": "tag-value" },
     },
     attachments: [
       {
-        filename: 'screenshot.png',
-        data: 'base64-encoded-image',
+        filename: "screenshot.png",
+        data: "base64-encoded-image",
       },
     ],
   });

packages/core/src/js/client.ts

@@ -1,4 +1,4 @@
-import { captureFeedback as captureFeedbackApi, eventFromException, eventFromMessage } from '@sentry/browser';
+import { eventFromException, eventFromMessage } from '@sentry/browser';
 import { BaseClient } from '@sentry/core';
 import type {
   ClientReportEnvelope,
@@ -7,7 +7,6 @@ import type {
   Event,
   EventHint,
   Outcome,
-  SendFeedbackParams,
   SeverityLevel,
   TransportMakeRequestResponse,
 } from '@sentry/types';
@@ -83,13 +82,6 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
     });
   }
 
-  /**
-   * Sends user feedback to Sentry.
-   */
-  public captureFeedback(feedback: SendFeedbackParams, hint?: EventHint): void {
-    captureFeedbackApi(feedback, hint);
-  }
-
   /**
    * @inheritdoc
    */

packages/core/src/js/index.ts

@@ -17,6 +17,7 @@ export {
   addBreadcrumb,
   captureException,
   captureEvent,
+  captureFeedback,
   captureMessage,
   Scope,
   setContext,
@@ -60,17 +61,7 @@ export { SDK_NAME, SDK_VERSION } from './version';
 export type { ReactNativeOptions } from './options';
 export { ReactNativeClient } from './client';
 
-export {
-  init,
-  wrap,
-  nativeCrash,
-  flush,
-  close,
-  captureFeedback,
-  captureUserFeedback,
-  withScope,
-  crashedLastRun,
-} from './sdk';
+export { init, wrap, nativeCrash, flush, close, captureUserFeedback, withScope, crashedLastRun } from './sdk';
 export { TouchEventBoundary, withTouchEventBoundary } from './touchevents';
 
 export {

packages/core/src/js/sdk.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable complexity */
-import { getClient, getGlobalScope,getIntegrationsToSetup, getIsolationScope,initAndBind, withScope as coreWithScope } from '@sentry/core';
+import { captureFeedback, getClient, getGlobalScope,getIntegrationsToSetup, getIsolationScope,initAndBind, withScope as coreWithScope } from '@sentry/core';
 import {
   defaultStackParser,
   makeFetchTransport,
@@ -222,7 +222,7 @@ export async function close(): Promise<void> {
  * @deprecated Use `Sentry.captureFeedback` instead.
  */
 export function captureUserFeedback(feedback: UserFeedback): void {
-  const feedbackParams = {
+  const feedbackParams: SendFeedbackParams = {
     name: feedback.name,
     email: feedback.email,
     message: feedback.comments,
@@ -231,13 +231,6 @@ export function captureUserFeedback(feedback: UserFeedback): void {
   captureFeedback(feedbackParams);
 }
 
-/**
- * Captures user feedback and sends it to Sentry.
- */
-export function captureFeedback(feedbackParams: SendFeedbackParams, hint?: EventHint): void {
-  getClient<ReactNativeClient>()?.captureFeedback(feedbackParams, hint);
-}
-
 /**
  * Creates a new scope with and executes the given operation within.
  * The scope is automatically removed once the operation

packages/core/test/client.test.ts

@@ -1,15 +1,8 @@
 import * as mockedtimetodisplaynative from './tracing/mockedtimetodisplaynative';
 jest.mock('../src/js/tracing/timetodisplaynative', () => mockedtimetodisplaynative);
 
-import { captureFeedback as captureFeedbackApi, defaultStackParser } from '@sentry/browser';
-import type {
-  Envelope,
-  Event,
-  Outcome,
-  SendFeedbackParams,
-  Transport,
-  TransportMakeRequestResponse,
-} from '@sentry/types';
+import { defaultStackParser } from '@sentry/browser';
+import type { Envelope, Event, Outcome, Transport, TransportMakeRequestResponse } from '@sentry/types';
 import { rejectedSyncPromise, SentryError } from '@sentry/utils';
 import * as RN from 'react-native';
 
@@ -82,14 +75,6 @@ jest.mock(
   }),
 );
 
-jest.mock('@sentry/browser', () => {
-  const actual = jest.requireActual('@sentry/browser');
-  return {
-    ...actual,
-    captureFeedback: jest.fn(),
-  };
-});
-
 const EXAMPLE_DSN = 'https://[email protected]/148053';
 
 const DEFAULT_OPTIONS: ReactNativeClientOptions = {
@@ -294,62 +279,6 @@ describe('Tests ReactNativeClient', () => {
     });
   });
 
-  describe('UserFeedback', () => {
-    test('sends UserFeedback', () => {
-      const client = new ReactNativeClient({
-        ...DEFAULT_OPTIONS,
-        dsn: EXAMPLE_DSN,
-      });
-      jest.mock('@sentry/browser', () => ({
-        captureFeedback: jest.fn(),
-      }));
-
-      const feedback: SendFeedbackParams = {
-        message: 'Test Comments',
-        email: '[email protected]',
-        name: 'Test User',
-        associatedEventId: 'testEvent123',
-      };
-
-      client.captureFeedback(feedback);
-
-      expect(captureFeedbackApi).toHaveBeenCalledWith(feedback, undefined);
-    });
-
-    test('sends UserFeedback with hint', () => {
-      const client = new ReactNativeClient({
-        ...DEFAULT_OPTIONS,
-        dsn: EXAMPLE_DSN,
-      });
-      jest.mock('@sentry/browser', () => ({
-        captureFeedback: jest.fn(),
-      }));
-
-      const feedback: SendFeedbackParams = {
-        message: 'Test Comments',
-        email: '[email protected]',
-        name: 'Test User',
-        associatedEventId: 'testEvent123',
-      };
-
-      const hint = {
-        captureContext: {
-          tags: { testtag: 'testvalue' },
-        },
-        attachments: [
-          {
-            filename: 'screenshot.png',
-            data: 'base64Image',
-          },
-        ],
-      };
-
-      client.captureFeedback(feedback, hint);
-
-      expect(captureFeedbackApi).toHaveBeenCalledWith(feedback, hint);
-    });
-  });
-
   describe('attachStacktrace', () => {
     let mockTransportSend: jest.Mock;
     let client: ReactNativeClient;