From 04336aa91739af82d3a386d0fb61afc0f45512dc Mon Sep 17 00:00:00 2001
From: Chris Bongers <chrisbongers@gmail.com>
Date: Wed, 5 Feb 2025 16:19:47 +0200
Subject: [PATCH] fix: last item feedback

---
 .../FeedSettings/components/SmartPrompts.tsx  | 50 ++++++++++---------
 .../post/smartPrompts/CustomPrompt.tsx        | 11 +++-
 .../post/smartPrompts/PromptButtons.tsx       |  2 +-
 .../post/smartPrompts/SmartPrompt.tsx         |  3 ++
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/packages/shared/src/components/feeds/FeedSettings/components/SmartPrompts.tsx b/packages/shared/src/components/feeds/FeedSettings/components/SmartPrompts.tsx
index 13c55350a4..e909a194cd 100644
--- a/packages/shared/src/components/feeds/FeedSettings/components/SmartPrompts.tsx
+++ b/packages/shared/src/components/feeds/FeedSettings/components/SmartPrompts.tsx
@@ -7,8 +7,6 @@ import {
   TypographyType,
 } from '../../../typography/Typography';
 import { PlusUser } from '../../../PlusUser';
-import ConditionalWrapper from '../../../ConditionalWrapper';
-import { SimpleTooltip } from '../../../tooltips';
 import { LogEvent, Origin, TargetId } from '../../../../lib/log';
 import { Button, ButtonSize, ButtonVariant } from '../../../buttons/Button';
 import { plusUrl } from '../../../../lib/constants';
@@ -20,6 +18,8 @@ import { useSettingsContext } from '../../../../contexts/SettingsContext';
 import { labels } from '../../../../lib';
 import { useLogContext } from '../../../../contexts/LogContext';
 import { useFeedSettingsEditContext } from '../FeedSettingsEditContext';
