Merge pull request #53 from liquality/fix-fee-name

fix: changed message for no liquidity and fixed fee name in the FeeSe…

package.json

@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "private": true,
   "license": "MIT",
   "author": "Liquality <info@liquality.io>",

src/components/FeeSelector.vue

@@ -14,9 +14,7 @@
 import { getTxFee } from '@/utils/fees'
 import BN from 'bignumber.js'
 import { prettyFiatBalance } from '@/utils/coinFormatter'
-import {
-  getChainFromAsset
-} from '@/utils/asset'
+import cryptoassets from '@/utils/cryptoassets'
 
 export default {
   props: ['asset', 'value', 'fees', 'txTypes', 'fiatRates'],
@@ -35,7 +33,8 @@ export default {
         content += `${total} ${this.asset}`
         content += `<br />${totalFiat} USD`
       } else {
-        content += `${this.fees[name].fee} ${getChainFromAsset(this.asset)}`
+        const { unit } = cryptoassets[this.asset].fees
+        content += `<br />${this.fees[name].fee} ${unit}`
       }
 
       return `${content}</div>`

src/components/NoLiquidityMessage.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="notification-content">
-    <div>No liquidity for this pair.</div>
-    <div>Request it via
-      <button class="btn btn-option liq-telegram-btn"
+    <div>No liquidity.</div>
+    <div>Request liquidity for tokens via<button class="btn btn-option liq-telegram-btn"
               @click="openTelegramLink">
         Liquality Telegram
       </button>

src/manifest.json

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

src/views/Swap.vue

@@ -72,7 +72,10 @@
               <div class="float-right btn-group">
                 <v-popover offset="1" trigger="hover focus" class="mr-2">
                   <button
-                    :class="{ active: amountOption === 'min' }"
+                    :class="{
+                      active: amountOption === 'min' && market
+                     }"
+                    :disabled="!market"
                     class="btn btn-option"
                     @click="setSendAmount(min)"
                   >
@@ -87,7 +90,10 @@
                 </v-popover>
                 <v-popover offset="1" trigger="hover focus">
                   <button
-                    :class="{ active: amountOption === 'max' }"
+                     :class="{
+                      active: amountOption === 'max' && market
+                     }"
+                     :disabled="!market"
                     class="btn btn-option tooltip-target"
                     @click="setSendAmount(max)"
                   >
@@ -328,11 +334,14 @@
           <div class="mt-20">
             <label> Rate </label>
             <div class="d-flex align-items-center justify-content-between my-0 py-0">
-              <div>
+              <div v-if="market">
                 1 {{ asset }}&nbsp;=&nbsp;{{ bestRateBasedOnAmount }} &nbsp;{{
                   toAsset
                 }}
               </div>
+              <div v-else>
+                1 {{ asset }}&nbsp;=&nbsp;N/A
+              </div>
             </div>
           </div>
         </div>
@@ -443,7 +452,7 @@ export default {
   },
   created () {
     this.asset = this.routeAsset
-    this.toAsset = Object.keys(this.selectedMarket)[0] || ''
+    this.toAsset = Object.keys(this.selectedMarket)[0] || 'N/A'
     this.sendAmount = this.min
     this.updateMarketData({ network: this.activeNetwork })
     this.updateFees({ asset: this.assetChain })