From 5ab8f2027aaddae08098af3412afa595e90c90bd Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Wed, 12 Mar 2025 13:34:00 -0700
Subject: [PATCH 1/3] fix: catch error transaction simulation failed for sol

---
 .../src/ui/action/views/swap-initiated/index.vue |  7 ++++++-
 .../views/swap/views/swap-best-offer/index.vue   | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/packages/extension/src/ui/action/views/swap-initiated/index.vue b/packages/extension/src/ui/action/views/swap-initiated/index.vue
index 0c4ca52cc..68d73e2bf 100644
--- a/packages/extension/src/ui/action/views/swap-initiated/index.vue
+++ b/packages/extension/src/ui/action/views/swap-initiated/index.vue
@@ -37,7 +37,9 @@
             <p>
               {{ errorMessage }}
             </p>
-            <p><a @click="$emit('update:tryAgain')">Try again</a></p>
+            <p v-if="network.name !== NetworkNames.Solana">
+              <a @click="$emit('update:tryAgain')">Try again</a>
+            </p>
             <a @click="$emit('update:close')">Cancel</a>
           </div>
         </div>
@@ -61,6 +63,8 @@ import LottieError from '@action/assets/animation/error-big.json';
 import LottieStatus from '@action/assets/animation/status.json';
 import { Vue3Lottie } from 'vue3-lottie';
 import { TokenType } from '@enkryptcom/swap';
+import { NetworkNames } from '@enkryptcom/types';
+import { BaseNetwork } from '@/types/base-network';
 
 interface IProps {
   fromToken: TokenType;
@@ -71,6 +75,7 @@ interface IProps {
   isHardware: boolean;
   isError: boolean;
   errorMessage: string;
+  network: BaseNetwork;
 }
 
 defineEmits<{
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 8f1e8e271..52c93bcf6 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
@@ -92,6 +92,7 @@
       :is-hardware="account ? account.isHardware : false"
       :is-error="isTXSendError"
       :error-message="TXSendErrorMessage"
+      :network="network"
       @update:close="close"
       @update:try-again="sendAction"
     />
@@ -134,7 +135,7 @@ import BigNumber from 'bignumber.js';
 import { defaultGasCostVals } from '@/providers/common/libs/default-vals';
 import { SwapBestOfferWarnings } from '../../types';
 import { NATIVE_TOKEN_ADDRESS } from '@/providers/ethereum/libs/common';
-import { EnkryptAccount } from '@enkryptcom/types';
+import { EnkryptAccount, NetworkNames } from '@enkryptcom/types';
 import { getNetworkByName } from '@/libs/utils/networks';
 import {
   getNetworkInfoByName,
@@ -435,7 +436,18 @@ const sendAction = async () => {
       .catch(err => {
         console.error(err);
         isTXSendError.value = true;
-        TXSendErrorMessage.value = err.error ? err.error.message : err.message;
+        const error = err.error ? err.error.message : err.message;
+        if (network.value!.name !== NetworkNames.Solana) {
+          TXSendErrorMessage.value = err.error
+            ? err.error.message
+            : err.message;
+        } else {
+          TXSendErrorMessage.value = error.includes(
+            'Transaction simulation failed',
+          )
+            ? 'Network may be busy. Please try again later.'
+            : error;
+        }
         trackSwapEvents(SwapEventType.swapFailed, {
           network: network.value!.name,
           fromToken: swapData.fromToken.name,

From c017077592bc7cc78abf05c9975d814be9211bd0 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Thu, 20 Mar 2025 12:59:34 -0700
Subject: [PATCH 2/3] devop: change message catch

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

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 52c93bcf6..380299a95 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
@@ -442,9 +442,9 @@ const sendAction = async () => {
             ? err.error.message
             : err.message;
         } else {
-          TXSendErrorMessage.value = error.includes(
-            'Transaction simulation failed',
-          )
+          TXSendErrorMessage.value = error
+            .toLowerCase()
+            .includes('simulation failed')
             ? 'Network may be busy. Please try again later.'
             : error;
         }

From d3347e6ad6acd12f20511a22c28737b83b2326f9 Mon Sep 17 00:00:00 2001
From: Gamaliel Padillo <gamalielgad1234@gmail.com>
Date: Mon, 24 Mar 2025 10:55:51 -0700
Subject: [PATCH 3/3] chore: error:

---
 .../src/ui/action/views/swap/views/swap-best-offer/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 380299a95..1c4de618f 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
@@ -445,7 +445,7 @@ const sendAction = async () => {
           TXSendErrorMessage.value = error
             .toLowerCase()
             .includes('simulation failed')
-            ? 'Network may be busy. Please try again later.'
+            ? 'Network may be busy. Please try again at a later time.'
             : error;
         }
         trackSwapEvents(SwapEventType.swapFailed, {