Skip to content

Commit f1ceb7d

Browse files
fix: passkey related issues (#1075)
Signed-off-by: pranalidhanavade <pranali.dhanavade@ayanworks.com>
1 parent f5c9df8 commit f1ceb7d

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

nextjs/src/features/passkey/DeviceDetails.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,18 @@ export default function DeviceDetails({
104104
>
105105
<Pencil className="h-4 w-4" />
106106
</Button>
107+
<div className="ml-auto">
108+
<Button
109+
onClick={() => setOpenDeleteModal(true)}
110+
disabled={disableRevoke}
111+
className={disableRevoke ? 'cursor-not-allowed opacity-50' : ''}
112+
>
113+
Revoke
114+
</Button>
115+
</div>
107116
</div>
108117

109-
<p className="text-muted-foreground mt-4 truncate text-sm">
118+
<p className="text-muted-foreground truncate text-sm">
110119
<Tooltip>
111120
<TooltipTrigger asChild>
112121
<span>{dateConversion(createDateTime)}</span>
@@ -118,18 +127,6 @@ export default function DeviceDetails({
118127
<p className="text-muted-foreground truncate text-sm">
119128
{credentialID}
120129
</p>
121-
122-
<div className="mt-2 flex justify-end">
123-
<div className="mt-2 flex justify-end">
124-
<Button
125-
onClick={() => setOpenDeleteModal(true)}
126-
disabled={disableRevoke}
127-
className={disableRevoke ? 'disabled:cursor-not-allowed' : ''}
128-
>
129-
Revoke
130-
</Button>
131-
</div>
132-
</div>
133130
</div>
134131
</div>
135132

nextjs/src/features/passkey/PassKeyAddDevice.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,16 @@ export default function PasskeyAddDevice({
7676
}, [email])
7777

7878
return (
79-
<Dialog open={openModal} onOpenChange={setOpenModel}>
79+
<Dialog
80+
open={openModal}
81+
onOpenChange={(isOpen) => {
82+
setOpenModel(isOpen)
83+
if (!isOpen) {
84+
setFidoUserError(null)
85+
setNextStep(false)
86+
}
87+
}}
88+
>
8089
<DialogContent>
8190
<DialogHeader>
8291
<DialogTitle>Create Passkey</DialogTitle>
@@ -138,7 +147,9 @@ export default function PasskeyAddDevice({
138147
</div>
139148

140149
<div className="flex justify-end">
141-
<Button type="submit">Next</Button>
150+
<Button onClick={() => setFidoUserError(null)} type="submit">
151+
Next
152+
</Button>
142153
</div>
143154
</Form>
144155
)}

nextjs/src/features/passkey/PasskeyAlert.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import React from 'react'
55

66
const PasskeyAlert = (): React.JSX.Element => (
77
<div className="mt-4 flex">
8-
<Alert variant="default" className="flex w-full items-start space-x-3 p-4">
8+
<Alert className="flex w-auto items-start space-x-3 bg-yellow-100 p-2 text-yellow-700">
99
<AlertTriangle className="mt-1 h-5 w-5 text-yellow-500" />
1010
<div>
1111
<AlertTitle className="text-yellow-700">Notice</AlertTitle>
12-
<AlertDescription>
12+
<AlertDescription className="text-warning">
1313
This browser or device partially supports passkey.
1414
</AlertDescription>
1515
</div>

0 commit comments

Comments
 (0)