Skip to content

Commit eab902b

Browse files
committed
[Dashboard] clean up revoke modal and remove cache
1 parent c1f7aaa commit eab902b

File tree

4 files changed

+44
-40
lines changed

4 files changed

+44
-40
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ storybook-static
3131
.aider*
3232

3333
tsconfig.tsbuildinfo
34-
.cursor
34+
.cursor
35+
apps/dashboard/node-compile-cache
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
"use client";
22

3-
import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
43
import { useAuthorizedWallets } from "@3rdweb-sdk/react/hooks/useApi";
54
import { AuthorizedWalletsTable } from "components/settings/AuthorizedWallets/AuthorizedWalletsTable";
65

7-
// TODO - remove ChakraProviderSetup after migrating AuthorizedWalletsTable
86
// TODO - fetch the authorized wallets server side
97

108
export function AccountDevicesPage() {
119
const authorizedWalletsQuery = useAuthorizedWallets();
1210

1311
return (
14-
<ChakraProviderSetup>
15-
<AuthorizedWalletsTable
16-
authorizedWallets={authorizedWalletsQuery.data || []}
17-
isPending={authorizedWalletsQuery.isPending}
18-
isFetched={authorizedWalletsQuery.isFetched}
19-
/>
20-
</ChakraProviderSetup>
12+
<AuthorizedWalletsTable
13+
authorizedWallets={authorizedWalletsQuery.data || []}
14+
isPending={authorizedWalletsQuery.isPending}
15+
isFetched={authorizedWalletsQuery.isFetched}
16+
/>
2117
);
2218
}
Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { Button } from "@/components/ui/button";
12
import {
2-
Modal,
3-
ModalCloseButton,
4-
ModalContent,
5-
ModalFooter,
6-
ModalHeader,
7-
ModalOverlay,
8-
} from "@chakra-ui/react";
9-
import { Button } from "tw-components";
3+
Dialog,
4+
DialogContent,
5+
DialogDescription,
6+
DialogFooter,
7+
DialogHeader,
8+
DialogTitle,
9+
} from "@/components/ui/dialog";
1010

1111
type AuthorizedWalletRevokeModalProps = {
1212
isOpen: boolean;
@@ -19,25 +19,34 @@ export const AuthorizedWalletRevokeModal: React.FC<
1919
AuthorizedWalletRevokeModalProps
2020
> = ({ isOpen, onClose, onSubmit, authorizedWalletId }) => {
2121
return (
22-
<Modal isOpen={isOpen} onClose={onClose} isCentered>
23-
<ModalOverlay />
24-
<ModalContent className="!bg-background rounded-lg border border-border">
25-
<ModalHeader>Are you sure you want to revoke this device?</ModalHeader>
26-
<ModalCloseButton />
22+
<Dialog
23+
open={isOpen}
24+
onOpenChange={(open) => {
25+
if (!open) {
26+
onClose();
27+
}
28+
}}
29+
>
30+
<DialogContent className="p-0">
31+
<DialogHeader className="p-6">
32+
<DialogTitle>Revoke Device Access</DialogTitle>
33+
<DialogDescription className="text-muted-foreground">
34+
Are you sure you want to revoke this device?
35+
</DialogDescription>
36+
</DialogHeader>
2737

28-
<ModalFooter>
29-
<Button mr={3} onClick={onClose} variant="ghost">
38+
<DialogFooter className="gap-4 border-border border-t bg-card p-6">
39+
<Button variant="outline" onClick={onClose}>
3040
Cancel
3141
</Button>
3242
<Button
43+
variant="destructive"
3344
onClick={() => onSubmit(authorizedWalletId)}
34-
variant="outline"
35-
colorScheme="red"
3645
>
3746
Revoke
3847
</Button>
39-
</ModalFooter>
40-
</ModalContent>
41-
</Modal>
48+
</DialogFooter>
49+
</DialogContent>
50+
</Dialog>
4251
);
4352
};

apps/dashboard/src/components/settings/AuthorizedWallets/AuthorizedWalletsTable.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
"use client";
22

3+
import { Button } from "@/components/ui/button";
34
import {
45
type AuthorizedWallet,
56
useRevokeAuthorizedWallet,
67
} from "@3rdweb-sdk/react/hooks/useApi";
7-
import { useDisclosure } from "@chakra-ui/react";
88
import { createColumnHelper } from "@tanstack/react-table";
99
import { TWTable } from "components/shared/TWTable";
1010
import { format } from "date-fns/format";
1111
import { useTrack } from "hooks/analytics/useTrack";
1212
import { useState } from "react";
1313
import { toast } from "sonner";
1414
import { isAddress } from "thirdweb/utils";
15-
import { Button, Text } from "tw-components";
1615
import type { ComponentWithChildren } from "types/component-with-children";
1716
import { shortenString } from "utils/usedapp-external";
1817
import { AuthorizedWalletRevokeModal } from "./AuthorizedWalletRevokeModal";
@@ -33,7 +32,7 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
3332
const [revokeAuthorizedWalletId, setRevokeAuthorizedWalletId] = useState<
3433
string | undefined
3534
>(undefined);
36-
const { onOpen, isOpen, onClose } = useDisclosure();
35+
const [isOpen, setIsOpen] = useState(false);
3736

3837
const columns = [
3938
columnHelper.accessor("deviceName", {
@@ -44,9 +43,9 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
4443
return;
4544
}
4645
if (isAddress(value)) {
47-
return <Text>{shortenString(value, false)}</Text>;
46+
return <span className="text-sm">{shortenString(value, false)}</span>;
4847
}
49-
return <Text>{value}</Text>;
48+
return <span className="text-sm">{value}</span>;
5049
},
5150
}),
5251

@@ -59,7 +58,7 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
5958
return;
6059
}
6160
const createdDate = format(new Date(value), "MMM dd, yyyy");
62-
return <Text>{createdDate}</Text>;
61+
return <span className="text-sm">{createdDate}</span>;
6362
},
6463
}),
6564

@@ -73,8 +72,7 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
7372
return (
7473
<Button
7574
onClick={() => handleOpen(value)}
76-
variant="outline"
77-
color="red"
75+
variant="destructive"
7876
size="sm"
7977
>
8078
Revoke Access
@@ -86,11 +84,11 @@ export const AuthorizedWalletsTable: ComponentWithChildren<
8684

8785
const handleOpen = (authorizedWalletId: AuthorizedWallet["id"]) => {
8886
setRevokeAuthorizedWalletId(authorizedWalletId);
89-
onOpen();
87+
setIsOpen(true);
9088
};
9189

9290
const handleClose = () => {
93-
onClose();
91+
setIsOpen(false);
9492
setRevokeAuthorizedWalletId(undefined);
9593
};
9694

0 commit comments

Comments
 (0)