Skip to content

Commit 84a4a86

Browse files
committed
fix total calculation
1 parent d75cf09 commit 84a4a86

File tree

3 files changed

+8
-27
lines changed

3 files changed

+8
-27
lines changed

instances/widgets.treasury-factory.near/widget/components/TokensDropdown.jsx

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ useEffect(() => {
7878
icon: NearToken,
7979
title: "NEAR",
8080
value: "NEAR",
81-
tokenBalance: isLockupContract
82-
? nearBalances.availableParsed
83-
: nearBalances.totalParsed,
81+
tokenBalance: nearBalances.availableParsed,
8482
},
8583
];
8684

@@ -105,23 +103,13 @@ useEffect(() => {
105103
const [isOpen, setIsOpen] = useState(false);
106104
const [selectedOptionValue, setSelectedValue] = useState(selectedValue);
107105

108-
function getNearAvailableBalance(tokenBalance) {
109-
return Big(tokenBalance)
110-
.minus(nearBalances.storageParsed ?? "0")
111-
.minus(nearStakedTokens ?? "0")
112-
.toFixed(2);
113-
}
114106
const toggleDropdown = () => {
115107
setIsOpen(!isOpen);
116108
};
117109

118110
function sendTokensAvailable(value) {
119111
const balance = options.find((i) => i.value === value)?.tokenBalance;
120-
return setTokensAvailable(
121-
value === "NEAR" && !isLockupContract
122-
? getNearAvailableBalance(balance)
123-
: balance
124-
);
112+
return setTokensAvailable(balance);
125113
}
126114

127115
useEffect(() => {
@@ -209,10 +197,7 @@ const Item = ({ option }) => {
209197
</div>
210198
)}
211199
<div className="text-sm text-secondary w-100 text-wrap">
212-
Tokens available:{" "}
213-
{option.value === "NEAR" && !isLockupContract
214-
? getNearAvailableBalance(option.tokenBalance)
215-
: option.tokenBalance}
200+
Tokens available: {option.tokenBalance}
216201
</div>
217202
</div>
218203
</div>

instances/widgets.treasury-factory.near/widget/pages/dashboard/Portfolio.jsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -235,18 +235,15 @@ const PortfolioCard = ({
235235
};
236236

237237
const NearPortfolio = () => {
238-
let available = Big(nearBalances?.availableParsed ?? "0")
239-
.minus(nearStakedTotalTokens ?? "0")
238+
let total = Big(nearBalances?.totalParsed ?? "0")
239+
.plus(nearStakedTotalTokens ?? "0")
240240
.toFixed(2);
241-
if (parseFloat(available) < 0) {
242-
available = 0;
243-
}
244241
return (
245242
<PortfolioCard
246243
symbol={"NEAR"}
247244
hideBorder={!ftTokens?.length && !isNearPortfolioExpanded}
248245
Icon={NearToken}
249-
balance={nearBalances.totalParsed}
246+
balance={isLockupContract ? nearBalances.totalParsed : total}
250247
showExpand={true}
251248
price={nearPrice}
252249
isExpanded={isNearPortfolioExpanded}
@@ -255,9 +252,7 @@ const NearPortfolio = () => {
255252
<div className="d-flex flex-column">
256253
<BalanceDisplay
257254
label={"Available Balance"}
258-
balance={
259-
isLockupContract ? nearBalances.availableParsed : available
260-
}
255+
balance={nearBalances?.availableParsed}
261256
tooltipInfo={TooltipText?.available}
262257
price={nearPrice}
263258
/>

instances/widgets.treasury-factory.near/widget/pages/dashboard/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ useEffect(() => {
188188

189189
const totalBalance = Big(nearBalances?.totalParsed ?? "0")
190190
.mul(nearPrice ?? 1)
191+
.plus(Big(nearStakedTotalTokens ?? "0").mul(nearPrice ?? 1))
191192
.plus(Big(lockupNearBalances?.totalParsed ?? "0").mul(nearPrice ?? 1))
192193
.plus(Big(userFTTokens?.totalCumulativeAmt ?? "0"))
193194
.toFixed(2);

0 commit comments

Comments
 (0)