diff --git a/components/AccessTokens/CopyAccessKeyModal.tsx b/components/AccessTokens/CopyAccessKeyModal.tsx
index 0ee64676..c8dfd7d9 100644
--- a/components/AccessTokens/CopyAccessKeyModal.tsx
+++ b/components/AccessTokens/CopyAccessKeyModal.tsx
@@ -36,8 +36,7 @@ export const CopyAccessTokenModal: React.FC<CopyAccessTokenModalProps> = ({
             size="sm"
             onClose={onCloseModal}
             popup
-            //@ts-ignore
-            theme={customThemeTModal}
+            theme={customThemeTModal as Modal['props']['theme']}
             dismissible
         >
             <Modal.Body className="!bg-gray-800 p-8  md:px-7 md:py-7">
diff --git a/components/AccessTokens/CreateSecretKeyModal.tsx b/components/AccessTokens/CreateSecretKeyModal.tsx
index 1f7bd6a5..fbb3c683 100644
--- a/components/AccessTokens/CreateSecretKeyModal.tsx
+++ b/components/AccessTokens/CreateSecretKeyModal.tsx
@@ -60,8 +60,7 @@ export const CreateSecretKeyModal: React.FC<CreateSecretKeyModalProps> = ({
                 size="sm"
                 onClose={onCloseModal}
                 popup
-                //@ts-ignore
-                theme={customThemeTModal}
+                theme={customThemeTModal as Modal['props']['theme']}
                 dismissible
             >
                 {/* <Modal.Header className="!bg-gray-800" /> */}
diff --git a/components/nodes/AdminCreateNodeFormModal.tsx b/components/nodes/AdminCreateNodeFormModal.tsx
index 08b1d87c..2c370e63 100644
--- a/components/nodes/AdminCreateNodeFormModal.tsx
+++ b/components/nodes/AdminCreateNodeFormModal.tsx
@@ -132,8 +132,7 @@ export function AdminCreateNodeFormModal({
             size="md"
             onClose={onClose}
             popup
-            //@ts-ignore
-            theme={customThemeTModal}
+            theme={customThemeTModal as Modal['props']['theme']}
             dismissible={false}
         >
             <Modal.Body className="!bg-gray-800 p-8 md:px-9 md:py-8 rounded-none">
diff --git a/components/nodes/AdminNodeClaimModal.tsx b/components/nodes/AdminNodeClaimModal.tsx
index c2889bce..b2bfd644 100644
--- a/components/nodes/AdminNodeClaimModal.tsx
+++ b/components/nodes/AdminNodeClaimModal.tsx
@@ -282,8 +282,7 @@ export function AdminNodeClaimModal({
             onClose={onClose}
             size="md"
             popup
-            //@ts-ignore
-            theme={customThemeTModal}
+            theme={customThemeTModal as Modal['props']['theme']}
             dismissible
         >
             <Modal.Header className="!bg-gray-800">
diff --git a/components/nodes/NodeDeleteModal.tsx b/components/nodes/NodeDeleteModal.tsx
index be5111cf..e9e2909d 100644
--- a/components/nodes/NodeDeleteModal.tsx
+++ b/components/nodes/NodeDeleteModal.tsx
@@ -72,8 +72,7 @@ export const NodeDeleteModal: React.FC<NodeDeleteModalProps> = ({
             size="md"
             onClose={onClose}
             popup
-            //@ts-ignore
-            theme={customThemeTModal}
+            theme={customThemeTModal as Modal['props']['theme']}
             dismissible
         >
             <Modal.Body className="!bg-gray-800 p-8 md:px-9 md:py-8 rounded-none">
diff --git a/components/nodes/NodeEditModal.tsx b/components/nodes/NodeEditModal.tsx
index 0f53d18e..57826586 100644
--- a/components/nodes/NodeEditModal.tsx
+++ b/components/nodes/NodeEditModal.tsx
@@ -112,8 +112,7 @@ export const NodeEditModal: React.FC<NodeEditModalProps> = ({
                 size="3xl"
                 onClose={onCloseEditModal}
                 popup
-                //@ts-ignore
-                theme={customThemeTModal}
+                theme={customThemeTModal as Modal['props']['theme']}
                 dismissible
             >
                 <Modal.Body className="!bg-gray-800 p-8 md:px-9 md:py-8 rounded-none ">
diff --git a/components/nodes/NodeLogoModal.tsx b/components/nodes/NodeLogoModal.tsx
index ec8d01a5..0d8ba5a4 100644
--- a/components/nodes/NodeLogoModal.tsx
+++ b/components/nodes/NodeLogoModal.tsx
@@ -12,8 +12,7 @@ export function NodeLogoModal({ openLogoModal, onCloseModal }) {
                 size="2xl"
                 onClose={onCloseModal}
                 popup
-                //@ts-ignore
-                theme={customThemeTModal}
+                theme={customThemeTModal as Modal['props']['theme']}
                 dismissible
             >
                 <Modal.Header className="!bg-gray-800 px-8 py-8">
diff --git a/components/nodes/NodeVersionDeleteModal.tsx b/components/nodes/NodeVersionDeleteModal.tsx
index 21350749..c94cafa3 100644
--- a/components/nodes/NodeVersionDeleteModal.tsx
+++ b/components/nodes/NodeVersionDeleteModal.tsx
@@ -70,8 +70,7 @@ export const NodeVersionDeleteModal: React.FC<NodeVersionDeleteModalProps> = ({
             size="md"
             onClose={onCloseDeleteModal}
             popup
-            //@ts-ignore
-            theme={customThemeTModal}
+            theme={customThemeTModal as Modal['props']['theme']}
             dismissible
         >
             <Modal.Body className="!bg-gray-800 p-8 md:px-9 md:py-8 rounded-none">
diff --git a/components/publisher/CreatePublisherModal.tsx b/components/publisher/CreatePublisherModal.tsx
index 5e4884fc..414c35eb 100644
--- a/components/publisher/CreatePublisherModal.tsx
+++ b/components/publisher/CreatePublisherModal.tsx
@@ -73,8 +73,7 @@ const CreatePublisherModal: React.FC<CreatePublisherModalProps> = ({
             show={open}
             onClose={onCloseModal}
             size="xl"
-            //@ts-ignore
-            theme={customThemeTModal}
+            theme={customThemeTModal as Modal['props']['theme']}
             popup
             dismissible
         >
diff --git a/components/publisher/EditSecretKeyModal.tsx b/components/publisher/EditSecretKeyModal.tsx
index dc72b693..549870a0 100644
--- a/components/publisher/EditSecretKeyModal.tsx
+++ b/components/publisher/EditSecretKeyModal.tsx
@@ -11,8 +11,7 @@ export function EditSecretKeyModal({ openModal, onCloseModal }) {
             onClose={onCloseModal}
             popup
             dismissible
-            //@ts-ignore
-            theme={customThemeTModal}
+            theme={customThemeTModal as Modal['props']['theme']}
         >
             <Modal.Body className="!bg-gray-800 p-8 md:px-9 md:py-8">
                 <div className="space-y-6">
diff --git a/pages/publishers/[publisherId]/claim-my-node.tsx b/pages/publishers/[publisherId]/claim-my-node.tsx
index c56c423f..7bff1701 100644
--- a/pages/publishers/[publisherId]/claim-my-node.tsx
+++ b/pages/publishers/[publisherId]/claim-my-node.tsx
@@ -289,7 +289,7 @@ function ClaimMyNodePage() {
                 setPermissionCheckLoading(false)
             }
         },
-        [t]
+        [t, setPermissionCheckLoading]
     )
 
     useEffect(() => {