Activity status should not show feedback form

lexi-taylor · lexi-taylor · commit 270fc46a697e · 2025-05-06T23:48:05.000Z
diff --git a/__tests__/html2/activity/feedback.noForm.html b/__tests__/html2/activity/feedback.noForm.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<html lang="en-US">
+  <head>
+    <link href="/assets/index.css" rel="stylesheet" type="text/css" />
+    <script crossorigin="anonymous" src="https://unpkg.com/@babel/standalone@7.8.7/babel.min.js"></script>
+    <script crossorigin="anonymous" src="https://unpkg.com/react@16.8.6/umd/react.production.min.js"></script>
+    <script crossorigin="anonymous" src="https://unpkg.com/react-dom@16.8.6/umd/react-dom.production.min.js"></script>
+    <script crossorigin="anonymous" src="/test-harness.js"></script>
+    <script crossorigin="anonymous" src="/test-page-object.js"></script>
+    <script crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script>
+  </head>
+  <body>
+    <main id="webchat"></main>
+    <script type="text/babel">
+      run(async function () {
+        const {
+          React,
+          ReactDOM: { render },
+          WebChat: { ReactWebChat }
+        } = window; // Imports in UMD fashion.
+
+        const { directLine, store } = testHelpers.createDirectLineEmulator();
+
+        const App = () => (
+          <React.Fragment>
+            <ReactWebChat
+              directLine={directLine}
+              store={store}
+            />
+          </React.Fragment>
+        );
+
+        render(<App />, document.getElementById('webchat'));
+
+        await pageConditions.uiConnected();
+
+        await directLine.emulateIncomingActivity({
+          type: 'message',
+          id: 'a-00001',
+          timestamp: 0,
+          text: 'This is a a test message without a disclaimer',
+          from: {
+            role: 'bot'
+          },
+          locale: 'en-US',
+          entities: [],
+          channelData: {
+            feedbackLoop: {
+              type: 'default'
+            }
+          }
+        });
+
+        pageElements.byTestId('send box text area').focus();
+        await host.sendShiftTab(3);
+
+        await host.sendKeys('ENTER');
+        await host.sendKeys('ENTER');
+
+
+        await expect(pageElements.byTestId('feedback sendbox')).toBeFalsy();
+
+        await host.snapshot('local');
+      });
+    </script>
+  </body>
+</html>
diff --git a/__tests__/html2/activity/feedback.noForm.html.snap-1.png b/__tests__/html2/activity/feedback.noForm.html.snap-1.png
diff --git a/packages/component/src/ActivityFeedback/providers/ActivityFeedbackComposer.tsx b/packages/component/src/ActivityFeedback/providers/ActivityFeedbackComposer.tsx
@@ -13,7 +13,7 @@ import dereferenceBlankNodes from '../../Utils/JSONLinkedData/dereferenceBlankNo
 import hasFeedbackLoop from '../private/hasFeedbackLoop';
 import ActivityFeedbackContext, { type ActivityFeedbackContextType } from './private/ActivityFeedbackContext';
 
-const { usePonyfill, usePostActivity } = hooks;
+const { usePonyfill, usePostActivity, useStyleOptions } = hooks;
 
 type ActivityFeedbackComposerProps = Readonly<{
   activity: WebChatActivity;
@@ -188,7 +188,9 @@ function ActivityFeedbackComposer({ children, activity: activityFromProps }: Act
     [actionsRef, actionStateRef, activityRef, postActivity, setActionStateWithRefresh]
   );
 
-  const shouldShowFeedbackForm = hasFeedbackLoop(activity);
+  const [{ feedbackActionsPlacement }] = useStyleOptions();
+
+  const shouldShowFeedbackForm = hasFeedbackLoop(activity) && feedbackActionsPlacement === 'activity-actions';
   const shouldShowFeedbackFormRef = useRefFrom(shouldShowFeedbackForm);
 
   const shouldShowFeedbackFormState = useMemo<readonly [boolean]>(
