More typing and fixes

src/pages/homepage/components/Bookmarks/Bookmarks.tsx

@@ -5,7 +5,7 @@ import { textClasses } from 'styles';
 import type { Bookmark, BookmarkGroup } from 'types';
 import LinkGroups from './LinkGroups';
 
-function Links({ contentType }: { contentType: [string] }) {
+function Links({ contentType }: { contentType: string[] }) {
 	const { data: linkData, isFetched: linksIsFetched } = useQueryAPI({
 		endpoint: 'api/links',
 	});
@@ -28,18 +28,26 @@ function Links({ contentType }: { contentType: [string] }) {
 				return category;
 			});
 			setGroups(
-				groupList.sort((a: any, b: any) => {
+				groupList.sort((a: BookmarkGroup, b: BookmarkGroup) => {
 					switch (bookmarkSort) {
 						case 'A>Z':
 							return a.categoryName > b.categoryName ? 1 : -1;
 						case 'Z>A':
 							return a.categoryName < b.categoryName ? 1 : -1;
 						case 'Newest':
-							return a.id < b.id ? 1 : -1;
+							if (a.id && b.id) {
+								return a.id < b.id ? 1 : -1;
+							}
+
+							return -1;
 						case 'Oldest':
-							return a.id > b.id ? 1 : -1;
+							if (a.id && b.id) {
+								return a.id > b.id ? 1 : -1;
+							}
+
+							return -1;
 						case 'Custom':
-							return a.index > b.index ? 1 : -1;
+							return a.categoryIndex > b.categoryIndex ? 1 : -1;
 					}
 				}),
 			);