Skip to content

feat: add 'Show all tokens' toggle for owners #6325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 1, 2023
Merged

feat: add 'Show all tokens' toggle for owners #6325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2a103b3
add tokens switch
Kira-Pilot Feb 23, 2023
6402745
reorged TokensPage
Kira-Pilot Feb 23, 2023
340a9d1
using Trans component for description
Kira-Pilot Feb 23, 2023
ff2ac68
using Trans component on DeleteDialog
Kira-Pilot Feb 23, 2023
ade9548
add owner col
Kira-Pilot Feb 23, 2023
dd587e8
simplify hook return
Kira-Pilot Feb 23, 2023
2ce518c
lint
Kira-Pilot Feb 24, 2023
740c4a2
type for response
Kira-Pilot Feb 24, 2023
bb6ce20
Merge remote-tracking branch 'origin/main' into add-token-switch/kira…
Kira-Pilot Feb 28, 2023
b54c70b
PR feedback
Kira-Pilot Feb 28, 2023
7b87fb1
fix lint
Kira-Pilot Mar 1, 2023
41fed93
Merge remote-tracking branch 'origin/main' into add-token-switch/kira…
Kira-Pilot Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
using Trans component on DeleteDialog
  • Loading branch information
@Kira-Pilot
Kira-Pilot committed Feb 23, 2023
commit ff2ac685d124f885eeee36daac502550017efd8d
2 changes: 1 addition & 1 deletion site/src/i18n/en/tokensPage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emptyState": "No tokens found",
"deleteToken": {
"delete": "Delete Token",
"deleteCaption": "Are you sure you want to delete this token?",
"deleteCaption": "Are you sure you want to delete this token?<br/><br/><4>{{tokenId}}</4>",
"deleteSuccess": "Token has been deleted",
"deleteFailure": "Failed to delete token"
},
Expand Down
15 changes: 7 additions & 8 deletions site/src/pages/UserSettingsPage/TokensPage/components/ConfirmDeleteDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { FC } from "react"
import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"
import { useTranslation } from "react-i18next"
import { Typography } from "components/Typography/Typography"
import { useTranslation, Trans } from "react-i18next"
import { useDeleteToken } from "../hooks"
import { displaySuccess, displayError } from "components/GlobalSnackbar/utils"
import { getErrorMessage } from "api/errors"
Expand All @@ -13,13 +12,13 @@ export const ConfirmDeleteDialog: FC<{
}> = ({ queryKey, tokenId, setTokenId }) => {
const { t } = useTranslation("tokensPage")

const content = (
<Typography>
{t("deleteToken.deleteCaption")}
const description = (
<Trans t={t} i18nKey="deleteToken.deleteCaption" values={{ tokenId }}>
Are you sure you want to delete this token?
<br />
<br />
{tokenId}
</Typography>
{{ tokenId }}
</Trans>
)

const { mutate: deleteToken, isLoading: isDeleting } =
Expand All @@ -39,7 +38,7 @@ export const ConfirmDeleteDialog: FC<{
return (
<ConfirmDialog
title={t("deleteToken.delete")}
description={content}
description={description}
open={Boolean(tokenId) || isDeleting}
confirmLoading={isDeleting}
onConfirm={() => {
Expand Down