Skip to content

Commit 046b996

Browse files
committed
fix(web): Balance fetching
1 parent fed59d2 commit 046b996

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

web/src/pages/NewTransaction/Terms/Payment/GeneralTransaction/TokenAndAmount/TokenSelector/TokenItem/Balance.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const Balance: React.FC<IBalance> = ({ token }) => {
3737
});
3838

3939
const formattedBalance = useMemo(() => {
40-
const balance = isNativeTransaction ? nativeBalance : tokenBalance;
40+
const balance = isNativeTransaction ? nativeBalance?.value : tokenBalance;
4141
return getFormattedBalance(balance, token);
4242
}, [isNativeTransaction, nativeBalance, tokenBalance, token]);
4343

web/src/pages/NewTransaction/Terms/Payment/GeneralTransaction/TokenAndAmount/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const TokenAndAmount: React.FC<ITokenAndAmount> = ({ quantity, setQuantity }) =>
7979
}, [quantity, balanceAmount, setHasSufficientNativeBalance]);
8080

8181
const formattedBalance = useMemo(() => {
82-
const balance = isNativeTransaction ? nativeBalance : tokenBalance;
82+
const balance = isNativeTransaction ? nativeBalance?.value : tokenBalance;
8383
return getFormattedBalance(balance, sendingToken);
8484
}, [balanceAmount, sendingToken, isNativeTransaction, nativeBalance, tokenBalance]);
8585

web/src/utils/format.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ export const roundNumberDown = (value: number, fractionDigits = 0) => {
88

99
export const formatUnitsWei = (value: bigint) => formatUnits(value, 18);
1010

11-
export const formatValue = (value: string, fractionDigits, roundDown) => {
11+
export const formatValue = (value: string, fractionDigits: number, roundDown: boolean) => {
1212
let units = Number(value);
1313
if (roundDown) units = roundNumberDown(units, fractionDigits);
1414
return commify(units.toFixed(fractionDigits));
1515
};
1616

17-
export const formatPNK = (value: bigint, fractionDigits = 0, roundDown = true) =>
18-
formatValue(formatUnitsWei(value), fractionDigits, roundDown);
17+
export const formatPNK = (value: bigint, fractionDigits = 0, roundDown = true) => {
18+
if (value === undefined) return "0";
19+
return formatValue(formatUnitsWei(value), fractionDigits, roundDown);
20+
};
1921

20-
export const formatETH = (value: bigint, fractionDigits = 4, roundDown = true) =>
21-
formatValue(formatEther(value), fractionDigits, roundDown);
22+
export const formatETH = (value: bigint, fractionDigits = 4, roundDown = true) => {
23+
if (value === undefined) return "0";
24+
return formatValue(formatEther(value), fractionDigits, roundDown);
25+
};
2226

2327
export const formatUSD = (value: number, fractionDigits = 2) => "$" + commify(Number(value).toFixed(fractionDigits));

web/src/utils/getFormattedBalance.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { formatETH, formatPNK } from "./format";
22

3-
export const getFormattedBalance = (balanceData: any, token: any) => {
4-
if (!balanceData) return undefined;
5-
if (token?.symbol === "PNK") return formatPNK(balanceData.value);
6-
return formatETH(balanceData.value);
3+
export const getFormattedBalance = (balanceData: bigint | undefined, token: any) => {
4+
if (balanceData === undefined) return undefined;
5+
if (token?.symbol === "PNK") return formatPNK(balanceData);
6+
return formatETH(balanceData);
77
};

0 commit comments

Comments
 (0)