diff --git a/dashboard/src/app/(inside)/user/data-table.tsx b/dashboard/src/app/(inside)/user/data-table.tsx
index 0a478fe..dd88dc8 100644
--- a/dashboard/src/app/(inside)/user/data-table.tsx
+++ b/dashboard/src/app/(inside)/user/data-table.tsx
@@ -15,7 +15,7 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
+import { Button, buttonVariants } from '@/components/ui/button';
import Link from 'next/link';
import { toast } from 'sonner';
import {
@@ -259,12 +259,14 @@ export function IdentityDataTable({ data, pageSize, pageToken, query, fetchIdent
- deleteIdentitySessions(currentIdentity.id)}>
- Invalidate sessions
-
Cancel
+ deleteIdentitySessions(currentIdentity.id)}>
+ Invalidate sessions
+
@@ -280,13 +282,13 @@ export function IdentityDataTable({ data, pageSize, pageToken, query, fetchIdent
+
+ Cancel
+
blockIdentity(currentIdentity.id)}>
Block identity
-
- Cancel
-
@@ -302,13 +304,13 @@ export function IdentityDataTable({ data, pageSize, pageToken, query, fetchIdent
+
+ Cancel
+
unblockIdentity(currentIdentity.id)}>
Unblock identity
-
- Cancel
-
@@ -325,13 +327,14 @@ export function IdentityDataTable({ data, pageSize, pageToken, query, fetchIdent
- deleteIdentity(currentIdentity.id)}>
- Delete identity
-
Cancel
+ deleteIdentity(currentIdentity.id)}>
+ Delete identity
+
diff --git a/dashboard/src/components/confirmation-dialog-wrapper.tsx b/dashboard/src/components/confirmation-dialog-wrapper.tsx
index dbd8c83..f1d791a 100644
--- a/dashboard/src/components/confirmation-dialog-wrapper.tsx
+++ b/dashboard/src/components/confirmation-dialog-wrapper.tsx
@@ -1,6 +1,6 @@
'use client';
-import { Button, ButtonProps } from '@/components/ui/button';
+import { ButtonProps, buttonVariants } from '@/components/ui/button';
import {
AlertDialog,
AlertDialogAction,
@@ -23,9 +23,8 @@ interface ButtonWithConfirmDialogProps {
dialogTitle: string
dialogDescription: string
dialogButtonCancel?: string
- dialogButtonCancelProps?: ButtonProps
dialogButtonSubmit?: string
- dialogButtonSubmitProps?: ButtonProps
+ dialogButtonSubmitProps?: typeof buttonVariants
children: ReactNode
}
@@ -37,7 +36,6 @@ export function ConfirmationDialogWrapper(
dialogTitle,
dialogDescription,
dialogButtonCancel,
- dialogButtonCancelProps,
dialogButtonSubmit,
dialogButtonSubmitProps,
children,
@@ -59,19 +57,13 @@ export function ConfirmationDialogWrapper(
{dialogDescription}
-
-
+
+ {dialogButtonCancel ?? 'Cancel'}
-
-
+
+ {dialogButtonSubmit ?? 'Confirm'}
diff --git a/dashboard/src/components/ui/alert-dialog.tsx b/dashboard/src/components/ui/alert-dialog.tsx
index 0fce158..c6ec9fb 100644
--- a/dashboard/src/components/ui/alert-dialog.tsx
+++ b/dashboard/src/components/ui/alert-dialog.tsx
@@ -104,7 +104,7 @@ const AlertDialogAction = React.forwardRef<
>(({ className, ...props }, ref) => (
));