Merge pull request #13 from liquality/fix-speed-up-options-send

fixed speedup options

package.json

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

src/manifest.json

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

src/views/PermissionSend.vue

@@ -13,7 +13,7 @@
       <div class="form-group">
         <label>Network Speed / Fee</label>
         <div class="permission-send_fees">
-          <FeeSelector :asset="asset" v-model="selectedFee" v-bind:fees="assetFees" />
+          <FeeSelector :asset="asset" v-model="selectedFee" v-bind:fees="assetFees" v-bind:fiatRates="fiatRates"/>
         </div>
       </div>
       <div v-if="data" class="permission-send_data">

src/views/Send.vue

@@ -165,9 +165,12 @@
             Amount + Fees
           </label>
           <div class="d-flex align-items-center justify-content-between mt-0">
-            <div class="font-weight-bold">
-            {{ amount }} {{ asset }} + {{ totalFee }} {{ feeType }}
-          </div>
+            <div class="font-weight-bold" v-if="asset === feeType">
+              {{ amountWithFee }} {{ asset }}
+            </div>
+             <div class="font-weight-bold" v-else>
+              {{ amount }} {{ asset }} + {{ totalFee }} {{ feeType }}
+            </div>
           <div class="font-weight-bold">${{ totalToSendInFiat }}</div>
           </div>
         </div>
@@ -317,8 +320,10 @@ export default {
       return getFeeLabel(this.selectedFee)
     },
     totalToSendInFiat () {
-      const total = BN(this.amount).plus(BN(this.totalFee))
-      return prettyFiatBalance(total, this.fiatRates[this.asset])
+      return prettyFiatBalance(this.amountWithFee, this.fiatRates[this.asset])
+    },
+    amountWithFee () {
+      return BN(this.amount).plus(BN(this.totalFee))
     }
   },
   methods: {

src/views/Swap.vue

@@ -265,9 +265,8 @@
               </div>
             </div>
           </div>
-          <div class="detail-group">
+          <div class="detail-group" v-if="sendTo">
             <label class="text-muted"> Receive At </label>
-              <span v-if="sendTo">
                 {{ shortenAddress(sendTo) }}
                 <CopyIcon
                   class="copy-icon"
@@ -277,10 +276,6 @@
                     hideOnTargetClick: false,
                   }"
                 />
-              </span>
-              <span v-else>
-                This Wallet
-              </span>
           </div>
           <div class="mt-20">
             <label> Rate </label>

src/views/TransactionDetails.vue

@@ -22,7 +22,7 @@
             <h2>Network Speed/Fee</h2>
             <p>{{prettyBalance(tx ? tx.fee : item.tx.fee, item.from)}} {{ assetChain }} | {{ item.fee }} {{ feeUnit }} <a v-if="canUpdateFee && !showFeeSelector" @click="openFeeSelector()">Speed up</a></p>
             <div v-if="showFeeSelector" class="mt-2">
-              <FeeSelector :asset="item.from" v-model="selectedFee" v-bind:fees="assetFees" v-bind:txTypes="[txType]" />
+              <FeeSelector :asset="item.from" v-model="selectedFee" v-bind:fees="assetFees" v-bind:txTypes="[txType]" v-bind:fiatRates="fiatRates"/>
               <button class="btn btn-sm btn-primary btn-icon ml-2" :disabled="feeSelectorLoading" @click="updateFee()">
                 <SpinnerIcon class="btn-loading" v-if="feeSelectorLoading" />
                 <template v-else>Update</template>
@@ -93,7 +93,7 @@ export default {
   props: ['id'],
   computed: {
     ...mapGetters(['client']),
-    ...mapState(['activeWalletId', 'activeNetwork', 'history', 'fees']),
+    ...mapState(['activeWalletId', 'activeNetwork', 'history', 'fees', 'fiatRates']),
     assetChain () {
       return getChainFromAsset(this.item.from)
     },