improvements

Signed-off-by: Abhinav Kumar <[email protected]>

Author: abhinavkrin

apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx

@@ -16,7 +16,7 @@ const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement
 	const removeSidenav = embeddedLayout && !currentRoutePath?.startsWith('/admin');
 
 	const firstChannelAfterLogin = useSetting<string>('First_Channel_After_Login', '');
-	const roomName = firstChannelAfterLogin.startsWith('#') ? firstChannelAfterLogin.slice(1) : firstChannelAfterLogin;
+	const roomName = (firstChannelAfterLogin.startsWith('#') ? firstChannelAfterLogin.slice(1) : firstChannelAfterLogin).trim();
 
 	const redirected = useRef(false);
 
@@ -31,6 +31,11 @@ const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement
 			return;
 		}
 
+		if (roomName.startsWith('@') || roomName.startsWith('?')) {
+			// Because this will break url routing. Eg: /channel/#roomName and /channel/?roomName which will route to path /channel
+			return;
+		}
+
 		if (redirected.current) {
 			return;
 		}

apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx

@@ -21,7 +21,7 @@ const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElemen
 	const removeSidenav = embeddedLayout && !currentRoutePath?.startsWith('/admin');
 
 	const firstChannelAfterLogin = useSetting<string>('First_Channel_After_Login', '');
-	const roomName = firstChannelAfterLogin.startsWith('#') ? firstChannelAfterLogin.slice(1) : firstChannelAfterLogin;
+	const roomName = (firstChannelAfterLogin.startsWith('#') ? firstChannelAfterLogin.slice(1) : firstChannelAfterLogin).trim();
 
 	const redirected = useRef(false);
 
@@ -36,6 +36,11 @@ const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElemen
 			return;
 		}
 
+		if (roomName.startsWith('@') || roomName.startsWith('?')) {
+			// Because this will break url routing. Eg: /channel/#roomName and /channel/?roomName which will route to path /channel
+			return;
+		}
+
 		if (redirected.current) {
 			return;
 		}