Fix merge conflicts

components/LinkViews/LinkCard.tsx

@@ -16,6 +16,7 @@ import Link from "next/link";
 import LinkIcon from "./LinkComponents/LinkIcon";
 import useOnScreen from "@/hooks/useOnScreen";
 import { generateLinkHref } from "@/lib/client/generateLinkHref";
+import useAccountStore from "@/store/account";
 import usePermissions from "@/hooks/usePermissions";
 
 type Props = {
@@ -32,6 +33,7 @@ export default function LinkCard({
   showCheckbox = true,
 }: Props) {
   const { collections } = useCollectionStore();
+  const { account } = useAccountStore();
 
   const { links, getLink, setSelectedLinks, selectedLinks } = useLinkStore();
 
@@ -106,7 +108,7 @@ export default function LinkCard({
         />
       }
       <Link
-        href={generateLinkHref(link)}
+        href={generateLinkHref(link, account)}
         target="_blank"
         className="rounded-2xl cursor-pointer"
       >

components/LinkViews/LinkList.tsx

@@ -13,6 +13,7 @@ import LinkIcon from "@/components/LinkViews/LinkComponents/LinkIcon";
 import Link from "next/link";
 import { isPWA } from "@/lib/client/utils";
 import { generateLinkHref } from "@/lib/client/generateLinkHref";
+import useAccountStore from "@/store/account";
 import usePermissions from "@/hooks/usePermissions";
 
 type Props = {
@@ -29,6 +30,7 @@ export default function LinkCardCompact({
   showCheckbox = true,
 }: Props) {
   const { collections } = useCollectionStore();
+  const { account } = useAccountStore();
   const { links, setSelectedLinks, selectedLinks } = useLinkStore();
 
   const handleCheckboxClick = (link: LinkIncludingShortenedCollectionAndTags) => {
@@ -81,7 +83,7 @@ export default function LinkCardCompact({
           />
         }
         <Link
-          href={generateLinkHref(link)}
+          href={generateLinkHref(link, account)}
           target="_blank"
           className="flex items-center cursor-pointer"
         >

lib/client/generateLinkHref.ts

@@ -1,10 +1,8 @@
-import useAccountStore from "@/store/account";
-import { ArchivedFormat, LinkIncludingShortenedCollectionAndTags } from "@/types/global";
+import { AccountSettings, ArchivedFormat, LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 import { LinksRouteTo } from "@prisma/client";
 import { pdfAvailable, readabilityAvailable, screenshotAvailable } from "../shared/getArchiveValidity";
 
-export const generateLinkHref = (link: LinkIncludingShortenedCollectionAndTags): string => {
-	const { account } = useAccountStore();
+export const generateLinkHref = (link: LinkIncludingShortenedCollectionAndTags, account: AccountSettings): string => {
 
 	// Return the links href based on the account's preference
 	// If the user's preference is not available, return the original link