From d9eb4987ee3497789f224897a8f4e96f007a6c14 Mon Sep 17 00:00:00 2001 From: Timofey Trepalin Date: Fri, 12 Jul 2024 16:37:03 +0500 Subject: [PATCH] fixed stats usd value, fixed swap dialog Signed-off-by: Timofey Trepalin --- .../ADAR/components/RouteAssets/Stages/ReviewDetails.vue | 2 +- src/modules/ADAR/components/RouteAssets/SwapDialog.vue | 1 + src/modules/ADAR/components/Stats/adarStats.vue | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue b/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue index 8719e95ff..ad61b173d 100644 --- a/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue +++ b/src/modules/ADAR/components/RouteAssets/Stages/ReviewDetails.vue @@ -416,7 +416,7 @@ export default class ReviewDetails extends Mixins(mixins.TransactionMixin, mixin } onTransferAddFundsClick(tokenData: OutcomeAssetsAmount) { - const requiredAmount = this.tokenTransferAmountRequired(tokenData.asset, tokenData.amountRequired); + const requiredAmount = tokenData.amountRequired; let assetFrom: Asset; if (this.inputToken.address !== tokenData.asset.address) { assetFrom = this.inputToken; diff --git a/src/modules/ADAR/components/RouteAssets/SwapDialog.vue b/src/modules/ADAR/components/RouteAssets/SwapDialog.vue index 2a129abc4..029678459 100644 --- a/src/modules/ADAR/components/RouteAssets/SwapDialog.vue +++ b/src/modules/ADAR/components/RouteAssets/SwapDialog.vue @@ -47,6 +47,7 @@ export default class SwapDialog extends Mixins(mixins.TransactionMixin, mixins.D const { assetFrom, assetTo } = this.presetSwapData; const isAssetToXor = assetTo.symbol === XOR.symbol; const fieldToValue = isAssetToXor ? this.roundedValueTo.add(this.networkSwapFee) : this.roundedValueTo; + swapComponent.isTokenFromSelected = false; await swapComponent.handleSelectToken(assetTo); swapComponent.isTokenFromSelected = true; await swapComponent.handleSelectToken(assetFrom); diff --git a/src/modules/ADAR/components/Stats/adarStats.vue b/src/modules/ADAR/components/Stats/adarStats.vue index 3a9ad54b2..412aec656 100644 --- a/src/modules/ADAR/components/Stats/adarStats.vue +++ b/src/modules/ADAR/components/Stats/adarStats.vue @@ -119,7 +119,7 @@ export default class AdarStats extends Mixins(mixins.LoadingMixin, TranslationMi const rate = item.payload?.comment?.rates[receiver.asset.symbol]; return rate ? result.add(new FPNumber(rate).mul(receiver.amount)) : result; }, FPNumber.ZERO); - return sum; + return acc.add(sum); } const assetsTable = this.whitelistArray; const asset = assetsTable.find((asset) => asset.address === item.assetAddress);