From 2b626dc332e7965f84958d6610e5887f74666c18 Mon Sep 17 00:00:00 2001
From: Henrique Tolentino <htolentino@nvidia.com>
Date: Thu, 16 Jul 2026 13:30:41 -0400
Subject: [PATCH 1/2] Fix RadioCard clicks

Signed-off-by: Henrique Tolentino <htolentino@nvidia.com>
---
 web/packages/common/src/components/RadioCard/index.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/packages/common/src/components/RadioCard/index.tsx b/web/packages/common/src/components/RadioCard/index.tsx
index c67b6ccb8a..796e4681b9 100644
--- a/web/packages/common/src/components/RadioCard/index.tsx
+++ b/web/packages/common/src/components/RadioCard/index.tsx
@@ -84,17 +84,16 @@ export const RadioCard: FC<RadioCardProps> = ({
   return (
     <RadioGroupItem
       aria-labelledby={id}
-      className="w-full items-start"
-      asChild
+      className="group block w-full items-start"
       {...attributes?.RadioGroupItem}
     >
       <Card
         className={cn(
           'cursor-pointer [&_*]:cursor-pointer',
           'hover:bg-interaction-hover',
-          'data-[state=checked]:border-interaction-selected',
+          'group-data-[state=checked]:border-interaction-selected',
           checked === true && 'border-interaction-selected',
-          'data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+          'group-data-[disabled]:pointer-events-none group-data-[disabled]:opacity-50',
           nvPanelContentClass,
           className
         )}

From 524bb55c3a3d87520019c7caccfe0653432e56d3 Mon Sep 17 00:00:00 2001
From: Henrique Tolentino <htolentino@nvidia.com>
Date: Thu, 16 Jul 2026 14:01:04 -0400
Subject: [PATCH 2/2] Small fixes

Signed-off-by: Henrique Tolentino <htolentino@nvidia.com>
---
 web/packages/common/src/components/RadioCard/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/common/src/components/RadioCard/index.tsx b/web/packages/common/src/components/RadioCard/index.tsx
index 796e4681b9..096362cb8c 100644
--- a/web/packages/common/src/components/RadioCard/index.tsx
+++ b/web/packages/common/src/components/RadioCard/index.tsx
@@ -84,8 +84,8 @@ export const RadioCard: FC<RadioCardProps> = ({
   return (
     <RadioGroupItem
       aria-labelledby={id}
-      className="group block w-full items-start"
       {...attributes?.RadioGroupItem}
+      className={cn('group block w-full items-start', attributes?.RadioGroupItem?.className)}
     >
       <Card
         className={cn(