From 4e9737e0f3eee27cea1412b6ca891ce7c4469439 Mon Sep 17 00:00:00 2001 From: Tuditi Date: Thu, 16 May 2024 16:00:20 +0200 Subject: [PATCH] feat: disable gas selection if isTransferring --- .../popup/popups/EvmTransactionFromDappPopup.svelte | 1 + .../send-flow/views/TransactionSummaryView.svelte | 1 + .../views/components/EvmTransactionDetails.svelte | 9 ++++++++- .../views/components/EvmTransactionSummary.svelte | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte index 7384b623a5..4a74e2c51a 100644 --- a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte +++ b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte @@ -249,6 +249,7 @@ destinationNetworkId={evmNetwork.id} transaction={preparedTransaction} {gasPrices} + {busy} /> diff --git a/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte b/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte index 0469f615b1..fb721fce51 100644 --- a/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte +++ b/packages/desktop/views/dashboard/send-flow/views/TransactionSummaryView.svelte @@ -205,6 +205,7 @@ transaction={preparedTransaction} sendFlowParameters={$sendFlowParameters} network={evmNetwork} + {busy} /> {:else if !isSourceNetworkLayer2 && preparedOutput && $sendFlowParameters} {#if isDestinationNetworkLayer2} diff --git a/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte b/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte index f9b1cba2b6..7bd5113d8a 100644 --- a/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte +++ b/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte @@ -14,6 +14,7 @@ export let transaction: EvmTransactionData export let gasPrices: IGasPricesBySpeed export let storageDeposit: bigint = BigInt(0) + export let busy: boolean const { gasLimit, estimatedGas } = transaction @@ -47,7 +48,13 @@ }} >
- +
{/if} diff --git a/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionSummary.svelte b/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionSummary.svelte index 5fa97dc132..35dceb3371 100644 --- a/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionSummary.svelte +++ b/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionSummary.svelte @@ -12,6 +12,7 @@ export let network: IEvmNetwork export let selectedGasSpeed: GasSpeed export let gasPrices: IGasPricesBySpeed + export let busy: boolean $: transactionAsset = getTransactionAsset(sendFlowParameters) function getTransactionAsset(_sendFlowParameters: SendFlowParameters): { @@ -69,5 +70,6 @@ {transaction} {storageDeposit} {gasPrices} + {busy} />