fix watchlist button

hikka-io · Mar 7, 2024 · 4c831e9 · 4c831e9
1 parent 4883139
commit 4c831e9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/components/modals/watch-edit-modal.tsx b/components/modals/watch-edit-modal.tsx
@@ -66,6 +66,11 @@ const Component = ({ slug }: Props) => {
         closeModal();
     };
 
+    const onDeleteSubmit = async () => {
+        deleteFromList();
+        closeModal();
+    };
+
     useEffect(() => {
         if (watch?.status) {
             setSelectedStatus(watch.status);
@@ -159,7 +164,7 @@ const Component = ({ slug }: Props) => {
                 <div className="grid w-full grid-cols-2 gap-8">
                     <Button
                         variant="destructive"
-                        onClick={handleSubmit(() => deleteFromList())}
+                        onClick={handleSubmit(onDeleteSubmit)}
                         disabled={
                             isSubmitting ||
                             addToListLoading ||

diff --git a/components/ui/combobox.tsx b/components/ui/combobox.tsx
@@ -211,7 +211,7 @@ export const Combobox = forwardRef(
                                 <CommandGroup>
                                     <ScrollArea>
                                         <ScrollBar orientation="vertical" />
-                                        <div className="max-h-60">
+                                        <div className="max-h-72">
                                             {props.options.map((option) => (
                                                 <Fragment key={option.value}>
                                                     {option.separator && (

diff --git a/components/watchlist-button.tsx b/components/watchlist-button.tsx
@@ -50,7 +50,6 @@ const OPTIONS = [
             </div>
         ),
     })),
-    SETTINGS_BUTTON,
 ];
 
 const Component = ({ slug, additional, disabled }: Props) => {
@@ -114,7 +113,10 @@ const Component = ({ slug, additional, disabled }: Props) => {
 
     return (
         <Combobox
-            options={OPTIONS}
+            options={[
+                ...OPTIONS,
+                ...(watch && !watchError ? [SETTINGS_BUTTON] : []),
+            ]}
             onChange={handleChangeStatus}
             value={watch && !watchError ? watch.status : undefined}
             renderToggle={(open, setOpen, value) => {