Merge pull request #24 from liquality/fix-swap-screen

fix: fixed swap screen to amount calculation and removed swtich icon

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "private": true,
   "license": "MIT",
   "author": "Liquality <[email protected]>",

src/manifest.json

@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.10.4",
+  "version": "0.10.5",
   "name": "Liquality Wallet",
   "description": "Secure multi-crypto wallet with built-in Atomic Swaps!",
   "homepage_url": "https://liquality.io",

src/views/Swap.vue

@@ -81,10 +81,7 @@
               </div>
             </div>
           </div>
-          <div class="form-group switch-icon">
-            <ArrowDownIcon/>
-          </div>
-          <div class="form-group">
+          <div class="form-group mt-30">
             <span class="float-left">
               <label for="amount">Receive</label>
             </span>
@@ -333,7 +330,6 @@ import {
 import { shortenAddress } from '@/utils/address'
 import { TX_TYPES, FEE_TYPES, getTxFee, getFeeLabel } from '@/utils/fees'
 import SwapIcon from '@/assets/icons/arrow_swap.svg'
-import ArrowDownIcon from '@/assets/icons/arrow_down.svg'
 import SpinnerIcon from '@/assets/icons/spinner.svg'
 import ClockIcon from '@/assets/icons/clock.svg'
 import CopyIcon from '@/assets/icons/copy.svg'
@@ -353,13 +349,11 @@ export default {
     DetailsContainer,
     CopyIcon,
     CloseIcon,
-    AssetList,
-    ArrowDownIcon
+    AssetList
   },
   data () {
     return {
       amount: 0,
-      toAmount: 0,
       amountOption: 'min',
       asset: null,
       toAsset: null,
@@ -378,10 +372,6 @@ export default {
     this.asset = this.routeAsset
     this.toAsset = Object.keys(this.selectedMarket)[0]
     this.amount = this.min
-    this.toAmount = dpUI(
-      BN(this.safeAmount).times(this.bestRateBasedOnAmount),
-      this.toAsset
-    )
     this.updateMarketData({ network: this.activeNetwork })
     this.updateFees({ asset: this.assetChain })
     this.updateFees({ asset: this.toAssetChain })
@@ -445,6 +435,11 @@ export default {
     safeAmount () {
       return this.amount || 0
     },
+    toAmount () {
+      return dpUI(
+        BN(this.safeAmount).times(this.bestRateBasedOnAmount),
+        this.toAsset)
+    },
     market () {
       return this.selectedMarket[this.toAsset]
     },
@@ -603,22 +598,22 @@ export default {
       this.resetAmounts()
     },
     setAsset (val) {
-      this.amount = this.min
       this.asset = val
       this.toAsset = Object.keys(this.selectedMarket)[0]
+      this.amount = this.min
       this.resetAmounts()
     },
     resetAmounts () {
-      this.toAmount = dpUI(
-        BN(this.safeAmount).times(this.bestRateBasedOnAmount),
-        this.toAsset
-      )
       this.updateFees({ asset: this.assetChain })
       this.updateFees({ asset: this.toAssetChain })
       this.selectedFee = {
         [this.assetChain]: 'average',
         [this.toAssetChain]: 'average'
       }
+      this.toAmount = dpUI(
+        BN(this.safeAmount).times(this.bestRateBasedOnAmount),
+        this.toAsset
+      )
     },
     async swap () {
       const fromAmount = cryptoassets[this.asset].currencyToUnit(this.amount)