From 9283e68421e9a3bcd5b6be52b331edcd5114c3ae Mon Sep 17 00:00:00 2001 From: Anastasiya S Date: Fri, 19 Aug 2022 17:51:24 +0300 Subject: [PATCH] fix: calculate estimated time in ens modal fix: calculate estimated time in ens modal --- ui/app/AppLayouts/Profile/stores/EnsUsernamesStore.qml | 4 ++++ ui/imports/shared/status/StatusETHTransactionModal.qml | 4 +++- vendor/status-go | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/app/AppLayouts/Profile/stores/EnsUsernamesStore.qml b/ui/app/AppLayouts/Profile/stores/EnsUsernamesStore.qml index d8df4437f3..53ebe188ec 100644 --- a/ui/app/AppLayouts/Profile/stores/EnsUsernamesStore.qml +++ b/ui/app/AppLayouts/Profile/stores/EnsUsernamesStore.qml @@ -140,6 +140,10 @@ QtObject { return ensUsernamesModule.getGasEthValue(gweiValue, gasLimit) } + function getEstimatedTime(chainId, maxFeePerGas) { + return walletSectionTransactions.getEstimatedTime(chainId, maxFeePerGas) + } + function getStatusToken() { if(!root.ensUsernamesModule) return "" diff --git a/ui/imports/shared/status/StatusETHTransactionModal.qml b/ui/imports/shared/status/StatusETHTransactionModal.qml index c44a37e822..c563bb8326 100644 --- a/ui/imports/shared/status/StatusETHTransactionModal.qml +++ b/ui/imports/shared/status/StatusETHTransactionModal.qml @@ -112,6 +112,7 @@ ModalPopup { visible: false accounts: root.ensUsernamesStore.walletAccounts contactsStore: root.contactsStore + isValid: true selectedRecipient: { "address": root.ensUsernamesStore.getEnsRegisteredAddress(), "type": RecipientSelector.Type.Address } readOnly: true onSelectedRecipientChanged: if (isValid) { gasSelector.estimateGas() } @@ -122,9 +123,10 @@ ModalPopup { anchors.top: selectFromAccount.bottom anchors.topMargin: Style.current.padding getGasEthValue: root.ensUsernamesStore.getGasEthValue + getEstimatedTime: root.ensUsernamesStore.getEstimatedTime getFiatValue: root.ensUsernamesStore.getFiatValue defaultCurrency: root.ensUsernamesStore.getCurrentCurrency() - + property var estimateGas: Backpressure.debounce(gasSelector, 600, function() { let estimatedGas = root.estimateGasFunction(selectFromAccount.selectedAccount); gasSelector.selectedGasLimit = estimatedGas diff --git a/vendor/status-go b/vendor/status-go index ef21440e32..956cc1870e 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit ef21440e320d21ed0ad26cb3506d3d93ce5671be +Subproject commit 956cc1870ea72871b8e929f63f812799456c1460