Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ import {
import { useState, useMemo, useEffect } from "react";
import { useAppSelector } from "store/hooks";
import { QuoteStatus, ConnectionStatus } from "models/tauriModel";
import { selectPeers } from "store/selectors";
import {
selectConnectedPeerIds,
selectMakerDiscoveryActivity,
selectPeers,
} from "store/selectors";
import TorIcon from "renderer/components/icons/TorIcon";
import TruncatedText from "renderer/components/other/TruncatedText";
import ClickToCopy from "renderer/components/other/ClickToCopy";
Expand All @@ -42,11 +46,10 @@ export default function MakerDiscoveryStatus() {
const [everConnectedPeers, setEverConnectedPeers] = useState<Set<string>>(
new Set(),
);
const peers = useAppSelector(selectPeers);

const connectedPeerIds = peers
.filter((p) => p.connection === ConnectionStatus.Connected)
.map((p) => p.peer_id);
const connectedPeerIds = useAppSelector(selectConnectedPeerIds);
const { quotesInflight, dialsInflight } = useAppSelector(
selectMakerDiscoveryActivity,
);

// Track peers that have ever been connected (accumulating historical state)
useEffect(() => {
Expand All @@ -58,15 +61,7 @@ export default function MakerDiscoveryStatus() {
newIds.forEach((id) => updated.add(id));
return updated;
});
// eslint-disable-next-line react-hooks/exhaustive-deps -- peers is the stable source
}, [peers]);

const quotesInflight = peers.filter(
(p) => p.quote === QuoteStatus.Inflight,
).length;
const dialsInflight = peers.filter(
(p) => p.connection === ConnectionStatus.Dialing,
).length;
}, [connectedPeerIds]);

const isActive = quotesInflight > 0 || dialsInflight > 0;

Expand Down Expand Up @@ -140,12 +135,13 @@ export default function MakerDiscoveryStatus() {
</Stack>
</Paper>
</Tooltip>
<PeerDetailsDialog
open={dialogOpen}
onClose={() => setDialogOpen(false)}
peers={peers}
everConnectedPeers={everConnectedPeers}
/>
{dialogOpen && (
<PeerDetailsDialog
open={dialogOpen}
onClose={() => setDialogOpen(false)}
everConnectedPeers={everConnectedPeers}
/>
)}
</>
);
}
Expand Down Expand Up @@ -338,16 +334,15 @@ function PeerTable({ peers, page, rowsPerPage }: PeerTableProps) {
interface PeerDetailsDialogProps {
open: boolean;
onClose: () => void;
peers: Peer[];
everConnectedPeers: Set<string>;
}

function PeerDetailsDialog({
open,
onClose,
peers,
everConnectedPeers,
}: PeerDetailsDialogProps) {
const peers = useAppSelector(selectPeers);
const [page, setPage] = useState(0);
const rowsPerPage = 8;

Expand Down
23 changes: 22 additions & 1 deletion src-gui/src/store/selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import {

const selectRpcState = (state: RootState) => state.rpc.state;
const selectP2pState = (state: RootState) => state.p2p;
const selectConnectionStatus = (state: RootState) => state.p2p.connectionStatus;
const selectQuoteStatus = (state: RootState) => state.p2p.quoteStatus;

export const selectSwapInfosRaw = createSelector(
[selectRpcState],
Expand Down Expand Up @@ -60,7 +62,26 @@ export const selectPendingApprovals = createSelector(
),
);

// TODO: This should be split into multiple selectors/hooks to avoid excessive re-rendering
export const selectConnectedPeerIds = createSelector(
[selectConnectionStatus],
(connectionStatus) =>
Object.entries(connectionStatus)
.filter(([, status]) => status === ConnectionStatus.Connected)
.map(([peerId]) => peerId),
);

export const selectMakerDiscoveryActivity = createSelector(
[selectConnectionStatus, selectQuoteStatus],
(connectionStatus, quoteStatus) => ({
dialsInflight: Object.values(connectionStatus).filter(
(status) => status === ConnectionStatus.Dialing,
).length,
quotesInflight: Object.values(quoteStatus).filter(
(status) => status === QuoteStatus.Inflight,
).length,
}),
);

export const selectPeers = createSelector([selectP2pState], (p2p) => {
const peerIds = new Set([
...Object.keys(p2p.connectionStatus),
Expand Down