diff --git a/ui/imports/shared/popups/send/SendModal.qml b/ui/imports/shared/popups/send/SendModal.qml index f798d5b738..fa4f094d93 100644 --- a/ui/imports/shared/popups/send/SendModal.qml +++ b/ui/imports/shared/popups/send/SendModal.qml @@ -81,8 +81,7 @@ StatusDialog { readonly property double maxCryptoBalance: isSelectedHoldingValidAsset ? selectedHolding.currentBalance : 0 readonly property double maxInputBalance: amountToSendInput.inputIsFiat ? maxFiatBalance : maxCryptoBalance readonly property string inputSymbol: amountToSendInput.inputIsFiat ? currencyStore.currentCurrency : !!d.selectedHolding && !!d.selectedHolding.symbol ? d.selectedHolding.symbol: "" - readonly property bool errorMode: popup.isLoading || !recipientLoader.ready ? false : errorType !== Constants.NoError || networkSelector.errorMode - || !(amountToSendInput.inputNumberValid || d.isCollectiblesTransfer) + readonly property bool errorMode: popup.isLoading || !recipientLoader.ready ? false : errorType !== Constants.NoError || networkSelector.errorMode || !(amountToSendInput.inputNumberValid || d.isCollectiblesTransfer) readonly property string uuid: Utils.uuid() property bool isPendingTx: false property string totalTimeEstimate diff --git a/ui/imports/shared/popups/send/controls/CollectibleBackButtonWithInfo.qml b/ui/imports/shared/popups/send/controls/CollectibleBackButtonWithInfo.qml index 6cb69bf922..db0cd20f20 100644 --- a/ui/imports/shared/popups/send/controls/CollectibleBackButtonWithInfo.qml +++ b/ui/imports/shared/popups/send/controls/CollectibleBackButtonWithInfo.qml @@ -45,6 +45,7 @@ Rectangle { Layout.alignment: Qt.AlignVCenter | Qt.AlignRight verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignRight + elide: Text.ElideRight text: "%1 %2".arg(count).arg(name) font.pixelSize: 13 lineHeight: 18 diff --git a/ui/imports/shared/popups/send/views/AmountToSend.qml b/ui/imports/shared/popups/send/views/AmountToSend.qml index 606458f888..070fdc220e 100644 --- a/ui/imports/shared/popups/send/views/AmountToSend.qml +++ b/ui/imports/shared/popups/send/views/AmountToSend.qml @@ -3,6 +3,7 @@ import QtQuick.Layouts 1.15 import StatusQ.Core 0.1 import StatusQ.Core.Theme 0.1 +import StatusQ.Controls 0.1 import StatusQ.Core.Utils 0.1 as SQUtils import StatusQ.Controls.Validators 0.1 @@ -137,6 +138,7 @@ ColumnLayout { input.edit.color: input.valid ? Theme.palette.directColor1 : Theme.palette.dangerColor1 input.edit.readOnly: !root.interactive + validationMode: StatusInput.ValidationMode.OnlyWhenDirty validators: [ StatusFloatValidator {