Skip to content

Commit a64e9db

Browse files
committed
frontend: import from react-router-dom only
This ensures that the app is using the version of useNavigate that is designed to work with the DOM.
1 parent 34c31b2 commit a64e9db

File tree

7 files changed

+8
-11
lines changed

7 files changed

+8
-11
lines changed

frontends/web/src/app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717

1818
import { useCallback, useEffect, Fragment } from 'react';
19+
import { useNavigate } from 'react-router-dom';
1920
import { useTranslation } from 'react-i18next';
20-
import { useNavigate } from 'react-router';
2121
import { useSync } from './hooks/api';
2222
import { useDefault } from './hooks/default';
2323
import { usePrevious } from './hooks/previous';

frontends/web/src/components/sidebar/sidebar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717

1818
import React, { useContext, useEffect, useState } from 'react';
19-
import { useLocation } from 'react-router';
20-
import { Link, NavLink } from 'react-router-dom';
19+
import { Link, NavLink, useLocation } from 'react-router-dom';
2120
import { useTranslation } from 'react-i18next';
2221
import { useKeystores } from '@/hooks/backend';
2322
import type { TDevices } from '@/api/devices';

frontends/web/src/routes/account/actionButtons.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
*/
1616

1717
import { MouseEvent } from 'react';
18+
import { Link, useNavigate } from 'react-router-dom';
1819
import { useTranslation } from 'react-i18next';
19-
import { Link } from 'react-router-dom';
20-
import { useNavigate } from 'react-router';
2120
import { WalletConnectLight } from '@/components/icon';
2221
import { useMediaQuery } from '@/hooks/mediaquery';
2322
import { connectKeystore, AccountCode, IAccount, CoinCode } from '@/api/account';

frontends/web/src/routes/device/bitbox02/passphrase.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { useTranslation } from 'react-i18next';
19-
import { useNavigate } from 'react-router';
2018
import { useEffect, useState } from 'react';
19+
import { useNavigate } from 'react-router-dom';
20+
import { useTranslation } from 'react-i18next';
2121
import { getDeviceInfo, setMnemonicPassphraseEnabled } from '@/api/bitbox02';
2222
import { MultilineMarkup, SimpleMarkup } from '@/utils/markup';
2323
import { UseDisableBackButton } from '@/hooks/backbutton';

frontends/web/src/routes/device/bitbox02/wizard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { useEffect, useState } from 'react';
18-
import { useNavigate } from 'react-router';
18+
import { useNavigate } from 'react-router-dom';
1919
import { useLoad, useSync } from '@/hooks/api';
2020
import { getStatus, getVersion, verifyAttestation } from '@/api/bitbox02';
2121
import { attestationCheckDone, statusChanged } from '@/api/devicessync';

frontends/web/src/routes/router.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import React, { ReactChild } from 'react';
18-
import { Route, Routes, useParams } from 'react-router';
18+
import { Route, Routes, useParams } from 'react-router-dom';
1919
import { IAccount } from '@/api/account';
2020
import { TDevices } from '@/api/devices';
2121
import { AddAccount } from './account/add/add';

frontends/web/src/utils/route.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
*/
1616

1717
import { useContext, useEffect } from 'react';
18-
import { NavigateFunction, useLocation, useNavigate } from 'react-router';
18+
import { NavigateFunction, useLocation, useNavigate } from 'react-router-dom';
1919
import { AppContext } from '@/contexts/AppContext';
2020

21-
2221
let navigate: NavigateFunction | undefined;
2322

2423
/**

0 commit comments

Comments
 (0)