+import { SimpleTooltip } from '../../../tooltips';
+import ConditionalWrapper from '../../../ConditionalWrapper';
 
 export const SmartPrompts = (): ReactElement => {
   const { editFeedSettings } = useFeedSettingsEditContext();
@@ -54,23 +54,25 @@ export const SmartPrompts = (): ReactElement => {
           of every post in one click.
         </Typography>
       </div>
-      <ConditionalWrapper
-        condition={!isPlus}
-        wrapper={(child) => {
-          return (
-            <SimpleTooltip
-              container={{
-                className: 'max-w-70 text-center typo-subhead',
-              }}
-              content="Upgrade to Plus to unlock Smart Prompts."
-            >
-              <div className="w-fit">{child as ReactElement}</div>
-            </SimpleTooltip>
-          );
-        }}
-      >
-        <div className="flex flex-col gap-2">
-          {prompts?.map(({ id, label, description }) => (
+
+      <div className="flex flex-col gap-2">
+        {prompts?.map(({ id, label, description }) => (
+          <ConditionalWrapper
+            condition={!isPlus}
+            key={`w-${id}`}
+            wrapper={(child) => {
+              return (
+                <SimpleTooltip
+                  container={{
+                    className: 'max-w-70 text-center typo-subhead',
+                  }}
+                  content="Upgrade to Plus to unlock Smart Prompts."
+                >
+                  <div className="w-fit">{child as ReactElement}</div>
+                </SimpleTooltip>
+              );
+            }}
+          >
             <FilterCheckbox
               key={id}
               name={`prompt-${id}`}
@@ -78,7 +80,7 @@ export const SmartPrompts = (): ReactElement => {
               description={description}
               disabled={!isPlus}
               onToggleCallback={() => {
-                const newState = !(promptFlags?.[id] || true);
+                const newState = !promptFlags?.[id] || false;
                 editFeedSettings(() => updatePromptFlag(id, newState));
                 displayToast(
                   labels.feed.settings.globalPreferenceNotice.smartPrompt,
@@ -86,7 +88,7 @@ export const SmartPrompts = (): ReactElement => {
 
                 logEvent({
                   event_name: LogEvent.ToggleSmartPrompts,
-                  target_type: label,
+                  target_type: id,
                   target_id: newState ? TargetId.On : TargetId.Off,
                   extra: JSON.stringify({
                     origin: Origin.Settings,
@@ -97,9 +99,9 @@ export const SmartPrompts = (): ReactElement => {
             >
               <Typography bold>{label}</Typography>
             </FilterCheckbox>
-          ))}
-        </div>
-      </ConditionalWrapper>
+          </ConditionalWrapper>
+        ))}
+      </div>
       {!isPlus && (
         <Button
           className="w-fit"
diff --git a/packages/shared/src/components/post/smartPrompts/CustomPrompt.tsx b/packages/shared/src/components/post/smartPrompts/CustomPrompt.tsx
index d7eb7d2f02..0db8fa92a9 100644
--- a/packages/shared/src/components/post/smartPrompts/CustomPrompt.tsx
+++ b/packages/shared/src/components/post/smartPrompts/CustomPrompt.tsx
@@ -17,12 +17,16 @@ import { labels } from '../../../lib';
 import { RenderMarkdown } from '../../RenderMarkdown';
 import { CopyIcon, EditIcon } from '../../icons';
 import { useCopyText } from '../../../hooks/useCopy';
+import { postLogEvent } from '../../../lib/feed';
+import { LogEvent } from '../../../lib/log';
+import { useLogContext } from '../../../contexts/LogContext';
 
 type CustomPromptProps = {
   post: Post;
 };
 
 export const CustomPrompt = ({ post }: CustomPromptProps): ReactElement => {
+  const { logEvent } = useLogContext();
   const { data: prompts } = usePromptsQuery();
   const [isEdit, setIsEdit] = useState(false);
   const [copying, copy] = useCopyText();
@@ -34,10 +38,15 @@ export const CustomPrompt = ({ post }: CustomPromptProps): ReactElement => {
   const onSubmitCustomPrompt = useCallback(
     (e) => {
       e.preventDefault();
+      logEvent(
+        postLogEvent(LogEvent.SmartPrompt, post, {
+          extra: { prompt: 'custom-prompt' },
+        }),
+      );
       setIsEdit(false);
       executePrompt(e.target[0].value);
     },
-    [executePrompt],
+    [executePrompt, logEvent, post],
   );
 
   if (!data || isEdit) {
diff --git a/packages/shared/src/components/post/smartPrompts/PromptButtons.tsx b/packages/shared/src/components/post/smartPrompts/PromptButtons.tsx
index f355ed59b6..50f602e335 100644
--- a/packages/shared/src/components/post/smartPrompts/PromptButtons.tsx
+++ b/packages/shared/src/components/post/smartPrompts/PromptButtons.tsx
@@ -141,7 +141,7 @@ export const PromptButtons = ({
         </SimpleTooltip>
       ))}
 
-      {!showAll && !isMobile && promptList?.length > 0 && (
+      {!showAll && !isMobile && promptList?.length > 0 && remainingTags > 0 && (
         <SimpleTooltip content="See more prompts">
           <Button
             variant={ButtonVariant.Subtle}
diff --git a/packages/shared/src/components/post/smartPrompts/SmartPrompt.tsx b/packages/shared/src/components/post/smartPrompts/SmartPrompt.tsx
index e07c65917a..21016ac5b1 100644
--- a/packages/shared/src/components/post/smartPrompts/SmartPrompt.tsx
+++ b/packages/shared/src/components/post/smartPrompts/SmartPrompt.tsx
@@ -38,6 +38,9 @@ export const SmartPrompt = ({ post }: { post: Post }): ReactElement => {
       if (!triedSmartPrompts) {
         completeAction(ActionType.SmartPrompt);
       }
+    }
+
+    if (![PromptDisplay.CustomPrompt, PromptDisplay.TLDR].includes(prompt)) {
       logEvent(
         postLogEvent(LogEvent.SmartPrompt, post, {
           extra: { prompt },