Merge pull request MyEtherWallet#2544 from MyEtherWallet/bug/fix-gas-…

…price-too-high-check

Fix missed cases for gas price too high

CHANGELOG.md

@@ -1,4 +1,9 @@
+### Bug
+
+- Fix missed cases for gas price too high, add warning for VET [#2544](https://github.com/MyEtherWallet/MyEtherWallet/pull/2544)
+
 ### Release v5.7.5
+
 ### Devop
 
 - Update MEW wallet from MEWconnect [#2542](https://github.com/MyEtherWallet/MyEtherWallet/pull/2542)

src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.scss

@@ -2,6 +2,27 @@
 
 $swap-custom-mobile-colleps-width: 700px;
 
+
+.swap-warning-message{
+  margin: 0 auto;
+  text-align: center;
+  //width: 300px;
+  background-color: $light-orange-1;
+  position: relative;
+  //color: $light-orange-1;
+  border-radius: 5px;
+  border: 1px solid $light-green-1;
+  @media all and (max-width: $mobile-width) {
+    width: 100%;
+  }
+
+  i {
+    position: absolute;
+    right: 20px;
+    top: 16px;
+    font-size: 30px;
+  }
+}
 .fee-notice {
   text-align: center;
   color: $text-color-red;

src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.vue

@@ -27,7 +27,9 @@
       <div class="title-block">
         <interface-container-title :title="$t('common.swap')" />
       </div>
-
+      <div v-if="showWarning" class="swap-warning-message">
+        {{ $t('swap.warning.currency-warning', { currency: toCurrency }) }}
+      </div>
       <div class="form-content-container">
         <div class="send-form">
           <div class="form-block amount-to-address">
@@ -307,6 +309,7 @@ export default {
       lastBestRate: 0,
       lastFeeEstimate: new BigNumber(0),
       bitySpecialCurrencies: ['BTC', 'REP'],
+      warningCurrencies: ['VET'],
       selectedProvider: {},
       swapDetails: {},
       currencyDetails: {},
@@ -353,6 +356,7 @@ export default {
       gasNotice: false,
       moreEthNeeded: false,
       recalculating: true,
+      showWarning: false,
       exitToFiatCallback: () => {},
       sendSignedCallback: () => {},
       debounceUpdateEstimate: {},
@@ -829,6 +833,7 @@ export default {
     },
     async updateRateEstimate(fromCurrency, toCurrency, fromValue, to) {
       if (this.haveProviderRates) {
+        this.showWarning = this.warningCurrencies.includes(toCurrency);
         this.loadingData = true;
         this.recalculating = true;
         this.noProvidersPair = { fromCurrency, toCurrency };

src/partners/dexAg/dexAg.js

@@ -329,17 +329,10 @@ export default class DexAg {
         value: tradeDetails.trade.value
       };
 
-      const bancorGas =
-        tradeDetails.metadata.gasPrice &&
-        swapDetails.provider === 'bancor' &&
-        this.platformGasPrice > 0;
+      const checkGas =
+        tradeDetails.metadata.gasPrice && this.platformGasPrice > 0;
 
-      const kyberGas =
-        tradeDetails.metadata.gasPrice &&
-        swapDetails.provider === 'kyber' &&
-        this.platformGasPrice > 0;
-
-      if (bancorGas || kyberGas) {
+      if (checkGas) {
         const gasPrice = new BigNumber(tradeDetails.metadata.gasPrice);
         const platformGasPrice = this.web3.utils.toWei(
           this.platformGasPrice.toString(),

src/translations/swap/en_US.json

@@ -38,7 +38,8 @@
     "error-generating-swap": "An error occurred while finalizing the swap details",
     "not-enough-eth-gas": "Insufficient balance for Amount + Transaction Fee.",
     "not-enough-tx-fee": "Insufficient balance for Transaction Fee.",
-    "liquidity-too-low": "The amount requested is greater than the amount available at this time"
+    "liquidity-too-low": "The amount requested is greater than the amount available at this time",
+    "currency-warning": "Make sure you have a compatible {currency} wallet for this swap, MEW does not support {currency}."
   },
   "notice": {
     "retrieve-changelly-rate-failed": "Failed to retrieve Changelly rate from {fromCurrency} to {toCurrency}",