Merge pull request #27 from liquality/fix-swap-review-screen

Fix swap review screen
liquality · Jan 8, 2021 · e0bc2f9 · e0bc2f9
2 parents 4f92daa + 8e8facb
commit e0bc2f9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liquality-wallet",
-  "version": "0.10.7",
+  "version": "0.10.8",
   "private": true,
   "license": "MIT",
   "author": "Liquality <[email protected]>",

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "manifest_version": 2,
-  "version": "0.10.7",
+  "version": "0.10.8",
   "name": "Liquality Wallet",
   "description": "Secure multi-crypto wallet with built-in Atomic Swaps!",
   "homepage_url": "https://liquality.io",

diff --git a/src/views/Swap.vue b/src/views/Swap.vue
@@ -240,7 +240,7 @@
               <div class="confirm-value" :style="getAssetColorStyle(asset)">
                 {{ sendAmount }} {{ asset }}
               </div>
-              <div class="details-text">${{ sendAmountFiat }}</div>
+              <div class="details-text">{{ sendAmountFiat }}</div>
             </div>
           </div>
           <div class="detail-group">
@@ -258,7 +258,7 @@
             <label class="text-muted"> Amount + Fees </label>
             <div class="d-flex align-items-center justify-content-between mt-0">
               <div class="font-weight-bold">
-                {{ send }} {{ asset }} + {{ totalFees[assetChain] }}
+                {{ sendAmount }} {{ asset }} + {{ totalFees[assetChain] }}
                 {{ sendFeeType }}
               </div>
               <div class="font-weight-bold">${{ totalToSendInFiat }}</div>
@@ -269,9 +269,9 @@
             <label> Receive </label>
             <div class="d-flex align-items-center justify-content-between my-0 py-0">
               <div class="confirm-value" :style="getAssetColorStyle(toAsset)">
-                {{ toAmount }} {{ toAsset }}
+                {{ receiveAmount }} {{ toAsset }}
               </div>
-              <div class="details-text">${{ receiveAmountFiat }}</div>
+              <div class="details-text">{{ receiveAmountFiat }}</div>
             </div>
           </div>
           <div class="detail-group">
@@ -645,9 +645,11 @@ export default {
       ]?.[this.asset]
       return address && cryptoassets[this.asset].formatAddress(address)
     },
+    totalToSend () {
+      return BN(this.safeAmount).plus(BN(this.totalFees[this.assetChain]))
+    },
     totalToSendInFiat () {
-      const total = BN(this.safeAmount).plus(BN(this.totalFees[this.assetChain]))
-      return prettyFiatBalance(total, this.fiatRates[this.asset])
+      return prettyFiatBalance(this.totalToSend, this.fiatRates[this.asset])
     }
   },
   methods: {