From 30ad95170d0c9c82dbf20e52948259a603e83a34 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@gmail.com>
Date: Tue, 17 Dec 2024 12:43:20 +0200
Subject: [PATCH] Use sendFeedback from JS to get error messages

---
 packages/core/package.json                    |  1 +
 .../core/src/js/feedback/FeedbackForm.tsx     | 29 ++++++++++++++-----
 .../core/test/feedback/FeedbackForm.test.tsx  | 12 ++++----
 yarn.lock                                     |  1 +
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 12d2da1b7..6bbc66d95 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -65,6 +65,7 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
+    "@sentry-internal/feedback": "8.45.1",
     "@sentry/babel-plugin-component-annotate": "2.20.1",
     "@sentry/browser": "8.45.1",
     "@sentry/cli": "2.39.1",
diff --git a/packages/core/src/js/feedback/FeedbackForm.tsx b/packages/core/src/js/feedback/FeedbackForm.tsx
index 6f2ed9187..25dabb054 100644
--- a/packages/core/src/js/feedback/FeedbackForm.tsx
+++ b/packages/core/src/js/feedback/FeedbackForm.tsx
@@ -1,5 +1,6 @@
-import { captureFeedback, getCurrentScope, lastEventId, logger } from '@sentry/core';
-import type { SendFeedbackParams } from '@sentry/types';
+import { sendFeedback } from '@sentry-internal/feedback';
+import type { EventHint, SendFeedbackParams } from '@sentry/core';
+import { getCurrentScope, lastEventId, logger } from '@sentry/core';
 import * as React from 'react';
 import type { KeyboardTypeOptions } from 'react-native';
 import {
@@ -20,6 +21,15 @@ import defaultStyles from './FeedbackForm.styles';
 import type { FeedbackFormProps, FeedbackFormState, FeedbackFormStyles,FeedbackGeneralConfiguration, FeedbackTextConfiguration } from './FeedbackForm.types';
 import { checkInternetConnection, isValidEmail } from './utils';
 
+const submitFeedback = async (feedbackParams: SendFeedbackParams, hint: EventHint, success: () => void, error: (e: string) => void): Promise<void> => {
+  try {
+    await sendFeedback(feedbackParams, hint);
+    success();
+  } catch (e) {
+    error(e.toString());
+  }
+};
+
 /**
  * @beta
  * Implements a feedback form screen that sends feedback to Sentry using Sentry.captureFeedback.
@@ -75,11 +85,16 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     checkInternetConnection(() => { // onConnected
-      this.setState({ isVisible: false });
-      captureFeedback(userFeedback);
-      onSubmitSuccess({ name: trimmedName, email: trimmedEmail, message: trimmedDescription, attachments: undefined });
-      Alert.alert(text.successMessageText);
-      onFormSubmitted();
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      submitFeedback(userFeedback, undefined, () => { // success
+        this.setState({ isVisible: false });
+        onSubmitSuccess({ name: trimmedName, email: trimmedEmail, message: trimmedDescription, attachments: undefined });
+        Alert.alert(text.successMessageText);
+        onFormSubmitted();
+      }, (error: string) => { // error
+        Alert.alert(text.errorTitle, error);
+        logger.error(`Feedback form submission failed: ${error}`);
+      });
     }, () => { // onDisconnected
       Alert.alert(text.errorTitle, text.networkError);
       logger.error(`Feedback form submission failed: ${text.networkError}`);
diff --git a/packages/core/test/feedback/FeedbackForm.test.tsx b/packages/core/test/feedback/FeedbackForm.test.tsx
index 2d19f5402..07e9ee54f 100644
--- a/packages/core/test/feedback/FeedbackForm.test.tsx
+++ b/packages/core/test/feedback/FeedbackForm.test.tsx
@@ -1,4 +1,4 @@
-import { captureFeedback } from '@sentry/core';
+import { sendFeedback } from '@sentry-internal/feedback';
 import { fireEvent, render, waitFor } from '@testing-library/react-native';
 import * as React from 'react';
 import { Alert } from 'react-native';
@@ -16,7 +16,6 @@ jest.spyOn(Alert, 'alert');
 
 jest.mock('@sentry/core', () => ({
   ...jest.requireActual('@sentry/core'),
-  captureFeedback: jest.fn(),
   getCurrentScope: jest.fn(() => ({
     getUser: jest.fn(() => ({
       email: 'test@example.com',
@@ -29,6 +28,9 @@ jest.mock('../../src/js/feedback/utils', () => ({
   ...jest.requireActual('../../src/js/feedback/utils'),
   checkInternetConnection: jest.fn(),
 }));
+jest.mock('@sentry-internal/feedback', () => ({
+  sendFeedback: jest.fn(),
+}));
 
 const defaultProps: FeedbackFormProps = {
   onFormClose: mockOnFormClose,
@@ -112,7 +114,7 @@ describe('FeedbackForm', () => {
     });
   });
 
-  it('calls captureFeedback when the form is submitted successfully', async () => {
+  it('calls sendFeedback when the form is submitted successfully', async () => {
     const { getByPlaceholderText, getByText } = render(<FeedbackForm {...defaultProps} />);
 
     fireEvent.changeText(getByPlaceholderText(defaultProps.namePlaceholder), 'John Doe');
@@ -122,11 +124,11 @@ describe('FeedbackForm', () => {
     fireEvent.press(getByText(defaultProps.submitButtonLabel));
 
     await waitFor(() => {
-      expect(captureFeedback).toHaveBeenCalledWith({
+      expect(sendFeedback).toHaveBeenCalledWith({
         message: 'This is a feedback message.',
         name: 'John Doe',
         email: 'john.doe@example.com',
-      });
+      }, undefined);
     });
   });
 
diff --git a/yarn.lock b/yarn.lock
index 1ab773092..f77509c43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7821,6 +7821,7 @@ __metadata:
     "@react-native/babel-preset": 0.76.3
     "@sentry-internal/eslint-config-sdk": 8.45.1
     "@sentry-internal/eslint-plugin-sdk": 8.45.1
+    "@sentry-internal/feedback": 8.45.1
     "@sentry-internal/typescript": 8.45.1
     "@sentry/babel-plugin-component-annotate": 2.20.1
     "@sentry/browser": 8.45.1