mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-05-03 07:14:51 -04:00
feat(gui): Dedicated react component for truncating swap ids, peer ids, ...
This commit is contained in:
parent
c486ca5de9
commit
5e87be8a8b
8 changed files with 32 additions and 10 deletions
|
@ -11,6 +11,7 @@ import {
|
||||||
import { ReactNode } from "react";
|
import { ReactNode } from "react";
|
||||||
import { exhaustiveGuard } from "utils/typescriptUtils";
|
import { exhaustiveGuard } from "utils/typescriptUtils";
|
||||||
import HumanizedBitcoinBlockDuration from "../other/HumanizedBitcoinBlockDuration";
|
import HumanizedBitcoinBlockDuration from "../other/HumanizedBitcoinBlockDuration";
|
||||||
|
import TruncatedText from "../other/TruncatedText";
|
||||||
import {
|
import {
|
||||||
SwapCancelRefundButton,
|
SwapCancelRefundButton,
|
||||||
SwapResumeButton,
|
SwapResumeButton,
|
||||||
|
@ -219,7 +220,7 @@ export default function SwapStatusAlert({
|
||||||
variant="filled"
|
variant="filled"
|
||||||
>
|
>
|
||||||
<AlertTitle>
|
<AlertTitle>
|
||||||
Swap {swap.swap_id.substring(0, 5)}... is unfinished
|
Swap <TruncatedText>{swap.swap_id}</TruncatedText> is unfinished
|
||||||
</AlertTitle>
|
</AlertTitle>
|
||||||
<SwapAlertStatusText swap={swap} />
|
<SwapAlertStatusText swap={swap} />
|
||||||
</Alert>
|
</Alert>
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import { DialogTitle, makeStyles, Typography } from "@material-ui/core";
|
import { DialogTitle, makeStyles, Typography } from "@material-ui/core";
|
||||||
|
import { ReactNode } from "react";
|
||||||
|
|
||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
root: {
|
root: {
|
||||||
|
@ -8,7 +9,7 @@ const useStyles = makeStyles({
|
||||||
});
|
});
|
||||||
|
|
||||||
type DialogTitleProps = {
|
type DialogTitleProps = {
|
||||||
title: string;
|
title: ReactNode;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function DialogHeader({ title }: DialogTitleProps) {
|
export default function DialogHeader({ title }: DialogTitleProps) {
|
||||||
|
|
|
@ -13,6 +13,7 @@ import {
|
||||||
import { CliLog } from "models/cliModel";
|
import { CliLog } from "models/cliModel";
|
||||||
import { useSnackbar } from "notistack";
|
import { useSnackbar } from "notistack";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
import TruncatedText from "renderer/components/other/TruncatedText";
|
||||||
import { store } from "renderer/store/storeRenderer";
|
import { store } from "renderer/store/storeRenderer";
|
||||||
import { useActiveSwapInfo, useAppSelector } from "store/hooks";
|
import { useActiveSwapInfo, useAppSelector } from "store/hooks";
|
||||||
import { parseDateString } from "utils/parseUtils";
|
import { parseDateString } from "utils/parseUtils";
|
||||||
|
@ -68,7 +69,7 @@ function SwapSelectDropDown({
|
||||||
<MenuItem value={0}>Do not attach logs</MenuItem>
|
<MenuItem value={0}>Do not attach logs</MenuItem>
|
||||||
{swaps.map((swap) => (
|
{swaps.map((swap) => (
|
||||||
<MenuItem value={swap.swap_id} key={swap.swap_id}>
|
<MenuItem value={swap.swap_id} key={swap.swap_id}>
|
||||||
Swap {swap.swap_id.substring(0, 5)}... from{" "}
|
Swap <TruncatedText>{swap.swap_id}</TruncatedText> from{" "}
|
||||||
{new Date(parseDateString(swap.start_date)).toDateString()} (
|
{new Date(parseDateString(swap.start_date)).toDateString()} (
|
||||||
<PiconeroAmount amount={swap.xmr_amount} />)
|
<PiconeroAmount amount={swap.xmr_amount} />)
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
|
|
@ -14,6 +14,7 @@ import {
|
||||||
import { Multiaddr } from "multiaddr";
|
import { Multiaddr } from "multiaddr";
|
||||||
import { useSnackbar } from "notistack";
|
import { useSnackbar } from "notistack";
|
||||||
import { ChangeEvent, useState } from "react";
|
import { ChangeEvent, useState } from "react";
|
||||||
|
import TruncatedText from "renderer/components/other/TruncatedText";
|
||||||
import PromiseInvokeButton from "renderer/components/PromiseInvokeButton";
|
import PromiseInvokeButton from "renderer/components/PromiseInvokeButton";
|
||||||
|
|
||||||
const PRESET_RENDEZVOUS_POINTS = [
|
const PRESET_RENDEZVOUS_POINTS = [
|
||||||
|
@ -108,10 +109,7 @@ export default function ListSellersDialog({
|
||||||
<Chip
|
<Chip
|
||||||
key={rAddress}
|
key={rAddress}
|
||||||
clickable
|
clickable
|
||||||
label={`${rAddress.substring(
|
label={<TruncatedText limit={30}>{rAddress}</TruncatedText>}
|
||||||
0,
|
|
||||||
Math.min(rAddress.length - 1, 20),
|
|
||||||
)}...`}
|
|
||||||
onClick={() => setRendezvousAddress(rAddress)}
|
onClick={() => setRendezvousAddress(rAddress)}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import { Box, Chip, makeStyles, Tooltip, Typography } from "@material-ui/core";
|
import { Box, Chip, makeStyles, Tooltip, Typography } from "@material-ui/core";
|
||||||
import { VerifiedUser } from "@material-ui/icons";
|
import { VerifiedUser } from "@material-ui/icons";
|
||||||
import { ExtendedProviderStatus } from "models/apiModel";
|
import { ExtendedProviderStatus } from "models/apiModel";
|
||||||
|
import TruncatedText from "renderer/components/other/TruncatedText";
|
||||||
import {
|
import {
|
||||||
MoneroBitcoinExchangeRate,
|
MoneroBitcoinExchangeRate,
|
||||||
SatsAmount,
|
SatsAmount,
|
||||||
|
@ -38,7 +39,7 @@ export default function ProviderInfo({
|
||||||
{provider.multiAddr}
|
{provider.multiAddr}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography color="textSecondary" gutterBottom>
|
<Typography color="textSecondary" gutterBottom>
|
||||||
{provider.peerId.substring(0, 8)}...{provider.peerId.slice(-8)}
|
<TruncatedText limit={12}>{provider.peerId}</TruncatedText>
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="caption">
|
<Typography variant="caption">
|
||||||
Exchange rate:{" "}
|
Exchange rate:{" "}
|
||||||
|
|
14
src-gui/src/renderer/components/other/TruncatedText.tsx
Normal file
14
src-gui/src/renderer/components/other/TruncatedText.tsx
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
export default function TruncatedText({
|
||||||
|
children,
|
||||||
|
limit = 6,
|
||||||
|
ellipsis = "...",
|
||||||
|
}: {
|
||||||
|
children: string;
|
||||||
|
limit?: number;
|
||||||
|
ellipsis?: string;
|
||||||
|
}) {
|
||||||
|
const truncatedText =
|
||||||
|
children.length > limit ? children.slice(0, limit) + ellipsis : children;
|
||||||
|
|
||||||
|
return truncatedText;
|
||||||
|
}
|
|
@ -11,6 +11,7 @@ import KeyboardArrowDownIcon from "@material-ui/icons/KeyboardArrowDown";
|
||||||
import KeyboardArrowUpIcon from "@material-ui/icons/KeyboardArrowUp";
|
import KeyboardArrowUpIcon from "@material-ui/icons/KeyboardArrowUp";
|
||||||
import { GetSwapInfoResponse } from "models/tauriModel";
|
import { GetSwapInfoResponse } from "models/tauriModel";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
import TruncatedText from "renderer/components/other/TruncatedText";
|
||||||
import { PiconeroAmount, SatsAmount } from "../../../other/Units";
|
import { PiconeroAmount, SatsAmount } from "../../../other/Units";
|
||||||
import HistoryRowActions from "./HistoryRowActions";
|
import HistoryRowActions from "./HistoryRowActions";
|
||||||
import HistoryRowExpanded from "./HistoryRowExpanded";
|
import HistoryRowExpanded from "./HistoryRowExpanded";
|
||||||
|
@ -52,7 +53,9 @@ export default function HistoryRow(swap: GetSwapInfoResponse) {
|
||||||
{expanded ? <KeyboardArrowUpIcon /> : <KeyboardArrowDownIcon />}
|
{expanded ? <KeyboardArrowUpIcon /> : <KeyboardArrowDownIcon />}
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>{swap.swap_id}</TableCell>
|
<TableCell>
|
||||||
|
<TruncatedText>{swap.swap_id}</TruncatedText>
|
||||||
|
</TableCell>
|
||||||
<TableCell>
|
<TableCell>
|
||||||
<AmountTransfer
|
<AmountTransfer
|
||||||
xmrAmount={swap.xmr_amount}
|
xmrAmount={swap.xmr_amount}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import {
|
||||||
} from "@material-ui/core";
|
} from "@material-ui/core";
|
||||||
import { ButtonProps } from "@material-ui/core/Button/Button";
|
import { ButtonProps } from "@material-ui/core/Button/Button";
|
||||||
import { BobStateName, GetSwapInfoResponseExt } from "models/tauriModelExt";
|
import { BobStateName, GetSwapInfoResponseExt } from "models/tauriModelExt";
|
||||||
|
import TruncatedText from "renderer/components/other/TruncatedText";
|
||||||
import PromiseInvokeButton from "renderer/components/PromiseInvokeButton";
|
import PromiseInvokeButton from "renderer/components/PromiseInvokeButton";
|
||||||
import { getMoneroRecoveryKeys } from "renderer/rpc";
|
import { getMoneroRecoveryKeys } from "renderer/rpc";
|
||||||
import { store } from "renderer/store/storeRenderer";
|
import { store } from "renderer/store/storeRenderer";
|
||||||
|
@ -38,7 +39,9 @@ function MoneroRecoveryKeysDialog({
|
||||||
return (
|
return (
|
||||||
<Dialog open onClose={onClose} maxWidth="sm" fullWidth>
|
<Dialog open onClose={onClose} maxWidth="sm" fullWidth>
|
||||||
<DialogHeader
|
<DialogHeader
|
||||||
title={`Recovery Keys for swap ${swap_id.substring(0, 5)}...`}
|
title=<>
|
||||||
|
Recovery Keys for swap <TruncatedText>{swap_id}</TruncatedText>
|
||||||
|
</>
|
||||||
/>
|
/>
|
||||||
<DialogContent>
|
<DialogContent>
|
||||||
<DialogContentText>
|
<DialogContentText>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue