Regression: addAction verification breaking rooms (#24019)

app/push-notifications/client/tabBar.ts

@@ -4,21 +4,14 @@ import { useUserSubscription } from '../../../client/contexts/UserContext';
 import { addAction } from '../../../client/views/room/lib/Toolbox';
 
 addAction('push-notifications', ({ room }) => {
-	if (!room) {
-		return null;
-	}
+	const subscription = useUserSubscription(room?._id);
 
-	const subscription = useUserSubscription(room._id);
-	if (!subscription) {
-		return null;
-	}
-
-	return useMemo(() => ({
+	return useMemo(() => (subscription ? {
 		groups: ['channel', 'group', 'direct', 'direct_multiple', 'team'],
 		id: 'push-notifications',
 		title: 'Notifications_Preferences',
 		icon: 'bell',
 		template: lazy(() => import('../../../client/views/room/contextualBar/NotificationPreferences')),
 		order: 8,
-	}), []);
+	} : null), [subscription]);
 });

app/ui/client/lib/chatMessages.js

@@ -594,7 +594,7 @@ export class ChatMessages {
 
 	onDestroyed(rid, tmid) {
 		UserAction.cancel(rid);
-		if (this.input.parentElement.classList.contains('editing') === true) {
+		if (this.input.parentElement?.classList.contains('editing') === true) {
 			if (!tmid) {
 				this.clearCurrentDraft();
 				this.clearEditing();