address PR review feedback

- Form: use ?? so empty-string text overrides are respected (Copilot)
- constants: grammar fix "with an empty message" (Copilot)
- sendFeedback: clean up afterSendEvent listener on timeout to avoid leak (Copilot)
- tests: cover empty-message and no-client early-return paths (Copilot)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: logaretm

packages/feedback/src/constants/index.ts

@@ -26,7 +26,7 @@ export const HIGHLIGHT_TOOL_TEXT = 'Highlight';
 export const HIDE_TOOL_TEXT = 'Hide';
 export const REMOVE_HIGHLIGHT_TEXT = 'Remove';
 
-export const ERROR_EMPTY_MESSAGE_TEXT = 'Unable to submit feedback with empty message';
+export const ERROR_EMPTY_MESSAGE_TEXT = 'Unable to submit feedback with an empty message';
 export const ERROR_NO_CLIENT_TEXT = 'No client setup, cannot send feedback.';
 export const ERROR_TIMEOUT_TEXT = 'Unable to determine if Feedback was correctly sent.';
 export const ERROR_FORBIDDEN_TEXT =

packages/feedback/src/core/sendFeedback.ts

@@ -37,7 +37,10 @@ export const sendFeedback: SendFeedback = (
   // We want to wait for the feedback to be sent (or not)
   return new Promise<string>((resolve, reject) => {
     // After 30s, we want to clear anyhow
-    const timeout = setTimeout(() => reject('ERROR_TIMEOUT' satisfies FeedbackErrorCode), 30_000);
+    const timeout = setTimeout(() => {
+      cleanup();
+      reject('ERROR_TIMEOUT' satisfies FeedbackErrorCode);
+    }, 30_000);
 
     const cleanup = client.on('afterSendEvent', (event: Event, response: TransportMakeRequestResponse) => {
       if (event.event_id !== eventId) {

packages/feedback/src/modal/components/Form.tsx

@@ -146,7 +146,7 @@ export function Form({
         } catch (error) {
           DEBUG_BUILD && debug.error(error);
           const err = error instanceof Error ? error : new Error(String(error));
-          setError(errorTextByCode[err.message as FeedbackErrorCode] || errorGenericText);
+          setError(errorTextByCode[err.message as FeedbackErrorCode] ?? errorGenericText);
           onSubmitError(err);
         }
       } finally {

packages/feedback/test/core/sendFeedback.test.ts

@@ -267,6 +267,21 @@ describe('sendFeedback', () => {
     ]);
   });
 
+  it('throws when message is empty', () => {
+    mockSdk();
+    expect(() => sendFeedback({ message: '' })).toThrow('ERROR_EMPTY_MESSAGE');
+  });
+
+  it('throws when no client is set up', async () => {
+    // Isolate in its own scope so the client set up by other tests doesn't bleed in.
+    // `getClient` reads from the current scope; resetting it here leaves no client.
+    const { getGlobalScope } = await import('@sentry/core');
+    getGlobalScope().setClient(undefined);
+    getCurrentScope().setClient(undefined);
+    getIsolationScope().setClient(undefined);
+    expect(() => sendFeedback({ message: 'mi' })).toThrow('ERROR_NO_CLIENT');
+  });
+
   it('handles 400 transport error', async () => {
     mockSdk();
     vi.spyOn(getClient()!.getTransport()!, 'send').mockImplementation(() => {