diff --git a/apps/meteor/app/ui-utils/client/lib/SideNav.ts b/apps/meteor/app/ui-utils/client/lib/SideNav.ts
index 5d3a6801fce6d..94bcc6f4b179c 100644
--- a/apps/meteor/app/ui-utils/client/lib/SideNav.ts
+++ b/apps/meteor/app/ui-utils/client/lib/SideNav.ts
@@ -27,7 +27,7 @@ export const SideNav = new (class extends Emitter<{
 
 	private flexNav: JQuery<HTMLElement>;
 
-	toggleFlex(status: 1 | -1, callback: () => void): void {
+	toggleFlex(status: 1 | -1, callback?: () => void): void {
 		if (this.animating === true) {
 			return;
 		}
diff --git a/apps/meteor/client/views/admin/sidebar/AdminSidebar.js b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
similarity index 80%
rename from apps/meteor/client/views/admin/sidebar/AdminSidebar.js
rename to apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
index 8d5e9a229696a..5b36ccb36fdbb 100644
--- a/apps/meteor/client/views/admin/sidebar/AdminSidebar.js
+++ b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useEffect, memo } from 'react';
+import React, { useCallback, useMemo, useEffect, memo, FC } from 'react';
 
 import { menu, SideNav } from '../../../../app/ui-utils/client';
 import PlanTag from '../../../components/PlanTag';
@@ -11,7 +11,7 @@ import SettingsProvider from '../../../providers/SettingsProvider';
 import AdminSidebarPages from './AdminSidebarPages';
 import AdminSidebarSettings from './AdminSidebarSettings';
 
-function AdminSidebar() {
+const AdminSidebar: FC = () => {
 	const t = useTranslation();
 
 	const canViewSettings = useAtLeastOnePermission(
@@ -28,7 +28,8 @@ function AdminSidebar() {
 	}, []);
 
 	const currentRoute = useCurrentRoute();
-	const currentPath = useRoutePath(...currentRoute);
+	const [currentRouteName, currentRouteParams, currentQueryStringParams] = currentRoute;
+	const currentPath = useRoutePath(currentRouteName || '', currentRouteParams, currentQueryStringParams);
 	const [, , , currentRouteGroupName] = currentRoute;
 
 	useEffect(() => {
@@ -50,12 +51,12 @@ function AdminSidebar() {
 					}
 				/>
 				<Sidebar.Content>
-					<AdminSidebarPages currentPath={currentPath} />
-					{canViewSettings && <AdminSidebarSettings currentPath={currentPath} />}
+					<AdminSidebarPages currentPath={currentPath || ''} />
+					{canViewSettings && <AdminSidebarSettings currentPath={currentPath || ''} />}
 				</Sidebar.Content>
 			</Sidebar>
 		</SettingsProvider>
 	);
-}
+};
 
 export default memo(AdminSidebar);
diff --git a/apps/meteor/client/views/omnichannel/components/Field.js b/apps/meteor/client/views/omnichannel/components/Field.js
deleted file mode 100644
index d45043ae5e672..0000000000000
--- a/apps/meteor/client/views/omnichannel/components/Field.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Box } from '@rocket.chat/fuselage';
-import React from 'react';
-
-const Field = ({ children }) => <Box mb='x16'>{children}</Box>;
-
-export default Field;
diff --git a/apps/meteor/client/views/omnichannel/components/Field.tsx b/apps/meteor/client/views/omnichannel/components/Field.tsx
new file mode 100644
index 0000000000000..64651ba24054f
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/components/Field.tsx
@@ -0,0 +1,6 @@
+import { Box } from '@rocket.chat/fuselage';
+import React, { FC } from 'react';
+
+const Field: FC = ({ children }) => <Box mb='x16'>{children}</Box>;
+
+export default Field;
diff --git a/apps/meteor/client/views/omnichannel/components/Label.js b/apps/meteor/client/views/omnichannel/components/Label.js
deleted file mode 100644
index 2cb387f697f8b..0000000000000
--- a/apps/meteor/client/views/omnichannel/components/Label.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Box } from '@rocket.chat/fuselage';
-import React from 'react';
-
-const Label = (props) => <Box mbe='x8' fontScale='p2m' color='default' {...props} />;
-
-export default Label;
diff --git a/apps/meteor/client/views/omnichannel/components/Label.tsx b/apps/meteor/client/views/omnichannel/components/Label.tsx
new file mode 100644
index 0000000000000..63c9f71b0e2db
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/components/Label.tsx
@@ -0,0 +1,6 @@
+import { Box } from '@rocket.chat/fuselage';
+import React, { ComponentProps, FC } from 'react';
+
+const Label: FC<ComponentProps<typeof Box>> = (props) => <Box mbe='x8' fontScale='p2m' color='default' {...props} />;
+
+export default Label;