diff --git a/package.json b/package.json
index f3326b078..acac8fa92 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "license": "Apache-2.0",
   "private": true,
   "author": "jihoon@tutanota.de <jihoon@tutanota.de>",
diff --git a/src/App.vue b/src/App.vue
index f2c96c227..1c8879d25 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -149,13 +149,12 @@ import { KnownSymbols, FPNumber } from '@sora-substrate/util'
 import { PageNames, BridgeChildPages, SidebarMenuGroups, SocialNetworkLinks, FaucetLink, Components, LogoSize } from '@/consts'
 
 import TransactionMixin from '@/components/mixins/TransactionMixin'
-import LoadingMixin from '@/components/mixins/LoadingMixin'
 import NodeErrorMixin from '@/components/mixins/NodeErrorMixin'
 
 import axios from '@/api'
 import router, { lazyComponent } from '@/router'
 import { formatAddress, disconnectWallet } from '@/utils'
-import { Node, ConnectToNodeOptions } from '@/types/nodes'
+import { ConnectToNodeOptions } from '@/types/nodes'
 
 const WALLET_DEFAULT_ROUTE = WALLET_CONSTS.RouteNames.Wallet
 const WALLET_CONNECTION_ROUTE = WALLET_CONSTS.RouteNames.WalletConnection
@@ -170,7 +169,7 @@ const WALLET_CONNECTION_ROUTE = WALLET_CONSTS.RouteNames.WalletConnection
     TokenLogo: lazyComponent(Components.TokenLogo)
   }
 })
