Merge pull request #588 from z3us-dapps/develop

v2.0.39+ext
z3us-dapps · May 24, 2024 · 0fc7710 · 0fc7710
2 parents 0ef08c5 + 40059f5
commit 0fc7710
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/apps/extension/package.json b/apps/extension/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "z3us-extension",
-	"version": "2.0.38",
+	"version": "2.0.39",
 	"type": "module",
 	"scripts": {
 		"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",

diff --git a/apps/extension/src/components/modals/sign-modal.tsx b/apps/extension/src/components/modals/sign-modal.tsx
@@ -108,20 +108,24 @@ const SignModal: React.FC<IProps> = ({
 	}
 
 	const handleCancel = () => {
-		if (keystore?.webAuthn) return
 		onCancel()
 		setError('')
 		setIsOpen(false)
 	}
 
+	const handleInteraction = () => {
+		if (keystore?.webAuthn) return
+		handleCancel()
+	}
+
 	return (
 		<DialogRoot open={isOpen}>
 			<DialogPortal>
 				<DialogOverlay className={dialogStyles.dialogOverlay} />
 				<DialogContent
 					className={alertStyles.alertDialogContent}
-					onEscapeKeyDown={handleCancel}
-					onInteractOutside={handleCancel}
+					onEscapeKeyDown={handleInteraction}
+					onInteractOutside={handleInteraction}
 				>
 					<Box className={styles.signAlertDialogContentWrapper}>
 						{title && (