status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/wallet): gas error position

This commit is contained in:
¨Anthony 2021-09-27 12:59:50 +02:00 committed by Iuri Matias
parent 5b63bc14bc
commit e0c5e9b9b0
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml
View File

@ -134,7 +134,7 @@ ModalPopup {
} }
GasSelector { GasSelector {
id: gasSelector id: gasSelector
anchors.topMargin: Style.current.bigPadding anchors.topMargin: Style.current.padding
gasPrice: parseFloat(walletModel.gasView.gasPrice) gasPrice: parseFloat(walletModel.gasView.gasPrice)
getGasEthValue: walletModel.gasView.getGasEthValue getGasEthValue: walletModel.gasView.getGasEthValue
getFiatValue: walletModel.balanceView.getFiatValue getFiatValue: walletModel.balanceView.getFiatValue
@ -173,8 +173,7 @@ ModalPopup {
} }
GasValidator { GasValidator {
id: gasValidator id: gasValidator
anchors.bottom: parent.bottom anchors.top: gasSelector.bottom
anchors.bottomMargin: 8
selectedAccount: selectFromAccount.selectedAccount selectedAccount: selectFromAccount.selectedAccount
selectedAmount: parseFloat(root.selectedAmount) selectedAmount: parseFloat(root.selectedAmount)
selectedAsset: root.selectedAsset selectedAsset: root.selectedAsset

3
ui/app/AppLayouts/Wallet/SendModal.qml
View File

@ -130,7 +130,7 @@ ModalPopup {
GasSelector { GasSelector {
id: gasSelector id: gasSelector
anchors.top: txtAmount.bottom anchors.top: txtAmount.bottom
anchors.topMargin: Style.current.bigPadding * 2 anchors.topMargin: Style.current.padding
gasPrice: parseFloat(walletModel.gasView.gasPrice) gasPrice: parseFloat(walletModel.gasView.gasPrice)
getGasEthValue: walletModel.gasView.getGasEthValue getGasEthValue: walletModel.gasView.getGasEthValue
getFiatValue: walletModel.balanceView.getFiatValue getFiatValue: walletModel.balanceView.getFiatValue
@ -163,7 +163,6 @@ ModalPopup {
GasValidator { GasValidator {
id: gasValidator id: gasValidator
anchors.top: gasSelector.bottom anchors.top: gasSelector.bottom
anchors.topMargin: 8
selectedAccount: selectFromAccount.selectedAccount selectedAccount: selectFromAccount.selectedAccount
selectedAmount: parseFloat(txtAmount.selectedAmount) selectedAmount: parseFloat(txtAmount.selectedAmount)
selectedAsset: txtAmount.selectedAsset selectedAsset: txtAmount.selectedAsset

5
ui/shared/status/StatusETHTransactionModal.qml
View File

@ -109,7 +109,7 @@ ModalPopup {
id: gasSelector id: gasSelector
visible: true visible: true
anchors.top: selectFromAccount.bottom anchors.top: selectFromAccount.bottom
anchors.topMargin: Style.current.bigPadding * 2 anchors.topMargin: Style.current.padding
gasPrice: parseFloat(walletModel.gasView.gasPrice) gasPrice: parseFloat(walletModel.gasView.gasPrice)
getGasEthValue: walletModel.gasView.getGasEthValue getGasEthValue: walletModel.gasView.getGasEthValue
getFiatValue: walletModel.balanceView.getFiatValue getFiatValue: walletModel.balanceView.getFiatValue
@ -123,8 +123,7 @@ ModalPopup {
} }
GasValidator { GasValidator {
id: gasValidator id: gasValidator
anchors.bottom: parent.bottom anchors.top: gasSelector.bottom
anchors.bottomMargin: 8
selectedAccount: selectFromAccount.selectedAccount selectedAccount: selectFromAccount.selectedAccount
selectedAsset: root.asset selectedAsset: root.asset
selectedAmount: 0 selectedAmount: 0

5
ui/shared/status/StatusSNTTransactionModal.qml
View File

@ -114,7 +114,7 @@ ModalPopup {
GasSelector { GasSelector {
id: gasSelector id: gasSelector
anchors.top: selectFromAccount.bottom anchors.top: selectFromAccount.bottom
anchors.topMargin: Style.current.bigPadding * 2 anchors.topMargin: Style.current.padding
gasPrice: parseFloat(walletModel.gasView.gasPrice) gasPrice: parseFloat(walletModel.gasView.gasPrice)
getGasEthValue: walletModel.gasView.getGasEthValue getGasEthValue: walletModel.gasView.getGasEthValue
getFiatValue: walletModel.balanceView.getFiatValue getFiatValue: walletModel.balanceView.getFiatValue
@ -129,8 +129,7 @@ ModalPopup {
} }
GasValidator { GasValidator {
id: gasValidator id: gasValidator
anchors.bottom: parent.bottom anchors.top: gasSelector.bottom
anchors.bottomMargin: 8
selectedAccount: selectFromAccount.selectedAccount selectedAccount: selectFromAccount.selectedAccount
selectedAsset: root.asset selectedAsset: root.asset
selectedAmount: parseFloat(root.assetPrice) selectedAmount: parseFloat(root.assetPrice)