-export default class App extends Mixins(TransactionMixin, LoadingMixin, NodeErrorMixin) {
+export default class App extends Mixins(TransactionMixin, NodeErrorMixin) {
   readonly nodesFeatureEnabled = true
 
   readonly SidebarMenuGroups = SidebarMenuGroups
@@ -187,7 +186,6 @@ export default class App extends Mixins(TransactionMixin, LoadingMixin, NodeErro
 
   showHelpDialog = false
 
-  @State(state => state.settings.node) node!: Node
   @State(state => state.settings.faucetUrl) faucetUrl!: string
   @State(state => state.settings.selectNodeDialogVisibility) selectNodeDialogVisibility!: boolean
 
@@ -199,12 +197,11 @@ export default class App extends Mixins(TransactionMixin, LoadingMixin, NodeErro
   @Getter nodeIsConnected!: boolean
 
   @Action navigate // Wallet
-  @Action trackActiveTransactions
-  @Action setSoraNetwork
+  @Action trackActiveTransactions!: AsyncVoidFn
+  @Action setSoraNetwork!: (data: any) => Promise<void>
   @Action setDefaultNodes!: (nodes: any) => Promise<void>
   @Action connectToNode!: (options: ConnectToNodeOptions) => Promise<void>
   @Action setFaucetUrl!: (url: string) => void
-  @Action setSelectNodeDialogVisibility!: (flag: boolean) => void
   @Action('setEvmSmartContracts', { namespace: 'web3' }) setEvmSmartContracts
   @Action('setSubNetworks', { namespace: 'web3' }) setSubNetworks
   @Action('setSmartContracts', { namespace: 'web3' }) setSmartContracts
diff --git a/src/components/ConfirmRemoveLiquidity.vue b/src/components/ConfirmRemoveLiquidity.vue
index 3fe6f8695..cf8683f07 100644
--- a/src/components/ConfirmRemoveLiquidity.vue
+++ b/src/components/ConfirmRemoveLiquidity.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { Component, Mixins } from 'vue-property-decorator'
 import { Getter } from 'vuex-class'
 
 import TranslationMixin from '@/components/mixins/TranslationMixin'
@@ -74,8 +74,6 @@ const namespace = 'removeLiquidity'
   }
 })
 export default class ConfirmRemoveLiquidity extends Mixins(TranslationMixin, DialogMixin, LoadingMixin, NumberFormatterMixin) {
-  @Prop({ default: false, type: Boolean }) readonly visible!: boolean
-
   @Getter('firstToken', { namespace }) firstToken!: any
   @Getter('secondToken', { namespace }) secondToken!: any
   @Getter('liquidityAmount', { namespace }) liquidityAmount!: string
@@ -85,7 +83,7 @@ export default class ConfirmRemoveLiquidity extends Mixins(TranslationMixin, Dia
   @Getter('price', { namespace: 'prices' }) price!: string | number
   @Getter('priceReversed', { namespace: 'prices' }) priceReversed!: string | number
 
-  @Getter slippageTolerance!: number
+  @Getter slippageTolerance!: string
 
   get formattedFromValue (): string {
     return this.formatStringValue(this.firstTokenAmount)
diff --git a/src/components/ConfirmSwap.vue b/src/components/ConfirmSwap.vue
index d9e9e916b..f6db5fc7a 100644
--- a/src/components/ConfirmSwap.vue
+++ b/src/components/ConfirmSwap.vue
@@ -65,7 +65,7 @@ export default class ConfirmSwap extends Mixins(TransactionMixin, DialogMixin) {
   @Getter('minMaxReceived', { namespace }) minMaxReceived!: CodecString
   @Getter('isExchangeB', { namespace }) isExchangeB!: boolean
 
-  @Getter slippageTolerance!: number
+  @Getter slippageTolerance!: string
   @Getter('swapLiquiditySource', { namespace }) liquiditySource!: LiquiditySourceTypes
 
   @Prop({ default: false, type: Boolean }) readonly isInsufficientBalance!: boolean
diff --git a/src/components/PairTokenLogo.vue b/src/components/PairTokenLogo.vue
index df72fc484..822efc905 100644
--- a/src/components/PairTokenLogo.vue
+++ b/src/components/PairTokenLogo.vue
@@ -10,7 +10,7 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'
 import { AccountAsset, Asset } from '@sora-substrate/util'
 
 import TranslationMixin from '@/components/mixins/TranslationMixin'
-import { LogoSize, Components } from '@/consts'
+import { LogoSize, Components, ObjectInit } from '@/consts'
 import { lazyComponent } from '@/router'
 
 @Component({
@@ -19,8 +19,8 @@ import { lazyComponent } from '@/router'
   }
 })
 export default class PairTokenLogo extends Mixins(TranslationMixin) {
-  @Prop({ type: Object, default: () => null }) readonly firstToken!: AccountAsset | Asset
-  @Prop({ type: Object, default: () => null }) readonly secondToken!: AccountAsset | Asset
+  @Prop({ type: Object, default: ObjectInit }) readonly firstToken!: AccountAsset | Asset
+  @Prop({ type: Object, default: ObjectInit }) readonly secondToken!: AccountAsset | Asset
   @Prop({ type: String, default: LogoSize.MEDIUM, required: false }) readonly size!: LogoSize
 
   get computedClasses (): string {
diff --git a/src/components/SelectNetwork.vue b/src/components/SelectNetwork.vue
index 51c489e31..a69067ac9 100644
--- a/src/components/SelectNetwork.vue
+++ b/src/components/SelectNetwork.vue
@@ -43,7 +43,7 @@ export default class SelectNetwork extends Mixins(TranslationMixin, DialogMixin)
 
   @Getter('subNetworks', { namespace: 'web3' }) subNetworks!: Array<SubNetwork>
 
-  created () {
+  created (): void {
     this.selectedNetwork = bridgeApi.externalNetwork || this.subNetworks[0]?.id
   }
 
diff --git a/src/components/SelectNodeDialog.vue b/src/components/SelectNodeDialog.vue
index b90a79b2b..528032527 100644
--- a/src/components/SelectNodeDialog.vue
+++ b/src/components/SelectNodeDialog.vue
@@ -57,14 +57,13 @@ const NodeInfoView = 'NodeInfoView'
 })
 export default class SelectNodeDialog extends Mixins(TranslationMixin, LoadingMixin, DialogMixin, NodeErrorMixin) {
   @Getter nodeList!: Array<Node>
-  @State(state => state.settings.node) node!: Node
   @State(state => state.settings.defaultNodes) defaultNodes!: Array<Node>
   @State(state => state.settings.nodeAddressConnecting) nodeAddressConnecting!: string
   @State(state => state.settings.nodeConnectionAllowance) nodeConnectionAllowance!: boolean
   @State(state => state.settings.soraNetwork) soraNetwork!: string
   @Action connectToNode!: (options: ConnectToNodeOptions) => Promise<void>
-  @Action addCustomNode!: (node: Node) => void
-  @Action removeCustomNode!: (node: any) => void
+  @Action addCustomNode!: (node: Node) => Promise<void>
+  @Action removeCustomNode!: (node: any) => Promise<void>
 
   currentView = NodeListView
   selectedNode: any = {}
diff --git a/src/components/SelectRegisteredAsset.vue b/src/components/SelectRegisteredAsset.vue
index 852175b61..9a8a95b8c 100644
--- a/src/components/SelectRegisteredAsset.vue
+++ b/src/components/SelectRegisteredAsset.vue
@@ -98,7 +98,7 @@ import SelectAssetMixin from '@/components/mixins/SelectAssetMixin'
 import LoadingMixin from '@/components/mixins/LoadingMixin'
 import NumberFormatterMixin from '@/components/mixins/NumberFormatterMixin'
 import DialogBase from '@/components/DialogBase.vue'
-import { Components } from '@/consts'
+import { Components, ObjectInit } from '@/consts'
 import { lazyComponent } from '@/router'
 import { formatAssetBalance } from '@/utils'
 
@@ -113,7 +113,7 @@ const namespace = 'assets'
 })
 export default class SelectRegisteredAsset extends Mixins(TranslationMixin, SelectAssetMixin, LoadingMixin, NumberFormatterMixin) {
   query = ''
-  selectedAsset: AccountAsset | RegisteredAccountAsset | null = null
+  selectedAsset: Nullable<AccountAsset | RegisteredAccountAsset> = null
   readonly tokenTabs = [
     'tokens',
     'custom'
@@ -123,9 +123,9 @@ export default class SelectRegisteredAsset extends Mixins(TranslationMixin, Sele
   customAddress = ''
   customSymbol = ''
   alreadyAttached = false
-  selectedCustomAsset: Asset | undefined | null = null
+  selectedCustomAsset: Nullable<Asset> = null
 
-  @Prop({ default: () => null, type: Object }) readonly asset!: AccountAsset
+  @Prop({ default: ObjectInit, type: Object }) readonly asset!: AccountAsset
 
   @Getter('whitelistAssets', { namespace }) whitelistAssets!: Array<Asset>
   @Getter('isSoraToEvm', { namespace: 'bridge' }) isSoraToEvm!: boolean
diff --git a/src/components/SelectToken.vue b/src/components/SelectToken.vue
index 83508d1c7..5e6543834 100644
--- a/src/components/SelectToken.vue
+++ b/src/components/SelectToken.vue
@@ -131,7 +131,7 @@ import SelectAssetMixin from '@/components/mixins/SelectAssetMixin'
 import LoadingMixin from '@/components/mixins/LoadingMixin'
 import NumberFormatterMixin from '@/components/mixins/NumberFormatterMixin'
 import DialogBase from '@/components/DialogBase.vue'
-import { Components } from '@/consts'
+import { Components, ObjectInit } from '@/consts'
 import { lazyComponent } from '@/router'
 import { copyToClipboard, formatAddress, formatAssetBalance, debouncedInputHandler } from '@/utils'
 
@@ -154,12 +154,12 @@ export default class SelectToken extends Mixins(TranslationMixin, SelectAssetMix
   customAddress = ''
   alreadyAttached = false
   isConfirmed = false
-  customAsset: Asset | null = null
+  customAsset: Nullable<Asset> = null
 
-  @Prop({ default: () => false, type: Boolean }) readonly connected!: boolean
-  @Prop({ default: () => null, type: Object }) readonly asset!: Asset
-  @Prop({ default: () => false, type: Boolean }) readonly accountAssetsOnly!: boolean
-  @Prop({ default: () => false, type: Boolean }) readonly notNullBalanceOnly!: boolean
+  @Prop({ default: false, type: Boolean }) readonly connected!: boolean
+  @Prop({ default: ObjectInit, type: Object }) readonly asset!: Asset
+  @Prop({ default: false, type: Boolean }) readonly accountAssetsOnly!: boolean
+  @Prop({ default: false, type: Boolean }) readonly notNullBalanceOnly!: boolean
 
   @Getter('whitelistAssets', { namespace }) whitelistAssets!: Array<Asset>
   @Getter('nonWhitelistAccountAssets', { namespace }) nonWhitelistAccountAssets!: Array<AccountAsset>
diff --git a/src/components/Settings/MarketAlgorithm.vue b/src/components/Settings/MarketAlgorithm.vue
index f3a70e397..0c22463db 100644
--- a/src/components/Settings/MarketAlgorithm.vue
+++ b/src/components/Settings/MarketAlgorithm.vue
@@ -30,7 +30,7 @@ import { TabItem } from '@/types/tabs'
 export default class MarketAlgorithm extends Mixins(TranslationMixin) {
   @State(state => state.settings.marketAlgorithm) marketAlgorithm!: MarketAlgorithms
   @State(state => state.swap.pairLiquiditySources) liquiditySources!: Array<LiquiditySourceTypes>
-  @Action('setMarketAlgorithm') setMarketAlgorithm!: (name: string) => void
+  @Action('setMarketAlgorithm') setMarketAlgorithm!: (name: string) => Promise<void>
 
   get marketAlgorithms (): Array<MarketAlgorithms> {
     const items = Object.keys(LiquiditySourceForMarketAlgorithm) as Array<MarketAlgorithms>
diff --git a/src/components/Settings/SlippageTolerance.vue b/src/components/Settings/SlippageTolerance.vue
index 11cf30156..73e38e3ea 100644
--- a/src/components/Settings/SlippageTolerance.vue
+++ b/src/components/Settings/SlippageTolerance.vue
@@ -78,10 +78,10 @@ export default class SlippageTolerance extends Mixins(TranslationMixin, NumberFo
 
   slippageToleranceFocused = false
 
-  @Getter slippageTolerance!: number
+  @Getter slippageTolerance!: string
   @Getter transactionDeadline!: number
   @Getter nodeAddress!: { ip: string; port: number }
-  @Action setSlippageTolerance!: any
+  @Action setSlippageTolerance!: (value: string) => Promise<void>
   @Action setTransactionDeadline!: any
 
   get customSlippageTolerance (): string {
@@ -107,14 +107,16 @@ export default class SlippageTolerance extends Mixins(TranslationMixin, NumberFo
   }
 
   get isErrorValue (): boolean {
-    return this.slippageTolerance < this.slippageToleranceExtremeValues.min || this.slippageTolerance > this.slippageToleranceExtremeValues.max
+    const slippageTolerance = Number(this.slippageTolerance)
+    return slippageTolerance < this.slippageToleranceExtremeValues.min || slippageTolerance > this.slippageToleranceExtremeValues.max
   }
 
   get slippageToleranceValidation (): string {
-    if (this.slippageTolerance >= this.slippageToleranceExtremeValues.min && this.slippageTolerance <= 0.1) {
+    const slippageTolerance = Number(this.slippageTolerance)
+    if (slippageTolerance >= this.slippageToleranceExtremeValues.min && slippageTolerance <= 0.1) {
       return 'warning'
     }
-    if (this.slippageTolerance >= 5 && this.slippageTolerance <= this.slippageToleranceExtremeValues.max) {
+    if (slippageTolerance >= 5 && slippageTolerance <= this.slippageToleranceExtremeValues.max) {
       return 'frontrun'
     }
     if (this.isErrorValue) {
@@ -144,12 +146,10 @@ export default class SlippageTolerance extends Mixins(TranslationMixin, NumberFo
     if (
       FPNumber.lt(
         this.getFPNumber(this.slippageTolerance),
-        this.getFPNumber(
-          this.slippageToleranceExtremeValues.min
-        )
+        this.getFPNumber(this.slippageToleranceExtremeValues.min)
       )
     ) {
-      value = this.slippageToleranceExtremeValues.min
+      value = `${this.slippageToleranceExtremeValues.min}`
     }
     this.setSlippageTolerance(value)
     this.slippageToleranceFocused = false
diff --git a/src/components/TokenLogo.vue b/src/components/TokenLogo.vue
index 2e6bb7f59..552e92164 100644
--- a/src/components/TokenLogo.vue
+++ b/src/components/TokenLogo.vue
@@ -8,12 +8,12 @@ import { Asset, AccountAsset, KnownAssets } from '@sora-substrate/util'
 import { WhitelistAssets } from 'polkaswap-token-whitelist'
 
 import TranslationMixin from '@/components/mixins/TranslationMixin'
-import { LogoSize } from '@/consts'
+import { LogoSize, ObjectInit } from '@/consts'
 
 @Component
 export default class TokenLogo extends Mixins(TranslationMixin) {
   @Prop({ type: String, default: '' }) readonly tokenSymbol!: string // ONLY for Bridge.vue
-  @Prop({ type: Object, default: () => null }) readonly token!: AccountAsset | Asset
+  @Prop({ type: Object, default: ObjectInit }) readonly token!: AccountAsset | Asset
   @Prop({ type: String, default: LogoSize.MEDIUM, required: false }) readonly size!: LogoSize
 
   get tokenClasses (): string {
diff --git a/src/components/mixins/TokenPairMixin.ts b/src/components/mixins/TokenPairMixin.ts
index 950a28510..5839ad296 100644
--- a/src/components/mixins/TokenPairMixin.ts
+++ b/src/components/mixins/TokenPairMixin.ts
@@ -27,7 +27,7 @@ const CreateTokenPairMixin = (namespace: string) => {
     @Getter('price', { namespace: 'prices' }) price!: string
     @Getter('priceReversed', { namespace: 'prices' }) priceReversed!: string
 
-    @Getter slippageTolerance!: number
+    @Getter slippageTolerance!: string
     @Getter isLoggedIn!: boolean
 
     @Action('setFirstTokenAddress', { namespace }) setFirstTokenAddress
diff --git a/src/components/mixins/TransactionMixin.ts b/src/components/mixins/TransactionMixin.ts
index 1efffff90..d810f9548 100644
--- a/src/components/mixins/TransactionMixin.ts
+++ b/src/components/mixins/TransactionMixin.ts
@@ -1,5 +1,5 @@
 import { Component, Mixins } from 'vue-property-decorator'
-import { History, TransactionStatus, Operation, RewardInfo } from '@sora-substrate/util'
+import { History, TransactionStatus, Operation } from '@sora-substrate/util'
 import { api } from '@soramitsu/soraneo-wallet-web'
 import findLast from 'lodash/fp/findLast'
 import { Action } from 'vuex-class'
@@ -14,7 +14,7 @@ import NumberFormatterMixin from './NumberFormatterMixin'
 export default class TransactionMixin extends Mixins(TranslationMixin, LoadingMixin, NumberFormatterMixin) {
   private time = 0
 
-  transaction: History | null = null // It's used just for sync errors
+  transaction: Nullable<History> = null // It's used just for sync errors
 
   @Action addActiveTransaction
   @Action removeActiveTransaction
diff --git a/src/consts/index.ts b/src/consts/index.ts
index 1e2bf369d..6d23691d1 100644
--- a/src/consts/index.ts
+++ b/src/consts/index.ts
@@ -28,6 +28,8 @@ export const Links = {
   }
 }
 
+export const ObjectInit = () => null
+
 export const ZeroStringValue = '0'
 
 export const MetamaskCancellationCode = 4001
diff --git a/src/store/addLiquidity.ts b/src/store/addLiquidity.ts
index bd34e2ccb..160e4b1c1 100644
--- a/src/store/addLiquidity.ts
+++ b/src/store/addLiquidity.ts
@@ -37,11 +37,11 @@ interface AddLiquidityState {
   firstTokenValue: string;
   secondTokenValue: string;
   secondTokenBalance: any;
-  reserve: null | Array<CodecString>;
+  reserve: Nullable<Array<CodecString>>;
   minted: CodecString;
   fee: CodecString;
   totalSupply: CodecString;
-  focusedField: null | string;
+  focusedField: Nullable<string>;
   isAvailable: boolean;
 }
 
@@ -135,7 +135,7 @@ const mutations = {
   },
   [types.GET_RESERVE_REQUEST] (state) {
   },
-  [types.GET_RESERVE_SUCCESS] (state: AddLiquidityState, reserve: null | Array<CodecString>) {
+  [types.GET_RESERVE_SUCCESS] (state: AddLiquidityState, reserve: Nullable<Array<CodecString>>) {
     state.reserve = reserve
   },
   [types.GET_RESERVE_FAILURE] (state, error) {
diff --git a/src/store/bridge.ts b/src/store/bridge.ts
index 408ad060e..787310221 100644
--- a/src/store/bridge.ts
+++ b/src/store/bridge.ts
@@ -331,7 +331,7 @@ const mutations = {
   [types.GET_RESTORED_HISTORY_REQUEST] (state) {},
   [types.GET_RESTORED_HISTORY_SUCCESS] (state) {},
   [types.GET_RESTORED_HISTORY_FAILURE] (state) {},
-  [types.SET_HISTORY_ITEM] (state, historyItem: BridgeHistory | null) {
+  [types.SET_HISTORY_ITEM] (state, historyItem: Nullable<BridgeHistory>) {
     state.historyItem = historyItem
   },
   [types.SIGN_SORA_TRANSACTION_SORA_EVM_REQUEST] (state) {},
@@ -495,7 +495,7 @@ const actions = {
       throw error
     }
   },
-  setHistoryItem ({ commit }, historyItem: BridgeHistory | null) {
+  setHistoryItem ({ commit }, historyItem: Nullable<BridgeHistory>) {
     commit(types.SET_HISTORY_ITEM, historyItem)
   },
   saveHistory ({ commit }, history: BridgeHistory) {
diff --git a/src/store/removeLiquidity.ts b/src/store/removeLiquidity.ts
index e9351a3a6..211653e09 100644
--- a/src/store/removeLiquidity.ts
+++ b/src/store/removeLiquidity.ts
@@ -27,12 +27,12 @@ const types = flow(
 ])
 
 interface RemoveLiquidityState {
-  liquidity: null | any;
+  liquidity: Nullable<any>;
   removePart: number;
   liquidityAmount: string;
   firstTokenAmount: string;
   secondTokenAmount: string;
-  focusedField: null | string;
+  focusedField: Nullable<string>;
   fee: CodecString;
   reserveA: CodecString;
   reserveB: CodecString;
diff --git a/src/store/swap.ts b/src/store/swap.ts
index 09d7357db..5043aae54 100644
--- a/src/store/swap.ts
+++ b/src/store/swap.ts
@@ -35,9 +35,9 @@ const types = flow(
 )(['CHECK_AVAILABILITY'])
 
 interface SwapState {
-  tokenFromAddress: string | null;
+  tokenFromAddress: Nullable<string>;
   tokenFromBalance: any;
-  tokenToAddress: string | null;
+  tokenToAddress: Nullable<string>;
   tokenToBalance: any;
   fromValue: string;
   toValue: string;
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
new file mode 100644
index 000000000..77109f520
--- /dev/null
+++ b/src/types/index.d.ts
@@ -0,0 +1,5 @@
+type Nullable<T> = T | null | undefined
+
+type VoidFn = () => void
+
+type AsyncVoidFn = () => Promise<void>
diff --git a/src/utils/index.ts b/src/utils/index.ts
index ea0980b54..5bde069c9 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -97,7 +97,7 @@ export const hasInsufficientBalance = (
   return FPNumber.lt(fpMaxBalance, fpAmount)
 }
 
-export const hasInsufficientXorForFee = (xorAsset: AccountAsset | RegisteredAccountAsset | null, fee: CodecString, isXorOutputSwap = false): boolean => {
+export const hasInsufficientXorForFee = (xorAsset: Nullable<AccountAsset | RegisteredAccountAsset>, fee: CodecString, isXorOutputSwap = false): boolean => {
   if (!xorAsset) return true
   if (asZeroValue(fee)) return false
 
@@ -126,7 +126,7 @@ export async function delay (ms = 50): Promise<void> {
   await new Promise(resolve => setTimeout(resolve, ms))
 }
 
-export const formatAssetSymbol = (assetSymbol: string | undefined | null): string => {
+export const formatAssetSymbol = (assetSymbol: Nullable<string>): string => {
   return assetSymbol ?? ''
 }
 
diff --git a/src/views/AddLiquidity.vue b/src/views/AddLiquidity.vue
index 18dc89082..821f62265 100644
--- a/src/views/AddLiquidity.vue
+++ b/src/views/AddLiquidity.vue
@@ -192,8 +192,8 @@ export default class AddLiquidity extends Mixins(TokenPairMixin, NumberFormatter
   @Action('addLiquidity', { namespace }) addLiquidity
   @Action('resetFocusedField', { namespace }) resetFocusedField
 
-  @Action('updateAccountLiquidity', { namespace: 'pool' }) updateAccountLiquidity
-  @Action('destroyUpdateAccountLiquiditySubscription', { namespace: 'pool' }) destroyUpdateAccountLiquiditySubscription
+  @Action('updateAccountLiquidity', { namespace: 'pool' }) updateAccountLiquidity!: AsyncVoidFn
+  @Action('destroyUpdateAccountLiquiditySubscription', { namespace: 'pool' }) destroyUpdateAccountLiquiditySubscription!: AsyncVoidFn
 
   readonly delimiters = FPNumber.DELIMITERS_CONFIG
 
diff --git a/src/views/Bridge.vue b/src/views/Bridge.vue
index 3b1340f5a..deaf93bea 100644
--- a/src/views/Bridge.vue
+++ b/src/views/Bridge.vue
@@ -188,14 +188,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { Component, Mixins } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
 import { RegisteredAccountAsset, BridgeNetworks, KnownSymbols, FPNumber, CodecString } from '@sora-substrate/util'
 
 import BridgeMixin from '@/components/mixins/BridgeMixin'
 import NetworkFormatterMixin from '@/components/mixins/NetworkFormatterMixin'
 import TranslationMixin from '@/components/mixins/TranslationMixin'
-import LoadingMixin from '@/components/mixins/LoadingMixin'
 import NumberFormatterMixin from '@/components/mixins/NumberFormatterMixin'
 
 import router, { lazyComponent } from '@/router'
@@ -231,7 +230,6 @@ const namespace = 'bridge'
 export default class Bridge extends Mixins(
   BridgeMixin,
   TranslationMixin,
-  LoadingMixin,
   NetworkFormatterMixin,
   NumberFormatterMixin
 ) {
@@ -240,8 +238,8 @@ export default class Bridge extends Mixins(
   @Action('setAssetAddress', { namespace }) setAssetAddress
   @Action('setAmount', { namespace }) setAmount
   @Action('resetBridgeForm', { namespace }) resetBridgeForm
-  @Action('resetBalanceSubscription', { namespace }) resetBalanceSubscription
-  @Action('getNetworkFee', { namespace }) getNetworkFee
+  @Action('resetBalanceSubscription', { namespace }) resetBalanceSubscription!: AsyncVoidFn
+  @Action('getNetworkFee', { namespace }) getNetworkFee!: AsyncVoidFn
 
   @Getter('evmBalance', { namespace: 'web3' }) evmBalance!: CodecString
   @Getter('evmNetwork', { namespace: 'web3' }) evmNetwork!: BridgeNetworks
@@ -257,8 +255,6 @@ export default class Bridge extends Mixins(
   @Getter('soraNetworkFee', { namespace }) soraNetworkFee!: CodecString
   @Getter('evmNetworkFee', { namespace }) evmNetworkFee!: CodecString
 
-  @Prop({ type: Boolean, default: false }) readonly parentLoading!: boolean
-
   readonly delimiters = FPNumber.DELIMITERS_CONFIG
 
   EvmSymbol = EvmSymbol
diff --git a/src/views/BridgeTransaction.vue b/src/views/BridgeTransaction.vue
index 706dd2a6f..a82642a13 100644
--- a/src/views/BridgeTransaction.vue
+++ b/src/views/BridgeTransaction.vue
@@ -163,7 +163,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { Component, Mixins } from 'vue-property-decorator'
 import { Getter, Action } from 'vuex-class'
 import { AccountAsset, RegisteredAccountAsset, KnownSymbols, FPNumber, CodecString, BridgeHistory, BridgeNetworks } from '@sora-substrate/util'
 import { interpret } from 'xstate'
@@ -188,14 +188,13 @@ const namespace = 'bridge'
 })
 export default class BridgeTransaction extends Mixins(
   BridgeMixin,
-  LoadingMixin,
   NetworkFormatterMixin,
   NumberFormatterMixin
 ) {
   @Getter('isValidNetworkType', { namespace: 'web3' }) isValidNetworkType!: boolean
 
   @Getter('isSoraToEvm', { namespace }) isSoraToEvm!: boolean
-  @Getter('asset', { namespace }) asset!: AccountAsset | RegisteredAccountAsset | null
+  @Getter('asset', { namespace }) asset!: Nullable<AccountAsset | RegisteredAccountAsset>
   @Getter('tokenXOR', { namespace: 'assets' }) tokenXOR!: any
   @Getter('amount', { namespace }) amount!: string
   @Getter('evmBalance', { namespace: 'web3' }) evmBalance!: CodecString
@@ -212,7 +211,7 @@ export default class BridgeTransaction extends Mixins(
   @Getter('transactionStep', { namespace }) transactionStep!: number
   @Getter('historyItem', { namespace }) historyItem!: any
 
-  @Action('getNetworkFee', { namespace }) getNetworkFee
+  @Action('getNetworkFee', { namespace }) getNetworkFee!: AsyncVoidFn
 
   @Action('setCurrentTransactionState', { namespace }) setCurrentTransactionState
   @Action('setInitialTransactionState', { namespace }) setInitialTransactionState
@@ -236,8 +235,6 @@ export default class BridgeTransaction extends Mixins(
   @Action('setSoraTransactionHash', { namespace }) setSoraTransactionHash
   @Action('setEvmTransactionHash', { namespace }) setEvmTransactionHash
 
-  @Prop({ type: Boolean, default: false }) readonly parentLoading!: boolean
-
   EvmSymbol = EvmSymbol
   KnownSymbols = KnownSymbols
   formatAssetSymbol = formatAssetSymbol
diff --git a/src/views/BridgeTransactionsHistory.vue b/src/views/BridgeTransactionsHistory.vue
index 72dff11f2..7b2d21746 100644
--- a/src/views/BridgeTransactionsHistory.vue
+++ b/src/views/BridgeTransactionsHistory.vue
@@ -106,19 +106,19 @@ const namespace = 'bridge'
 })
 export default class BridgeTransactionsHistory extends Mixins(TranslationMixin, LoadingMixin, NetworkFormatterMixin) {
   @Getter('registeredAssets', { namespace: 'assets' }) registeredAssets!: Array<RegisteredAccountAsset>
-  @Getter('history', { namespace }) history!: Array<BridgeHistory> | null
+  @Getter('history', { namespace }) history!: Nullable<Array<BridgeHistory>>
   @Getter('restored', { namespace }) restored!: boolean
   @Getter('soraNetworkFee', { namespace }) soraNetworkFee!: string
   @Getter('evmNetworkFee', { namespace }) evmNetworkFee!: CodecString
 
-  @Action('getHistory', { namespace }) getHistory
-  @Action('getRestoredFlag', { namespace }) getRestoredFlag
-  @Action('getRestoredHistory', { namespace }) getRestoredHistory
-  @Action('getNetworkFee', { namespace }) getNetworkFee
-  @Action('getEvmNetworkFee', { namespace }) getEvmNetworkFee
-  @Action('clearHistory', { namespace }) clearHistory
+  @Action('getHistory', { namespace }) getHistory!: AsyncVoidFn
+  @Action('getRestoredFlag', { namespace }) getRestoredFlag!: AsyncVoidFn
+  @Action('getRestoredHistory', { namespace }) getRestoredHistory!: AsyncVoidFn
+  @Action('getNetworkFee', { namespace }) getNetworkFee!: AsyncVoidFn
+  @Action('getEvmNetworkFee', { namespace }) getEvmNetworkFee!: AsyncVoidFn
+  @Action('clearHistory', { namespace }) clearHistory!: AsyncVoidFn
   @Action('setSoraToEvm', { namespace }) setSoraToEvm
-  @Action('setTransactionConfirm', { namespace }) setTransactionConfirm
+  @Action('setTransactionConfirm', { namespace }) setTransactionConfirm!: (value: boolean) => Promise<void>
   @Action('setAssetAddress', { namespace }) setAssetAddress
   @Action('setAmount', { namespace }) setAmount
   @Action('setSoraTransactionHash', { namespace }) setSoraTransactionHash
@@ -132,9 +132,7 @@ export default class BridgeTransactionsHistory extends Mixins(TranslationMixin,
   @Action('setHistoryItem', { namespace }) setHistoryItem
   @Action('saveHistory', { namespace }) saveHistory
 
-  @Action('updateRegisteredAssets', { namespace: 'assets' }) updateRegisteredAssets
-
-  @Prop({ type: Boolean, default: false }) readonly parentLoading!: boolean
+  @Action('updateRegisteredAssets', { namespace: 'assets' }) updateRegisteredAssets!: AsyncVoidFn
 
   PageNames = PageNames
   formatAssetSymbol = formatAssetSymbol
diff --git a/src/views/Pool.vue b/src/views/Pool.vue
index 36bbd6d8d..bf2317418 100644
--- a/src/views/Pool.vue
+++ b/src/views/Pool.vue
@@ -62,7 +62,7 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
-import { AccountLiquidity } from '@sora-substrate/util'
+import { AccountLiquidity, Asset } from '@sora-substrate/util'
 
 import TranslationMixin from '@/components/mixins/TranslationMixin'
 import LoadingMixin from '@/components/mixins/LoadingMixin'
@@ -83,11 +83,11 @@ const namespace = 'pool'
 export default class Pool extends Mixins(TranslationMixin, LoadingMixin, NumberFormatterMixin) {
   @Getter isLoggedIn!: boolean
   @Getter('accountLiquidity', { namespace }) accountLiquidity!: any
-  @Getter('assets', { namespace: 'assets' }) assets
-  @Action('getAssets', { namespace: 'assets' }) getAssets
+  @Getter('assets', { namespace: 'assets' }) assets!: Array<Asset>
+  @Action('getAssets', { namespace: 'assets' }) getAssets!: AsyncVoidFn
 
-  @Action('updateAccountLiquidity', { namespace }) updateAccountLiquidity
-  @Action('destroyUpdateAccountLiquiditySubscription', { namespace }) destroyUpdateAccountLiquiditySubscription
+  @Action('updateAccountLiquidity', { namespace }) updateAccountLiquidity!: AsyncVoidFn
+  @Action('destroyUpdateAccountLiquiditySubscription', { namespace }) destroyUpdateAccountLiquiditySubscription!: AsyncVoidFn
 
   async mounted () {
     await this.withApi(async () => {
diff --git a/src/views/RemoveLiquidity.vue b/src/views/RemoveLiquidity.vue
index ba8998b1c..1026cc685 100644
--- a/src/views/RemoveLiquidity.vue
+++ b/src/views/RemoveLiquidity.vue
@@ -164,13 +164,11 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Watch, Prop } from 'vue-property-decorator'
+import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'vuex-class'
 import { FPNumber, KnownSymbols, AccountLiquidity, CodecString } from '@sora-substrate/util'
 
 import TransactionMixin from '@/components/mixins/TransactionMixin'
-import LoadingMixin from '@/components/mixins/LoadingMixin'
-import NumberFormatterMixin from '@/components/mixins/NumberFormatterMixin'
 import ConfirmDialogMixin from '@/components/mixins/ConfirmDialogMixin'
 
 import router, { lazyComponent } from '@/router'
@@ -190,13 +188,11 @@ const namespace = 'removeLiquidity'
     ConfirmRemoveLiquidity: lazyComponent(Components.ConfirmRemoveLiquidity)
   }
 })
-export default class RemoveLiquidity extends Mixins(TransactionMixin, LoadingMixin, NumberFormatterMixin, ConfirmDialogMixin) {
+export default class RemoveLiquidity extends Mixins(TransactionMixin, ConfirmDialogMixin) {
   readonly KnownSymbols = KnownSymbols
   readonly delimiters = FPNumber.DELIMITERS_CONFIG
 
-  @Prop({ type: Boolean, default: false }) readonly parentLoading!: boolean
-
-  @Getter('focusedField', { namespace }) focusedField!: null | string
+  @Getter('focusedField', { namespace }) focusedField!: Nullable<string>
   @Getter('liquidity', { namespace }) liquidity!: AccountLiquidity
   @Getter('firstToken', { namespace }) firstToken!: any
   @Getter('secondToken', { namespace }) secondToken!: any
@@ -220,18 +216,18 @@ export default class RemoveLiquidity extends Mixins(TransactionMixin, LoadingMix
   @Action('setFocusedField', { namespace }) setFocusedField
   @Action('resetFocusedField', { namespace }) resetFocusedField
   @Action('removeLiquidity', { namespace }) removeLiquidity
-  @Action('getAssets', { namespace: 'assets' }) getAssets
-  @Action('resetData', { namespace }) resetData
+  @Action('getAssets', { namespace: 'assets' }) getAssets!: AsyncVoidFn
+  @Action('resetData', { namespace }) resetData!: AsyncVoidFn
   @Action('getPrices', { namespace: 'prices' }) getPrices
-  @Action('resetPrices', { namespace: 'prices' }) resetPrices
-  @Action('updateAccountLiquidity', { namespace: 'pool' }) updateAccountLiquidity
-  @Action('destroyUpdateAccountLiquiditySubscription', { namespace: 'pool' }) destroyUpdateAccountLiquiditySubscription
+  @Action('resetPrices', { namespace: 'prices' }) resetPrices!: AsyncVoidFn
+  @Action('updateAccountLiquidity', { namespace: 'pool' }) updateAccountLiquidity!: AsyncVoidFn
+  @Action('destroyUpdateAccountLiquiditySubscription', { namespace: 'pool' }) destroyUpdateAccountLiquiditySubscription!: AsyncVoidFn
 
   removePartInput = 0
   sliderInput: any
   sliderDragButton: any
 
-  async mounted () {
+  async mounted (): Promise<void> {
     this.resetData()
     this.resetPrices()
     await this.withApi(async () => {
@@ -254,7 +250,7 @@ export default class RemoveLiquidity extends Mixins(TransactionMixin, LoadingMix
     }
   }
 
-  destroyed () {
+  destroyed (): void {
     if (this.sliderDragButton) {
       this.$el.removeEventListener('mousedown', this.sliderDragButton)
     }
diff --git a/src/views/Rewards.vue b/src/views/Rewards.vue
index a6a474db3..fda160bc8 100644
--- a/src/views/Rewards.vue
+++ b/src/views/Rewards.vue
@@ -74,9 +74,9 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Prop } from 'vue-property-decorator'
+import { Component, Mixins } from 'vue-property-decorator'
 import { Action, Getter, State } from 'vuex-class'
-import { AccountAsset, KnownSymbols, KnownAssets, RewardInfo, RewardsInfo, RewardingEvents, CodecString } from '@sora-substrate/util'
+import { AccountAsset, KnownSymbols, RewardInfo, RewardsInfo, CodecString } from '@sora-substrate/util'
 
 import web3Util from '@/utils/web3-util'
 import { lazyComponent } from '@/router'
@@ -86,7 +86,6 @@ import { RewardsAmountTableItem, RewardInfoGroup } from '@/types/rewards'
 
 import WalletConnectMixin from '@/components/mixins/WalletConnectMixin'
 import TransactionMixin from '@/components/mixins/TransactionMixin'
-import NumberFormatterMixin from '@/components/mixins/NumberFormatterMixin'
 
 @Component({
   components: {
@@ -99,9 +98,7 @@ import NumberFormatterMixin from '@/components/mixins/NumberFormatterMixin'
     InfoLine: lazyComponent(Components.InfoLine)
   }
 })
-export default class Rewards extends Mixins(WalletConnectMixin, TransactionMixin, NumberFormatterMixin) {
-  @Prop({ type: Boolean, default: false }) readonly parentLoading!: boolean
-
+export default class Rewards extends Mixins(WalletConnectMixin, TransactionMixin) {
   @State(state => state.rewards.fee) fee!: CodecString
   @State(state => state.rewards.feeFetching) feeFetching!: boolean
   @State(state => state.rewards.rewardsFetching) rewardsFetching!: boolean
@@ -124,8 +121,8 @@ export default class Rewards extends Mixins(WalletConnectMixin, TransactionMixin
   @Getter('transactionStepsCount', { namespace: 'rewards' }) transactionStepsCount!: number
   @Getter('vestedRewadsGroupItem', { namespace: 'rewards' }) vestedRewadsGroupItem!: RewardInfoGroup
 
-  @Action('reset', { namespace: 'rewards' }) reset!: () => void
-  @Action('setSelectedRewards', { namespace: 'rewards' }) setSelectedRewards!: (params) => void
+  @Action('reset', { namespace: 'rewards' }) reset!: AsyncVoidFn
+  @Action('setSelectedRewards', { namespace: 'rewards' }) setSelectedRewards!: (params: any) => Promise<void>
   @Action('getRewards', { namespace: 'rewards' }) getRewards!: (address: string) => Promise<Array<RewardInfo>>
   @Action('claimRewards', { namespace: 'rewards' }) claimRewards!: (options: any) => Promise<void>
 
diff --git a/src/views/Swap.vue b/src/views/Swap.vue
index 6e13717d6..0c25eec55 100644
--- a/src/views/Swap.vue
+++ b/src/views/Swap.vue
@@ -139,10 +139,11 @@
 </template>
 
 <script lang="ts">
-import { Component, Mixins, Watch, Prop } from 'vue-property-decorator'
+import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter, State } from 'vuex-class'
 import { api } from '@soramitsu/soraneo-wallet-web'
 import { KnownAssets, KnownSymbols, CodecString, AccountAsset, LiquiditySourceTypes, LPRewardsInfo, FPNumber } from '@sora-substrate/util'
+import type { Subscription } from '@polkadot/x-rxjs'
 
 import TranslationMixin from '@/components/mixins/TranslationMixin'
 import LoadingMixin from '@/components/mixins/LoadingMixin'
@@ -168,7 +169,7 @@ const namespace = 'swap'
 })
 export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberFormatterMixin) {
   @Getter isLoggedIn!: boolean
-  @Getter slippageTolerance!: number
+  @Getter slippageTolerance!: string
   @Getter('tokenXOR', { namespace: 'assets' }) tokenXOR!: AccountAsset
   @Getter('tokenFrom', { namespace }) tokenFrom!: AccountAsset
   @Getter('tokenTo', { namespace }) tokenTo!: AccountAsset
@@ -190,11 +191,11 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
   @Action('setExchangeB', { namespace }) setExchangeB!: (isExchangeB: boolean) => Promise<void>
   @Action('setLiquidityProviderFee', { namespace }) setLiquidityProviderFee!: (value: CodecString) => Promise<void>
   @Action('setNetworkFee', { namespace }) setNetworkFee!: (value: CodecString) => Promise<void>
-  @Action('checkSwap', { namespace }) checkSwap!: () => Promise<void>
-  @Action('reset', { namespace }) reset!: () => void
+  @Action('checkSwap', { namespace }) checkSwap!: AsyncVoidFn
+  @Action('reset', { namespace }) reset!: AsyncVoidFn
   @Action('getPrices', { namespace: 'prices' }) getPrices!: (options: any) => Promise<void>
-  @Action('resetPrices', { namespace: 'prices' }) resetPrices!: () => Promise<void>
-  @Action('getAssets', { namespace: 'assets' }) getAssets
+  @Action('resetPrices', { namespace: 'prices' }) resetPrices!: AsyncVoidFn
+  @Action('getAssets', { namespace: 'assets' }) getAssets!: AsyncVoidFn
   @Action('setPairLiquiditySources', { namespace }) setPairLiquiditySources!: (liquiditySources: Array<LiquiditySourceTypes>) => Promise<void>
   @Action('setRewards', { namespace }) setRewards!: (rewards: Array<LPRewardsInfo>) => Promise<void>
 
@@ -207,7 +208,7 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
 
   @Watch('liquiditySource')
   private handleLiquiditySourceChange (): void {
-    this.recountSwapValues()
+    this.subscribeOnSwapReserves()
   }
 
   @Watch('isLoggedIn')
@@ -218,8 +219,6 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
     }
   }
 
-  @Prop({ type: Boolean, default: false }) readonly parentLoading!: boolean
-
   readonly delimiters = FPNumber.DELIMITERS_CONFIG
   KnownSymbols = KnownSymbols
   isInsufficientAmount = false
@@ -229,6 +228,7 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
   showSelectTokenDialog = false
   showConfirmSwapDialog = false
   isRecountingProcess = false
+  liquidityReservesSubscription: Nullable<Subscription> = null
 
   get areTokensSelected (): boolean {
     return !!(this.tokenFrom && this.tokenTo)
@@ -301,10 +301,6 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
     })
   }
 
-  destroyed () {
-    this.reset()
-  }
-
   formatBalance (token): string {
     return formatAssetBalance(token)
   }
@@ -340,7 +336,7 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
       this.tokenTo?.address
     )) : []
 
-    this.setPairLiquiditySources(sources)
+    await this.setPairLiquiditySources(sources)
   }
 
   async handleInputFieldFrom (value): Promise<any> {
@@ -367,12 +363,12 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
 
   private async runRecountSwapValues (): Promise<void> {
     const value = this.isExchangeB ? this.toValue : this.fromValue
+    if (!this.areTokensSelected || asZeroValue(value)) return
+
     const setOppositeValue = this.isExchangeB ? this.setFromValue : this.setToValue
     const resetOppositeValue = this.isExchangeB ? this.resetFieldFrom : this.resetFieldTo
     const oppositeToken = this.isExchangeB ? this.tokenFrom : this.tokenTo
 
-    if (!this.areTokensSelected || asZeroValue(value)) return
-
     try {
       this.isRecountingProcess = true
       this.isInsufficientAmount = false
@@ -399,6 +395,25 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
 
   recountSwapValues = debouncedInputHandler(this.runRecountSwapValues)
 
+  private cleanSwapReservesSubscription (): void {
+    if (!this.liquidityReservesSubscription) {
+      return
+    }
+    this.liquidityReservesSubscription.unsubscribe()
+    this.liquidityReservesSubscription = null
+  }
+
+  private subscribeOnSwapReserves (): void {
+    this.cleanSwapReservesSubscription()
+    if (!this.areTokensSelected) return
+
+    this.liquidityReservesSubscription = api.subscribeOnSwapReserves(
+      this.tokenFrom.address,
+      this.tokenTo.address,
+      this.liquiditySource
+    ).subscribe(this.recountSwapValues)
+  }
+
   private async calcMinMaxRecieved (): Promise<void> {
     const amount = this.isExchangeB ? this.fromValue : this.toValue
     const minMaxReceived = await api.getMinMaxValue(this.tokenFrom?.address, this.tokenTo?.address, amount, this.slippageTolerance, this.isExchangeB)
@@ -449,7 +464,7 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
     await this.setTokenFromAddress(toAddress)
     await this.setTokenToAddress(fromAddress)
 
-    this.updatePairLiquiditySources()
+    await this.updatePairLiquiditySources()
 
     if (this.isExchangeB) {
       this.setExchangeB(false)
@@ -458,6 +473,8 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
       this.setExchangeB(true)
       await this.handleInputFieldTo(this.fromValue)
     }
+
+    this.subscribeOnSwapReserves()
   }
 
   async handleMaxValue (): Promise<void> {
@@ -488,7 +505,7 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
         this.checkSwap(),
         this.updatePairLiquiditySources()
       ])
-      await this.recountSwapValues()
+      this.subscribeOnSwapReserves()
     }
   }
 
@@ -508,6 +525,11 @@ export default class Swap extends Mixins(TranslationMixin, LoadingMixin, NumberF
   openSettingsDialog (): void {
     this.showSettings = true
   }
+
+  destroyed (): void {
+    this.reset()
+    this.cleanSwapReservesSubscription()
+  }
 }
 </script>