Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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;
Expand All @@ -71,6 +75,7 @@ interface IProps {
isHardware: boolean;
isError: boolean;
errorMessage: string;
network: BaseNetwork;
}

defineEmits<{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
.toLowerCase()
.includes('simulation failed')
? 'Network may be busy. Please try again at a later time.'
: error;
}
trackSwapEvents(SwapEventType.swapFailed, {
network: network.value!.name,
fromToken: swapData.fromToken.name,
Expand Down