Skip to content

Commit b0849cb

Browse files
committed
fix(*): parse amountInUsd
1 parent 082fe1d commit b0849cb

3 files changed

Lines changed: 18 additions & 16 deletions

File tree

apps/root/src/common/utils/earn/parsing.tsx

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ export function parseUserStrategiesFinancialData(userPositions: EarnPosition[] =
375375

376376
const newAmount = assetBalance.amount.amount + acc[assetBalance.token.address].amount;
377377
const newAmountInUsd =
378-
Number(assetBalance.amount.amountInUSD) + Number(acc[assetBalance.token.address].amountInUSD);
378+
Number(assetBalance.amount.amountInUSD ?? 0) + Number(acc[assetBalance.token.address].amountInUSD ?? 0);
379379
// eslint-disable-next-line no-param-reassign
380380
acc[assetBalance.token.address] = {
381381
amount: newAmount,
@@ -406,14 +406,14 @@ export function parseUserStrategiesFinancialData(userPositions: EarnPosition[] =
406406

407407
const newAmount = tokenBalance.profit.amount + acc[tokenBalance.token.address].amount;
408408
const newAmountInUsd =
409-
Number(tokenBalance.profit.amountInUSD) + Number(acc[tokenBalance.token.address].amountInUSD);
409+
Number(tokenBalance.profit.amountInUSD ?? 0) + Number(acc[tokenBalance.token.address].amountInUSD ?? 0);
410410

411411
// Asset tracking
412412
if (isSameToken(tokenBalance.token, position.strategy.asset)) {
413-
currentProfitAssetUsd += Number(tokenBalance.profit.amountInUSD);
413+
currentProfitAssetUsd += Number(tokenBalance.profit.amountInUSD ?? 0);
414414
}
415415
// Totals tracking
416-
currentProfitTotalUsd += Number(tokenBalance.profit.amountInUSD);
416+
currentProfitTotalUsd += Number(tokenBalance.profit.amountInUSD ?? 0);
417417

418418
// eslint-disable-next-line no-param-reassign
419419
acc[tokenBalance.token.address] = {
@@ -457,7 +457,8 @@ export function parseUserStrategiesFinancialData(userPositions: EarnPosition[] =
457457
const newRatiodUsdAmount =
458458
Number(assetBalance?.amount.amountInUSD || 0) * (period.annualRatio * (totalApy / 100));
459459
const newAmount = newRatiodAmount + periodAcc.byToken[assetBalance.token.address].amount;
460-
const newAmountInUsd = newRatiodUsdAmount + Number(periodAcc.byToken[assetBalance.token.address].amountInUSD);
460+
const newAmountInUsd =
461+
newRatiodUsdAmount + Number(periodAcc.byToken[assetBalance.token.address].amountInUSD || 0);
461462
// eslint-disable-next-line no-param-reassign
462463
periodAcc.byToken[assetBalance.token.address] = {
463464
amount: newAmount,
@@ -514,9 +515,9 @@ export function parseUserStrategiesFinancialData(userPositions: EarnPosition[] =
514515
acc[balance.token.address] = {
515516
amount: acc[balance.token.address].amount + balance.profit.amount,
516517
amountInUnits: formatUnits(acc[balance.token.address].amount + balance.profit.amount, balance.token.decimals),
517-
amountInUSD: (Number(acc[balance.token.address].amountInUSD) + Number(balance.profit.amountInUSD)).toFixed(
518-
18
519-
),
518+
amountInUSD: (
519+
Number(acc[balance.token.address].amountInUSD ?? 0) + Number(balance.profit.amountInUSD ?? 0)
520+
).toFixed(18),
520521
};
521522
});
522523
} else {
@@ -536,13 +537,14 @@ export function parseUserStrategiesFinancialData(userPositions: EarnPosition[] =
536537
}
537538

538539
const amountProfit = currentBalanceToken.profit.amount - balance.profit.amount;
539-
const amountProfitInUsd = Number(currentBalanceToken.profit.amountInUSD) - Number(balance.profit.amountInUSD);
540+
const amountProfitInUsd =
541+
Number(currentBalanceToken.profit.amountInUSD ?? 0) - Number(balance.profit.amountInUSD ?? 0);
540542

541543
// eslint-disable-next-line no-param-reassign
542544
acc[balance.token.address] = {
543545
amount: acc[balance.token.address].amount + amountProfit,
544546
amountInUnits: formatUnits(acc[balance.token.address].amount + amountProfit, balance.token.decimals),
545-
amountInUSD: (Number(acc[balance.token.address].amountInUSD) + amountProfitInUsd).toFixed(18),
547+
amountInUSD: (Number(acc[balance.token.address].amountInUSD ?? 0) + amountProfitInUsd).toFixed(18),
546548
};
547549
});
548550
}
@@ -552,7 +554,7 @@ export function parseUserStrategiesFinancialData(userPositions: EarnPosition[] =
552554

553555
const totalMonthlyEarnings = Object.values(monthlyEarnings).reduce((acc, amount) => {
554556
// eslint-disable-next-line no-param-reassign
555-
return acc + Number(amount.amountInUSD) || 0;
557+
return acc + Number(amount.amountInUSD ?? 0) || 0;
556558
}, 0);
557559

558560
return {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"downloadAndBuildTranslations": "yarn downloadTranslations:auth && yarn compile"
2121
},
2222
"dependencies": {
23-
"@balmy/sdk": "0.8.0"
23+
"@balmy/sdk": "0.9.0"
2424
},
2525
"devDependencies": {
2626
"@formatjs/cli": "^6.0.4",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,10 +1155,10 @@
11551155
"@babel/helper-validator-identifier" "^7.24.7"
11561156
to-fast-properties "^2.0.0"
11571157

1158-
"@balmy/sdk@*", "@balmy/sdk@0.8.0":
1159-
version "0.8.0"
1160-
resolved "https://registry.yarnpkg.com/@balmy/sdk/-/sdk-0.8.0.tgz#53510cf1b9bc5c7c0c6d6f1a4cc01e0448ca0568"
1161-
integrity sha512-QAqqgQU6L29VxdQaNBynPnv3KRwPjsnU++WCbiYR/SFe0HkFAm+vNHW1dtMVcuMwrcpBLPKaALMjSDLIsMcjsw==
1158+
"@balmy/sdk@*", "@balmy/sdk@0.9.0":
1159+
version "0.9.0"
1160+
resolved "https://registry.yarnpkg.com/@balmy/sdk/-/sdk-0.9.0.tgz#98160a691d6f668163165edc1b371bde88cb117a"
1161+
integrity sha512-O8areOYP6h6jXf608N6SkYfvWBUF8b1M6TuUArDmOFNVuw2ZCLDpMj0udRo27IOBa+9Phdb4nIAITZFKBLHWDQ==
11621162
dependencies:
11631163
cross-fetch "3.1.5"
11641164
crypto-js "4.2.0"

0 commit comments

Comments
 (0)