chore: move some conditionals to effect

RocketChat · Nov 22, 2024 · 38e057b · 38e057b
1 parent f95f668
commit 38e057b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/apps/meteor/client/components/message/toolbar/useJumpToStarMessage.tsx b/apps/meteor/client/components/message/toolbar/useJumpToStarMessage.tsx
@@ -8,6 +8,12 @@ export const useJumpToStarMessage = () => {
 	const allowStarring = useSetting('Message_AllowStarring');
 
 	useEffect(() => {
+		if (!allowStarring) {
+			return () => {
+				MessageAction.removeButton('jump-to-star-message');
+			};
+		}
+
 		MessageAction.addButton({
 			id: 'jump-to-star-message',
 			icon: 'jump',
@@ -17,7 +23,7 @@ export const useJumpToStarMessage = () => {
 				setMessageJumpQueryStringParameter(message._id);
 			},
 			condition({ message, subscription, user }) {
-				if (subscription == null || !allowStarring) {
+				if (subscription == null) {
 					return false;
 				}