From cb322445f54f05e4f6e10b40fa5c0f12322e4eeb Mon Sep 17 00:00:00 2001
From: Nikita-Polyakov <polyakov@soramitsu.co.jp>
Date: Thu, 21 Oct 2021 12:02:35 +0300
Subject: [PATCH] fix calc error

---
 src/components/SwapInfo.vue |  6 +-----
 src/store/swap.ts           | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/SwapInfo.vue b/src/components/SwapInfo.vue
index daa09b81b..821118084 100644
--- a/src/components/SwapInfo.vue
+++ b/src/components/SwapInfo.vue
@@ -10,7 +10,7 @@
       is-formatted
     />
     <info-line v-for="(reward, index) in rewardsValues" :key="index" v-bind="reward" />
-    <info-line v-if="hasPriceImpact" :label="t('swap.priceImpact')" :label-tooltip="t('swap.priceImpactTooltip')">
+    <info-line :label="t('swap.priceImpact')" :label-tooltip="t('swap.priceImpactTooltip')">
       <value-status-wrapper :value="priceImpact">
         <formatted-amount class="swap-value" :value="priceImpactFormatted">%</formatted-amount>
       </value-status-wrapper>
@@ -118,10 +118,6 @@ export default class SwapInfo extends Mixins(mixins.FormattedAmountMixin, Transl
     ];
   }
 
-  get hasPriceImpact(): boolean {
-    return !asZeroValue(this.priceImpact);
-  }
-
   get priceImpactFormatted(): string {
     return this.formatStringValue(this.priceImpact);
   }
diff --git a/src/store/swap.ts b/src/store/swap.ts
index 7b181e067..0b7f5848e 100644
--- a/src/store/swap.ts
+++ b/src/store/swap.ts
@@ -6,7 +6,7 @@ import concat from 'lodash/fp/concat';
 import { api } from '@soramitsu/soraneo-wallet-web';
 import { FPNumber, CodecString, LiquiditySourceTypes, LPRewardsInfo } from '@sora-substrate/util';
 
-import { MarketAlgorithmForLiquiditySource } from '@/consts';
+import { MarketAlgorithmForLiquiditySource, ZeroStringValue } from '@/consts';
 import { TokenBalanceSubscriptions } from '@/utils/subscriptions';
 
 const balanceSubscriptions = new TokenBalanceSubscriptions();
@@ -96,7 +96,7 @@ const getters = {
     return state.toValue;
   },
   minMaxReceived(state: SwapState) {
-    return state.minMaxReceived || '0';
+    return state.minMaxReceived || ZeroStringValue;
   },
   isExchangeB(state: SwapState) {
     return state.isExchangeB;
@@ -122,17 +122,22 @@ const getters = {
     return state.isAvailableChecking;
   },
   priceImpact(state: SwapState, getters) {
-    if (!state.toValue || !state.amountWithoutImpact || !getters.tokenTo) return '0';
+    const { fromValue, toValue, amountWithoutImpact, isExchangeB } = state;
 
-    const withoutImpact = FPNumber.fromCodecValue(state.amountWithoutImpact, getters.tokenTo.decimals);
+    const token = isExchangeB ? getters.tokenFrom : getters.tokenTo;
+    const value = isExchangeB ? fromValue : toValue;
 
-    if (withoutImpact.isZero()) return '0';
+    if (!token || !value || !amountWithoutImpact) return ZeroStringValue;
 
-    const amount = new FPNumber(state.toValue);
-    const div = amount.div(withoutImpact);
-    const result = new FPNumber(1).sub(div).mul(FPNumber.HUNDRED);
+    const withoutImpact = FPNumber.fromCodecValue(amountWithoutImpact, token.decimals);
 
-    return FPNumber.lte(result, FPNumber.ZERO) ? '0' : FPNumber.ZERO.sub(result).toFixed(2);
+    if (withoutImpact.isZero()) return ZeroStringValue;
+
+    const amount = new FPNumber(value, token.decimals);
+    const impact = isExchangeB ? withoutImpact.div(amount) : amount.div(withoutImpact);
+    const result = new FPNumber(1).sub(impact).mul(FPNumber.HUNDRED);
+
+    return FPNumber.lte(result, FPNumber.ZERO) ? ZeroStringValue : FPNumber.ZERO.sub(result).toFixed(2);
   },
 };