From 37996b42832af23a397345f4c86fbaf94426ef72 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 20 Nov 2024 12:31:08 -0800
Subject: [PATCH 01/14] fix: error message for send when address has no balance
 for rent

---
 .../components/send-alert.vue                 |  53 +++++++++
 .../solana/ui/send-transaction/index.vue      | 109 +++++++++++++++---
 2 files changed, 147 insertions(+), 15 deletions(-)
 create mode 100644 packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue

diff --git a/packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue b/packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue
new file mode 100644
index 000000000..ff3565591
--- /dev/null
+++ b/packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue
@@ -0,0 +1,53 @@
+<template>
+  <div class="send-alert">
+    <alert-icon />
+    <p>{{ errorMsg }}</p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import AlertIcon from '@action/icons/send/alert-icon.vue';
+
+interface IProps {
+  errorMsg: string;
+}
+
+defineProps<IProps>();
+</script>
+
+<style lang="less">
+@import '@action/styles/theme.less';
+
+.send-alert {
+  margin: 0 32px 8px 32px;
+  background: @error01;
+  border-radius: 10px;
+  padding: 12px 16px 12px 57px;
+  position: relative;
+  box-sizing: border-box;
+
+  svg {
+    position: absolute;
+    left: 16px;
+    top: 50%;
+    margin-top: -12px;
+  }
+
+  p {
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    color: @error;
+    margin: 0;
+
+    a {
+      color: @error;
+
+      &:hover {
+        text-decoration: none;
+      }
+    }
+  }
+}
+</style>
diff --git a/packages/extension/src/providers/solana/ui/send-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
index 12b74be95..8468498a2 100644
--- a/packages/extension/src/providers/solana/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
@@ -93,18 +93,7 @@
         :fee="gasCostValues[selectedFee]"
       />
 
-      <send-alert
-        v-show="hasEnoughBalance && nativeBalanceAfterTransaction.isNeg()"
-        :native-symbol="network.currencyName"
-        :price="accountAssets[0]?.price || '0'"
-        :native-value="
-          fromBase(
-            nativeBalanceAfterTransaction.abs().toString(),
-            network.decimals,
-          )
-        "
-        :decimals="network.decimals"
-      />
+      <send-alert v-show="errorMsg" :error-msg="errorMsg" />
 
       <div class="send-transaction__buttons">
         <div class="send-transaction__buttons-cancel">
