dropdown menu items hide all of item when loading, can subscribe to o…

…wn feed
ForumMagnum · May 15, 2024 · b70207a · b70207a
1 parent dc49213
commit b70207a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/packages/lesswrong/components/dropdowns/DropdownItem.tsx b/packages/lesswrong/components/dropdowns/DropdownItem.tsx
@@ -119,24 +119,24 @@ const DropdownItem = ({
               <Loading />
             </ListItemIcon>
           }
-          {icon && !loading &&
-            <ListItemIcon>
+          {!loading && <>
+            {icon && <ListItemIcon>
               {typeof icon === "string"
                 ? <ForumIcon icon={icon} className={iconClassName} />
                 : icon()
               }
-            </ListItemIcon>
-          }
-          <span className={classes.title}>{title}</span>
-          {typeof afterIcon === "string"
-            ? <ForumIcon icon={afterIcon} className={classes.afterIcon} />
-            : afterIcon?.()
-          }
-          {sideMessage &&
-            <div className={classes.sideMessage}>
-              {sideMessage}
-            </div>
-          }
+            </ListItemIcon>}
+            <span className={classes.title}>{title}</span>
+            {typeof afterIcon === "string"
+              ? <ForumIcon icon={afterIcon} className={classes.afterIcon} />
+              : afterIcon?.()
+            }
+            {sideMessage &&
+              <div className={classes.sideMessage}>
+                {sideMessage}
+              </div>
+            }
+          </>}
         </MenuItem>
       </TooltipWrapper>
     </LinkWrapper>

diff --git a/packages/lesswrong/components/dropdowns/NotifyMeToggleDropdownItem.tsx b/packages/lesswrong/components/dropdowns/NotifyMeToggleDropdownItem.tsx
@@ -31,7 +31,7 @@ export const NotifyMeToggleDropdownItemInternal = ({
   subscriptionType,
   classes,
 }: NotifyMeToggleDropdownItemInternalProps) => {
-  const {isSubscribed, onSubscribe} = useNotifyMe({
+  const {isSubscribed, onSubscribe, loading, disabled } = useNotifyMe({
     document,
     overrideSubscriptionType: subscriptionType,
     hideFlashes: true,
@@ -53,6 +53,8 @@ export const NotifyMeToggleDropdownItemInternal = ({
       title={title}
       onClick={toggleSubscribed}
       afterIcon={afterIcon}
+      loading={loading}
+      disabled={disabled}
     />
   );
 }

diff --git a/packages/lesswrong/components/hooks/useNotifyMe.ts b/packages/lesswrong/components/hooks/useNotifyMe.ts
@@ -192,8 +192,8 @@ export const useNotifyMe = ({
     };
   };
 
-  // Can't subscribe to yourself
-  if (collectionName === 'Users' && document._id === currentUser?._id) {
+  // Can't subscribe to yourself, unless it's for your feed
+  if (collectionName === 'Users' && document._id === currentUser?._id && subscriptionType !== 'newActivityForFeed') {
     return {
       disabled: true,
       loading: false,

diff --git a/packages/lesswrong/lib/subscriptionUtil.ts b/packages/lesswrong/lib/subscriptionUtil.ts
@@ -40,6 +40,8 @@ export function userIsDefaultSubscribed({user, subscriptionType, collectionName,
     case subscriptionTypes.newDialogueMessages:
       const authorIds = [document.userId, ...getConfirmedCoauthorIds(document)];
       return authorIds.includes(user._id);
+    case subscriptionTypes.newActivityForFeed:
+      return false;
     default:
       //eslint-disable-next-line no-console
       console.error("Unrecognized subscription type: "+subscriptionType);