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.

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

Fix: "Select" naming collision #13908

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/CentralizedExchanges/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Emoji from "@/components/Emoji"
import InlineLink from "@/components/Link"
import OldHeading from "@/components/OldHeading"
import Text from "@/components/OldText"
import Select from "@/components/ui/Select"
import Select from "@/components/Select"

import { getLocaleTimestamp } from "@/lib/utils/time"

Expand Down
2 changes: 1 addition & 1 deletion src/components/Layer2/Layer2Onboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { ButtonLink } from "../Buttons"
import InlineLink from "../Link"
import OldHeading from "../OldHeading"
import Text from "../OldText"
import Select, { SelectOnChange } from "../ui/Select"
import Select, { SelectOnChange } from "../Select"

const Flex50 = (props: ChildOnlyProp) => (
<Box flex={{ base: "100%", md: "50%" }} {...props} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Meta, StoryObj } from "@storybook/react"

import { HStack } from "../flex"
import { Select } from "../Select"
import { HStack } from "../ui/flex"

import Select from "./"

const meta = {
title: "Atoms / Form / Dropdown",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/Staking/StakingLaunchpadWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Translation from "@/components/Translation"
import { cn } from "@/lib/utils/cn"
import { trackCustomEvent } from "@/lib/utils/matomo"

import Select, { type SelectOnChange } from "../Select"
import { Flex } from "../ui/flex"
import Select, { type SelectOnChange } from "../ui/Select"

type StakingDataOption = { label: string; value: string }

Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useCentralizedExchanges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useTranslation } from "next-i18next"
// import squarelink from "@/public/images/wallets/squarelink.png"
// import trust from "@/public/images/wallets/trust.png"
import type { ImageProps } from "@/components/Image"
import { SelectOnChange } from "@/components/ui/Select"
import { SelectOnChange } from "@/components/Select"

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

Expand Down
Loading