Only catch errors thrown from the captureFeedback function

Author: antonis

packages/core/src/js/feedback/FeedbackForm.tsx

@@ -20,7 +20,7 @@ import { sentryLogo } from './branding';
 import { defaultConfiguration } from './defaults';
 import defaultStyles from './FeedbackForm.styles';
 import type { FeedbackFormProps, FeedbackFormState, FeedbackFormStyles,FeedbackGeneralConfiguration, FeedbackTextConfiguration } from './FeedbackForm.types';
-import { checkInternetConnection, isValidEmail } from './utils';
+import { isValidEmail } from './utils';
 
 /**
  * @beta
@@ -76,22 +76,18 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor
       associatedEventId: eventId,
     };
 
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    checkInternetConnection(() => { // onConnected
+    try {
       this.setState({ isVisible: false });
       captureFeedback(userFeedback);
       onSubmitSuccess({ name: trimmedName, email: trimmedEmail, message: trimmedDescription, attachments: undefined });
       Alert.alert(text.successMessageText);
       onFormSubmitted();
-    }, () => { // onDisconnected
-      Alert.alert(text.errorTitle, text.networkError);
-      logger.error(`Feedback form submission failed: ${text.networkError}`);
-    }, () => { // onError
-      const errorString = `Feedback form submission failed: ${text.genericError}`;
+    } catch (error) {
+      const errorString = `Feedback form submission failed: ${error}`;
       onSubmitError(new Error(errorString));
       Alert.alert(text.errorTitle, text.genericError);
-      logger.error(errorString);
-    });
+      logger.error(`Feedback form submission failed: ${error}`);
+    }
   };
 
   /**

packages/core/src/js/feedback/FeedbackForm.types.ts

@@ -129,12 +129,7 @@ export interface FeedbackTextConfiguration {
   emailError?: string;
 
   /**
-   * Message when there is a network error
-   */
-  networkError?: string;
-
-  /**
-   * Message when there is a network error
+   * Message when there is a generic error
    */
   genericError?: string;
 }

packages/core/src/js/feedback/defaults.ts

@@ -16,7 +16,6 @@ const ERROR_TITLE = 'Error';
 const FORM_ERROR = 'Please fill out all required fields.';
 const EMAIL_ERROR = 'Please enter a valid email address.';
 const SUCCESS_MESSAGE_TEXT = 'Thank you for your report!';
-const CONNECTIONS_ERROR_TEXT = 'Unable to send Feedback due to network issues.';
 const GENERIC_ERROR_TEXT = 'Unable to send feedback due to an unexpected error.';
 
 export const defaultConfiguration: Partial<FeedbackFormProps> = {
@@ -70,6 +69,5 @@ export const defaultConfiguration: Partial<FeedbackFormProps> = {
   formError: FORM_ERROR,
   emailError: EMAIL_ERROR,
   successMessageText: SUCCESS_MESSAGE_TEXT,
-  networkError: CONNECTIONS_ERROR_TEXT,
   genericError: GENERIC_ERROR_TEXT,
 };

packages/core/src/js/feedback/utils.ts

@@ -1,20 +1,3 @@
-export const checkInternetConnection = async (
-  onConnected: () => void,
-  onDisconnected: () => void,
-  onError: () => void,
-): Promise<void> => {
-  try {
-    const response = await fetch('https://sentry.io', { method: 'HEAD' });
-    if (response.ok) {
-      onConnected();
-    } else {
-      onDisconnected();
-    }
-  } catch (error) {
-    onError();
-  }
-};
-
 export const isValidEmail = (email: string): boolean => {
   const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
   return emailRegex.test(email);

packages/core/test/feedback/FeedbackForm.test.tsx

@@ -5,7 +5,6 @@ import { Alert } from 'react-native';
 
 import { FeedbackForm } from '../../src/js/feedback/FeedbackForm';
 import type { FeedbackFormProps } from '../../src/js/feedback/FeedbackForm.types';
-import { checkInternetConnection } from '../../src/js/feedback/utils';
 
 const mockOnFormClose = jest.fn();
 const mockOnSubmitSuccess = jest.fn();
@@ -26,10 +25,6 @@ jest.mock('@sentry/core', () => ({
   })),
   lastEventId: jest.fn(),
 }));
-jest.mock('../../src/js/feedback/utils', () => ({
-  ...jest.requireActual('../../src/js/feedback/utils'),
-  checkInternetConnection: jest.fn(),
-}));
 
 const defaultProps: FeedbackFormProps = {
   onFormClose: mockOnFormClose,
@@ -50,16 +45,10 @@ const defaultProps: FeedbackFormProps = {
   formError: 'Please fill out all required fields.',
   emailError: 'The email address is not valid.',
   successMessageText: 'Feedback success',
-  networkError: 'Network error',
   genericError: 'Generic error',
 };
 
 describe('FeedbackForm', () => {
-  beforeEach(() => {
-    (checkInternetConnection as jest.Mock).mockImplementation((onConnected, _onDisconnected, _onError) => {
-      onConnected();
-    });
-  });
   afterEach(() => {
     jest.clearAllMocks();
   });
@@ -163,27 +152,9 @@ describe('FeedbackForm', () => {
     });
   });
 
-  it('shows an error message when there is no network connection', async () => {
-    (checkInternetConnection as jest.Mock).mockImplementationOnce((_onConnected, onDisconnected, _onError) => {
-      onDisconnected();
-    });
-
-    const { getByPlaceholderText, getByText } = render(<FeedbackForm {...defaultProps} />);
-
-    fireEvent.changeText(getByPlaceholderText(defaultProps.namePlaceholder), 'John Doe');
-    fireEvent.changeText(getByPlaceholderText(defaultProps.emailPlaceholder), '[email protected]');
-    fireEvent.changeText(getByPlaceholderText(defaultProps.messagePlaceholder), 'This is a feedback message.');
-
-    fireEvent.press(getByText(defaultProps.submitButtonLabel));
-
-    await waitFor(() => {
-      expect(Alert.alert).toHaveBeenCalledWith(defaultProps.errorTitle, defaultProps.networkError);
-    });
-  });
-
   it('shows an error message when there is a generic connection', async () => {
-    (checkInternetConnection as jest.Mock).mockImplementationOnce((_onConnected, _onDisconnected, onError) => {
-      onError();
+    (captureFeedback as jest.Mock).mockImplementationOnce(() => {
+      throw new Error('Test error');
     });
 
     const { getByPlaceholderText, getByText } = render(<FeedbackForm {...defaultProps} />);
@@ -200,8 +171,8 @@ describe('FeedbackForm', () => {
   });
 
   it('calls onSubmitError when there is an error', async () => {
-    (checkInternetConnection as jest.Mock).mockImplementationOnce((_onConnected, _onDisconnected, onError) => {
-      onError();
+    (captureFeedback as jest.Mock).mockImplementationOnce(() => {
+      throw new Error('Test error');
     });
 
     const { getByPlaceholderText, getByText } = render(<FeedbackForm {...defaultProps} />);