fix: conflicting records

Author: izadoesdev

apps/dashboard/app/(main)/settings/_components/settings-section.tsx

@@ -97,18 +97,6 @@ export function UnsavedChangesFooter({
 	saveLabel = "Save Changes",
 	message = "You have unsaved changes",
 }: UnsavedChangesFooterProps) {
-	useHotkeys(
-		"mod+s",
-		(e) => {
-			if (hasChanges && !isSaving) {
-				e.preventDefault();
-				onSave();
-			}
-		},
-		{ preventDefault: true, enabled: hasChanges && !isSaving },
-		[hasChanges, isSaving, onSave]
-	);
-
 	useHotkeys(
 		"escape",
 		() => {

apps/dashboard/app/(main)/websites/page.tsx

@@ -7,7 +7,6 @@ import {
 	TrendUpIcon,
 } from "@phosphor-icons/react";
 import { useState } from "react";
-import { useHotkeys } from "react-hotkeys-hook";
 import { EmptyState } from "@/components/empty-state";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
@@ -64,34 +63,6 @@ export default function WebsitesPage() {
 		refetch,
 	} = useWebsites();
 
-	const canCreateWebsite = !dialogOpen;
-	const isLoadingOrFetching = isLoading || isFetching;
-	const canRefresh = !isLoadingOrFetching;
-
-	useHotkeys(
-		"mod+n",
-		(e) => {
-			if (canCreateWebsite) {
-				e.preventDefault();
-				setDialogOpen(true);
-			}
-		},
-		{ preventDefault: true, enabled: canCreateWebsite },
-		[canCreateWebsite]
-	);
-
-	useHotkeys(
-		"mod+shift+r",
-		(e) => {
-			if (canRefresh) {
-				e.preventDefault();
-				refetch();
-			}
-		},
-		{ preventDefault: true, enabled: canRefresh },
-		[canRefresh, refetch]
-	);
-
 	return (
 		<div className="flex h-full flex-col">
 			{/* Enhanced header */}

apps/dashboard/components/charts/annotation-modal.tsx

@@ -164,21 +164,6 @@ export function AnnotationModal(props: AnnotationModalProps) {
 		}
 	};
 
-	useHotkeys(
-		"mod+enter",
-		(e) => {
-			if (isOpen && text.trim() && !submitting && !isSubmitting) {
-				e.preventDefault();
-				handleSubmit();
-			}
-		},
-		{
-			preventDefault: true,
-			enabled: isOpen && Boolean(text.trim()) && !submitting && !isSubmitting,
-		},
-		[isOpen, text, submitting, isSubmitting, handleSubmit]
-	);
-
 	const getDateRangeText = () => {
 		if (mode === "edit") {
 			const { annotation } = props as EditModeProps;

apps/dashboard/components/layout/theme-toggle.tsx

@@ -2,7 +2,6 @@
 
 import { MonitorIcon, MoonIcon, SunIcon } from "@phosphor-icons/react";
 import { useTheme } from "next-themes";
-import { useHotkeys } from "react-hotkeys-hook";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
@@ -32,15 +31,6 @@ export function ThemeToggle({ className }: ThemeTogglerProps) {
 		});
 	};
 
-	useHotkeys(
-		"mod+d",
-		() => {
-			switchTheme();
-		},
-		{ preventDefault: true },
-		[currentTheme]
-	);
-
 	return (
 		<Button
 			aria-label="Toggle theme"

apps/dashboard/components/ui/keyboard-shortcuts.tsx

@@ -16,21 +16,12 @@ const SHORTCUT_GROUPS: ShortcutGroup[] = [
 		title: "General",
 		shortcuts: [
 			{ label: "Search", keys: "Ctrl+K", macKeys: "⌘K" },
-			{ label: "Toggle theme", keys: "Ctrl+D", macKeys: "⌘D" },
-		],
-	},
-	{
-		title: "Websites",
-		shortcuts: [
-			{ label: "Create new website", keys: "Ctrl+N", macKeys: "⌘N" },
-			{ label: "Refresh websites", keys: "Ctrl+Shift+R", macKeys: "⌘⇧R" },
 		],
 	},
 	{
 		title: "Forms & Dialogs",
 		shortcuts: [
-			{ label: "Save changes", keys: "Ctrl+S", macKeys: "⌘S" },
-			{ label: "Submit form", keys: "Ctrl+Enter", macKeys: "⌘↵" },
+			{ label: "Submit form", keys: "Enter" },
 			{ label: "Close dialog", keys: "Esc" },
 		],
 	},

apps/dashboard/components/website-dialog.tsx

@@ -5,7 +5,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { LoaderCircle } from "lucide-react";
 import { useEffect, useRef } from "react";
 import { useForm } from "react-hook-form";
-import { useHotkeys } from "react-hotkeys-hook";
 import { toast } from "sonner";
 import { z } from "zod";
 import { useOrganizationsContext } from "@/components/providers/organizations-provider";
@@ -157,28 +156,6 @@ export function WebsiteDialog({
 		}
 	});
 
-	useHotkeys(
-		"mod+enter",
-		(e) => {
-			if (
-				open &&
-				form.formState.isValid &&
-				!createWebsiteMutation.isPending &&
-				!updateWebsiteMutation.isPending
-			) {
-				e.preventDefault();
-				handleSubmit();
-			}
-		},
-		{ preventDefault: true, enabled: open },
-		[
-			open,
-			form.formState.isValid,
-			createWebsiteMutation.isPending,
-			updateWebsiteMutation.isPending,
-		]
-	);
-
 	return (
 		<Dialog onOpenChange={onOpenChange} open={open}>
 			<DialogContent className="w-[95vw] max-w-md sm:w-full">