Merge remote-tracking branch 'origin/multicurrency' into dev

VerusCoin · Oct 12, 2023 · ee27349 · ee27349
2 parents 59702a5 + 9ac6a9e
commit ee27349
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...dModal/ConvertOrCrossChainSend/ConvertOrCrossChainSendForm/ConvertOrCrossChainSendForm.js b/...dModal/ConvertOrCrossChainSend/ConvertOrCrossChainSendForm/ConvertOrCrossChainSendForm.js
@@ -879,11 +879,9 @@ const ConvertOrCrossChainSendForm = ({ setLoading, setModalHeight, updateSendFor
       }
 
       if (
-        (coinObj.proto === 'vrsc' &&
+        coinObj.proto === 'vrsc' &&
           output.exportto != null &&
-          output.exportto.toLowerCase() ===
-            toIAddress(VETH, coinObj.testnet ? 'VRSCTEST' : 'VRSC').toLowerCase()) ||
-        output.exportto.toLowerCase() === 'veth'
+          (output.exportto.toLowerCase() === toIAddress(VETH, coinObj.testnet ? 'VRSCTEST' : 'VRSC').toLowerCase() || output.exportto.toLowerCase() === 'veth')
       ) {
         try {
           const provider = getWeb3ProviderForNetwork(

diff --git a/src/utils/api/channels/erc20/requests/preflight.js b/src/utils/api/channels/erc20/requests/preflight.js
@@ -191,7 +191,7 @@ export const preflightBridgeTransfer = async (coinObj, channelId, activeUser, ou
         throw new Error("Failed to find a currency mapped to sending erc20 token that can be converted");
       }
     } else {
-      throw new Error("Cannot send to Verus network without a mapped currency");
+      throw new Error("Cannot send to Verus network without a mapped currency, please select a currency to receive as");
     }
 
     const toEthAddress = (iAddr) => {

diff --git a/src/utils/api/channels/vrpc/requests/calculateCurrencyTransferFee.js b/src/utils/api/channels/vrpc/requests/calculateCurrencyTransferFee.js
@@ -4,7 +4,7 @@ import { getCurrency } from "../../verusid/callCreators";
 import { coinsToSats } from "../../../../math";
 
 export const calculateCurrencyTransferFee = async (systemId, currency, exportto, convertto, feecurrency, via, source, address) => {
-  if (feecurrency !== systemId && exportto == null) {
+  if (feecurrency === systemId && exportto == null) {
     return "25000";
   } else {
     const { error, result: destinationSystem } = await getCurrency(systemId, exportto);