Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6

app/javascript/mastodon/features/collections/components/collection_menu.tsx

@@ -163,11 +163,7 @@ export const CollectionMenu: React.FC<{
         return ownerItems;
       }
     } else {
-      const nonOwnerItems: MenuItem[] = [
-        viewCollectionItem,
-        ...shareItems,
-        null,
-      ];
+      const nonOwnerItems: MenuItem[] = [...shareItems, null];
 
       // Collection notifications already have a prominent 'Remove me' button
       if (currentAccountInCollection && context !== 'notifications') {
@@ -189,6 +185,10 @@ export const CollectionMenu: React.FC<{
         });
       }
 
+      if (context !== 'collection') {
+        return [viewCollectionItem, ...nonOwnerItems];
+      }
+
       return nonOwnerItems;
     }
   }, [