@@ -125,7 +114,7 @@
 <script setup lang="ts">
 import { ref, onMounted, PropType, computed, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { debounce } from 'lodash';
+import { debounce, has } from 'lodash';
 import SendHeader from '@/providers/common/ui/send-transaction/send-header.vue';
 import SendAddressInput from './components/send-address-input.vue';
 import SendFromContactsList from '@/providers/common/ui/send-transaction/send-from-contacts-list.vue';
@@ -133,7 +122,7 @@ import SendContactsList from '@/providers/common/ui/send-transaction/send-contac
 import AssetsSelectList from '@action/views/assets-select-list/index.vue';
 import NftSelectList from '@/providers/common/ui/send-transaction/nft-select-list/index.vue';
 import SendTokenSelect from './components/send-token-select.vue';
-import SendAlert from '@/providers/common/ui/send-transaction/send-alert.vue';
+import SendAlert from './components/send-alert.vue';
 import SendNftSelect from '@/providers/common/ui/send-transaction/send-nft-select.vue';
 import SendInputAmount from '@/providers/common/ui/send-transaction/send-input-amount.vue';
 import SendFeeSelect from './components/send-fee-select.vue';
@@ -148,7 +137,10 @@ import BigNumber from 'bignumber.js';
 import { defaultGasCostVals } from '@/providers/common/libs/default-vals';
 import { fromBase, toBase, isValidDecimals } from '@enkryptcom/utils';
 import { VerifyTransactionParams, SendTransactionDataType } from '../types';
-import { formatFloatingPointValue } from '@/libs/utils/number-formatter';
+import {
+  formatFloatingPointValue,
+  formatFiatValue,
+} from '@/libs/utils/number-formatter';
 import { routes as RouterNames } from '@/ui/action/router';
 import getUiPath from '@/libs/utils/get-ui-path';
 import Browser from 'webextension-polyfill';
@@ -239,6 +231,7 @@ const addressFrom = ref<string>(
 );
 const addressTo = ref<string>('');
 const isLoadingAssets = ref(true);
+const hasMinimumForRent = ref(false);
 
 const selectedNft = ref<NFTItemWithCollectionName>({
   id: '',
@@ -328,6 +321,90 @@ const nativeBalanceAfterTransaction = computed(() => {
   return toBN(0);
 });
 
+const nativeValue = computed(() => {
+  return fromBase(
+    nativeBalanceAfterTransaction.value.toString(),
+    props.network.decimals,
+  );
+});
+
+const nativePrice = computed(() => {
+  return accountAssets.value[0]?.price || '0';
+});
+
+const priceDifference = computed(() => {
+  return new BigNumber(nativeValue.value)
+    .times(nativePrice.value ?? '0')
+    .toFixed();
+});
+
+const errorMsg = computed(() => {
+  if (hasEnoughBalance.value && nativeBalanceAfterTransaction.value.isNeg()) {
+    return `Not enough funds. You are
+      ~${formatFloatingPointValue(nativeValue.value).value}
+      ${props.network.currencyName} ($ ${
+        formatFiatValue(priceDifference.value).value
+      }) short.`;
+  }
+  if (!hasMinimumForRent.value && addressTo.value !== '') {
+    return `Recipient doesn't have enough ${props.network.currencyName} to receive`;
+  }
+  if (
+    !props.network.isAddress(getAddress(addressTo.value)) &&
+    addressTo.value !== ''
+  )
+    return `Invalid to address.`;
+  if (
+    isSendToken.value &&
+    !isValidDecimals(sendAmount.value, selectedAsset.value.decimals!)
+  ) {
+    return `Invalid decimals for ${selectedAsset.value.symbol}.`;
+  }
+  if (!isSendToken.value && !selectedNft.value.id) {
+    return `Invalid NFT selected.`;
+  }
+  if (new BigNumber(sendAmount.value).gt(assetMaxValue.value))
+    return `Amount exceeds maximum value.`;
+  return '';
+});
+
+const checkIfToIsRentExempt = async () => {
+  const toPubKey = new PublicKey(getAddress(addressTo.value));
+  const balance = await solConnection.value!.web3.getBalance(toPubKey);
+  const rentExempt =
+    await solConnection.value!.web3.getMinimumBalanceForRentExemption(
+      ACCOUNT_SIZE,
+    );
+
+  // rent is added to ATA so no need to check
+  if (
+    isSendToken.value &&
+    selectedAsset.value.contract !== NATIVE_TOKEN_ADDRESS
+  ) {
+    hasMinimumForRent.value = true;
+    return;
+  }
+
+  /** balance is lower than rent but to amount is higher than rent
+   else if balance is higher than rent
+   else if balance is lower than rent and to amount is lower than rent **/
+  if (
+    toBN(balance).lt(toBN(rentExempt)) &&
+    toBN(sendAmount.value).gt(toBN(rentExempt))
+  ) {
+    hasMinimumForRent.value = true;
+  } else if (toBN(balance).gte(toBN(rentExempt))) {
+    hasMinimumForRent.value = true;
+  } else if (
+    toBN(balance).lt(toBN(rentExempt)) &&
+    toBN(sendAmount.value).lt(toBN(rentExempt))
+  ) {
+    hasMinimumForRent.value = false;
+  } else {
+    hasMinimumForRent.value = false;
+  }
+};
+
 const setTransactionFees = (tx: SolTransaction) => {
   return tx
     .getEstimatedFee(solConnection.value!.web3)
@@ -382,6 +459,7 @@ const sendButtonTitle = computed(() => {
 
 const isValidSend = computed<boolean>(() => {
   if (!isInputsValid.value) return false;
+  if (!hasMinimumForRent.value) return false;
   if (nativeBalanceAfterTransaction.value.isNeg()) return false;
   if (!isEstimateValid.value) return false;
   if (gasCostValues.value.ECONOMY.nativeValue === '0') return false;
@@ -522,6 +600,7 @@ watch(
   () => {
     if (isInputsValid.value) {
       updateTransactionFees();
+      checkIfToIsRentExempt();
     }
   },
 );

From 4cde3ad1c85852f317978714c63b5b214e591c84 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 20 Nov 2024 12:35:03 -0800
Subject: [PATCH 02/14] devop: remove import

---
 .../src/providers/solana/ui/send-transaction/index.vue        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/extension/src/providers/solana/ui/send-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
index 8468498a2..635c26596 100644
--- a/packages/extension/src/providers/solana/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
@@ -114,7 +114,7 @@
 <script setup lang="ts">
 import { ref, onMounted, PropType, computed, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { debounce, has } from 'lodash';
+import { debounce } from 'lodash';
 import SendHeader from '@/providers/common/ui/send-transaction/send-header.vue';
 import SendAddressInput from './components/send-address-input.vue';
 import SendFromContactsList from '@/providers/common/ui/send-transaction/send-from-contacts-list.vue';
@@ -347,7 +347,7 @@ const errorMsg = computed(() => {
       }) short.`;
   }
   if (!hasMinimumForRent.value && addressTo.value !== '') {
-    return `Recipient doesn't have enough ${props.network.currencyName} to receive`;
+    return `Recipient doesn't have enough ${props.network.currencyName} to receive.`;
   }
   if (
     !props.network.isAddress(getAddress(addressTo.value)) &&

From e52f87a1cf374aaa9aa27e824a35bcda77f61ad6 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 20 Nov 2024 12:47:05 -0800
Subject: [PATCH 03/14] chore: remove error for rent minimum, add rent to
 transaction

---
 .../solana/ui/send-transaction/index.vue      | 55 ++++---------------
 1 file changed, 12 insertions(+), 43 deletions(-)

diff --git a/packages/extension/src/providers/solana/ui/send-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
index 635c26596..b5d510735 100644
--- a/packages/extension/src/providers/solana/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
@@ -231,7 +231,6 @@ const addressFrom = ref<string>(
 );
 const addressTo = ref<string>('');
 const isLoadingAssets = ref(true);
-const hasMinimumForRent = ref(false);
 
 const selectedNft = ref<NFTItemWithCollectionName>({
   id: '',
@@ -346,9 +345,6 @@ const errorMsg = computed(() => {
         formatFiatValue(priceDifference.value).value
       }) short.`;
   }
-  if (!hasMinimumForRent.value && addressTo.value !== '') {
-    return `Recipient doesn't have enough ${props.network.currencyName} to receive.`;
-  }
   if (
     !props.network.isAddress(getAddress(addressTo.value)) &&
     addressTo.value !== ''
@@ -368,43 +364,6 @@ const errorMsg = computed(() => {
   return '';
 });
 
-const checkIfToIsRentExempt = async () => {
-  const toPubKey = new PublicKey(getAddress(addressTo.value));
-  const balance = await solConnection.value!.web3.getBalance(toPubKey);
-  const rentExempt =
-    await solConnection.value!.web3.getMinimumBalanceForRentExemption(
-      ACCOUNT_SIZE,
-    );
-
-  // rent is added to ATA so no need to check
-  if (
-    isSendToken.value &&
-    selectedAsset.value.contract !== NATIVE_TOKEN_ADDRESS
-  ) {
-    hasMinimumForRent.value = true;
-    return;
-  }
-
-  /** balance is lower than rent but to amount is higher than rent
-   else if balance is higher than rent
-   else if balance is lower than rent and to amount is lower than rent **/
-  if (
-    toBN(balance).lt(toBN(rentExempt)) &&
-    toBN(sendAmount.value).gt(toBN(rentExempt))
-  ) {
-    hasMinimumForRent.value = true;
-  } else if (toBN(balance).gte(toBN(rentExempt))) {
-    hasMinimumForRent.value = true;
-  } else if (
-    toBN(balance).lt(toBN(rentExempt)) &&
-    toBN(sendAmount.value).lt(toBN(rentExempt))
-  ) {
-    hasMinimumForRent.value = false;
-  } else {
-    hasMinimumForRent.value = false;
-  }
-};
-
 const setTransactionFees = (tx: SolTransaction) => {
   return tx
     .getEstimatedFee(solConnection.value!.web3)
@@ -459,7 +418,6 @@ const sendButtonTitle = computed(() => {
 
 const isValidSend = computed<boolean>(() => {
   if (!isInputsValid.value) return false;
-  if (!hasMinimumForRent.value) return false;
   if (nativeBalanceAfterTransaction.value.isNeg()) return false;
   if (!isEstimateValid.value) return false;
   if (gasCostValues.value.ECONOMY.nativeValue === '0') return false;
@@ -499,6 +457,12 @@ const updateTransactionFees = async () => {
     }),
   );
   if (isSendToken.value && TxInfo.value.contract === NATIVE_TOKEN_ADDRESS) {
+    const toPubKey = new PublicKey(getAddress(addressTo.value));
+    const balance = await solConnection.value!.web3.getBalance(toPubKey);
+    const rentExempt =
+      await solConnection.value!.web3.getMinimumBalanceForRentExemption(
+        ACCOUNT_SIZE,
+      );
     transaction.add(
       SystemProgram.transfer({
         fromPubkey: from,
@@ -506,6 +470,12 @@ const updateTransactionFees = async () => {
         lamports: toBN(TxInfo.value.value).toNumber(),
       }),
     );
+    if (toBN(balance).lt(toBN(rentExempt))) {
+      storageFee.value =
+        await solConnection.value!.web3.getMinimumBalanceForRentExemption(
+          ACCOUNT_SIZE,
+        );
+    }
   } else if (
     isSendToken.value ||
     (!isSendToken.value && selectedNft.value.type === NFTType.SolanaToken)
@@ -600,7 +570,6 @@ watch(
   () => {
     if (isInputsValid.value) {
       updateTransactionFees();
-      checkIfToIsRentExempt();
     }
   },
 );

From 9c1e48f26c20f900de31dcf3dfe1cec26bda5447 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 20 Nov 2024 12:48:44 -0800
Subject: [PATCH 04/14] devop: add code rabbit suggestions

---
 .../solana/ui/send-transaction/components/send-alert.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue b/packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue
index ff3565591..046f53424 100644
--- a/packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue
+++ b/packages/extension/src/providers/solana/ui/send-transaction/components/send-alert.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="send-alert">
+  <div class="send-alert" role="alert" aria-live="polite">
     <alert-icon />
-    <p>{{ errorMsg }}</p>
+    <p aria-label="Error message">{{ errorMsg }}</p>
   </div>
 </template>
 

From 54f1211e629d3a13b83bbb5503e7512c3141c291 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 20 Nov 2024 14:38:24 -0800
Subject: [PATCH 05/14] fix: change error message when only 1 qupte is returned
 on swap

---
 packages/extension/src/ui/action/views/swap/index.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index 9681d940a..859e48008 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -538,6 +538,17 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
 
     // Decide what message to show
     if (fromAmountBN.lt(lowestMinimum)) {
+      /**
+       * weird edgecase for solana where rango doesn't return
+       * minumum amount for the swap and returns changelly
+       * but rango's actual minimum is a lot lower than changelly's
+       */
+      if (quotes.length === 1) {
+        errors.value.inputAmount = `Minimum amount may be lower than: ~${fromT.toReadable(
+          lowestMinimum,
+        )}`;
+        return;
+      }
       // Swapping too few tokens
       errors.value.inputAmount = `Minimum amount: ${fromT.toReadable(
         lowestMinimum,

From 00e525df26d4875bac6b8c32f7468de8c793bc93 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 20 Nov 2024 14:39:20 -0800
Subject: [PATCH 06/14] chore: remove return

---
 packages/extension/src/ui/action/views/swap/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index 859e48008..cd994a0c4 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -547,12 +547,12 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
         errors.value.inputAmount = `Minimum amount may be lower than: ~${fromT.toReadable(
           lowestMinimum,
         )}`;
-        return;
+      } else {
+        // Swapping too few tokens
+        errors.value.inputAmount = `Minimum amount: ${fromT.toReadable(
+          lowestMinimum,
+        )}`;
       }
-      // Swapping too few tokens
-      errors.value.inputAmount = `Minimum amount: ${fromT.toReadable(
-        lowestMinimum,
-      )}`;
     } else if (fromAmountBN.gt(highestMaximum)) {
       // Swapping too many tokens
       errors.value.inputAmount = `Maximum amount: ${fromT.toReadable(

From 9c24b1f3f6bb59d5726c2165179bb9216753b0cc Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 20 Nov 2024 15:27:08 -0800
Subject: [PATCH 07/14] fix: return value on rango, set min if 0

---
 .../src/ui/action/views/swap/index.vue        |  8 +-
 packages/swap/src/providers/rango/index.ts    | 82 +++++++++----------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index cd994a0c4..6e9ae8825 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -528,9 +528,11 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
         highestMaximum = q.minMax.maximumFrom;
       }
       // Minimum briding fees / rent fees / etc
+      // set smallest fee to q.additionalNativeFees if it's smaller than the current smallest or if smallest is 0
       if (
-        !q.additionalNativeFees.eqn(0) &&
-        q.additionalNativeFees.lt(smallestNativeFees)
+        (!q.additionalNativeFees.eqn(0) &&
+          q.additionalNativeFees.lt(smallestNativeFees)) ||
+        (smallestNativeFees.eqn(0) && !q.additionalNativeFees.eqn(0))
       ) {
         smallestNativeFees = q.additionalNativeFees;
       }
@@ -562,7 +564,7 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
       // Can't afford the fees
       errors.value.inputAmount = `Insufficient Bridging fees: ~${nativeSwapToken
         .value!.toReadable(smallestNativeFees)
-        .substring(0, 6)} ${nativeSwapToken.value!.token.symbol} required`;
+        .substring(0, 10)} ${nativeSwapToken.value!.token.symbol} required`;
     }
 
     return;
diff --git a/packages/swap/src/providers/rango/index.ts b/packages/swap/src/providers/rango/index.ts
index adc5ea683..e45de4c2b 100644
--- a/packages/swap/src/providers/rango/index.ts
+++ b/packages/swap/src/providers/rango/index.ts
@@ -100,7 +100,7 @@ if (DEBUG) {
     );
   };
 } else {
-  debug = () => {};
+  debug = () => { };
 }
 
 type SupportedNetworkInfo = {
@@ -403,8 +403,8 @@ class Rango extends ProviderClass {
     debug(
       "init",
       "Rango meta" +
-        `  tokens.length=${rangoMeta.tokens.length}` +
-        `  blockchains.length=${rangoMeta.blockchains.length}`,
+      `  tokens.length=${rangoMeta.tokens.length}` +
+      `  blockchains.length=${rangoMeta.blockchains.length}`,
     );
 
     const supportedNetworkInfo = supportedNetworkInfoByName.get(this.network);
@@ -573,7 +573,7 @@ class Rango extends ProviderClass {
     if (token.address == null) {
       console.warn(
         `Cannot get Rango token symbol: Token address is not defined` +
-          ` for token ${token.name} (${token.symbol}) - ${token.address}`,
+        ` for token ${token.name} (${token.symbol}) - ${token.address}`,
       );
       return undefined;
     }
@@ -607,12 +607,12 @@ class Rango extends ProviderClass {
     debug(
       "getRangoSwap",
       `Getting swap` +
-        `  fromNetwork=${this.network}` +
-        `  toNetwork=${options.toToken.networkInfo.name}` +
-        `  fromToken=${options.fromToken.symbol}` +
-        `  toToken=${options.toToken.symbol}` +
-        `  fromAddress=${options.fromAddress}` +
-        `  toAddress=${options.toAddress}`,
+      `  fromNetwork=${this.network}` +
+      `  toNetwork=${options.toToken.networkInfo.name}` +
+      `  fromToken=${options.fromToken.symbol}` +
+      `  toToken=${options.toToken.symbol}` +
+      `  fromAddress=${options.fromAddress}` +
+      `  toAddress=${options.toAddress}`,
     );
 
     try {
@@ -626,8 +626,8 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           "No swap:" +
-            ` Enkrypt does not support Rango swap on the source network` +
-            `  fromNetwork=${this.network}`,
+          ` Enkrypt does not support Rango swap on the source network` +
+          `  fromNetwork=${this.network}`,
         );
         return null;
       }
@@ -640,8 +640,8 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           "No swap:" +
-            ` Enkrypt does not support Rango swap on the destination network` +
-            `  fromNetwork=${this.network}`,
+          ` Enkrypt does not support Rango swap on the destination network` +
+          `  fromNetwork=${this.network}`,
         );
         return null;
       }
@@ -655,10 +655,10 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           `No swap:` +
-            ` Rango does not support swap on the source network` +
-            `  fromNetwork=${this.network}` +
-            `  fromBlockchain=${fromRangoBlockchain.name}` +
-            `  enabled=${fromRangoBlockchain.enabled}`,
+          ` Rango does not support swap on the source network` +
+          `  fromNetwork=${this.network}` +
+          `  fromBlockchain=${fromRangoBlockchain.name}` +
+          `  enabled=${fromRangoBlockchain.enabled}`,
         );
         return null;
       }
@@ -673,10 +673,10 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           `No swap:` +
-            ` Rango does not support swap on the destination network` +
-            `  toNetwork=${options.toToken.networkInfo.name}` +
-            `  toBlockchain=${toRangoBlockchain.name}` +
-            `  enabled=${toRangoBlockchain.enabled}`,
+          ` Rango does not support swap on the destination network` +
+          `  toNetwork=${options.toToken.networkInfo.name}` +
+          `  toBlockchain=${toRangoBlockchain.name}` +
+          `  enabled=${toRangoBlockchain.enabled}`,
         );
         return null;
       }
@@ -688,8 +688,8 @@ class Rango extends ProviderClass {
       debug(
         "getRangoSwap",
         `Rango block chains ids` +
-          `  fromRangoBlockchain=${fromRangoBlockchainName}` +
-          `  toRangoBlockchain=${toRangoBlockchainName}`,
+        `  fromRangoBlockchain=${fromRangoBlockchainName}` +
+        `  toRangoBlockchain=${toRangoBlockchainName}`,
       );
 
       const fromTokenAddress = options.fromToken.address;
@@ -712,8 +712,8 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           `No swap: No symbol for src token or dst token` +
-            `  fromTokenSymbol=${fromRangoTokenSymbol}` +
-            `  toTokenSymbol=${toRangoTokenSymbol}`,
+          `  fromTokenSymbol=${fromRangoTokenSymbol}` +
+          `  toTokenSymbol=${toRangoTokenSymbol}`,
         );
         return null;
       }
@@ -751,15 +751,15 @@ class Rango extends ProviderClass {
       debug(
         "getRangoSwap",
         `Requesting quote from rango sdk...` +
-          `  fromRangoBlockchain=${fromRangoBlockchainName}` +
-          `  toRangoBlockchain=${toRangoBlockchainName}` +
-          `  fromToken=${fromRangoTokenSymbol}` +
-          `  toToken=${toRangoTokenSymbol}` +
-          `  fromAddress=${options.fromAddress}` +
-          `  toAddress=${options.toAddress}` +
-          `  amount=${options.amount.toString()}` +
-          `  slippage=${slippage}` +
-          `  referrerFee=${params.referrerFee}`,
+        `  fromRangoBlockchain=${fromRangoBlockchainName}` +
+        `  toRangoBlockchain=${toRangoBlockchainName}` +
+        `  fromToken=${fromRangoTokenSymbol}` +
+        `  toToken=${toRangoTokenSymbol}` +
+        `  fromAddress=${options.fromAddress}` +
+        `  toAddress=${options.toAddress}` +
+        `  amount=${options.amount.toString()}` +
+        `  slippage=${slippage}` +
+        `  referrerFee=${params.referrerFee}`,
       );
       const rangoSwapResponse = await rangoClient.swap(params, abortable);
       debug("getRangoSwap", `Received quote from rango sdk`);
@@ -784,9 +784,7 @@ class Rango extends ProviderClass {
       let additionalNativeFees = toBN(0);
       rangoSwapResponse.route.fee.forEach((f) => {
         if (
-          !f.token.address &&
-          f.expenseType === "FROM_SOURCE_WALLET" &&
-          f.name !== "Network Fee"
+          f.expenseType === "FROM_SOURCE_WALLET"
         ) {
           additionalNativeFees = additionalNativeFees.add(toBN(f.amount));
         }
@@ -1011,7 +1009,7 @@ class Rango extends ProviderClass {
               debug(
                 "getRangoSwap",
                 `Checking Rango signatures...` +
-                  `  signatures=${thirdPartySignatures.length}`,
+                `  signatures=${thirdPartySignatures.length}`,
                 `  pubkeys=${thirdPartySignatures
                   .map(({ pubkey }) => pubkey)
                   .join(",")}`,
@@ -1389,7 +1387,7 @@ async function fetchRangoSwaplist(abortable?: {
     if (retryidx >= retries.length) {
       throw new Error(
         `Failed to fetch Rango swaplists after ${retries.length}` +
-          ` retries: ${String(errref?.err ?? "???")}`,
+        ` retries: ${String(errref?.err ?? "???")}`,
       );
     }
     const waitMs = retries[retryidx];
@@ -1614,7 +1612,7 @@ async function checkExpectedSolanaLegacyTransactionStatus(
       debug(
         "checkExpectedSolanaLegacyTransactionStatus",
         `Retrying Rango Solana unsigned legacy transaction simulation` +
-          ` with updated block hash ${latestBlockHash.blockhash}...`,
+        ` with updated block hash ${latestBlockHash.blockhash}...`,
       );
       legacyTx.recentBlockhash = latestBlockHash.blockhash;
       abortable?.signal?.throwIfAborted();
@@ -1670,7 +1668,7 @@ async function checkExpectedSolanaVersionedTransactionStatus(
       debug(
         "checkExpectedSolanaVersionedTransactionStatus",
         `Retrying Rango Solana unsigned versioned transaction simulation` +
-          ` with updated block hash ${latestBlockHash.blockhash}...`,
+        ` with updated block hash ${latestBlockHash.blockhash}...`,
       );
       versionedTx.message.recentBlockhash = latestBlockHash.blockhash;
     }

From 50bebbbcba408f591dee9add6f73d5b366a3d944 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Thu, 21 Nov 2024 11:15:53 -0800
Subject: [PATCH 08/14] devop: add symbols to message

---
 packages/extension/src/ui/action/views/swap/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index 6e9ae8825..c621cbe3c 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -548,18 +548,18 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
       if (quotes.length === 1) {
         errors.value.inputAmount = `Minimum amount may be lower than: ~${fromT.toReadable(
           lowestMinimum,
-        )}`;
+        )} ${nativeSwapToken.value!.token.symbol}`;
       } else {
         // Swapping too few tokens
         errors.value.inputAmount = `Minimum amount: ${fromT.toReadable(
           lowestMinimum,
-        )}`;
+        )} ${nativeSwapToken.value!.token.symbol}`;
       }
     } else if (fromAmountBN.gt(highestMaximum)) {
       // Swapping too many tokens
       errors.value.inputAmount = `Maximum amount: ${fromT.toReadable(
         highestMaximum,
-      )}`;
+      )} ${nativeSwapToken.value!.token.symbol}`;
     } else if (smallestNativeFees.gt(remainingBalance)) {
       // Can't afford the fees
       errors.value.inputAmount = `Insufficient Bridging fees: ~${nativeSwapToken

From fec49c19b1a1d627d90a91438360686556e05a2a Mon Sep 17 00:00:00 2001
From: kvhnuke <10602065+kvhnuke@users.noreply.github.com>
Date: Thu, 21 Nov 2024 13:06:09 -0800
Subject: [PATCH 09/14] fix: sending to empty addresses

---
 .../extension/src/libs/cache-fetch/index.ts     |  2 +-
 .../extension/src/providers/solana/libs/api.ts  |  4 ++--
 .../solana/ui/send-transaction/index.vue        | 17 ++++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/extension/src/libs/cache-fetch/index.ts b/packages/extension/src/libs/cache-fetch/index.ts
index f85d49bf9..4b08885c0 100644
--- a/packages/extension/src/libs/cache-fetch/index.ts
+++ b/packages/extension/src/libs/cache-fetch/index.ts
@@ -42,7 +42,7 @@ const cacheFetch = async (
       .then(json => {
         const jsondata = options.postProcess ? options.postProcess(json) : json;
         const jsonstring = JSON.stringify(jsondata);
-        if (!jsonstring.includes('error')) {
+        if (!json.error) {
           const store: StoredData = {
             timestamp: new Date().getTime(),
             data: jsonstring,
diff --git a/packages/extension/src/providers/solana/libs/api.ts b/packages/extension/src/providers/solana/libs/api.ts
index e7d404a93..9931e7526 100644
--- a/packages/extension/src/providers/solana/libs/api.ts
+++ b/packages/extension/src/providers/solana/libs/api.ts
@@ -64,7 +64,7 @@ class API implements ProviderAPIInterface {
     }
     const allTokensResponse = await cacheFetch(
       {
-        url: 'https://utl.solcast.dev/solana-tokenlist.json',
+        url: 'https://raw.githubusercontent.com/solflare-wallet/token-list/refs/heads/master/solana-tokenlist.json',
         postProcess: (data: any) => {
           const allTokens = data.tokens as TokenDetails[];
           const tObj: Record<string, TokenDetails> = {};
@@ -74,7 +74,7 @@ class API implements ProviderAPIInterface {
           return tObj;
         },
       },
-      60 * 60 * 1000,
+      6 * 60 * 60 * 1000,
     );
     const allTokens = allTokensResponse as Record<string, TokenDetails>;
     let decimals = 9;
diff --git a/packages/extension/src/providers/solana/ui/send-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
index b5d510735..1f59aeda9 100644
--- a/packages/extension/src/providers/solana/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
@@ -457,8 +457,7 @@ const updateTransactionFees = async () => {
     }),
   );
   if (isSendToken.value && TxInfo.value.contract === NATIVE_TOKEN_ADDRESS) {
-    const toPubKey = new PublicKey(getAddress(addressTo.value));
-    const balance = await solConnection.value!.web3.getBalance(toPubKey);
+    const toBalance = await solConnection.value!.web3.getBalance(to);
     const rentExempt =
       await solConnection.value!.web3.getMinimumBalanceForRentExemption(
         ACCOUNT_SIZE,
@@ -470,11 +469,15 @@ const updateTransactionFees = async () => {
         lamports: toBN(TxInfo.value.value).toNumber(),
       }),
     );
-    if (toBN(balance).lt(toBN(rentExempt))) {
-      storageFee.value =
-        await solConnection.value!.web3.getMinimumBalanceForRentExemption(
-          ACCOUNT_SIZE,
-        );
+    if (toBN(toBalance).lt(toBN(rentExempt))) {
+      storageFee.value = rentExempt - toBalance;
+      transaction.add(
+        SystemProgram.transfer({
+          fromPubkey: from,
+          toPubkey: to,
+          lamports: storageFee.value,
+        }),
+      );
     }
   } else if (
     isSendToken.value ||

From 4db7a0272951c43985b329e493524be9e19b8c08 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Thu, 21 Nov 2024 14:11:06 -0800
Subject: [PATCH 10/14] fix: native fee from changelly

---
 .../swap/src/providers/changelly/index.ts     | 266 +++++++++---------
 1 file changed, 133 insertions(+), 133 deletions(-)

diff --git a/packages/swap/src/providers/changelly/index.ts b/packages/swap/src/providers/changelly/index.ts
index 16cd5fcc6..44e60600c 100644
--- a/packages/swap/src/providers/changelly/index.ts
+++ b/packages/swap/src/providers/changelly/index.ts
@@ -99,7 +99,7 @@ if (DEBUG) {
   };
 } else {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
-  debug = () => {};
+  debug = () => { };
 }
 
 class Changelly extends ProviderClass {
@@ -286,8 +286,8 @@ class Changelly extends ProviderClass {
     if (response.error) {
       console.warn(
         `Error validating address with via Changelly` +
-          `  code=${String(response.error.code)}` +
-          `  message=${String(response.error.message)}`,
+        `  code=${String(response.error.code)}` +
+        `  message=${String(response.error.message)}`,
       );
       return false;
     }
@@ -295,8 +295,8 @@ class Changelly extends ProviderClass {
     if (typeof response.result.result !== "boolean") {
       console.warn(
         'Unexpected response to "validateAddress" call to Changelly.' +
-          ` Expected a response.result.result to be a boolean` +
-          ` but received response: ${JSON.stringify(response)}`,
+        ` Expected a response.result.result to be a boolean` +
+        ` but received response: ${JSON.stringify(response)}`,
       );
       return false;
     }
@@ -305,9 +305,9 @@ class Changelly extends ProviderClass {
     debug(
       "isValidAddress",
       `Changelly validateAddress result` +
-        `  address=${address}` +
-        `  ticker=${ticker}` +
-        `  isValid=${isValid}`,
+      `  address=${address}` +
+      `  ticker=${ticker}` +
+      `  isValid=${isValid}`,
     );
     return isValid;
   }
@@ -356,11 +356,11 @@ class Changelly extends ProviderClass {
         // JsonRPC ERR response
         console.warn(
           `Changelly "getFixRate" returned JSONRPC error response` +
-            `  fromToken=${fromToken.symbol} (${params.from})` +
-            `  toToken=${toToken.symbol} (${params.to})` +
-            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-            `  code=${String(response.error.code)}` +
-            `  message=${String(response.error.message)}`,
+          `  fromToken=${fromToken.symbol} (${params.from})` +
+          `  toToken=${toToken.symbol} (${params.to})` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  code=${String(response.error.code)}` +
+          `  message=${String(response.error.message)}`,
         );
         return emptyResponse;
       }
@@ -376,19 +376,19 @@ class Changelly extends ProviderClass {
       debug(
         "getMinMaxAmount",
         `Successfully got min and max of swap pair` +
-          `  fromToken=${fromToken.symbol} (${params.from})` +
-          `  toToken=${toToken.symbol} (${params.to})` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+        `  fromToken=${fromToken.symbol} (${params.from})` +
+        `  toToken=${toToken.symbol} (${params.to})` +
+        `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
       );
       return minMax;
     } catch (err) {
       // HTTP request failed
       console.warn(
         `Errored calling Changelly JSONRPC HTTP API "getFixRate"` +
-          `  fromToken=${fromToken.symbol}` +
-          `  toToken=${toToken.symbol}` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  err=${String(err)}`,
+        `  fromToken=${fromToken.symbol}` +
+        `  toToken=${toToken.symbol}` +
+        `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+        `  err=${String(err)}`,
       );
       return emptyResponse;
     }
@@ -406,12 +406,12 @@ class Changelly extends ProviderClass {
     debug(
       "getQuote",
       `Getting Changelly quote` +
-        `  srcToken=${options.fromToken.symbol}` +
-        `  dstToken=${options.toToken.symbol}` +
-        `  fromAddress=${options.fromAddress}` +
-        `  toAddress=${options.toAddress}` +
-        `  fromNetwork=${this.network}` +
-        `  toNetwork=${options.toToken.networkInfo.name}`,
+      `  srcToken=${options.fromToken.symbol}` +
+      `  dstToken=${options.toToken.symbol}` +
+      `  fromAddress=${options.fromAddress}` +
+      `  toAddress=${options.toAddress}` +
+      `  fromNetwork=${this.network}` +
+      `  toNetwork=${options.toToken.networkInfo.name}`,
     );
 
     if (
@@ -422,7 +422,7 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Enkrypt does not support Changelly on the destination network` +
-          `  dstNetwork=${options.toToken.networkInfo.name}`,
+        `  dstNetwork=${options.toToken.networkInfo.name}`,
       );
       return null;
     }
@@ -431,7 +431,7 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Enkrypt does not support Changelly on the source network` +
-          `  srcNetwork=${this.network}`,
+        `  srcNetwork=${this.network}`,
       );
       return null;
     }
@@ -440,8 +440,8 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Failed to find ticker for src token` +
-          `  srcToken=${options.fromToken.symbol}` +
-          `  srcNetwork=${this.network}`,
+        `  srcToken=${options.fromToken.symbol}` +
+        `  srcNetwork=${this.network}`,
       );
       return null;
     }
@@ -455,8 +455,8 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Failed to find ticker for dst token` +
-          `  dstToken=${options.toToken.symbol}` +
-          `  dstNetwork=${options.toToken.networkInfo.name}`,
+        `  dstToken=${options.toToken.symbol}` +
+        `  dstNetwork=${options.toToken.networkInfo.name}`,
       );
       return null;
     }
@@ -478,10 +478,10 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Quote request amount is zero` +
-          `  fromToken=${options.fromToken.symbol}` +
-          `  toToken=${options.toToken.symbol}` +
-          `  minimumFrom=${minMax.minimumFrom.toString()}` +
-          `  maximumFrom=${minMax.maximumFrom.toString()}`,
+        `  fromToken=${options.fromToken.symbol}` +
+        `  toToken=${options.toToken.symbol}` +
+        `  minimumFrom=${minMax.minimumFrom.toString()}` +
+        `  maximumFrom=${minMax.maximumFrom.toString()}`,
       );
       return null;
     }
@@ -513,12 +513,12 @@ class Changelly extends ProviderClass {
       if (response.error) {
         console.warn(
           `Changelly "getFixRateForAmount" returned JSONRPC error response,` +
-            ` returning no quotes` +
-            `  fromToken=${options.fromToken.symbol} (${params.from})` +
-            `  toToken=${options.toToken.symbol} (${params.to})` +
-            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-            `  code=${String(response.error.code)}` +
-            `  message=${String(response.error.message)}`,
+          ` returning no quotes` +
+          `  fromToken=${options.fromToken.symbol} (${params.from})` +
+          `  toToken=${options.toToken.symbol} (${params.to})` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  code=${String(response.error.code)}` +
+          `  message=${String(response.error.message)}`,
         );
         return null;
       }
@@ -526,12 +526,12 @@ class Changelly extends ProviderClass {
       if (!response.result || !response.result[0]?.id) {
         console.warn(
           `Changelly "getFixRateForAmount" response contains no quotes,` +
-            ` returning no quotes` +
-            `  fromToken=${options.fromToken.symbol} (${params.from})` +
-            `  toToken=${options.toToken.symbol} (${params.to})` +
-            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-            `  code=${String(response.error.code)}` +
-            `  message=${String(response.error.message)}`,
+          ` returning no quotes` +
+          `  fromToken=${options.fromToken.symbol} (${params.from})` +
+          `  toToken=${options.toToken.symbol} (${params.to})` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  code=${String(response.error.code)}` +
+          `  message=${String(response.error.message)}`,
         );
         return null;
       }
@@ -540,10 +540,10 @@ class Changelly extends ProviderClass {
       if (response.result.length > 1) {
         console.warn(
           `Changelly "getFixRateForAmount" returned more than one quote, continuing with first quote` +
-            `  fromToken=${options.fromToken.symbol} (${params.from})` +
-            `  toToken=${options.toToken.symbol} (${params.to})` +
-            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-            `  count=${response.result.length}ms`,
+          `  fromToken=${options.fromToken.symbol} (${params.from})` +
+          `  toToken=${options.toToken.symbol} (${params.to})` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  count=${response.result.length}ms`,
         );
       }
 
@@ -551,7 +551,7 @@ class Changelly extends ProviderClass {
 
       const evmGasLimit =
         options.fromToken.address === NATIVE_TOKEN_ADDRESS &&
-        options.fromToken.type === NetworkType.EVM
+          options.fromToken.type === NetworkType.EVM
           ? 21000
           : toBN(GAS_LIMITS.transferToken).toNumber();
 
@@ -565,10 +565,10 @@ class Changelly extends ProviderClass {
       } catch (err) {
         console.warn(
           `Changelly "getFixRateForAmount" "amountTo" possibly returned more` +
-            ` decimals than the token has, attempting to trim trailing decimals...` +
-            `  amountTo=${firstChangellyFixRateQuote.amountTo}` +
-            `  toTokenDecimals=${options.toToken.decimals}` +
-            `  err=${String(err)}`,
+          ` decimals than the token has, attempting to trim trailing decimals...` +
+          `  amountTo=${firstChangellyFixRateQuote.amountTo}` +
+          `  toTokenDecimals=${options.toToken.decimals}` +
+          `  err=${String(err)}`,
         );
         const original = firstChangellyFixRateQuote.amountTo;
         // eslint-disable-next-line no-use-before-define
@@ -583,12 +583,12 @@ class Changelly extends ProviderClass {
         debug(
           "getQuote",
           `Fixed amountTo` +
-            `  firstChangellyFixRateQuote.amountTo=${firstChangellyFixRateQuote.amountTo}` +
-            `  toTokenAmountBase=${toTokenAmountBase}` +
-            `  options.toToken.decimals=${options.toToken.decimals}` +
-            `  options.toToken.symbol=${options.toToken.symbol}` +
-            `  options.toToken.name=${options.toToken.name}` +
-            `  options.toToken.address=${options.toToken.address}`,
+          `  firstChangellyFixRateQuote.amountTo=${firstChangellyFixRateQuote.amountTo}` +
+          `  toTokenAmountBase=${toTokenAmountBase}` +
+          `  options.toToken.decimals=${options.toToken.decimals}` +
+          `  options.toToken.symbol=${options.toToken.symbol}` +
+          `  options.toToken.name=${options.toToken.name}` +
+          `  options.toToken.address=${options.toToken.address}`,
         );
       }
 
@@ -602,10 +602,10 @@ class Changelly extends ProviderClass {
       } catch (err) {
         console.warn(
           `Changelly "getFixRateForAmount" "networkFee" possibly returned more` +
-            ` decimals than the token has, attempting to trim trailing decimals...` +
-            `  networkFee=${firstChangellyFixRateQuote.networkFee}` +
-            `  toTokenDecimals=${options.toToken.decimals}` +
-            `  err=${String(err)}`,
+          ` decimals than the token has, attempting to trim trailing decimals...` +
+          `  networkFee=${firstChangellyFixRateQuote.networkFee}` +
+          `  toTokenDecimals=${options.toToken.decimals}` +
+          `  err=${String(err)}`,
         );
         const original = firstChangellyFixRateQuote.networkFee;
         // eslint-disable-next-line no-use-before-define
@@ -620,18 +620,18 @@ class Changelly extends ProviderClass {
         debug(
           "getQuote",
           `Fixed networkFee` +
-            `  firstChangellyFixRateQuote.networkFee=${firstChangellyFixRateQuote.networkFee}` +
-            `  networkFeeBase=${networkFeeBase}` +
-            `  options.toToken.decimals=${options.toToken.decimals}` +
-            `  options.toToken.symbol=${options.toToken.symbol}` +
-            `  options.toToken.name=${options.toToken.name}` +
-            `  options.toToken.address=${options.toToken.address}`,
+          `  firstChangellyFixRateQuote.networkFee=${firstChangellyFixRateQuote.networkFee}` +
+          `  networkFeeBase=${networkFeeBase}` +
+          `  options.toToken.decimals=${options.toToken.decimals}` +
+          `  options.toToken.symbol=${options.toToken.symbol}` +
+          `  options.toToken.name=${options.toToken.name}` +
+          `  options.toToken.address=${options.toToken.address}`,
         );
       }
 
       const providerQuoteResponse: ProviderQuoteResponse = {
         fromTokenAmount: quoteRequestAmount,
-        additionalNativeFees: toBN(0),
+        additionalNativeFees: toBN(firstChangellyFixRateQuote.networkFee),
         toTokenAmount: toBN(toTokenAmountBase).sub(toBN(networkFeeBase)),
         provider: this.name,
         quote: {
@@ -654,16 +654,16 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `Successfully retrieved quote from Changelly via "getFixRateForAmount"` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+        `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
       );
 
       return providerQuoteResponse;
     } catch (err) {
       console.warn(
         `Errored getting quotes from Changelly via "getFixRateForAmount",` +
-          ` returning no quotes` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  err=${String(err)}`,
+        ` returning no quotes` +
+        `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+        `  err=${String(err)}`,
       );
       return null;
     }
@@ -682,7 +682,7 @@ class Changelly extends ProviderClass {
       debug(
         "getSwap",
         `Enkrypt does not support Changelly on the source network, returning no swap` +
-          `  srcNetwork=${this.network}`,
+        `  srcNetwork=${this.network}`,
       );
       return null;
     }
@@ -695,7 +695,7 @@ class Changelly extends ProviderClass {
       debug(
         "getSwap",
         `Enkrypt does not support Changelly on the destination network, returning no swap` +
-          `  dstNetwork=${quote.options.toToken.networkInfo.name}`,
+        `  dstNetwork=${quote.options.toToken.networkInfo.name}`,
       );
       return null;
     }
@@ -726,11 +726,11 @@ class Changelly extends ProviderClass {
       if (response.error) {
         console.warn(
           `Changelly "createFixTransaction" returned JSONRPC error response, returning no swap` +
-            `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
-            `  toToken=${quote.options.toToken.symbol} (${params.to})` +
-            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-            `  code=${String(response.error.code)}` +
-            `  message=${String(response.error.message)}`,
+          `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
+          `  toToken=${quote.options.toToken.symbol} (${params.to})` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  code=${String(response.error.code)}` +
+          `  message=${String(response.error.message)}`,
         );
         return null;
       }
@@ -738,9 +738,9 @@ class Changelly extends ProviderClass {
       if (!response.result.id) {
         console.warn(
           `Changelly "createFixTransaction" response contains no id, returning no swap` +
-            `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
-            `  toToken=${quote.options.toToken.symbol} (${params.to})` +
-            `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+          `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
+          `  toToken=${quote.options.toToken.symbol} (${params.to})` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
         );
         return null;
       }
@@ -794,11 +794,11 @@ class Changelly extends ProviderClass {
             debug(
               "getSwap",
               `Preparing Solana Changelly SOL swap transaction` +
-                `  quote.options.fromAddress=${quote.options.fromAddress}` +
-                `  latestBlockHash=${latestBlockHash.blockhash}` +
-                `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
-                `  payinAddress=${changellyFixedRateTx.payinAddress}` +
-                `  lamports=${BigInt(quote.options.amount.toString())}`,
+              `  quote.options.fromAddress=${quote.options.fromAddress}` +
+              `  latestBlockHash=${latestBlockHash.blockhash}` +
+              `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
+              `  payinAddress=${changellyFixedRateTx.payinAddress}` +
+              `  lamports=${BigInt(quote.options.amount.toString())}`,
             );
             versionedTx = new VersionedTransaction(
               new TransactionMessage({
@@ -838,15 +838,15 @@ class Changelly extends ProviderClass {
             debug(
               "getSwap",
               `Preparing Solana Changelly SPL token swap transaction` +
-                `  srcMint=${mint.toBase58()}` +
-                `  srcTokenProgramId=${tokenProgramId.toBase58()}` +
-                `  wallet=${wallet.toBase58()}` +
-                `  walletAta=${tokenProgramId.toBase58()}` +
-                `  payin=${payin.toBase58()}` +
-                `  payinAta=${payinAta.toBase58()}` +
-                `  latestBlockHash=${latestBlockHash.blockhash}` +
-                `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
-                `  amount=${amount}`,
+              `  srcMint=${mint.toBase58()}` +
+              `  srcTokenProgramId=${tokenProgramId.toBase58()}` +
+              `  wallet=${wallet.toBase58()}` +
+              `  walletAta=${tokenProgramId.toBase58()}` +
+              `  payin=${payin.toBase58()}` +
+              `  payinAta=${payinAta.toBase58()}` +
+              `  latestBlockHash=${latestBlockHash.blockhash}` +
+              `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
+              `  amount=${amount}`,
             );
 
             // If the ATA account doesn't exist we need create it
@@ -925,28 +925,28 @@ class Changelly extends ProviderClass {
               debug(
                 "getSwap",
                 `No recent fees, not setting priority fee` +
-                  `  recentFeeCount=${recentFeeCount}` +
-                  `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
-                  `  recentFeeSum=${recentFeeSum}` +
-                  `  recentFeeMin=${recentFeeMin}` +
-                  `  recentFeeMax=${recentFeeMax}` +
-                  `  recentFeeMean=${recentFeeMean}` +
-                  `  recentFeeMedian=${recentFeeMedian}` +
-                  `  recentFeeMinAvg=${recentFeeMinAvg}`,
+                `  recentFeeCount=${recentFeeCount}` +
+                `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
+                `  recentFeeSum=${recentFeeSum}` +
+                `  recentFeeMin=${recentFeeMin}` +
+                `  recentFeeMax=${recentFeeMax}` +
+                `  recentFeeMean=${recentFeeMean}` +
+                `  recentFeeMedian=${recentFeeMedian}` +
+                `  recentFeeMinAvg=${recentFeeMinAvg}`,
               );
             } else {
               debug(
                 "getSwap",
                 `Setting priority fee` +
-                  `  priority_fee=${recentFeeMinAvg} micro_lamports/compute_unit` +
-                  `  recentFeeCount=${recentFeeCount}` +
-                  `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
-                  `  recentFeeSum=${recentFeeSum}` +
-                  `  recentFeeMin=${recentFeeMin}` +
-                  `  recentFeeMax=${recentFeeMax}` +
-                  `  recentFeeMean=${recentFeeMean}` +
-                  `  recentFeeMedian=${recentFeeMedian}` +
-                  `  recentFeeMinAvg=${recentFeeMinAvg}`,
+                `  priority_fee=${recentFeeMinAvg} micro_lamports/compute_unit` +
+                `  recentFeeCount=${recentFeeCount}` +
+                `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
+                `  recentFeeSum=${recentFeeSum}` +
+                `  recentFeeMin=${recentFeeMin}` +
+                `  recentFeeMax=${recentFeeMax}` +
+                `  recentFeeMean=${recentFeeMean}` +
+                `  recentFeeMedian=${recentFeeMedian}` +
+                `  recentFeeMinAvg=${recentFeeMinAvg}`,
               );
               instructions.unshift(
                 ComputeBudgetProgram.setComputeUnitPrice({
@@ -961,7 +961,7 @@ class Changelly extends ProviderClass {
                 /** destination */ payinAta,
                 /** owner */ wallet,
                 /** amount */ amount,
-                /** multiSigners */ [],
+                /** multiSigners */[],
                 /** programId */ tokenProgramId,
               ),
             );
@@ -1009,10 +1009,10 @@ class Changelly extends ProviderClass {
       } catch (err) {
         console.warn(
           `Changelly "createFixTransaction" "amountExpectedTo" possibly returned more` +
-            ` decimals than the token has, attempting to trim trailing decimals...` +
-            `  amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
-            `  toTokenDecimals=${quote.options.toToken.decimals}` +
-            `  err=${String(err)}`,
+          ` decimals than the token has, attempting to trim trailing decimals...` +
+          `  amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
+          `  toTokenDecimals=${quote.options.toToken.decimals}` +
+          `  err=${String(err)}`,
         );
         const original = changellyFixedRateTx.amountExpectedTo;
         // eslint-disable-next-line no-use-before-define
@@ -1027,12 +1027,12 @@ class Changelly extends ProviderClass {
         debug(
           "getQuote",
           `Fixed amountExpectedTo` +
-            `  changellyFixedRateTx.amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
-            `  baseToAmount=${baseToAmount}` +
-            `  quote.options.toToken.decimals=${quote.options.toToken.decimals}` +
-            `  quote.options.toToken.symbol=${quote.options.toToken.symbol}` +
-            `  quote.options.toToken.name=${quote.options.toToken.name}` +
-            `  quote.options.toToken.address=${quote.options.toToken.address}`,
+          `  changellyFixedRateTx.amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
+          `  baseToAmount=${baseToAmount}` +
+          `  quote.options.toToken.decimals=${quote.options.toToken.decimals}` +
+          `  quote.options.toToken.symbol=${quote.options.toToken.symbol}` +
+          `  quote.options.toToken.name=${quote.options.toToken.name}` +
+          `  quote.options.toToken.address=${quote.options.toToken.address}`,
         );
       }
 
@@ -1057,14 +1057,14 @@ class Changelly extends ProviderClass {
       debug(
         "getSwap",
         `Successfully extracted Changelly swap transaction via "createFixTransaction"` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+        `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
       );
       return retResponse;
     } catch (err) {
       console.warn(
         `Errored processing Changelly swap response, returning no swap` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  err=${String(err)}`,
+        `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+        `  err=${String(err)}`,
       );
       return null;
     }

From c17d75cc12f411f9b456cc99f49882acf0d55eac Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Thu, 21 Nov 2024 14:59:15 -0800
Subject: [PATCH 11/14] fix: add network solana to specific error, fix
 changelly additionalnativefees

---
 packages/extension/src/ui/action/views/swap/index.vue       | 6 +++---
 .../ui/action/views/swap/views/swap-best-offer/index.vue    | 1 -
 packages/swap/src/providers/changelly/index.ts              | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index c621cbe3c..2d536f4a1 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -545,7 +545,7 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
        * minumum amount for the swap and returns changelly
        * but rango's actual minimum is a lot lower than changelly's
        */
-      if (quotes.length === 1) {
+      if (quotes.length === 1 && props.network.name === NetworkNames.Solana) {
         errors.value.inputAmount = `Minimum amount may be lower than: ~${fromT.toReadable(
           lowestMinimum,
         )} ${nativeSwapToken.value!.token.symbol}`;
@@ -562,8 +562,8 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
       )} ${nativeSwapToken.value!.token.symbol}`;
     } else if (smallestNativeFees.gt(remainingBalance)) {
       // Can't afford the fees
-      errors.value.inputAmount = `Insufficient Bridging fees: ~${nativeSwapToken
-        .value!.toReadable(smallestNativeFees)
+      errors.value.inputAmount = `Insufficient Bridging fees: ~${fromT
+        .toReadable(smallestNativeFees)
         .substring(0, 10)} ${nativeSwapToken.value!.token.symbol} required`;
     }
 
diff --git a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
index 83090a272..dfb84bb60 100644
--- a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
+++ b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
@@ -477,7 +477,6 @@ const selectFee = (option: GasPriceTypes) => {
 };
 
 const selectTrade = (trade: ProviderSwapResponse) => {
-  console.log(trade.provider);
   pickedTrade.value = trade;
   setTransactionFees();
 };
diff --git a/packages/swap/src/providers/changelly/index.ts b/packages/swap/src/providers/changelly/index.ts
index 44e60600c..0c1747580 100644
--- a/packages/swap/src/providers/changelly/index.ts
+++ b/packages/swap/src/providers/changelly/index.ts
@@ -597,7 +597,7 @@ class Changelly extends ProviderClass {
       try {
         networkFeeBase = toBase(
           firstChangellyFixRateQuote.networkFee,
-          options.toToken.decimals,
+          options.fromToken.decimals,
         );
       } catch (err) {
         console.warn(
@@ -628,10 +628,9 @@ class Changelly extends ProviderClass {
           `  options.toToken.address=${options.toToken.address}`,
         );
       }
-
       const providerQuoteResponse: ProviderQuoteResponse = {
         fromTokenAmount: quoteRequestAmount,
-        additionalNativeFees: toBN(firstChangellyFixRateQuote.networkFee),
+        additionalNativeFees: toBN(networkFeeBase),
         toTokenAmount: toBN(toTokenAmountBase).sub(toBN(networkFeeBase)),
         provider: this.name,
         quote: {

From 1ba4048fe9dfc0d34cd1d72171be6dc1eac98c68 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Fri, 22 Nov 2024 10:48:02 -0800
Subject: [PATCH 12/14] devop: revert

---
 packages/swap/src/providers/changelly/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/swap/src/providers/changelly/index.ts b/packages/swap/src/providers/changelly/index.ts
index 0c1747580..36151f4f5 100644
--- a/packages/swap/src/providers/changelly/index.ts
+++ b/packages/swap/src/providers/changelly/index.ts
@@ -597,7 +597,7 @@ class Changelly extends ProviderClass {
       try {
         networkFeeBase = toBase(
           firstChangellyFixRateQuote.networkFee,
-          options.fromToken.decimals,
+          options.toToken.decimals,
         );
       } catch (err) {
         console.warn(

From ad8c2ee6c72e560e0464b03a941a9321e5353b94 Mon Sep 17 00:00:00 2001
From: kvhnuke <10602065+kvhnuke@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:55:19 -0800
Subject: [PATCH 13/14] fix: swap error messages

---
 .../src/ui/action/views/swap/index.vue        |  38 +--
 .../swap/src/providers/changelly/index.ts     | 266 +++++++++---------
 2 files changed, 142 insertions(+), 162 deletions(-)

diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index 2d536f4a1..a3caa71c0 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -4,7 +4,7 @@
       <div v-if="!!selected" class="swap">
         <div class="swap__header">
           <h3>Swap</h3>
-          <a class="swap__close" @click="$router.go(-1)">
+          <a class="swap__close" @click="router.go(-1)">
             <close-icon />
           </a>
         </div>
@@ -68,7 +68,7 @@
             <base-button
               title="Cancel"
               :no-background="true"
-              @click="$router.go(-1)"
+              @click="router.go(-1)"
             />
           </div>
           <div class="swap__buttons-send">
@@ -530,31 +530,16 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
       // Minimum briding fees / rent fees / etc
       // set smallest fee to q.additionalNativeFees if it's smaller than the current smallest or if smallest is 0
       if (
-        (!q.additionalNativeFees.eqn(0) &&
-          q.additionalNativeFees.lt(smallestNativeFees)) ||
-        (smallestNativeFees.eqn(0) && !q.additionalNativeFees.eqn(0))
+        !q.additionalNativeFees.eqn(0) &&
+        q.additionalNativeFees.lt(smallestNativeFees)
       ) {
         smallestNativeFees = q.additionalNativeFees;
       }
     });
-
-    // Decide what message to show
-    if (fromAmountBN.lt(lowestMinimum)) {
-      /**
-       * weird edgecase for solana where rango doesn't return
-       * minumum amount for the swap and returns changelly
-       * but rango's actual minimum is a lot lower than changelly's
-       */
-      if (quotes.length === 1 && props.network.name === NetworkNames.Solana) {
-        errors.value.inputAmount = `Minimum amount may be lower than: ~${fromT.toReadable(
-          lowestMinimum,
-        )} ${nativeSwapToken.value!.token.symbol}`;
-      } else {
-        // Swapping too few tokens
-        errors.value.inputAmount = `Minimum amount: ${fromT.toReadable(
-          lowestMinimum,
-        )} ${nativeSwapToken.value!.token.symbol}`;
-      }
+    if (fromAmountBN.gt(fromT.getBalanceRaw())) {
+      errors.value.inputAmount = 'Insufficient funds';
+    } else if (fromAmountBN.lt(lowestMinimum)) {
+      errors.value.inputAmount = `Amount too low`;
     } else if (fromAmountBN.gt(highestMaximum)) {
       // Swapping too many tokens
       errors.value.inputAmount = `Maximum amount: ${fromT.toReadable(
@@ -570,12 +555,6 @@ const pickBestQuote = (fromAmountBN: BN, quotes: ProviderQuoteResponse[]) => {
     return;
   }
 
-  // There exist quotes that fit the users swap amount
-
-  if (fromT.getBalanceRaw().lt(fromAmountBN)) {
-    errors.value.inputAmount = 'Insufficient funds';
-  }
-
   // Sort remaining quotes descending by the amount of the dest asset to be received
   // i.e. best deal first
   filteredQuotes.sort((a, b) => (b.toTokenAmount.gt(a.toTokenAmount) ? 1 : -1));
@@ -755,6 +734,7 @@ const selectTokenTo = (token: TokenTypeTo | TokenType) => {
 const inputAmountFrom = async (newVal: string) => {
   fromAmount.value = newVal;
   swapMax.value = false;
+  errors.value.inputAmount = '';
 };
 const selectAccount = (account: string) => {
   address.value = account;
diff --git a/packages/swap/src/providers/changelly/index.ts b/packages/swap/src/providers/changelly/index.ts
index 36151f4f5..b10fb64f5 100644
--- a/packages/swap/src/providers/changelly/index.ts
+++ b/packages/swap/src/providers/changelly/index.ts
@@ -99,7 +99,7 @@ if (DEBUG) {
   };
 } else {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
-  debug = () => { };
+  debug = () => {};
 }
 
 class Changelly extends ProviderClass {
@@ -286,8 +286,8 @@ class Changelly extends ProviderClass {
     if (response.error) {
       console.warn(
         `Error validating address with via Changelly` +
-        `  code=${String(response.error.code)}` +
-        `  message=${String(response.error.message)}`,
+          `  code=${String(response.error.code)}` +
+          `  message=${String(response.error.message)}`,
       );
       return false;
     }
@@ -295,8 +295,8 @@ class Changelly extends ProviderClass {
     if (typeof response.result.result !== "boolean") {
       console.warn(
         'Unexpected response to "validateAddress" call to Changelly.' +
-        ` Expected a response.result.result to be a boolean` +
-        ` but received response: ${JSON.stringify(response)}`,
+          ` Expected a response.result.result to be a boolean` +
+          ` but received response: ${JSON.stringify(response)}`,
       );
       return false;
     }
@@ -305,9 +305,9 @@ class Changelly extends ProviderClass {
     debug(
       "isValidAddress",
       `Changelly validateAddress result` +
-      `  address=${address}` +
-      `  ticker=${ticker}` +
-      `  isValid=${isValid}`,
+        `  address=${address}` +
+        `  ticker=${ticker}` +
+        `  isValid=${isValid}`,
     );
     return isValid;
   }
@@ -356,11 +356,11 @@ class Changelly extends ProviderClass {
         // JsonRPC ERR response
         console.warn(
           `Changelly "getFixRate" returned JSONRPC error response` +
-          `  fromToken=${fromToken.symbol} (${params.from})` +
-          `  toToken=${toToken.symbol} (${params.to})` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  code=${String(response.error.code)}` +
-          `  message=${String(response.error.message)}`,
+            `  fromToken=${fromToken.symbol} (${params.from})` +
+            `  toToken=${toToken.symbol} (${params.to})` +
+            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+            `  code=${String(response.error.code)}` +
+            `  message=${String(response.error.message)}`,
         );
         return emptyResponse;
       }
@@ -376,19 +376,19 @@ class Changelly extends ProviderClass {
       debug(
         "getMinMaxAmount",
         `Successfully got min and max of swap pair` +
-        `  fromToken=${fromToken.symbol} (${params.from})` +
-        `  toToken=${toToken.symbol} (${params.to})` +
-        `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+          `  fromToken=${fromToken.symbol} (${params.from})` +
+          `  toToken=${toToken.symbol} (${params.to})` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
       );
       return minMax;
     } catch (err) {
       // HTTP request failed
       console.warn(
         `Errored calling Changelly JSONRPC HTTP API "getFixRate"` +
-        `  fromToken=${fromToken.symbol}` +
-        `  toToken=${toToken.symbol}` +
-        `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-        `  err=${String(err)}`,
+          `  fromToken=${fromToken.symbol}` +
+          `  toToken=${toToken.symbol}` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  err=${String(err)}`,
       );
       return emptyResponse;
     }
@@ -406,12 +406,12 @@ class Changelly extends ProviderClass {
     debug(
       "getQuote",
       `Getting Changelly quote` +
-      `  srcToken=${options.fromToken.symbol}` +
-      `  dstToken=${options.toToken.symbol}` +
-      `  fromAddress=${options.fromAddress}` +
-      `  toAddress=${options.toAddress}` +
-      `  fromNetwork=${this.network}` +
-      `  toNetwork=${options.toToken.networkInfo.name}`,
+        `  srcToken=${options.fromToken.symbol}` +
+        `  dstToken=${options.toToken.symbol}` +
+        `  fromAddress=${options.fromAddress}` +
+        `  toAddress=${options.toAddress}` +
+        `  fromNetwork=${this.network}` +
+        `  toNetwork=${options.toToken.networkInfo.name}`,
     );
 
     if (
@@ -422,7 +422,7 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Enkrypt does not support Changelly on the destination network` +
-        `  dstNetwork=${options.toToken.networkInfo.name}`,
+          `  dstNetwork=${options.toToken.networkInfo.name}`,
       );
       return null;
     }
@@ -431,7 +431,7 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Enkrypt does not support Changelly on the source network` +
-        `  srcNetwork=${this.network}`,
+          `  srcNetwork=${this.network}`,
       );
       return null;
     }
@@ -440,8 +440,8 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Failed to find ticker for src token` +
-        `  srcToken=${options.fromToken.symbol}` +
-        `  srcNetwork=${this.network}`,
+          `  srcToken=${options.fromToken.symbol}` +
+          `  srcNetwork=${this.network}`,
       );
       return null;
     }
@@ -455,8 +455,8 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Failed to find ticker for dst token` +
-        `  dstToken=${options.toToken.symbol}` +
-        `  dstNetwork=${options.toToken.networkInfo.name}`,
+          `  dstToken=${options.toToken.symbol}` +
+          `  dstNetwork=${options.toToken.networkInfo.name}`,
       );
       return null;
     }
@@ -478,10 +478,10 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `No swap: Quote request amount is zero` +
-        `  fromToken=${options.fromToken.symbol}` +
-        `  toToken=${options.toToken.symbol}` +
-        `  minimumFrom=${minMax.minimumFrom.toString()}` +
-        `  maximumFrom=${minMax.maximumFrom.toString()}`,
+          `  fromToken=${options.fromToken.symbol}` +
+          `  toToken=${options.toToken.symbol}` +
+          `  minimumFrom=${minMax.minimumFrom.toString()}` +
+          `  maximumFrom=${minMax.maximumFrom.toString()}`,
       );
       return null;
     }
@@ -513,12 +513,12 @@ class Changelly extends ProviderClass {
       if (response.error) {
         console.warn(
           `Changelly "getFixRateForAmount" returned JSONRPC error response,` +
-          ` returning no quotes` +
-          `  fromToken=${options.fromToken.symbol} (${params.from})` +
-          `  toToken=${options.toToken.symbol} (${params.to})` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  code=${String(response.error.code)}` +
-          `  message=${String(response.error.message)}`,
+            ` returning no quotes` +
+            `  fromToken=${options.fromToken.symbol} (${params.from})` +
+            `  toToken=${options.toToken.symbol} (${params.to})` +
+            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+            `  code=${String(response.error.code)}` +
+            `  message=${String(response.error.message)}`,
         );
         return null;
       }
@@ -526,12 +526,12 @@ class Changelly extends ProviderClass {
       if (!response.result || !response.result[0]?.id) {
         console.warn(
           `Changelly "getFixRateForAmount" response contains no quotes,` +
-          ` returning no quotes` +
-          `  fromToken=${options.fromToken.symbol} (${params.from})` +
-          `  toToken=${options.toToken.symbol} (${params.to})` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  code=${String(response.error.code)}` +
-          `  message=${String(response.error.message)}`,
+            ` returning no quotes` +
+            `  fromToken=${options.fromToken.symbol} (${params.from})` +
+            `  toToken=${options.toToken.symbol} (${params.to})` +
+            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+            `  code=${String(response.error.code)}` +
+            `  message=${String(response.error.message)}`,
         );
         return null;
       }
@@ -540,10 +540,10 @@ class Changelly extends ProviderClass {
       if (response.result.length > 1) {
         console.warn(
           `Changelly "getFixRateForAmount" returned more than one quote, continuing with first quote` +
-          `  fromToken=${options.fromToken.symbol} (${params.from})` +
-          `  toToken=${options.toToken.symbol} (${params.to})` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  count=${response.result.length}ms`,
+            `  fromToken=${options.fromToken.symbol} (${params.from})` +
+            `  toToken=${options.toToken.symbol} (${params.to})` +
+            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+            `  count=${response.result.length}ms`,
         );
       }
 
@@ -551,7 +551,7 @@ class Changelly extends ProviderClass {
 
       const evmGasLimit =
         options.fromToken.address === NATIVE_TOKEN_ADDRESS &&
-          options.fromToken.type === NetworkType.EVM
+        options.fromToken.type === NetworkType.EVM
           ? 21000
           : toBN(GAS_LIMITS.transferToken).toNumber();
 
@@ -565,10 +565,10 @@ class Changelly extends ProviderClass {
       } catch (err) {
         console.warn(
           `Changelly "getFixRateForAmount" "amountTo" possibly returned more` +
-          ` decimals than the token has, attempting to trim trailing decimals...` +
-          `  amountTo=${firstChangellyFixRateQuote.amountTo}` +
-          `  toTokenDecimals=${options.toToken.decimals}` +
-          `  err=${String(err)}`,
+            ` decimals than the token has, attempting to trim trailing decimals...` +
+            `  amountTo=${firstChangellyFixRateQuote.amountTo}` +
+            `  toTokenDecimals=${options.toToken.decimals}` +
+            `  err=${String(err)}`,
         );
         const original = firstChangellyFixRateQuote.amountTo;
         // eslint-disable-next-line no-use-before-define
@@ -583,12 +583,12 @@ class Changelly extends ProviderClass {
         debug(
           "getQuote",
           `Fixed amountTo` +
-          `  firstChangellyFixRateQuote.amountTo=${firstChangellyFixRateQuote.amountTo}` +
-          `  toTokenAmountBase=${toTokenAmountBase}` +
-          `  options.toToken.decimals=${options.toToken.decimals}` +
-          `  options.toToken.symbol=${options.toToken.symbol}` +
-          `  options.toToken.name=${options.toToken.name}` +
-          `  options.toToken.address=${options.toToken.address}`,
+            `  firstChangellyFixRateQuote.amountTo=${firstChangellyFixRateQuote.amountTo}` +
+            `  toTokenAmountBase=${toTokenAmountBase}` +
+            `  options.toToken.decimals=${options.toToken.decimals}` +
+            `  options.toToken.symbol=${options.toToken.symbol}` +
+            `  options.toToken.name=${options.toToken.name}` +
+            `  options.toToken.address=${options.toToken.address}`,
         );
       }
 
@@ -602,10 +602,10 @@ class Changelly extends ProviderClass {
       } catch (err) {
         console.warn(
           `Changelly "getFixRateForAmount" "networkFee" possibly returned more` +
-          ` decimals than the token has, attempting to trim trailing decimals...` +
-          `  networkFee=${firstChangellyFixRateQuote.networkFee}` +
-          `  toTokenDecimals=${options.toToken.decimals}` +
-          `  err=${String(err)}`,
+            ` decimals than the token has, attempting to trim trailing decimals...` +
+            `  networkFee=${firstChangellyFixRateQuote.networkFee}` +
+            `  toTokenDecimals=${options.toToken.decimals}` +
+            `  err=${String(err)}`,
         );
         const original = firstChangellyFixRateQuote.networkFee;
         // eslint-disable-next-line no-use-before-define
@@ -620,17 +620,17 @@ class Changelly extends ProviderClass {
         debug(
           "getQuote",
           `Fixed networkFee` +
-          `  firstChangellyFixRateQuote.networkFee=${firstChangellyFixRateQuote.networkFee}` +
-          `  networkFeeBase=${networkFeeBase}` +
-          `  options.toToken.decimals=${options.toToken.decimals}` +
-          `  options.toToken.symbol=${options.toToken.symbol}` +
-          `  options.toToken.name=${options.toToken.name}` +
-          `  options.toToken.address=${options.toToken.address}`,
+            `  firstChangellyFixRateQuote.networkFee=${firstChangellyFixRateQuote.networkFee}` +
+            `  networkFeeBase=${networkFeeBase}` +
+            `  options.toToken.decimals=${options.toToken.decimals}` +
+            `  options.toToken.symbol=${options.toToken.symbol}` +
+            `  options.toToken.name=${options.toToken.name}` +
+            `  options.toToken.address=${options.toToken.address}`,
         );
       }
       const providerQuoteResponse: ProviderQuoteResponse = {
         fromTokenAmount: quoteRequestAmount,
-        additionalNativeFees: toBN(networkFeeBase),
+        additionalNativeFees: toBN(0),
         toTokenAmount: toBN(toTokenAmountBase).sub(toBN(networkFeeBase)),
         provider: this.name,
         quote: {
@@ -653,16 +653,16 @@ class Changelly extends ProviderClass {
       debug(
         "getQuote",
         `Successfully retrieved quote from Changelly via "getFixRateForAmount"` +
-        `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
       );
 
       return providerQuoteResponse;
     } catch (err) {
       console.warn(
         `Errored getting quotes from Changelly via "getFixRateForAmount",` +
-        ` returning no quotes` +
-        `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-        `  err=${String(err)}`,
+          ` returning no quotes` +
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  err=${String(err)}`,
       );
       return null;
     }
@@ -681,7 +681,7 @@ class Changelly extends ProviderClass {
       debug(
         "getSwap",
         `Enkrypt does not support Changelly on the source network, returning no swap` +
-        `  srcNetwork=${this.network}`,
+          `  srcNetwork=${this.network}`,
       );
       return null;
     }
@@ -694,7 +694,7 @@ class Changelly extends ProviderClass {
       debug(
         "getSwap",
         `Enkrypt does not support Changelly on the destination network, returning no swap` +
-        `  dstNetwork=${quote.options.toToken.networkInfo.name}`,
+          `  dstNetwork=${quote.options.toToken.networkInfo.name}`,
       );
       return null;
     }
@@ -725,11 +725,11 @@ class Changelly extends ProviderClass {
       if (response.error) {
         console.warn(
           `Changelly "createFixTransaction" returned JSONRPC error response, returning no swap` +
-          `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
-          `  toToken=${quote.options.toToken.symbol} (${params.to})` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-          `  code=${String(response.error.code)}` +
-          `  message=${String(response.error.message)}`,
+            `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
+            `  toToken=${quote.options.toToken.symbol} (${params.to})` +
+            `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+            `  code=${String(response.error.code)}` +
+            `  message=${String(response.error.message)}`,
         );
         return null;
       }
@@ -737,9 +737,9 @@ class Changelly extends ProviderClass {
       if (!response.result.id) {
         console.warn(
           `Changelly "createFixTransaction" response contains no id, returning no swap` +
-          `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
-          `  toToken=${quote.options.toToken.symbol} (${params.to})` +
-          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+            `  fromToken=${quote.options.fromToken.symbol} (${params.from})` +
+            `  toToken=${quote.options.toToken.symbol} (${params.to})` +
+            `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
         );
         return null;
       }
@@ -793,11 +793,11 @@ class Changelly extends ProviderClass {
             debug(
               "getSwap",
               `Preparing Solana Changelly SOL swap transaction` +
-              `  quote.options.fromAddress=${quote.options.fromAddress}` +
-              `  latestBlockHash=${latestBlockHash.blockhash}` +
-              `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
-              `  payinAddress=${changellyFixedRateTx.payinAddress}` +
-              `  lamports=${BigInt(quote.options.amount.toString())}`,
+                `  quote.options.fromAddress=${quote.options.fromAddress}` +
+                `  latestBlockHash=${latestBlockHash.blockhash}` +
+                `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
+                `  payinAddress=${changellyFixedRateTx.payinAddress}` +
+                `  lamports=${BigInt(quote.options.amount.toString())}`,
             );
             versionedTx = new VersionedTransaction(
               new TransactionMessage({
@@ -837,15 +837,15 @@ class Changelly extends ProviderClass {
             debug(
               "getSwap",
               `Preparing Solana Changelly SPL token swap transaction` +
-              `  srcMint=${mint.toBase58()}` +
-              `  srcTokenProgramId=${tokenProgramId.toBase58()}` +
-              `  wallet=${wallet.toBase58()}` +
-              `  walletAta=${tokenProgramId.toBase58()}` +
-              `  payin=${payin.toBase58()}` +
-              `  payinAta=${payinAta.toBase58()}` +
-              `  latestBlockHash=${latestBlockHash.blockhash}` +
-              `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
-              `  amount=${amount}`,
+                `  srcMint=${mint.toBase58()}` +
+                `  srcTokenProgramId=${tokenProgramId.toBase58()}` +
+                `  wallet=${wallet.toBase58()}` +
+                `  walletAta=${tokenProgramId.toBase58()}` +
+                `  payin=${payin.toBase58()}` +
+                `  payinAta=${payinAta.toBase58()}` +
+                `  latestBlockHash=${latestBlockHash.blockhash}` +
+                `  lastValidBlockHeight=${latestBlockHash.lastValidBlockHeight}` +
+                `  amount=${amount}`,
             );
 
             // If the ATA account doesn't exist we need create it
@@ -924,28 +924,28 @@ class Changelly extends ProviderClass {
               debug(
                 "getSwap",
                 `No recent fees, not setting priority fee` +
-                `  recentFeeCount=${recentFeeCount}` +
-                `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
-                `  recentFeeSum=${recentFeeSum}` +
-                `  recentFeeMin=${recentFeeMin}` +
-                `  recentFeeMax=${recentFeeMax}` +
-                `  recentFeeMean=${recentFeeMean}` +
-                `  recentFeeMedian=${recentFeeMedian}` +
-                `  recentFeeMinAvg=${recentFeeMinAvg}`,
+                  `  recentFeeCount=${recentFeeCount}` +
+                  `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
+                  `  recentFeeSum=${recentFeeSum}` +
+                  `  recentFeeMin=${recentFeeMin}` +
+                  `  recentFeeMax=${recentFeeMax}` +
+                  `  recentFeeMean=${recentFeeMean}` +
+                  `  recentFeeMedian=${recentFeeMedian}` +
+                  `  recentFeeMinAvg=${recentFeeMinAvg}`,
               );
             } else {
               debug(
                 "getSwap",
                 `Setting priority fee` +
-                `  priority_fee=${recentFeeMinAvg} micro_lamports/compute_unit` +
-                `  recentFeeCount=${recentFeeCount}` +
-                `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
-                `  recentFeeSum=${recentFeeSum}` +
-                `  recentFeeMin=${recentFeeMin}` +
-                `  recentFeeMax=${recentFeeMax}` +
-                `  recentFeeMean=${recentFeeMean}` +
-                `  recentFeeMedian=${recentFeeMedian}` +
-                `  recentFeeMinAvg=${recentFeeMinAvg}`,
+                  `  priority_fee=${recentFeeMinAvg} micro_lamports/compute_unit` +
+                  `  recentFeeCount=${recentFeeCount}` +
+                  `  recentFeeCountWithoutZeroes=${recentFeeCountWithoutZeroes}` +
+                  `  recentFeeSum=${recentFeeSum}` +
+                  `  recentFeeMin=${recentFeeMin}` +
+                  `  recentFeeMax=${recentFeeMax}` +
+                  `  recentFeeMean=${recentFeeMean}` +
+                  `  recentFeeMedian=${recentFeeMedian}` +
+                  `  recentFeeMinAvg=${recentFeeMinAvg}`,
               );
               instructions.unshift(
                 ComputeBudgetProgram.setComputeUnitPrice({
@@ -960,7 +960,7 @@ class Changelly extends ProviderClass {
                 /** destination */ payinAta,
                 /** owner */ wallet,
                 /** amount */ amount,
-                /** multiSigners */[],
+                /** multiSigners */ [],
                 /** programId */ tokenProgramId,
               ),
             );
@@ -1008,10 +1008,10 @@ class Changelly extends ProviderClass {
       } catch (err) {
         console.warn(
           `Changelly "createFixTransaction" "amountExpectedTo" possibly returned more` +
-          ` decimals than the token has, attempting to trim trailing decimals...` +
-          `  amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
-          `  toTokenDecimals=${quote.options.toToken.decimals}` +
-          `  err=${String(err)}`,
+            ` decimals than the token has, attempting to trim trailing decimals...` +
+            `  amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
+            `  toTokenDecimals=${quote.options.toToken.decimals}` +
+            `  err=${String(err)}`,
         );
         const original = changellyFixedRateTx.amountExpectedTo;
         // eslint-disable-next-line no-use-before-define
@@ -1026,12 +1026,12 @@ class Changelly extends ProviderClass {
         debug(
           "getQuote",
           `Fixed amountExpectedTo` +
-          `  changellyFixedRateTx.amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
-          `  baseToAmount=${baseToAmount}` +
-          `  quote.options.toToken.decimals=${quote.options.toToken.decimals}` +
-          `  quote.options.toToken.symbol=${quote.options.toToken.symbol}` +
-          `  quote.options.toToken.name=${quote.options.toToken.name}` +
-          `  quote.options.toToken.address=${quote.options.toToken.address}`,
+            `  changellyFixedRateTx.amountExpectedTo=${changellyFixedRateTx.amountExpectedTo}` +
+            `  baseToAmount=${baseToAmount}` +
+            `  quote.options.toToken.decimals=${quote.options.toToken.decimals}` +
+            `  quote.options.toToken.symbol=${quote.options.toToken.symbol}` +
+            `  quote.options.toToken.name=${quote.options.toToken.name}` +
+            `  quote.options.toToken.address=${quote.options.toToken.address}`,
         );
       }
 
@@ -1056,14 +1056,14 @@ class Changelly extends ProviderClass {
       debug(
         "getSwap",
         `Successfully extracted Changelly swap transaction via "createFixTransaction"` +
-        `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms`,
       );
       return retResponse;
     } catch (err) {
       console.warn(
         `Errored processing Changelly swap response, returning no swap` +
-        `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
-        `  err=${String(err)}`,
+          `  took=${(Date.now() - startedAt).toLocaleString()}ms` +
+          `  err=${String(err)}`,
       );
       return null;
     }

From 3716d402cf00877ad0df0ce82930b6c4b65524bf Mon Sep 17 00:00:00 2001
From: kvhnuke <10602065+kvhnuke@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:00:03 -0800
Subject: [PATCH 14/14] fix: swap error messages

---
 packages/swap/src/providers/rango/index.ts | 82 +++++++++++-----------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/packages/swap/src/providers/rango/index.ts b/packages/swap/src/providers/rango/index.ts
index e45de4c2b..adc5ea683 100644
--- a/packages/swap/src/providers/rango/index.ts
+++ b/packages/swap/src/providers/rango/index.ts
@@ -100,7 +100,7 @@ if (DEBUG) {
     );
   };
 } else {
-  debug = () => { };
+  debug = () => {};
 }
 
 type SupportedNetworkInfo = {
@@ -403,8 +403,8 @@ class Rango extends ProviderClass {
     debug(
       "init",
       "Rango meta" +
-      `  tokens.length=${rangoMeta.tokens.length}` +
-      `  blockchains.length=${rangoMeta.blockchains.length}`,
+        `  tokens.length=${rangoMeta.tokens.length}` +
+        `  blockchains.length=${rangoMeta.blockchains.length}`,
     );
 
     const supportedNetworkInfo = supportedNetworkInfoByName.get(this.network);
@@ -573,7 +573,7 @@ class Rango extends ProviderClass {
     if (token.address == null) {
       console.warn(
         `Cannot get Rango token symbol: Token address is not defined` +
-        ` for token ${token.name} (${token.symbol}) - ${token.address}`,
+          ` for token ${token.name} (${token.symbol}) - ${token.address}`,
       );
       return undefined;
     }
@@ -607,12 +607,12 @@ class Rango extends ProviderClass {
     debug(
       "getRangoSwap",
       `Getting swap` +
-      `  fromNetwork=${this.network}` +
-      `  toNetwork=${options.toToken.networkInfo.name}` +
-      `  fromToken=${options.fromToken.symbol}` +
-      `  toToken=${options.toToken.symbol}` +
-      `  fromAddress=${options.fromAddress}` +
-      `  toAddress=${options.toAddress}`,
+        `  fromNetwork=${this.network}` +
+        `  toNetwork=${options.toToken.networkInfo.name}` +
+        `  fromToken=${options.fromToken.symbol}` +
+        `  toToken=${options.toToken.symbol}` +
+        `  fromAddress=${options.fromAddress}` +
+        `  toAddress=${options.toAddress}`,
     );
 
     try {
@@ -626,8 +626,8 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           "No swap:" +
-          ` Enkrypt does not support Rango swap on the source network` +
-          `  fromNetwork=${this.network}`,
+            ` Enkrypt does not support Rango swap on the source network` +
+            `  fromNetwork=${this.network}`,
         );
         return null;
       }
@@ -640,8 +640,8 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           "No swap:" +
-          ` Enkrypt does not support Rango swap on the destination network` +
-          `  fromNetwork=${this.network}`,
+            ` Enkrypt does not support Rango swap on the destination network` +
+            `  fromNetwork=${this.network}`,
         );
         return null;
       }
@@ -655,10 +655,10 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           `No swap:` +
-          ` Rango does not support swap on the source network` +
-          `  fromNetwork=${this.network}` +
-          `  fromBlockchain=${fromRangoBlockchain.name}` +
-          `  enabled=${fromRangoBlockchain.enabled}`,
+            ` Rango does not support swap on the source network` +
+            `  fromNetwork=${this.network}` +
+            `  fromBlockchain=${fromRangoBlockchain.name}` +
+            `  enabled=${fromRangoBlockchain.enabled}`,
         );
         return null;
       }
@@ -673,10 +673,10 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           `No swap:` +
-          ` Rango does not support swap on the destination network` +
-          `  toNetwork=${options.toToken.networkInfo.name}` +
-          `  toBlockchain=${toRangoBlockchain.name}` +
-          `  enabled=${toRangoBlockchain.enabled}`,
+            ` Rango does not support swap on the destination network` +
+            `  toNetwork=${options.toToken.networkInfo.name}` +
+            `  toBlockchain=${toRangoBlockchain.name}` +
+            `  enabled=${toRangoBlockchain.enabled}`,
         );
         return null;
       }
@@ -688,8 +688,8 @@ class Rango extends ProviderClass {
       debug(
         "getRangoSwap",
         `Rango block chains ids` +
-        `  fromRangoBlockchain=${fromRangoBlockchainName}` +
-        `  toRangoBlockchain=${toRangoBlockchainName}`,
+          `  fromRangoBlockchain=${fromRangoBlockchainName}` +
+          `  toRangoBlockchain=${toRangoBlockchainName}`,
       );
 
       const fromTokenAddress = options.fromToken.address;
@@ -712,8 +712,8 @@ class Rango extends ProviderClass {
         debug(
           "getRangoSwap",
           `No swap: No symbol for src token or dst token` +
-          `  fromTokenSymbol=${fromRangoTokenSymbol}` +
-          `  toTokenSymbol=${toRangoTokenSymbol}`,
+            `  fromTokenSymbol=${fromRangoTokenSymbol}` +
+            `  toTokenSymbol=${toRangoTokenSymbol}`,
         );
         return null;
       }
@@ -751,15 +751,15 @@ class Rango extends ProviderClass {
       debug(
         "getRangoSwap",
         `Requesting quote from rango sdk...` +
-        `  fromRangoBlockchain=${fromRangoBlockchainName}` +
-        `  toRangoBlockchain=${toRangoBlockchainName}` +
-        `  fromToken=${fromRangoTokenSymbol}` +
-        `  toToken=${toRangoTokenSymbol}` +
-        `  fromAddress=${options.fromAddress}` +
-        `  toAddress=${options.toAddress}` +
-        `  amount=${options.amount.toString()}` +
-        `  slippage=${slippage}` +
-        `  referrerFee=${params.referrerFee}`,
+          `  fromRangoBlockchain=${fromRangoBlockchainName}` +
+          `  toRangoBlockchain=${toRangoBlockchainName}` +
+          `  fromToken=${fromRangoTokenSymbol}` +
+          `  toToken=${toRangoTokenSymbol}` +
+          `  fromAddress=${options.fromAddress}` +
+          `  toAddress=${options.toAddress}` +
+          `  amount=${options.amount.toString()}` +
+          `  slippage=${slippage}` +
+          `  referrerFee=${params.referrerFee}`,
       );
       const rangoSwapResponse = await rangoClient.swap(params, abortable);
       debug("getRangoSwap", `Received quote from rango sdk`);
@@ -784,7 +784,9 @@ class Rango extends ProviderClass {
       let additionalNativeFees = toBN(0);
       rangoSwapResponse.route.fee.forEach((f) => {
         if (
-          f.expenseType === "FROM_SOURCE_WALLET"
+          !f.token.address &&
+          f.expenseType === "FROM_SOURCE_WALLET" &&
+          f.name !== "Network Fee"
         ) {
           additionalNativeFees = additionalNativeFees.add(toBN(f.amount));
         }
@@ -1009,7 +1011,7 @@ class Rango extends ProviderClass {
               debug(
                 "getRangoSwap",
                 `Checking Rango signatures...` +
-                `  signatures=${thirdPartySignatures.length}`,
+                  `  signatures=${thirdPartySignatures.length}`,
                 `  pubkeys=${thirdPartySignatures
                   .map(({ pubkey }) => pubkey)
                   .join(",")}`,
@@ -1387,7 +1389,7 @@ async function fetchRangoSwaplist(abortable?: {
     if (retryidx >= retries.length) {
       throw new Error(
         `Failed to fetch Rango swaplists after ${retries.length}` +
-        ` retries: ${String(errref?.err ?? "???")}`,
+          ` retries: ${String(errref?.err ?? "???")}`,
       );
     }
     const waitMs = retries[retryidx];
@@ -1612,7 +1614,7 @@ async function checkExpectedSolanaLegacyTransactionStatus(
       debug(
         "checkExpectedSolanaLegacyTransactionStatus",
         `Retrying Rango Solana unsigned legacy transaction simulation` +
-        ` with updated block hash ${latestBlockHash.blockhash}...`,
+          ` with updated block hash ${latestBlockHash.blockhash}...`,
       );
       legacyTx.recentBlockhash = latestBlockHash.blockhash;
       abortable?.signal?.throwIfAborted();
@@ -1668,7 +1670,7 @@ async function checkExpectedSolanaVersionedTransactionStatus(
       debug(
         "checkExpectedSolanaVersionedTransactionStatus",
         `Retrying Rango Solana unsigned versioned transaction simulation` +
-        ` with updated block hash ${latestBlockHash.blockhash}...`,
+          ` with updated block hash ${latestBlockHash.blockhash}...`,
       );
       versionedTx.message.recentBlockhash = latestBlockHash.blockhash;
     }