Skip to content

Commit 9fb6970

Browse files
authored
Merge pull request #2416 from oasisprotocol/mz/bumpUil
Align UI Library imports with the latest library changes
2 parents 5a6ea2a + a42e7c8 commit 9fb6970

File tree

73 files changed

+93
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+93
-85
lines changed

.changelog/2416.trivial.md

Lines changed: 1 addition & 0 deletions

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const config = {
3939
group: ['**/oasis-nexus/generated/api'],
4040
message: "Import 'oasis-nexus/api' instead.",
4141
},
42+
{
43+
group: ['@oasisprotocol/ui-library/src/components/ui/*'],
44+
message: "Import '@oasisprotocol/ui-library/components' instead.",
45+
},
4246
],
4347
},
4448
],

src/app/components/Account/ContractCreatorInfo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
useGetRuntimeTransactionsTxHash,
99
} from '../../../oasis-nexus/api'
1010
import { AccountLink } from './AccountLink'
11-
import { Skeleton } from '@oasisprotocol/ui-library/src/components/ui/skeleton'
11+
import { Skeleton } from '@oasisprotocol/ui-library/src/components/skeleton'
1212

1313
const TxSender: FC<{ scope: RuntimeScope; txHash: string; alwaysTrim?: boolean }> = ({
1414
scope,

src/app/components/AdvancedField/ToggleAdvancedFields.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useLocalSettings } from '../../hooks/useLocalSettings'
22
import { useTranslation } from 'react-i18next'
33
import { ChevronsDownIcon, ChevronsUpIcon } from 'lucide-react'
4-
import { Button } from '@oasisprotocol/ui-library/src/components/ui/button'
4+
import { Button } from '@oasisprotocol/ui-library/src/components/button'
55

66
export function ToggleAdvancedFields() {
77
const { t } = useTranslation()

src/app/components/AnalyticsConsent/AnalyticsIsBlocked.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Button } from '@oasisprotocol/ui-library/src/components/ui/button'
1+
import { Button } from '@oasisprotocol/ui-library/src/components/button'
22
import { Link } from '@oasisprotocol/ui-library/src/components/link'
33
import { Trans, useTranslation } from 'react-i18next'
44
import { AnalyticsDialogLayout } from './AnalyticsDialogLayout'

src/app/components/AnalyticsConsent/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable react-hooks/rules-of-hooks -- REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS won't change in runtime */
22
import { createContext, FC, useContext, useEffect, useState } from 'react'
33
import { useBlocker, useLocation } from 'react-router-dom'
4-
import { Button } from '@oasisprotocol/ui-library/src/components/ui/button'
4+
import { Button } from '@oasisprotocol/ui-library/src/components/button'
55
import { Link } from '@oasisprotocol/ui-library/src/components/link'
66
import { Trans, useTranslation } from 'react-i18next'
77
import * as matomo from './initializeMatomo'

src/app/components/Balance/FiatMoneyAmount.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FC } from 'react'
33
import { CoinGeckoReferral } from '../CoinGeckoReferral'
44
import { FiatValueInfo } from './hooks'
55
import { Tooltip } from '@oasisprotocol/ui-library/src/components/tooltip'
6-
import { Skeleton } from '@oasisprotocol/ui-library/src/components/ui/skeleton'
6+
import { Skeleton } from '@oasisprotocol/ui-library/src/components/skeleton'
77
import { TriangleAlert } from 'lucide-react'
88

99
export const FiatMoneyWarning: FC<{ unknownTickers: string[] }> = ({ unknownTickers }) => {

src/app/components/DappBanner/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FC } from 'react'
22
import { Typography } from '@oasisprotocol/ui-library/src/components/typography'
33
import { SearchScope } from '../../../types/searchScope'
4-
import { Button } from '@oasisprotocol/ui-library/src/components/ui/button'
4+
import { Button } from '@oasisprotocol/ui-library/src/components/button'
55
import { EthOrOasisAddress } from '../../../oasis-nexus/api'
66
import { useAccountMetadata } from '../../hooks/useAccountMetadata'
77
import { Link } from '@oasisprotocol/ui-library/src/components/link'

src/app/components/Divider/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Separator } from '@oasisprotocol/ui-library/src/components/ui/separator'
1+
import { Separator } from '@oasisprotocol/ui-library/src/components/separator'
22

33
export const LayoutDivider = () => <Separator className="my-6" />
44
export const DashboardDivider = () => {

src/app/components/ImagePreview/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FC } from 'react'
22
import { useTranslation } from 'react-i18next'
3-
import { Button } from '@oasisprotocol/ui-library/src/components/ui/button'
3+
import { Button } from '@oasisprotocol/ui-library/src/components/button'
44
import { ImagePreviewDialog } from '@oasisprotocol/ui-library/src/components/dialog'
55
type ImagePreviewProps = {
66
handlePreviewClose: () => void

0 commit comments

Comments
 (0)