Skip to content

Commit dab21b5

Browse files
committed
fix: cleanup
1 parent bfde65d commit dab21b5

File tree

3 files changed

+54
-42
lines changed

3 files changed

+54
-42
lines changed

apps/namadillo/src/App/Transactions/BundledTransactionCard.tsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,10 @@ export const BundledTransactionCard: React.FC<Props> = ({
8383
<span className="font-mono text-sm">
8484
{shortenAddress(publicKey, 12, 12)}
8585
</span>
86-
<div className="relative group/tooltip">
87-
<CopyToClipboardControl
88-
className="text-neutral-400"
89-
value={publicKey}
90-
/>
91-
<Tooltip position="left" className="p-2 w-[150px] z-10">
92-
Copy public key
93-
</Tooltip>
94-
</div>
86+
<CopyToClipboardControl
87+
className="text-neutral-400"
88+
value={publicKey}
89+
/>
9590
</h4>
9691
</div>
9792
</div>

apps/namadillo/src/App/Transactions/TransactionCard.tsx

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,13 @@ const renderKeplrIcon = (address: string): JSX.Element | null => {
262262
return <img src={keplrSvg} height={18} width={18} />;
263263
};
264264

265-
const ValidatorTooltip: React.FC<{
265+
const ValidatorTooltip = ({
266+
validator,
267+
children,
268+
}: {
266269
validator: Validator;
267270
children: React.ReactNode;
268-
}> = ({ validator, children }) => {
271+
}): JSX.Element => {
269272
return (
270273
<div className="relative group/tooltip cursor-pointer">
271274
{children}
@@ -330,11 +333,14 @@ const ValidatorTooltip: React.FC<{
330333
);
331334
};
332335

333-
const TransactionCardContainer: React.FC<{
336+
const TransactionCardContainer = ({
337+
children,
338+
hasValidatorImage = false,
339+
}: {
334340
children: React.ReactNode;
335341
transactionFailed: boolean;
336342
hasValidatorImage?: boolean;
337-
}> = ({ children, hasValidatorImage = false }) => {
343+
}): JSX.Element => {
338344
return (
339345
<article
340346
className={twMerge(
@@ -351,12 +357,17 @@ const TransactionCardContainer: React.FC<{
351357
);
352358
};
353359

354-
const TransactionHeader: React.FC<{
360+
const TransactionHeader = ({
361+
transactionFailed,
362+
title,
363+
wrapperId,
364+
timestamp,
365+
}: {
355366
transactionFailed: boolean;
356367
title: string;
357368
wrapperId?: string;
358369
timestamp?: number;
359-
}> = ({ transactionFailed, title, wrapperId, timestamp }) => {
370+
}): JSX.Element => {
360371
return (
361372
<div className="flex items-center gap-3">
362373
<i
@@ -413,10 +424,13 @@ const TransactionHeader: React.FC<{
413424
);
414425
};
415426

416-
const TransactionAmount: React.FC<{
427+
const TransactionAmount = ({
428+
asset,
429+
amount,
430+
}: {
417431
asset: NamadaAsset | undefined;
418432
amount: BigNumber;
419-
}> = ({ asset, amount }) => {
433+
}): JSX.Element => {
420434
const tokenPrices = useAtomValue(
421435
tokenPricesFamily(asset?.address ? [asset.address] : [])
422436
);
@@ -446,7 +460,7 @@ const TransactionAmount: React.FC<{
446460
);
447461
};
448462

449-
const BondUnbondTransactionCard: React.FC<Props> = ({ tx }) => {
463+
const BondUnbondTransactionCard = ({ tx }: Props): JSX.Element => {
450464
const { transaction, asset, transactionFailed, validators } =
451465
useTransactionCardData(tx);
452466
const txnInfo = getBondOrUnbondTransactionInfo(transaction);
@@ -495,7 +509,7 @@ const BondUnbondTransactionCard: React.FC<Props> = ({ tx }) => {
495509
);
496510
};
497511

498-
const RedelegationTransactionCard: React.FC<Props> = ({ tx }) => {
512+
const RedelegationTransactionCard = ({ tx }: Props): JSX.Element => {
499513
const { transaction, asset, transactionFailed, validators } =
500514
useTransactionCardData(tx);
501515
const txnInfo = getRedelegationTransactionInfo(transaction);
@@ -564,7 +578,7 @@ const RedelegationTransactionCard: React.FC<Props> = ({ tx }) => {
564578
);
565579
};
566580

567-
const VoteTransactionCard: React.FC<Props> = ({ tx }) => {
581+
const VoteTransactionCard = ({ tx }: Props): JSX.Element => {
568582
const { transaction, transactionFailed } = useTransactionCardData(tx);
569583
const voteInfo = getVoteTransactionInfo(transaction);
570584
const proposalId =
@@ -624,7 +638,7 @@ const VoteTransactionCard: React.FC<Props> = ({ tx }) => {
624638
);
625639
};
626640

627-
const WithdrawTransactionCard: React.FC<Props> = ({ tx }) => {
641+
const WithdrawTransactionCard = ({ tx }: Props): JSX.Element => {
628642
const { transaction, transactionFailed, validators } =
629643
useTransactionCardData(tx);
630644

@@ -664,7 +678,7 @@ const WithdrawTransactionCard: React.FC<Props> = ({ tx }) => {
664678
);
665679
};
666680

667-
const GeneralTransactionCard: React.FC<Props> = ({ tx }) => {
681+
const GeneralTransactionCard = ({ tx }: Props): JSX.Element => {
668682
const { transaction, asset, transparentAddress, transactionFailed } =
669683
useTransactionCardData(tx);
670684
const txnInfo = getTransactionInfo(transaction, transparentAddress);

apps/namadillo/src/App/Transactions/TransactionHistory.tsx

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,29 @@ export const TransactionHistory = (): JSX.Element => {
8181

8282
const handleFiltering = (transaction: TransactionHistoryType): boolean => {
8383
const transactionKind = transaction.tx?.kind ?? "";
84-
if (filter.toLowerCase() === "all") {
85-
return transferKindOptions.includes(transactionKind);
86-
} else if (filter === "received") {
87-
return transaction.kind === "received";
88-
} else if (filter === "redelegation") {
89-
return transactionKind === "redelegation";
90-
} else if (filter === "vote") {
91-
return transactionKind === "voteProposal";
92-
} else if (filter === "withdraw") {
93-
return transactionKind === "withdraw";
94-
} else if (filter === "transfer") {
95-
return [
96-
"transparentTransfer",
97-
"shieldingTransfer",
98-
"unshieldingTransfer",
99-
"shieldedTransfer",
100-
].includes(transactionKind);
101-
} else if (filter === "ibc") {
102-
return transactionKind.startsWith("ibc");
103-
} else return transactionKind === filter;
84+
switch (filter.toLowerCase()) {
85+
case "all":
86+
return transferKindOptions.includes(transactionKind);
87+
case "received":
88+
return transaction.kind === "received";
89+
case "redelegation":
90+
return transactionKind === "redelegation";
91+
case "vote":
92+
return transactionKind === "voteProposal";
93+
case "withdraw":
94+
return transactionKind === "withdraw";
95+
case "transfer":
96+
return [
97+
"transparentTransfer",
98+
"shieldingTransfer",
99+
"unshieldingTransfer",
100+
"shieldedTransfer",
101+
].includes(transactionKind);
102+
case "ibc":
103+
return transactionKind.startsWith("ibc");
104+
default:
105+
return transactionKind === filter;
106+
}
104107
};
105108

106109
const filterDuplicateTransactions = (

0 commit comments

Comments
 (0)