Fix more types and use logical ANDs

components/CollectionCard.tsx

@@ -1,5 +1,5 @@
 import Link from "next/link";
-import { CollectionIncludingMembersAndLinkCount } from "@/types/global";
+import { AccountSettings, CollectionIncludingMembersAndLinkCount } from "@/types/global";
 import React, { useEffect, useState } from "react";
 import ProfilePhoto from "./ProfilePhoto";
 import usePermissions from "@/hooks/usePermissions";
@@ -33,15 +33,7 @@ export default function CollectionCard({ collection, className }: Props) {
 
   const permissions = usePermissions(collection.id as number);
 
-  const [collectionOwner, setCollectionOwner] = useState({
-    id: null as unknown as number,
-    name: "",
-    username: "",
-    image: "",
-    archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsMonolith: undefined as unknown as boolean,
-    archiveAsPDF: undefined as unknown as boolean,
-  });
+  const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
 
   useEffect(() => {
     const fetchOwner = async () => {

components/InputSelect/CollectionSelection.tsx

@@ -6,16 +6,6 @@ import { Options } from "./types";
 import CreatableSelect from "react-select/creatable";
 import Select, { ActionMeta } from "react-select";
 
-interface Option {
-  label: string;
-  value: number;
-  ownerId: number;
-  count?: {
-    links: number;
-  };
-  parentId?: number;
-}
-
 type Props = {
   onChange: (newValue: unknown, actionMeta: ActionMeta<unknown>) => void;
   showDefaultValue?: boolean;
@@ -113,7 +103,7 @@ export default function CollectionSelection({
         onChange={onChange}
         options={options}
         styles={styles}
-        defaultValue={showDefaultValue ? defaultValue : null}
+        defaultValue={showDefaultValue && defaultValue}
         components={{
           Option: customOption,
         }}
@@ -129,7 +119,7 @@ export default function CollectionSelection({
         onChange={onChange}
         options={options}
         styles={styles}
-        defaultValue={showDefaultValue ? defaultValue : null}
+        defaultValue={showDefaultValue && defaultValue}
         components={{
           Option: customOption,
         }}

components/InputSelect/TagSelection.tsx

@@ -35,7 +35,6 @@ export default function TagSelection({ onChange, defaultValue }: Props) {
       options={options}
       styles={styles}
       defaultValue={defaultValue}
-      // menuPosition="fixed"
       isMulti
     />
   );

components/ModalContent/EditCollectionSharingModal.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import TextInput from "@/components/TextInput";
 import useCollectionStore from "@/store/collections";
 import toast from "react-hot-toast";
-import { CollectionIncludingMembersAndLinkCount, Member } from "@/types/global";
+import { AccountSettings, CollectionIncludingMembersAndLinkCount, Member } from "@/types/global";
 import getPublicUserData from "@/lib/client/getPublicUserData";
 import useAccountStore from "@/store/account";
 import usePermissions from "@/hooks/usePermissions";
@@ -62,15 +62,7 @@ export default function EditCollectionSharingModal({
 
   const [memberUsername, setMemberUsername] = useState("");
 
-  const [collectionOwner, setCollectionOwner] = useState({
-    id: null as unknown as number,
-    name: "",
-    username: "",
-    image: "",
-    archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsMonolith: undefined as unknown as boolean,
-    archiveAsPDF: undefined as unknown as boolean,
-  });
+  const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
 
   useEffect(() => {
     const fetchOwner = async () => {
@@ -130,7 +122,7 @@ export default function EditCollectionSharingModal({
           </div>
         )}
 
-        {collection.isPublic ? (
+        {collection.isPublic && (
           <div className={permissions === true ? "pl-5" : ""}>
             <p className="mb-2">{t("sharable_link_guide")}</p>
             <div
@@ -148,7 +140,7 @@ export default function EditCollectionSharingModal({
               {publicCollectionURL}
             </div>
           </div>
-        ) : null}
+        )}
 
         {permissions === true && <div className="divider my-3"></div>}
 

components/ModalContent/PreservedFormatsModal.tsx

@@ -3,6 +3,7 @@ import useLinkStore from "@/store/links";
 import {
   LinkIncludingShortenedCollectionAndTags,
   ArchivedFormat,
+  AccountSettings,
 } from "@/types/global";
 import toast from "react-hot-toast";
 import Link from "next/link";
@@ -37,15 +38,7 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
 
   let isPublic = router.pathname.startsWith("/public") ? true : undefined;
 
-  const [collectionOwner, setCollectionOwner] = useState({
-    id: null as unknown as number,
-    name: "",
-    username: "",
-    image: "",
-    archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsMonolith: undefined as unknown as boolean,
-    archiveAsPDF: undefined as unknown as boolean,
-  });
+  const [collectionOwner, setCollectionOwner] = useState<Partial<AccountSettings>>({});
 
   useEffect(() => {
     const fetchOwner = async () => {