From e0c5e9b9b0079df5c5e4904d86543dbe28351812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=A8Anthony?= <¨anthony@laibe.cc¨>
Date: Mon, 27 Sep 2021 12:59:50 +0200
Subject: [PATCH] fix(@desktop/wallet): gas error position

---
 .../Chat/ChatColumn/ChatComponents/SignTransactionModal.qml  | 5 ++---
 ui/app/AppLayouts/Wallet/SendModal.qml                       | 3 +--
 ui/shared/status/StatusETHTransactionModal.qml               | 5 ++---
 ui/shared/status/StatusSNTTransactionModal.qml               | 5 ++---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
index f539955646..eebcaf0453 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
@@ -134,7 +134,7 @@ ModalPopup {
             }
             GasSelector {
                 id: gasSelector
-                anchors.topMargin: Style.current.bigPadding
+                anchors.topMargin: Style.current.padding
                 gasPrice: parseFloat(walletModel.gasView.gasPrice)
                 getGasEthValue: walletModel.gasView.getGasEthValue
                 getFiatValue: walletModel.balanceView.getFiatValue
@@ -173,8 +173,7 @@ ModalPopup {
             }
             GasValidator {
                 id: gasValidator
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 8
+                anchors.top: gasSelector.bottom
                 selectedAccount: selectFromAccount.selectedAccount
                 selectedAmount: parseFloat(root.selectedAmount)
                 selectedAsset: root.selectedAsset
diff --git a/ui/app/AppLayouts/Wallet/SendModal.qml b/ui/app/AppLayouts/Wallet/SendModal.qml
index 6a4647cd00..258181f136 100644
--- a/ui/app/AppLayouts/Wallet/SendModal.qml
+++ b/ui/app/AppLayouts/Wallet/SendModal.qml
@@ -130,7 +130,7 @@ ModalPopup {
             GasSelector {
                 id: gasSelector
                 anchors.top: txtAmount.bottom
-                anchors.topMargin: Style.current.bigPadding * 2
+                anchors.topMargin: Style.current.padding
                 gasPrice: parseFloat(walletModel.gasView.gasPrice)
                 getGasEthValue: walletModel.gasView.getGasEthValue
                 getFiatValue: walletModel.balanceView.getFiatValue
@@ -163,7 +163,6 @@ ModalPopup {
             GasValidator {
                 id: gasValidator
                 anchors.top: gasSelector.bottom
-                anchors.topMargin: 8
                 selectedAccount: selectFromAccount.selectedAccount
                 selectedAmount: parseFloat(txtAmount.selectedAmount)
                 selectedAsset: txtAmount.selectedAsset
diff --git a/ui/shared/status/StatusETHTransactionModal.qml b/ui/shared/status/StatusETHTransactionModal.qml
index e586ea6219..7dd09f602c 100644
--- a/ui/shared/status/StatusETHTransactionModal.qml
+++ b/ui/shared/status/StatusETHTransactionModal.qml
@@ -109,7 +109,7 @@ ModalPopup {
                 id: gasSelector
                 visible: true
                 anchors.top: selectFromAccount.bottom
-                anchors.topMargin: Style.current.bigPadding * 2
+                anchors.topMargin: Style.current.padding
                 gasPrice: parseFloat(walletModel.gasView.gasPrice)
                 getGasEthValue: walletModel.gasView.getGasEthValue
                 getFiatValue: walletModel.balanceView.getFiatValue
@@ -123,8 +123,7 @@ ModalPopup {
             }
             GasValidator {
                 id: gasValidator
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 8
+                anchors.top: gasSelector.bottom
                 selectedAccount: selectFromAccount.selectedAccount
                 selectedAsset: root.asset
                 selectedAmount: 0
diff --git a/ui/shared/status/StatusSNTTransactionModal.qml b/ui/shared/status/StatusSNTTransactionModal.qml
index 2ab4236177..6804340dd3 100644
--- a/ui/shared/status/StatusSNTTransactionModal.qml
+++ b/ui/shared/status/StatusSNTTransactionModal.qml
@@ -114,7 +114,7 @@ ModalPopup {
             GasSelector {
                 id: gasSelector
                 anchors.top: selectFromAccount.bottom
-                anchors.topMargin: Style.current.bigPadding * 2
+                anchors.topMargin: Style.current.padding
                 gasPrice: parseFloat(walletModel.gasView.gasPrice)
                 getGasEthValue: walletModel.gasView.getGasEthValue
                 getFiatValue: walletModel.balanceView.getFiatValue
@@ -129,8 +129,7 @@ ModalPopup {
             }
             GasValidator {
                 id: gasValidator
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 8
+                anchors.top: gasSelector.bottom
                 selectedAccount: selectFromAccount.selectedAccount
                 selectedAsset: root.asset
                 selectedAmount: parseFloat(root.assetPrice)