Skip to content

Commit 0e7dae1

Browse files
committed
fix: resolve conflicts
1 parent b2ec7e5 commit 0e7dae1

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

ui/components/app/wallet-overview/btc-overview.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react';
22
import { useSelector } from 'react-redux';
3-
import { isEqual } from 'lodash';
43
import {
54
///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
65
getMultichainIsMainnet,
@@ -10,7 +9,6 @@ import {
109
} from '../../../selectors/multichain';
1110
///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
1211
import { getIsBitcoinBuyable } from '../../../ducks/ramps';
13-
import { getSelectedInternalAccount } from '../../../selectors';
1412
import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
1513
///: END:ONLY_INCLUDE_IF
1614
import { getSelectedInternalAccount } from '../../../selectors';
@@ -23,18 +21,15 @@ type BtcOverviewProps = {
2321
const BtcOverview = ({ className }: BtcOverviewProps) => {
2422
const { chainId } = useSelector(getMultichainProviderConfig);
2523
const balance = useSelector(getMultichainSelectedAccountCachedBalance);
24+
const account = useSelector(getSelectedInternalAccount);
2625
///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
27-
const selectedAccount = useSelector(getSelectedInternalAccount);
2826
const isBtcMainnetAccount = useMultichainSelector(
2927
getMultichainIsMainnet,
30-
selectedAccount,
28+
account,
3129
);
3230
const isBtcBuyable = useSelector(getIsBitcoinBuyable);
3331
///: END:ONLY_INCLUDE_IF
3432

35-
// FIXME: Use `isEqual` to avoid potential re-renders
36-
const account = useSelector(getSelectedInternalAccount, isEqual);
37-
3833
return (
3934
<CoinOverview
4035
account={account}

0 commit comments

Comments
 (0)