MFA: Fix factors dialog closing when factors re-render. Removed debugging line setting the popup to Infinite

This commit is contained in:
gbuomprisco
2024-10-13 09:32:05 +08:00
parent 8f5690b959
commit fe2148730a
2 changed files with 29 additions and 30 deletions

View File

@@ -168,7 +168,6 @@ function ConfirmUnenrollFactorModal(
error: (error: string) => { error: (error: string) => {
return error; return error;
}, },
duration: Infinity
}); });
}, },
[props, t, unEnroll], [props, t, unEnroll],
@@ -245,9 +244,8 @@ function FactorsTable({
<td> <td>
<Badge <Badge
variant={'info'}
className={'inline-flex capitalize'} className={'inline-flex capitalize'}
color={factor.status === 'verified' ? 'success' : 'normal'} variant={factor.status === 'verified' ? 'success' : 'outline'}
> >
{factor.status} {factor.status}
</Badge> </Badge>

View File

@@ -23,6 +23,7 @@ import {
DialogDescription, DialogDescription,
DialogHeader, DialogHeader,
DialogTitle, DialogTitle,
DialogTrigger,
} from '@kit/ui/dialog'; } from '@kit/ui/dialog';
import { import {
Form, Form,
@@ -56,12 +57,13 @@ export function MultiFactorAuthSetupDialog(props: { userId: string }) {
}, [t]); }, [t]);
return ( return (
<> <Dialog open={isOpen} onOpenChange={setIsOpen}>
<Button onClick={() => setIsOpen(true)}> <DialogTrigger asChild>
<Button>
<Trans i18nKey={'account:setupMfaButtonLabel'} /> <Trans i18nKey={'account:setupMfaButtonLabel'} />
</Button> </Button>
</DialogTrigger>
<Dialog open={isOpen} onOpenChange={setIsOpen}>
<DialogContent <DialogContent
onInteractOutside={(e) => e.preventDefault()} onInteractOutside={(e) => e.preventDefault()}
onEscapeKeyDown={(e) => e.preventDefault()} onEscapeKeyDown={(e) => e.preventDefault()}
@@ -85,7 +87,6 @@ export function MultiFactorAuthSetupDialog(props: { userId: string }) {
</div> </div>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
</>
); );
} }