From 70e0e0c86dfc86c5d68dca1da1e3530fa5966f27 Mon Sep 17 00:00:00 2001
From: Nate Kelley <nate@buster.so>
Date: Thu, 25 Sep 2025 08:03:12 -0600
Subject: [PATCH] Do not dynamically import confirm modal

---
 apps/web/src/components/ui/modal/ModalBase.tsx        |  2 +-
 .../BusterNotifications/BusterNotifications.tsx       | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/web/src/components/ui/modal/ModalBase.tsx b/apps/web/src/components/ui/modal/ModalBase.tsx
index 72ceba8e7..d428acc33 100644
--- a/apps/web/src/components/ui/modal/ModalBase.tsx
+++ b/apps/web/src/components/ui/modal/ModalBase.tsx
@@ -1,6 +1,6 @@
 import * as DialogPrimitive from '@radix-ui/react-dialog';
 import * as React from 'react';
-import { Xmark } from '@/components/ui/icons';
+import Xmark from '@/components/ui/icons/NucleoIconOutlined/xmark';
 
 import { cn } from '@/lib/utils';
 import { Button } from '../buttons/Button';
diff --git a/apps/web/src/context/BusterNotifications/BusterNotifications.tsx b/apps/web/src/context/BusterNotifications/BusterNotifications.tsx
index 427c8dcf5..5dc22e566 100644
--- a/apps/web/src/context/BusterNotifications/BusterNotifications.tsx
+++ b/apps/web/src/context/BusterNotifications/BusterNotifications.tsx
@@ -1,17 +1,14 @@
 import type React from 'react';
 import type { PropsWithChildren } from 'react';
-import { lazy, Suspense, useCallback } from 'react';
+import { Suspense, useCallback } from 'react';
 import { type ExternalToast, toast } from 'sonner';
 import { createContext, useContextSelector } from 'use-context-selector';
+import { ConfirmModal } from '@/components/ui/modal/ConfirmModal';
 import { Toaster } from '@/components/ui/toaster/Toaster';
 import { useConfirmModalContext } from './useConfirmModal';
 
 export type NotificationType = 'success' | 'info' | 'warning' | 'error';
 
-const ConfirmModal = lazy(() =>
-  import('@/components/ui/modal/ConfirmModal').then((mod) => ({ default: mod.ConfirmModal }))
-);
-
 export type NotificationProps = {
   type?: NotificationType;
   title?: string;
@@ -136,9 +133,7 @@ export const BusterNotificationsProvider: React.FC<PropsWithChildren> = ({ child
     <BusterNotifications.Provider value={{ ...value, openConfirmModal }}>
       {children}
       <Toaster />
-      <Suspense fallback={<span className="hidden">...</span>}>
-        <ConfirmModal {...confirmModalProps} />
-      </Suspense>
+      <ConfirmModal {...confirmModalProps} />
     </BusterNotifications.Provider>
   );
 };