Use AddScreenshot naming

getsentry · Jan 10, 2025 · a1cb828 · a1cb828
1 parent fe23346
commit a1cb828
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/packages/core/src/js/feedback/FeedbackForm.tsx b/packages/core/src/js/feedback/FeedbackForm.tsx
@@ -94,10 +94,10 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor
     Alert.alert(text.successMessageText);
   };
 
-  public addRemoveAttachment: () => void = () => {
+  public addRemoveScreenshot: () => void = () => {
     if (!this.state.filename && !this.state.attachment) {
-      const { onFileChosen } = { ...defaultConfiguration, ...this.props };
-      onFileChosen((filename: string, attachement: string | Uint8Array) => {
+      const { onAddScreenshot } = { ...defaultConfiguration, ...this.props };
+      onAddScreenshot((filename: string, attachement: string | Uint8Array) => {
         this.setState({ filename, attachment: attachement });
       });
     } else {
@@ -183,7 +183,7 @@ export class FeedbackForm extends React.Component<FeedbackFormProps, FeedbackFor
                 multiline
               />
               {config.enableScreenshot && (
-                <TouchableOpacity style={styles.screenshotButton} onPress={this.addRemoveAttachment}>
+                <TouchableOpacity style={styles.screenshotButton} onPress={this.addRemoveScreenshot}>
                   <Text style={styles.screenshotText}>
                   {!this.state.filename && !this.state.attachment
                     ? text.addScreenshotButtonLabel

diff --git a/packages/core/src/js/feedback/FeedbackForm.types.ts b/packages/core/src/js/feedback/FeedbackForm.types.ts
@@ -154,9 +154,9 @@ export interface FeedbackCallbacks {
   onFormClose?: () => void;
 
   /**
-   * Callback when a file is chosen for attachment
+   * Callback when a screenshot is added
    */
-  onFileChosen?: (attachFile: (filename: string, base64Attachment: string | Uint8Array) => void) => void;
+  onAddScreenshot?: (attachFile: (filename: string, base64Attachment: string | Uint8Array) => void) => void;
 }
 
 /**

diff --git a/packages/core/src/js/feedback/defaults.ts b/packages/core/src/js/feedback/defaults.ts
@@ -29,9 +29,9 @@ export const defaultConfiguration: Partial<FeedbackFormProps> = {
       );
     }
   },
-  onFileChosen: (_: (filename: string, base64Attachment: string | Uint8Array) => void) => {
+  onAddScreenshot: (_: (filename: string, base64Attachment: string | Uint8Array) => void) => {
     if (__DEV__) {
-      Alert.alert('Development note', 'onFileChosen callback is not implemented.');
+      Alert.alert('Development note', 'onAddScreenshot callback is not implemented.');
     }
   },
 

diff --git a/packages/core/test/feedback/FeedbackForm.test.tsx b/packages/core/test/feedback/FeedbackForm.test.tsx
@@ -7,7 +7,7 @@ import { FeedbackForm } from '../../src/js/feedback/FeedbackForm';
 import type { FeedbackFormProps } from '../../src/js/feedback/FeedbackForm.types';
 
 const mockOnFormClose = jest.fn();
-const mockOnFileChosen = jest.fn();
+const mockOnAddScreenshot = jest.fn();
 const mockGetUser = jest.fn(() => ({
   email: '[email protected]',
   name: 'Test User',
@@ -25,7 +25,7 @@ jest.mock('@sentry/core', () => ({
 
 const defaultProps: FeedbackFormProps = {
   onFormClose: mockOnFormClose,
-  onFileChosen: mockOnFileChosen,
+  onAddScreenshot: mockOnAddScreenshot,
   addScreenshotButtonLabel: 'Add Screenshot',
   formTitle: 'Feedback Form',
   nameLabel: 'Name',
@@ -168,13 +168,13 @@ describe('FeedbackForm', () => {
     });
   });
 
-  it('calls onFileChosen when the screenshot button is pressed', async () => {
+  it('calls onAddScreenshot when the screenshot button is pressed', async () => {
     const { getByText } = render(<FeedbackForm {...defaultProps} enableScreenshot={true} />);
 
     fireEvent.press(getByText(defaultProps.addScreenshotButtonLabel));
 
     await waitFor(() => {
-      expect(mockOnFileChosen).toHaveBeenCalled();
+      expect(mockOnAddScreenshot).toHaveBeenCalled();
     });
   });
 

diff --git a/samples/react-native/ios/sentryreactnativesample/PrivacyInfo.xcprivacy b/samples/react-native/ios/sentryreactnativesample/PrivacyInfo.xcprivacy
@@ -10,6 +10,7 @@
 			<key>NSPrivacyAccessedAPITypeReasons</key>
 			<array>
 				<string>C617.1</string>
+				<string>3B52.1</string>
 			</array>
 		</dict>
 		<dict>

diff --git a/samples/react-native/src/App.tsx b/samples/react-native/src/App.tsx
@@ -141,7 +141,7 @@ const Stack = isMobileOs
   : createStackNavigator();
 const Tab = createBottomTabNavigator();
 
-const handleChooseFile = (attachFile: (filename: string, base64Attachment: string | Uint8Array) => void): void => {
+const handleChooseImage = (attachFile: (filename: string, base64Attachment: string | Uint8Array) => void): void => {
   launchImageLibrary({ mediaType: 'photo', includeBase64: true }, (response) => {
     if (response.didCancel) {
       console.log('User cancelled image picker');
@@ -176,7 +176,7 @@ const ErrorsTabNavigator = Sentry.withProfiler(
                 <FeedbackForm
                   {...props}
                   enableScreenshot={true}
-                  onFileChosen={handleChooseFile}
+                  onAddScreenshot={handleChooseImage}
                   onFormClose={props.navigation.goBack}
                   styles={{
                     submitButton: {