fix(permissions): Communities: HoldingsDropdown doesn't allow decimal input (Edit Permissions)
If chainName is empty, HoldingsDropdown doesn't initialise decimals for AmountInput Fixes #14942
This commit is contained in:
parent
c9641bb0b9
commit
bcb9d787c8
|
@ -13,6 +13,7 @@ Control {
|
||||||
property string shortName
|
property string shortName
|
||||||
property string amount
|
property string amount
|
||||||
property url iconSource
|
property url iconSource
|
||||||
|
property string decimals
|
||||||
property bool selected: false
|
property bool selected: false
|
||||||
property bool showSubItemsIcon: false
|
property bool showSubItemsIcon: false
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ ColumnLayout {
|
||||||
property alias tokenShortName: item.shortName
|
property alias tokenShortName: item.shortName
|
||||||
property alias tokenAmount: item.amount
|
property alias tokenAmount: item.amount
|
||||||
property alias tokenImage: item.iconSource
|
property alias tokenImage: item.iconSource
|
||||||
|
property alias tokenDecimals: item.decimals
|
||||||
property alias amountText: amountInput.text
|
property alias amountText: amountInput.text
|
||||||
property alias amount: amountInput.amount
|
property alias amount: amountInput.amount
|
||||||
property alias decimals: amountInput.tokenDecimals
|
property alias decimals: amountInput.tokenDecimals
|
||||||
|
@ -131,7 +132,7 @@ ColumnLayout {
|
||||||
maximumAmount: !!networksComboBoxLoader.item
|
maximumAmount: !!networksComboBoxLoader.item
|
||||||
? networksComboBoxLoader.item.currentAmount : "0"
|
? networksComboBoxLoader.item.currentAmount : "0"
|
||||||
tokenDecimals: !!networksComboBoxLoader.item
|
tokenDecimals: !!networksComboBoxLoader.item
|
||||||
? networksComboBoxLoader.item.decimals : 0
|
? networksComboBoxLoader.item.decimals : root.tokenDecimals
|
||||||
multiplierIndex: !!networksComboBoxLoader.item
|
multiplierIndex: !!networksComboBoxLoader.item
|
||||||
? networksComboBoxLoader.item.currentMultiplierIndex : 0
|
? networksComboBoxLoader.item.currentMultiplierIndex : 0
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,13 @@ QtObject {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getTokenDecimalsByKey(model, key) {
|
||||||
|
const item = getTokenByKey(model, key)
|
||||||
|
if (item)
|
||||||
|
return item.decimals ?? 0
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
function getTokenRemainingSupplyByKey(model, key) {
|
function getTokenRemainingSupplyByKey(model, key) {
|
||||||
const item = getTokenByKey(model, key)
|
const item = getTokenByKey(model, key)
|
||||||
|
|
||||||
|
|
|
@ -402,6 +402,7 @@ StatusDropdown {
|
||||||
tokenName: PermissionsHelpers.getTokenNameByKey(root.assetsModel, root.assetKey)
|
tokenName: PermissionsHelpers.getTokenNameByKey(root.assetsModel, root.assetKey)
|
||||||
tokenShortName: PermissionsHelpers.getTokenShortNameByKey(root.assetsModel, root.assetKey)
|
tokenShortName: PermissionsHelpers.getTokenShortNameByKey(root.assetsModel, root.assetKey)
|
||||||
tokenImage: PermissionsHelpers.getTokenIconByKey(root.assetsModel, root.assetKey)
|
tokenImage: PermissionsHelpers.getTokenIconByKey(root.assetsModel, root.assetKey)
|
||||||
|
tokenDecimals: PermissionsHelpers.getTokenDecimalsByKey(root.assetsModel, root.assetKey)
|
||||||
tokenAmount: PermissionsHelpers.getTokenRemainingSupplyByKey(root.assetsModel, root.assetKey)
|
tokenAmount: PermissionsHelpers.getTokenRemainingSupplyByKey(root.assetsModel, root.assetKey)
|
||||||
amountText: d.assetAmountText
|
amountText: d.assetAmountText
|
||||||
tokenCategoryText: qsTr("Asset")
|
tokenCategoryText: qsTr("Asset")
|
||||||
|
@ -477,6 +478,7 @@ StatusDropdown {
|
||||||
tokenShortName: ""
|
tokenShortName: ""
|
||||||
tokenImage: PermissionsHelpers.getTokenIconByKey(root.collectiblesModel, root.collectibleKey)
|
tokenImage: PermissionsHelpers.getTokenIconByKey(root.collectiblesModel, root.collectibleKey)
|
||||||
tokenAmount: PermissionsHelpers.getTokenRemainingSupplyByKey(root.collectiblesModel, root.collectibleKey)
|
tokenAmount: PermissionsHelpers.getTokenRemainingSupplyByKey(root.collectiblesModel, root.collectibleKey)
|
||||||
|
tokenDecimals: PermissionsHelpers.getTokenDecimalsByKey(root.collectiblesModel, root.assetKey)
|
||||||
amountText: d.collectibleAmountText
|
amountText: d.collectibleAmountText
|
||||||
tokenCategoryText: qsTr("Collectible")
|
tokenCategoryText: qsTr("Collectible")
|
||||||
addOrUpdateButtonEnabled: d.collectiblesReady
|
addOrUpdateButtonEnabled: d.collectiblesReady
|
||||||
|
|
Loading…
Reference in New Issue