Skip to content

Commit 5dea22c

Browse files
authored
Merge pull request #2435 from oasisprotocol/mz/router
Migrate from react-router-dom v6 to react-router v7
2 parents 1018edc + 173571f commit 5dea22c

File tree

93 files changed

+112
-111
lines changed

Some content is hidden

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

93 files changed

+112
-111
lines changed

.changelog/2435.internal.md

Lines changed: 1 addition & 0 deletions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"react": "18.3.1",
6565
"react-dom": "18.3.1",
6666
"react-i18next": "14.1.3",
67-
"react-router-dom": "6.30.0",
67+
"react-router": "^7.13.0",
6868
"recharts": "2.15.4",
6969
"viem": "^2.31.4"
7070
},

src/app/components/Account/AccountLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FC, ReactNode } from 'react'
2-
import { Link as RouterLink } from 'react-router-dom'
2+
import { Link as RouterLink } from 'react-router'
33
import { useScreenSize } from '../../hooks/useScreensize'
44
import { Link } from '@oasisprotocol/ui-library/src/components/link'
55
import { RouteUtils } from '../../utils/route-utils'

src/app/components/Account/BalancesOnOtherLayers.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from '../../../oasis-nexus/api'
1010
import { getLayerLabels } from '../../utils/content'
1111
import { RouteUtils } from '../../utils/route-utils'
12-
import { Link as RouterLink } from 'react-router-dom'
12+
import { Link as RouterLink } from 'react-router'
1313
import { Link } from '@oasisprotocol/ui-library/src/components/link'
1414
import { Tooltip } from '@oasisprotocol/ui-library/src/components/tooltip'
1515
import { RuntimeBalanceDisplay } from '../Balance/RuntimeBalanceDisplay'

src/app/components/Account/ConsensusAccountDetailsView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { AccountAvatar } from '../AccountAvatar'
1010
import { AccountSizeBadge } from '../AccountSizeBadge'
1111
import { ConsensusAccountLink } from './ConsensusAccountLink'
1212
import { CopyToClipboard } from '../CopyToClipboard'
13-
import { Link as RouterLink } from 'react-router-dom'
13+
import { Link as RouterLink } from 'react-router'
1414
import { Link } from '@oasisprotocol/ui-library/src/components/link'
1515
import { RouteUtils } from '../../utils/route-utils'
1616
import { transactionsContainerId } from '../../utils/tabAnchors'

src/app/components/Account/RuntimeAccountDetailsView.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 { Link as RouterLink } from 'react-router-dom'
3+
import { Link as RouterLink } from 'react-router'
44
import { StyledDescriptionList, StyledListTitleWithAvatar } from '../../components/StyledDescriptionList'
55
import { CopyToClipboard } from '../../components/CopyToClipboard'
66
import { TextSkeleton } from '../../components/Skeleton'

src/app/components/Account/ShowMoreTokensLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FC } from 'react'
2-
import { Link as RouterLink } from 'react-router-dom'
2+
import { Link as RouterLink } from 'react-router'
33
import { Link } from '@oasisprotocol/ui-library/src/components/link'
44
import { useTranslation } from 'react-i18next'
55
import { EvmTokenType, RuntimeAccount, type Token } from '../../../oasis-nexus/api'

src/app/components/Account/TokenPills.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 { Link as RouterLink } from 'react-router-dom'
3+
import { Link as RouterLink } from 'react-router'
44
import { Badge } from '@oasisprotocol/ui-library/src/components/badge'
55
import { Typography } from '@oasisprotocol/ui-library/src/components/typography'
66
import { useScreenSize } from '../../hooks/useScreensize'

src/app/components/BlockNavigationButtons/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FC } from 'react'
2-
import { Link as RouterLink, useSearchParams } from 'react-router-dom'
2+
import { Link as RouterLink, useSearchParams } from 'react-router'
33
import { useTranslation } from 'react-i18next'
44
import { PaginationNext, PaginationPrevious } from '@oasisprotocol/ui-library/src/components/pagination'
55
import { Tooltip } from '@oasisprotocol/ui-library/src/components/tooltip'

src/app/components/Blocks/BlockLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FC } from 'react'
2-
import { Link as RouterLink } from 'react-router-dom'
2+
import { Link as RouterLink } from 'react-router'
33
import { RouteUtils } from '../../utils/route-utils'
44
import { trimLongString } from '../../utils/trimLongString'
55
import { SearchScope } from '../../../types/searchScope'

0 commit comments

Comments
 (0)