Skip to content
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

Jump to bottom

Migrate WithdrawalsTabComparison to tailwind/shadcn #14201

Merged
merged 4 commits into from
Nov 4, 2024
Merged

Migrate WithdrawalsTabComparison to tailwind/shadcn #14201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74f0c5c
refactor(withdrawalstabcomparison): migrate withdrawalstabcomparison …
Baystef Oct 21, 2024
538de5f
Merge remote-tracking branch 'upstream/dev' into migrate/withdrawalst…
Baystef Oct 21, 2024
89b082d
use new ui button and cleanup code
pettinarip Oct 31, 2024
c3d3036
remove bg color from tab triggers
pettinarip Oct 31, 2024
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
97 changes: 46 additions & 51 deletions src/components/Staking/WithdrawalsTabComparison.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
import { useTranslation } from "next-i18next"
import {
ListItem,
Tab,
TabList,
TabPanel,
TabPanels,
Tabs,
UnorderedList,
} from "@chakra-ui/react"

import { ButtonLink } from "@/components/Buttons"
import OldHeading from "@/components/OldHeading"
import Text from "@/components/OldText"
import WithdrawalCredentials from "@/components/Staking/WithdrawalCredentials"
import Translation from "@/components/Translation"
import { ListItem, UnorderedList } from "@/components/ui/list"
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"

import { trackCustomEvent } from "@/lib/utils/matomo"

import { ButtonLink } from "../ui/buttons/Button"

const WithdrawalsTabComparison = () => {
const { t } = useTranslation("page-staking")
const handleMatomoEvent = (name: string): void => {
Expand All @@ -28,50 +20,53 @@ const WithdrawalsTabComparison = () => {
}

return (
<Tabs>
<TabList>
<Tab onClick={() => handleMatomoEvent("Current stakers")}>
<Tabs defaultValue="current">
<TabsList className="p-0">
<TabsTrigger
value="current"
onClick={() => handleMatomoEvent("Current stakers")}
>
{t("comp-withdrawal-comparison-current-title")}
</Tab>
<Tab onClick={() => handleMatomoEvent("New stakers")}>
</TabsTrigger>
<TabsTrigger
value="new"
onClick={() => handleMatomoEvent("New stakers")}
>
{t("comp-withdrawal-comparison-new-title")}
</Tab>
</TabList>
</TabsTrigger>
</TabsList>

<TabPanels>
<TabPanel>
<OldHeading as="h3">
{t("comp-withdrawal-comparison-current-title")}
</OldHeading>
<UnorderedList>
<ListItem>
<Translation id="page-staking:comp-withdrawal-comparison-current-li-1" />{" "}
</ListItem>
<ListItem>
<Translation id="page-staking:comp-withdrawal-comparison-current-li-2" />
</ListItem>
</UnorderedList>
<Text fontWeight="bold">
<Translation id="page-staking:comp-withdrawal-comparison-current-p" />
</Text>
<TabsContent
value="current"
className="space-y-4 bg-background-highlight"
>
<h3>{t("comp-withdrawal-comparison-current-title")}</h3>
<UnorderedList>
<ListItem>
<Translation id="page-staking:comp-withdrawal-comparison-current-li-1" />{" "}
</ListItem>
<ListItem>
<Translation id="page-staking:comp-withdrawal-comparison-current-li-2" />
</ListItem>
</UnorderedList>
<p className="font-bold">
<Translation id="page-staking:comp-withdrawal-comparison-current-p" />
</p>

<WithdrawalCredentials />
</TabPanel>
<WithdrawalCredentials />
</TabsContent>

<TabPanel>
<OldHeading as="h3">
{t("comp-withdrawal-comparison-new-title")}
</OldHeading>
<UnorderedList>
<ListItem>{t("comp-withdrawal-comparison-new-li-1")}</ListItem>
<ListItem>{t("comp-withdrawal-comparison-new-li-2")}</ListItem>
</UnorderedList>
<Text fontWeight="bold">{t("comp-withdrawal-comparison-new-p")}</Text>
<ButtonLink href="https://launchpad.ethereum.org/" hideArrow>
{t("comp-withdrawal-comparison-new-link")}
</ButtonLink>
</TabPanel>
</TabPanels>
<TabsContent value="new" className="space-y-4 bg-background-highlight">
<h3>{t("comp-withdrawal-comparison-new-title")}</h3>
<UnorderedList>
<ListItem>{t("comp-withdrawal-comparison-new-li-1")}</ListItem>
<ListItem>{t("comp-withdrawal-comparison-new-li-2")}</ListItem>
</UnorderedList>
<p className="font-bold">{t("comp-withdrawal-comparison-new-p")}</p>
<ButtonLink href="https://launchpad.ethereum.org/" hideArrow>
{t("comp-withdrawal-comparison-new-link")}
</ButtonLink>
</TabsContent>
</Tabs>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const TabsList = React.forwardRef<
<TabsPrimitive.List
ref={ref}
className={cn(
"inline-flex h-10 items-center justify-center rounded-md bg-background-highlight p-1",
"inline-flex h-10 items-center justify-center rounded-md p-1",
className
)}
{...props}
Expand Down
Loading