diff --git a/plugins/woocommerce-admin/client/activity-panel/activity-panel.js b/plugins/woocommerce-admin/client/activity-panel/activity-panel.js
index 2b275810c9d..a3ecf8cef0a 100644
--- a/plugins/woocommerce-admin/client/activity-panel/activity-panel.js
+++ b/plugins/woocommerce-admin/client/activity-panel/activity-panel.js
@@ -46,7 +46,6 @@ import { getUrlParams } from '~/utils';
import { useActiveSetupTasklist } from '~/task-lists';
import { getSegmentsFromPath } from '~/utils/url-helpers';
import { FeedbackIcon } from '~/products/images/feedback-icon';
-import { ProductFeedbackTour } from '~/guided-tours/add-product-feedback-tour';
const HelpPanel = lazy( () =>
import( /* webpackChunkName: "activity-panels-help" */ './panels/help' )
@@ -482,9 +481,6 @@ export const ActivityPanel = ( { isEmbedded, query } ) => {
clearPanel={ () => clearPanel() }
/>
- { isAddProductPage() && (
-
- ) }
{ showHelpHighlightTooltip ? (
{
- const { hasShownTour } = useSelect( ( select ) => {
- const { getOption } = select( OPTIONS_STORE_NAME );
-
- return {
- hasShownTour: getOption( FEEDBACK_TOUR_OPTION ) as
- | boolean
- | undefined,
- };
- } );
-
- return hasShownTour;
-};
-
-type ProductFeedbackTourProps = {
- currentTab: string;
-};
-
-export const ProductFeedbackTour: React.FC< ProductFeedbackTourProps > = ( {
- currentTab,
-} ) => {
- const hasShownTour = useShowProductFeedbackTour();
- const [ isTourVisible, setIsTourVisible ] = useState( false );
- const tourTimeout = useRef< ReturnType< typeof setTimeout > | null >(
- null
- );
- const { updateOptions } = useDispatch( OPTIONS_STORE_NAME );
-
- const clearTourTimeout = () => {
- clearTimeout( tourTimeout.current as ReturnType< typeof setTimeout > );
- tourTimeout.current = null;
- };
-
- useEffect( () => {
- if ( hasShownTour !== false ) {
- return;
- }
-
- tourTimeout.current = setTimeout( () => {
- setIsTourVisible( true );
- }, FEEDBACK_TIMEOUT_MS );
-
- return () => clearTourTimeout();
- }, [ hasShownTour ] );
-
- useEffect( () => {
- if ( ! isTourVisible ) {
- return;
- }
- updateOptions( {
- [ FEEDBACK_TOUR_OPTION ]: true,
- } );
- }, [ isTourVisible ] );
-
- if (
- currentTab === 'feedback' &&
- ( isTourVisible || tourTimeout.current )
- ) {
- setIsTourVisible( false );
- clearTourTimeout();
- }
-
- if ( ! isTourVisible ) {
- return null;
- }
-
- return (
- {
- setIsTourVisible( false );
- },
- } }
- />
- );
-};
diff --git a/plugins/woocommerce/changelog/dev-40130_remove_feeling_stuck_tooltip b/plugins/woocommerce/changelog/dev-40130_remove_feeling_stuck_tooltip
new file mode 100644
index 00000000000..c1499e51e2a
--- /dev/null
+++ b/plugins/woocommerce/changelog/dev-40130_remove_feeling_stuck_tooltip
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Remove "Feeling Stuck" tooltip #40397