Skip to content

fix: update txn amounts for shielding/unshielding transfers #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neocybereth merged 3 commits into from
Jun 13, 2025
Merged

fix: update txn amounts for shielding/unshielding transfers #2137

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36455b8
fix: update txn amounts for shielding/unshielding transfers
neocybereth Jun 13, 2025
6096b1c
fix: fix amounts for staking and transfers
neocybereth Jun 13, 2025
e6afb8f
fix: update ternary
neocybereth Jun 13, 2025
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
42 changes: 24 additions & 18 deletions apps/namadillo/src/App/Transactions/TransactionCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
IoCloseCircleOutline,
} from "react-icons/io5";
import { twMerge } from "tailwind-merge";
import { toDisplayAmount } from "utils";
import { isNamadaAsset, toDisplayAmount } from "utils";
import keplrSvg from "../../integrations/assets/keplr.svg";

type Tx = TransactionHistoryType;
Expand Down Expand Up @@ -86,25 +86,25 @@ const getTransactionInfo = (

const parsed = typeof tx.data === "string" ? JSON.parse(tx.data) : tx.data;
const sections: RawDataSection[] = Array.isArray(parsed) ? parsed : [parsed];
const target = sections.find((s) => s.targets?.length);
const source = sections.find((s) => s.sources?.length);

let receiver: string | undefined;
let amount: BigNumber | undefined;
let receiver: string | undefined;

// Find first section with targets or sources that has amount
const targetSection = sections.find((sec) => sec.targets?.[0]?.amount);
const sourceSection = sections.find((sec) => sec.sources?.[0]?.amount);

if (targetSection?.targets?.[0]) {
amount = new BigNumber(targetSection.targets[0].amount);
receiver = targetSection.targets[0].owner;
if (target?.targets) {
const mainTarget = target.targets.reduce((max, cur) =>
new BigNumber(cur.amount).isGreaterThan(max.amount) ? cur : max
);
amount = new BigNumber(mainTarget.amount);
receiver = mainTarget.owner;
}

if (!amount && sourceSection?.sources?.[0]) {
amount = new BigNumber(sourceSection.sources[0].amount);
// fall back to sources only when we had no targets
if (!amount && source?.sources?.[0]) {
amount = new BigNumber(source.sources[0].amount);
}

// Find sender from any section with sources
const sender = sections.find((sec) => sec.sources?.[0]?.owner)?.sources?.[0]
const sender = sections.find((s) => s.sources?.[0]?.owner)?.sources?.[0]
?.owner;

return amount ? { amount, sender, receiver } : undefined;
Expand All @@ -123,10 +123,6 @@ export const TransactionCard = ({
isBondingTransaction ?
getBondTransactionInfo(transaction)
: getTransactionInfo(transaction);
const baseAmount =
asset && txnInfo?.amount ?
toDisplayAmount(asset, txnInfo.amount)
: undefined;
const receiver = txnInfo?.receiver;
const sender = txnInfo?.sender;
const isReceived = transactionTopLevel?.kind === "received";
Expand All @@ -136,6 +132,14 @@ export const TransactionCard = ({
const validators = useAtomValue(allValidatorsAtom);
const validator = validators?.data?.find((v) => v.address === receiver);

const getBaseAmount = (): BigNumber | undefined => {
if (asset && txnInfo?.amount) {
if (isBondingTransaction) return toDisplayAmount(asset, txnInfo.amount);
if (isNamadaAsset(asset)) return txnInfo.amount;
return toDisplayAmount(asset, txnInfo.amount);
} else return undefined;
};

const renderKeplrIcon = (address: string): JSX.Element | null => {
if (isShieldedAddress(address)) return null;
if (isTransparentAddress(address)) return null;
Expand All @@ -158,6 +162,8 @@ export const TransactionCard = ({
return "Transfer";
};

const baseAmount = getBaseAmount();

return (
<article
className={twMerge(
Expand Down