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: TokenSelector doesn't show list of all known assets 

- concat the assets model with the list of plain tokens model
- adjust the delegates and tests

Fixes #15278
This commit is contained in:
Lukáš Tinkl 2024-06-25 15:37:42 +02:00 committed by Lukáš Tinkl
parent 55e88be4f1
commit 273858bc81
18 changed files with 397 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
storybook/pages/SwapInputPanelPage.qml
View File

@ -26,6 +26,31 @@ SplitView {
Logs { id: logs }
ListModel {
id: plainTokensModel
ListElement {
key: "aave"
name: "Aave"
symbol: "AAVE"
image: "https://cryptologos.cc/logos/aave-aave-logo.png"
communityId: ""
}
ListElement {
key: "usdc"
name: "USDC"
symbol: "USDC"
image: ""
communityId: ""
}
ListElement {
key: "hst"
name: "Decision Token"
symbol: "HST"
image: "https://etherscan.io/token/images/horizonstate2_28.png"
communityId: ""
}
}
QtObject {
id: d
@ -80,6 +105,7 @@ SplitView {
currencyStore: d.adaptor.currencyStore
flatNetworksModel: d.adaptor.swapStore.flatNetworks
processedAssetsModel: d.adaptor.walletAssetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: plainTokensModel
selectedNetworkChainId: d.swapInputParamsForm.selectedNetworkChainId
selectedAccountAddress: d.swapInputParamsForm.selectedAccountAddress
@ -106,6 +132,7 @@ SplitView {
currencyStore: d.adaptor.currencyStore
flatNetworksModel: d.adaptor.swapStore.flatNetworks
processedAssetsModel: d.adaptor.walletAssetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: plainTokensModel
selectedNetworkChainId: d.swapInputParamsForm.selectedNetworkChainId
selectedAccountAddress: d.swapInputParamsForm.selectedAccountAddress
@ -201,7 +228,6 @@ SplitView {
TextField {
Layout.fillWidth: true
id: ctrlToTokenKey
text: "STT"
}
}
RowLayout {

89
storybook/pages/SwapModalPage.qml
View File

@ -25,13 +25,8 @@ SplitView {
QtObject {
id: d
readonly property var accountsModel: WalletAccountsModel {}
readonly property var tokenBySymbolModel: TokensBySymbolModel {}
readonly property var flatNetworksModel: NetworksModel.flatNetworks
readonly property var filteredNetworksModel: SortFilterProxyModel {
sourceModel: d.flatNetworksModel
filters: ValueFilter { roleName: "isTest"; value: areTestNetworksEnabledCheckbox.checked }
}
function launchPopup() {
swapModal.createObject(root)
}
@ -59,8 +54,8 @@ SplitView {
SwapStore {
id: dSwapStore
signal suggestedRoutesReady(var txRoutes)
readonly property var accounts: d.accountsModel
readonly property var flatNetworks: d.flatNetworksModel
readonly property var accounts: WalletAccountsModel {}
readonly property var flatNetworks: NetworksModel.flatNetworks
readonly property bool areTestNetworksEnabled: areTestNetworksEnabledCheckbox.checked
function fetchSuggestedRoutes(accountFrom, accountTo, amount, tokenFrom, tokenTo,
@ -83,10 +78,30 @@ SplitView {
TokensStore {
id: tokensStore
readonly property var plainTokensBySymbolModel: TokensBySymbolModel {}
plainTokensBySymbolModel: TokensBySymbolModel {}
getDisplayAssetsBelowBalanceThresholdDisplayAmount: () => 0
}
SwapModalAdaptor {
id: adaptor
swapStore: dSwapStore
walletAssetsStore: WalletAssetsStore {
id: thisWalletAssetStore
walletTokensStore: tokensStore
readonly property var baseGroupedAccountAssetModel: GroupedAccountsAssetsModel {}
assetsWithFilteredBalances: thisWalletAssetStore.groupedAccountsAssetsModel
}
currencyStore: CurrenciesStore {}
swapFormData: SwapInputParamsForm {
defaultToTokenKey: "STT"
onSelectedAccountAddressChanged: {
if (selectedAccountAddress !== accountComboBox.currentValue)
accountComboBox.currentIndex = accountComboBox.indexOfValue(selectedAccountAddress)
}
}
swapOutputData: SwapOutputData{}
}
Component {
id: swapModal
SwapModal {
@ -95,24 +110,36 @@ SplitView {
modal: false
closePolicy: Popup.CloseOnEscape
destroyOnClose: true
swapInputParamsForm: SwapInputParamsForm {
defaultToTokenKey: "STT"
onSelectedAccountAddressChanged: {
if (selectedAccountAddress !== accountComboBox.currentValue)
accountComboBox.currentIndex = accountComboBox.indexOfValue(selectedAccountAddress)
swapInputParamsForm: adaptor.swapFormData
swapAdaptor: adaptor
plainTokensBySymbolModel: ListModel {
ListElement {
key: "aave"
name: "Aave"
symbol: "AAVE"
image: "https://cryptologos.cc/logos/aave-aave-logo.png"
communityId: ""
decimals: 18
marketDetails: []
}
}
swapAdaptor: SwapModalAdaptor {
swapStore: dSwapStore
walletAssetsStore: WalletAssetsStore {
id: thisWalletAssetStore
walletTokensStore: tokensStore
readonly property var baseGroupedAccountAssetModel: GroupedAccountsAssetsModel {}
assetsWithFilteredBalances: thisWalletAssetStore.groupedAccountsAssetsModel
ListElement {
key: "usdc"
name: "USDC"
symbol: "USDC"
image: ""
communityId: ""
decimals: 18
marketDetails: []
}
ListElement {
key: "hst"
name: "Decision Token"
symbol: "HST"
image: ""
communityId: ""
decimals: 18
marketDetails: []
}
currencyStore: CurrenciesStore {}
swapFormData: modal.swapInputParamsForm
swapOutputData: SwapOutputData{}
}
Binding {
target: swapInputParamsForm
@ -166,15 +193,7 @@ SplitView {
id: accountComboBox
textRole: "name"
valueRole: "address"
model: SortFilterProxyModel {
sourceModel: d.accountsModel
filters: ValueFilter {
roleName: "walletType"
value: Constants.watchWalletType
inverted: true
}
sorters: RoleSorter { roleName: "position"; sortOrder: Qt.AscendingOrder }
}
model: adaptor.nonWatchAccounts
currentIndex: 0
}
@ -185,7 +204,7 @@ SplitView {
id: networksComboBox
textRole: "chainName"
valueRole: "chainId"
model: d.filteredNetworksModel
model: adaptor.filteredFlatNetworksModel
currentIndex: 0
onCountChanged: currentIndex = 0
}

5
storybook/pages/TokenSelectorAssetDelegatePage.qml
View File

@ -12,10 +12,10 @@ import StatusQ.Core.Utils 0.1
import Storybook 1.0
import Models 1.0
import SortFilterProxyModel 0.2
import AppLayouts.Wallet.views 1.0
import utils 1.0
SplitView {
id: root
orientation: Qt.Vertical
@ -46,6 +46,7 @@ SplitView {
name: "Ethereum"
symbol: "ETH"
currencyBalanceAsString: "14,456.42 USD"
iconSource: Constants.tokenIcon(symbol)
balancesModel: ListModel {
readonly property var data: [
{ chainId: 1, balanceAsString: "1234.50", iconUrl: "network/Network=Ethereum" },

40
storybook/pages/TokenSelectorPage.qml
View File

@ -23,6 +23,31 @@ SplitView {
Logs { id: logs }
ListModel {
id: plainTokensModel
ListElement {
key: "aave"
name: "Aave"
symbol: "AAVE"
image: "https://cryptologos.cc/logos/aave-aave-logo.png"
communityId: ""
}
ListElement {
key: "usdc"
name: "USDC"
symbol: "USDC"
image: ""
communityId: ""
}
ListElement {
key: "hst"
name: "Decision Token"
symbol: "HST"
image: "https://etherscan.io/token/images/horizonstate2_28.png"
communityId: ""
}
}
QtObject {
id: d
@ -41,9 +66,11 @@ SplitView {
readonly property var adaptor: TokenSelectorViewAdaptor {
assetsModel: d.assetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: plainTokensModel
flatNetworksModel: d.flatNetworks
currentCurrency: d.currencyStore.currentCurrency
showAllTokens: ctrlShowAllTokens.checked
enabledChainIds: ctrlNetwork.currentValue ? [ctrlNetwork.currentValue] : []
accountAddress: ctrlAccount.currentValue ?? ""
showCommunityAssets: ctrlShowCommunityAssets.checked
@ -75,8 +102,8 @@ SplitView {
}
LogsAndControlsPanel {
SplitView.minimumHeight: 320
SplitView.preferredHeight: 320
SplitView.minimumHeight: 340
SplitView.preferredHeight: 340
logsView.logText: logs.logText
@ -111,6 +138,15 @@ SplitView {
}
}
Switch {
id: ctrlShowAllTokens
text: "Show all tokens"
onToggled: {
// NB: ComboBox doesn't like changing models at runtime
tokenSelector.model = null
tokenSelector.model = d.adaptor.outputAssetsModel
}
}
Switch {
id: ctrlShowCommunityAssets
text: "Show community assets"

38
storybook/pages/TokenSelectorViewPage.qml
View File

@ -27,6 +27,31 @@ SplitView {
Logs { id: logs }
ListModel {
id: plainTokensModel
ListElement {
key: "aave"
name: "Aave"
symbol: "AAVE"
image: "https://cryptologos.cc/logos/aave-aave-logo.png"
communityId: ""
}
ListElement {
key: "usdc"
name: "USDC"
symbol: "USDC"
image: ""
communityId: ""
}
ListElement {
key: "hst"
name: "Decision Token"
symbol: "HST"
image: "https://etherscan.io/token/images/horizonstate2_28.png"
communityId: ""
}
}
QtObject {
id: d
@ -69,10 +94,12 @@ SplitView {
readonly property var adaptor: TokenSelectorViewAdaptor {
assetsModel: d.assetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: plainTokensModel
flatNetworksModel: d.flatNetworks
enabledChainIds: d.enabledChainIds
currentCurrency: d.currencyStore.currentCurrency
showAllTokens: ctrlShowAllTokens.checked
accountAddress: ctrlAccount.currentValue ?? ""
showCommunityAssets: ctrlShowCommunityAssets.checked
searchString: ctrlSearch.text
@ -99,6 +126,7 @@ SplitView {
// tokensKey, name, symbol, decimals, currentCurrencyBalance (computed), marketDetails, balances -> [ chainId, address, balance, iconUrl ]
TokenSelectorView {
id: tokenSelector
anchors.fill: parent
model: d.adaptor.outputAssetsModel
@ -172,6 +200,16 @@ SplitView {
placeholderText: "Token name or symbol"
}
}
Switch {
id: ctrlShowAllTokens
text: "Show all tokens"
checked: true
onToggled: {
// NB: ListView doesn't like changing models at runtime
tokenSelector.model = null
tokenSelector.model = d.adaptor.outputAssetsModel
}
}
Switch {
id: ctrlShowCommunityAssets
text: "Show community assets"

13
storybook/qmlTests/tests/tst_SwapInputPanel.qml
View File

@ -21,6 +21,17 @@ Item {
width: 600
height: 400
ListModel {
id: plainTokensModel
ListElement {
key: "aave"
name: "Aave"
symbol: "AAVE"
image: "https://cryptologos.cc/logos/aave-aave-logo.png"
communityId: ""
}
}
QtObject {
id: d
@ -47,6 +58,7 @@ Item {
readonly property var tokenSelectorAdaptor: TokenSelectorViewAdaptor {
assetsModel: d.adaptor.walletAssetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: plainTokensModel
flatNetworksModel: d.adaptor.swapStore.flatNetworks
currentCurrency: d.adaptor.currencyStore.currentCurrency
@ -62,6 +74,7 @@ Item {
currencyStore: d.adaptor.currencyStore
flatNetworksModel: d.adaptor.swapStore.flatNetworks
processedAssetsModel: d.adaptor.walletAssetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: plainTokensModel
}
}

55
storybook/qmlTests/tests/tst_SwapModal.qml
View File

@ -222,12 +222,8 @@ Item {
for(let i =0; i< comboBoxList.model.count; i++) {
let delegateUnderTest = comboBoxList.itemAtIndex(i)
// check if the items are organized as per the position role
if(!!delegateUnderTest && !!comboBoxList.itemAtIndex(i+1)) {
verify(comboBoxList.itemAtIndex(i+1).model.position > delegateUnderTest.model.position)
}
compare(delegateUnderTest.title, swapAdaptor.nonWatchAccounts.get(i).name)
compare(delegateUnderTest.subTitle, SQUtils.Utils.elideText(swapAdaptor.nonWatchAccounts.get(i).address, 6, 4))
compare(delegateUnderTest.subTitle, SQUtils.Utils.elideAndFormatWalletAddress(swapAdaptor.nonWatchAccounts.get(i).address))
compare(delegateUnderTest.asset.color.toString().toUpperCase(), swapAdaptor.nonWatchAccounts.get(i).color.toString().toUpperCase())
compare(delegateUnderTest.asset.emoji, swapAdaptor.nonWatchAccounts.get(i).emoji)
@ -298,12 +294,15 @@ Item {
const inlineTagDelegate_0 = findChild(delegateUnderTest, "inlineTagDelegate_0")
verify(!!inlineTagDelegate_0)
const balance = delegateUnderTest.model.accountBalance.balance
compare(inlineTagDelegate_0.asset.name, Style.svg("tiny/%1".arg(delegateUnderTest.model.accountBalance.iconUrl)))
compare(inlineTagDelegate_0.asset.color.toString().toUpperCase(), delegateUnderTest.model.accountBalance.chainColor.toString().toUpperCase())
compare(inlineTagDelegate_0.titleText.color, delegateUnderTest.model.accountBalance.balance === "0" ? Theme.palette.baseColor1 : Theme.palette.directColor1)
compare(inlineTagDelegate_0.titleText.color, balance === "0" ? Theme.palette.baseColor1 : Theme.palette.directColor1)
let bigIntBalance = SQUtils.AmountsArithmetic.toNumber(delegateUnderTest.model.accountBalance.balance, delegateUnderTest.model.fromToken.decimals)
compare(inlineTagDelegate_0.title, root.swapAdaptor.formatCurrencyAmount(bigIntBalance, delegateUnderTest.model.fromToken.symbol))
let bigIntBalance = SQUtils.AmountsArithmetic.toNumber(balance, delegateUnderTest.model.fromToken.decimals)
compare(inlineTagDelegate_0.title, balance === "0" ? "0 %1".arg(delegateUnderTest.model.fromToken.symbol)
: root.swapAdaptor.formatCurrencyAmount(bigIntBalance, delegateUnderTest.model.fromToken.symbol))
}
closeAndVerfyModal()
@ -445,7 +444,8 @@ Item {
let fromToken = SQUtils.ModelUtils.getByKey(root.swapAdaptor.walletAssetsStore.walletTokensStore.plainTokensBySymbolModel, "key", root.swapFormData.fromTokensKey)
verify(!!fromToken)
let bigIntBalance = SQUtils.AmountsArithmetic.toNumber(accountBalance.balance, fromToken.decimals)
compare(inlineTagDelegate_0.title, root.swapAdaptor.formatCurrencyAmount(bigIntBalance, fromToken.symbol))
compare(inlineTagDelegate_0.title, bigIntBalance === 0 ? "0 %1".arg(fromToken.symbol)
: root.swapAdaptor.formatCurrencyAmount(bigIntBalance, fromToken.symbol))
}
// close account selection dropdown
accountsModalHeader.control.popup.close()
@ -513,6 +513,7 @@ Item {
}
function test_modal_swap_proposal_setup() {
skip("Flaky test relying on wait()")
root.swapAdaptor.reset()
// Launch popup
@ -740,6 +741,7 @@ Item {
const payPanel = findChild(controlUnderTest, "payPanel")
verify(!!payPanel)
waitForRendering(payPanel)
const amountToSendInput = findChild(payPanel, "amountToSendInput")
verify(!!amountToSendInput)
const bottomItemText = findChild(payPanel, "bottomItemText")
@ -760,15 +762,16 @@ Item {
tryCompare(amountToSendInput.input.input.edit, "cursorVisible", true)
tryCompare(bottomItemText, "text", root.swapAdaptor.currencyStore.formatCurrencyAmount(valueToExchange * expectedToken.marketDetails.currencyPrice.amount, root.swapAdaptor.currencyStore.currentCurrency))
compare(holdingSelector.currentTokensKey, expectedToken.tokensKey)
compare(tokenSelectorContentItemText.text, expectedToken.symbol)
tryCompare(tokenSelectorContentItemText, "text", expectedToken.symbol)
compare(tokenSelectorIcon.image.source, Constants.tokenIcon(expectedToken.symbol))
verify(tokenSelectorIcon.visible)
verify(maxTagButton.visible)
compare(maxTagButton.text, qsTr("Max. %1").arg(root.swapAdaptor.currencyStore.formatCurrencyAmount(WalletUtils.calculateMaxSafeSendAmount(expectedToken.currentBalance, expectedToken.symbol), expectedToken.symbol, {noSymbol: true})))
compare(maxTagButton.text, qsTr("Max. %1").arg(expectedToken.currentBalance === 0 ? "0"
: root.swapAdaptor.currencyStore.formatCurrencyAmount(WalletUtils.calculateMaxSafeSendAmount(expectedToken.currentBalance, expectedToken.symbol), expectedToken.symbol, {noSymbol: true})))
compare(payPanel.selectedHoldingId, expectedToken.symbol)
compare(payPanel.value, valueToExchange)
compare(payPanel.rawValue, SQUtils.AmountsArithmetic.fromNumber(valueToExchangeString, expectedToken.decimals).toString())
verify(payPanel.valueValid)
tryCompare(payPanel, "valueValid", expectedToken.currentBalance > 0)
closeAndVerfyModal()
}
@ -836,6 +839,7 @@ Item {
const payPanel = findChild(controlUnderTest, "payPanel")
verify(!!payPanel)
waitForRendering(payPanel)
const amountToSendInput = findChild(payPanel, "amountToSendInput")
verify(!!amountToSendInput)
const bottomItemText = findChild(payPanel, "bottomItemText")
@ -853,14 +857,15 @@ Item {
verify(amountToSendInput.interactive)
compare(amountToSendInput.input.text, valueToExchangeString)
compare(amountToSendInput.input.placeholderText, LocaleUtils.numberToLocaleString(0))
verify(amountToSendInput.input.input.edit.cursorVisible)
tryCompare(amountToSendInput.input.input.edit, "cursorVisible", true)
tryCompare(bottomItemText, "text", root.swapAdaptor.currencyStore.formatCurrencyAmount(valueToExchange * expectedToken.marketDetails.currencyPrice.amount, root.swapAdaptor.currencyStore.currentCurrency))
compare(holdingSelector.currentTokensKey, expectedToken.tokensKey)
compare(tokenSelectorContentItemText.text, expectedToken.symbol)
compare(tokenSelectorIcon.image.source, Constants.tokenIcon(expectedToken.symbol))
verify(tokenSelectorIcon.visible)
verify(maxTagButton.visible)
compare(maxTagButton.text, qsTr("Max. %1").arg(root.swapAdaptor.currencyStore.formatCurrencyAmount(WalletUtils.calculateMaxSafeSendAmount(expectedToken.currentBalance, expectedToken.symbol), expectedToken.symbol, {noSymbol: true})))
compare(maxTagButton.text, qsTr("Max. %1").arg(expectedToken.currentBalance === 0 ? "0"
: root.swapAdaptor.currencyStore.formatCurrencyAmount(WalletUtils.calculateMaxSafeSendAmount(expectedToken.currentBalance, expectedToken.symbol), expectedToken.symbol, {noSymbol: true})))
compare(payPanel.selectedHoldingId, expectedToken.symbol)
compare(payPanel.value, valueToExchange)
compare(payPanel.rawValue, SQUtils.AmountsArithmetic.fromNumber(valueToExchangeString, expectedToken.decimals).toString())
@ -893,7 +898,8 @@ Item {
// check states for the pay input selector
verify(maxTagButton.visible)
let maxPossibleValue = WalletUtils.calculateMaxSafeSendAmount(expectedToken.currentBalance, expectedToken.symbol)
compare(maxTagButton.text, qsTr("Max. %1").arg(root.swapAdaptor.currencyStore.formatCurrencyAmount(maxPossibleValue, expectedToken.symbol, {noSymbol: true})))
compare(maxTagButton.text, qsTr("Max. %1").arg(maxPossibleValue === 0 ? "0"
: root.swapAdaptor.currencyStore.formatCurrencyAmount(maxPossibleValue, expectedToken.symbol, {noSymbol: true})))
compare(payPanel.selectedHoldingId, expectedToken.symbol)
compare(payPanel.valueValid, valueToExchange <= maxPossibleValue)
compare(payPanel.value, valueToExchange)
@ -957,6 +963,7 @@ Item {
const receivePanel = findChild(controlUnderTest, "receivePanel")
verify(!!receivePanel)
waitForRendering(receivePanel)
const amountToSendInput = findChild(receivePanel, "amountToSendInput")
verify(!!amountToSendInput)
const bottomItemText = findChild(receivePanel, "bottomItemText")
@ -1000,7 +1007,7 @@ Item {
root.swapFormData.fromTokenAmount = valueToExchangeString
root.swapFormData.toTokenKey = "STT"
compare(formValuesChanged.count, 4)
compare(formValuesChanged.count, 3)
// Launch popup
launchAndVerfyModal()
@ -1076,7 +1083,8 @@ Item {
// check states for the pay input selector
verify(maxTagButton.visible)
let maxPossibleValue = WalletUtils.calculateMaxSafeSendAmount(expectedToken.currentBalance, expectedToken.symbol)
compare(maxTagButton.text, qsTr("Max. %1").arg(root.swapAdaptor.currencyStore.formatCurrencyAmount(maxPossibleValue, expectedToken.symbol, {noSymbol: true})))
compare(maxTagButton.text, qsTr("Max. %1").arg(maxPossibleValue === 0 ? "0"
: root.swapAdaptor.currencyStore.formatCurrencyAmount(maxPossibleValue, expectedToken.symbol, {noSymbol: true})))
verify(amountToSendInput.interactive)
verify(amountToSendInput.input.input.edit.cursorVisible)
compare(amountToSendInput.input.text, "")
@ -1087,17 +1095,18 @@ Item {
maxTagButton.clicked()
waitForItemPolished(payPanel)
tryCompare(formValuesChanged, "count", 4)
tryCompare(formValuesChanged, "count", 3)
verify(amountToSendInput.interactive)
verify(amountToSendInput.input.input.edit.cursorVisible)
compare(amountToSendInput.input.text, maxPossibleValue.toLocaleString(Qt.locale(), 'f', -128))
compare(amountToSendInput.input.text, maxPossibleValue > 0 ? maxPossibleValue.toLocaleString(Qt.locale(), 'f', -128) : "")
tryCompare(bottomItemText, "text", root.swapAdaptor.currencyStore.formatCurrencyAmount(maxPossibleValue * expectedToken.marketDetails.currencyPrice.amount, root.swapAdaptor.currencyStore.currentCurrency))
closeAndVerfyModal()
}
function test_modal_pay_input_switching_accounts() {
skip("flaky test")
// test with pay value being set and not set
let payValuesToTestWith = ["", "0.2"]
@ -1127,14 +1136,14 @@ Item {
for (let i=0; i< root.swapAdaptor.nonWatchAccounts.count; i++) {
root.swapFormData.selectedAccountAddress = root.swapAdaptor.nonWatchAccounts.get(i).address
let expectedToken = SQUtils.ModelUtils.getByKey(root.tokenSelectorAdaptor.outputAssetsModel, "tokensKey", "ETH")
waitForItemPolished(controlUnderTest.contentItem)
let expectedToken = SQUtils.ModelUtils.getByKey(root.tokenSelectorAdaptor.outputAssetsModel, "tokensKey", "ETH")
// check states for the pay input selector
verify(maxTagButton.visible)
tryCompare(maxTagButton, "visible", true)
let maxPossibleValue = WalletUtils.calculateMaxSafeSendAmount(expectedToken.currentBalance, expectedToken.symbol)
compare(maxTagButton.text, qsTr("Max. %1").arg(maxPossibleValue === 0 ? Qt.locale().zeroDigit : root.swapAdaptor.currencyStore.formatCurrencyAmount(maxPossibleValue, expectedToken.symbol, {noSymbol: true, minDecimals: 0})))
tryCompare(maxTagButton, "text", qsTr("Max. %1").arg(maxPossibleValue === 0 ? Qt.locale().zeroDigit : root.swapAdaptor.currencyStore.formatCurrencyAmount(maxPossibleValue, expectedToken.symbol, {noSymbol: true})))
compare(payPanel.selectedHoldingId, expectedToken.symbol)
tryCompare(payPanel, "valueValid", !!valueToExchangeString && valueToExchange <= maxPossibleValue)

38
storybook/qmlTests/tests/tst_TokenSelector.qml
View File

@ -13,6 +13,17 @@ Item {
width: 600
height: 400
ListModel {
id: plainTokensModel
ListElement {
key: "aave"
name: "Aave"
symbol: "AAVE"
image: "https://cryptologos.cc/logos/aave-aave-logo.png"
communityId: ""
}
}
QtObject {
id: d
@ -28,6 +39,7 @@ Item {
readonly property var adaptor: TokenSelectorViewAdaptor {
assetsModel: d.assetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: plainTokensModel
flatNetworksModel: d.flatNetworks
currentCurrency: "USD"
@ -217,5 +229,31 @@ Item {
tryCompare(ethDelegate, "tokensKey", "ETH")
compare(ethDelegate.ListView.section, "Popular assets")
}
function test_plainTokenDelegate() {
verify(!!controlUnderTest)
d.adaptor.showAllTokens = true
const tokensKey = "aave"
mouseClick(controlUnderTest)
waitForItemPolished(controlUnderTest)
const listview = findChild(controlUnderTest.popup.contentItem, "tokenSelectorListview")
verify(!!listview)
waitForItemPolished(listview)
const delegate = findChild(listview, "tokenSelectorAssetDelegate_%1".arg(tokensKey))
verify(!!delegate)
tryCompare(delegate, "tokensKey", tokensKey)
tryCompare(delegate, "currencyBalanceAsString", "")
// click the delegate, verify the signal has been fired and has the correct "tokensKey" as argument
mouseClick(delegate)
tryCompare(signalSpy, "count", 1)
compare(signalSpy.signalArguments[0][0], tokensKey)
compare(controlUnderTest.currentTokensKey, tokensKey)
d.adaptor.showAllTokens = false
}
}
}

1
storybook/qmlTests/tests/tst_TokenSelectorView.qml
View File

@ -36,7 +36,6 @@ Item {
id: componentUnderTest
TokenSelectorView {
anchors.fill: parent
model: d.adaptor.outputAssetsModel
}
}

26
storybook/qmlTests/tests/tst_TokenSelectorViewAdaptor.qml
View File

@ -13,6 +13,17 @@ Item {
width: 600
height: 400
ListModel {
id: plainTokensModel
ListElement {
key: "aave"
name: "Aave"
symbol: "AAVE"
image: "https://cryptologos.cc/logos/aave-aave-logo.png"
communityId: ""
}
}
QtObject {
id: d
@ -33,6 +44,7 @@ Item {
assetsModel: d.assetsStore.groupedAccountAssetsModel
flatNetworksModel: d.flatNetworks
currentCurrency: "USD"
plainTokensBySymbolModel: plainTokensModel
}
}
@ -75,6 +87,20 @@ Item {
tryCompare(controlUnderTest.outputAssetsModel, "count", originalCount)
}
function test_allTokens() {
verify(!!controlUnderTest)
const originalCount = controlUnderTest.outputAssetsModel.count
// turn on showing all tokens, verify we now have more items
controlUnderTest.showAllTokens = true
tryVerify(() => controlUnderTest.outputAssetsModel.count > originalCount)
// turning them back off, verify we are back to the original number of items
controlUnderTest.showAllTokens = false
tryCompare(controlUnderTest.outputAssetsModel, "count", originalCount)
}
function test_enabledChainIds() {
verify(!!controlUnderTest)

10
storybook/src/Models/WalletAccountsModel.qml
View File

@ -44,7 +44,7 @@ ListModel {
preferredSharingChainIds: "5:420:421613",
currencyBalance: ({amount: 1.25,
symbol: "USD",
displayDecimals: 4,
displayDecimals: 2,
stripTrailingZeroes: false}),
migratedToKeycard: true
},
@ -70,7 +70,7 @@ ListModel {
preferredSharingChainIds: "5:420:421613",
currencyBalance: ({amount: 10,
symbol: "USD",
displayDecimals: 4,
displayDecimals: 2,
stripTrailingZeroes: false}),
migratedToKeycard: false
},
@ -105,7 +105,7 @@ ListModel {
preferredSharingChainIds: "5:420:421613",
currencyBalance: ({amount: 110.05,
symbol: "USD",
displayDecimals: 4,
displayDecimals: 2,
stripTrailingZeroes: false}),
migratedToKeycard: false
},
@ -122,7 +122,7 @@ ListModel {
preferredSharingChainIds: "5:420:421613",
currencyBalance: ({amount: 3,
symbol: "USD",
displayDecimals: 4,
displayDecimals: 2,
stripTrailingZeroes: false}),
migratedToKeycard: false
},
@ -148,7 +148,7 @@ ListModel {
preferredSharingChainIds: "5:420:421613",
currencyBalance: ({amount: 999,
symbol: "USD",
displayDecimals: 4,
displayDecimals: 2,
stripTrailingZeroes: false}),
migratedToKeycard: false
}

111
ui/app/AppLayouts/Wallet/adaptors/TokenSelectorViewAdaptor.qml
View File

@ -6,6 +6,8 @@ import StatusQ.Core.Utils 0.1
import SortFilterProxyModel 0.2
import utils 1.0
QObject {
id: root
@ -27,14 +29,23 @@ QObject {
- currencyBalance: double (e.g. `1000.42` in user's fiat currency)
- currencyBalanceAsString: string (e.g. "1 000,42 CZK" formatted as a string according to the user's locale)
- balanceAsString: string (`1.42` formatted as e.g. "1,42" in user's locale)
- iconSource: string
*/
// input API
required property var assetsModel
// expected roles: key, name, symbol, image, communityId
property var plainTokensBySymbolModel // optional all tokens model, no balances
// expected roles: chainId, chainName, iconUrl
required property var flatNetworksModel
required property string currentCurrency // CurrenciesStore.currentCurrency, e.g. "USD"
// CurrenciesStore.currentCurrency, e.g. "USD"
required property string currentCurrency
// optional filter properties; empty/default values means no filtering
property bool showAllTokens // whether to show all tokens, or just the ones we own
property var enabledChainIds: []
property string accountAddress
property bool showCommunityAssets
@ -42,7 +53,41 @@ QObject {
// output model
readonly property SortFilterProxyModel outputAssetsModel: SortFilterProxyModel {
sourceModel: assetsObjectProxyModel
sourceModel: showAllTokens && !!plainTokensBySymbolModel ? concatModel : assetsObjectProxyModel
proxyRoles: [
FastExpressionRole {
name: "sectionId"
expression: {
if (!model.currentBalance)
return "section_zzz"
if (root.enabledChainIds.length === 1)
return "section_%1".arg(root.enabledChainIds[0])
}
expectedRoles: ["currentBalance"]
},
FastExpressionRole {
name: "sectionName"
function getSectionName(sectionId, hasBalance) {
if (sectionId === "section_zzz")
return qsTr("Popular assets")
if (root.enabledChainIds.length === 1 && hasBalance)
return qsTr("Your assets on %1").arg(ModelUtils.getByKey(root.flatNetworksModel, "chainId", root.enabledChainIds[0], "chainName"))
}
expression: getSectionName(model.sectionId, !!model.currentBalance)
expectedRoles: ["sectionId", "currentBalance"]
},
FastExpressionRole {
function tokenIcon(symbol) {
return Constants.tokenIcon(symbol)
}
name: "iconSource"
expression: model.image || tokenIcon(model.symbol)
expectedRoles: ["image", "symbol"]
}
]
filters: [
AnyOf {
@ -68,17 +113,57 @@ QObject {
RoleSorter {
roleName: "sectionId"
},
RoleSorter {
roleName: "currencyBalance"
sortOrder: Qt.DescendingOrder
FastExpressionSorter {
expression: {
if (modelLeft.sectionId === "section_zzz" && modelRight.sectionId === "section_zzz")
return 0
const lhs = modelLeft.currencyBalance
const rhs = modelRight.currencyBalance
if (lhs < rhs)
return 1
else if (lhs > rhs)
return -1
return 0
}
expectedRoles: ["currencyBalance", "sectionId"]
},
RoleSorter {
roleName: "name"
}
// FIXME #15277 sort by assetsController instead, to have the sorting/order as in the main wallet view
]
}
// internals
RolesRenamingModel {
id: renamedTokensBySymbolModel
sourceModel: root.plainTokensBySymbolModel
mapping: [
RoleRename {
from: "key"
to: "tokensKey"
}
]
}
ConcatModel {
id: concatModel
sources: [
SourceModel {
model: renamedTokensBySymbolModel
markerRoleValue: "plain_tokens_model"
},
SourceModel {
model: assetsObjectProxyModel
markerRoleValue: "wallet_assets_model"
}
]
markerRoleName: "which_model"
expectedRoles: ["tokensKey", "name", "symbol", "balances", "currentBalance", "currencyBalance", "currencyBalanceAsString", "communityId", "marketDetails"]
}
ObjectProxyModel {
id: assetsObjectProxyModel
sourceModel: root.assetsModel
@ -100,20 +185,6 @@ QObject {
currencyBalance ? LocaleUtils.currencyAmountToLocaleString({amount: currencyBalance, symbol: root.currentCurrency, displayDecimals})
: ""
readonly property string sectionId: {
if (root.enabledChainIds.length === 1) {
return currentBalance ? "section_%1".arg(root.enabledChainIds[0]) : "section_zzz"
}
return ""
}
readonly property string sectionName: {
if (root.enabledChainIds.length === 1) {
return currentBalance ? qsTr("Your assets on %1").arg(ModelUtils.getByKey(root.flatNetworksModel, "chainId", root.enabledChainIds[0], "chainName"))
: qsTr("Popular assets")
}
return ""
}
readonly property var balances: this
sourceModel: joinModel
@ -180,7 +251,7 @@ QObject {
}
}
exposedRoles: ["balances", "currentBalance", "currencyBalance", "currencyBalanceAsString", "balanceAsString", "sectionId", "sectionName"]
exposedRoles: ["balances", "currentBalance", "currencyBalance", "currencyBalanceAsString", "balanceAsString"]
expectedRoles: ["communityId", "balances", "decimals", "marketDetails"]
}
}

9
ui/app/AppLayouts/Wallet/controls/EditSlippagePanel.qml
View File

@ -95,12 +95,9 @@ Control {
}
StatusTextWithLoadingState {
text: {
let amount = !!root.toTokenAmount ? SQUtils.AmountsArithmetic.fromString(root.toTokenAmount) : NaN
let percentageAmount = 0
if(!Number.isNaN(amount)) {
percentageAmount = (amount - ((amount/100) * slippageSelector.value))
}
return ("%1 %2").arg(LocaleUtils.numberToLocaleString(percentageAmount)).arg(d.selectedToTokenSymbol)
const amount = !!root.toTokenAmount ? SQUtils.AmountsArithmetic.fromString(root.toTokenAmount).times(1 - slippageSelector.value/100)
: 0
return ("%1 %2").arg(LocaleUtils.numberToLocaleString(amount.toFixed())).arg(d.selectedToTokenSymbol)
}
font.pixelSize: 13
font.weight: Font.Medium

12
ui/app/AppLayouts/Wallet/controls/TokenSelector.qml
View File

@ -2,6 +2,7 @@ import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.0
import QtQuick.Window 2.15
import StatusQ 0.1
import StatusQ.Components 0.1
@ -84,7 +85,6 @@ ComboBox {
popup.width: 380
popup.x: root.width - popup.width
popup.y: root.height
popup.margins: Style.current.halfPadding
popup.background: Rectangle {
color: Theme.palette.statusSelect.menuItemBackgroundColor
@ -172,7 +172,8 @@ ComboBox {
tokensKey: model.tokensKey
name: model.name
symbol: model.symbol
currencyBalanceAsString: model.currencyBalanceAsString
currencyBalanceAsString: model.currencyBalanceAsString ?? ""
iconSource: model.iconSource
balancesModel: model.balances
onAssetSelected: (tokensKey) => root.selectToken(tokensKey)
@ -192,20 +193,19 @@ ComboBox {
Component {
id: iconTextContentItem
RowLayout {
readonly property string currentSymbol: d.isTokenSelected ? ModelUtils.getByKey(model, "tokensKey", d.currentTokensKey, "symbol")
: ""
spacing: root.spacing
StatusRoundedImage {
objectName: "tokenSelectorIcon"
Layout.preferredWidth: 20
Layout.preferredHeight: 20
image.source: Constants.tokenIcon(parent.currentSymbol)
image.source: ModelUtils.getByKey(model, "tokensKey", d.currentTokensKey, "iconSource")
image.sourceSize: Qt.size(width*root.Screen.devicePixelRatio, height*root.Screen.devicePixelRatio)
}
StatusBaseText {
objectName: "tokenSelectorContentItemText"
font.pixelSize: 28
color: root.hovered ? Theme.palette.blue : Theme.palette.darkBlue
text: parent.currentSymbol
text: ModelUtils.getByKey(model, "tokensKey", d.currentTokensKey, "symbol")
}
}
}

10
ui/app/AppLayouts/Wallet/panels/SwapInputPanel.qml
View File

@ -28,6 +28,7 @@ Control {
required property CurrenciesStore currencyStore
required property var flatNetworksModel
required property var processedAssetsModel
property var plainTokensBySymbolModel // optional all tokens model, no balances
property int selectedNetworkChainId: -1
property string selectedAccountAddress
@ -54,6 +55,7 @@ Control {
readonly property string selectedHoldingId: holdingSelector.currentTokensKey
readonly property double value: amountToSendInput.cryptoValueToSendFloat
readonly property string rawValue: amountToSendInput.cryptoValueToSend
readonly property int rawValueMultiplierIndex: amountToSendInput.multiplierIndex
readonly property bool valueValid: amountToSendInput.inputNumberValid
readonly property bool amountEnteredGreaterThanBalance: value > maxSendButton.maxSafeValue
@ -83,17 +85,19 @@ Control {
property var selectedHolding: SQUtils.ModelUtils.getByKey(holdingSelector.model, "tokensKey", holdingSelector.currentTokensKey)
readonly property bool isSelectedHoldingValidAsset: !!selectedHolding
readonly property double maxFiatBalance: isSelectedHoldingValidAsset ? selectedHolding.currencyBalance : 0
readonly property double maxCryptoBalance: isSelectedHoldingValidAsset ? selectedHolding.currentBalance : 0
readonly property double maxFiatBalance: isSelectedHoldingValidAsset && !!selectedHolding.currencyBalance ? selectedHolding.currencyBalance : 0
readonly property double maxCryptoBalance: isSelectedHoldingValidAsset && !!selectedHolding.currentBalance ? selectedHolding.currentBalance : 0
readonly property double maxInputBalance: amountToSendInput.inputIsFiat ? maxFiatBalance : maxCryptoBalance
readonly property string inputSymbol: amountToSendInput.inputIsFiat ? root.currencyStore.currentCurrency
: (!!selectedHolding ? selectedHolding.symbol : "")
readonly property var adaptor: TokenSelectorViewAdaptor {
assetsModel: root.processedAssetsModel
plainTokensBySymbolModel: root.plainTokensBySymbolModel
flatNetworksModel: root.flatNetworksModel
currentCurrency: root.currencyStore.currentCurrency
showAllTokens: true
enabledChainIds: root.selectedNetworkChainId !== -1 ? [root.selectedNetworkChainId] : []
accountAddress: root.selectedAccountAddress || ""
searchString: holdingSelector.searchString
@ -206,7 +210,7 @@ Control {
input.input.edit.color: !input.valid ? Theme.palette.dangerColor1 : maxSendButton.hovered ? Theme.palette.baseColor1
: Theme.palette.directColor1
multiplierIndex: !!d.selectedHolding ? d.selectedHolding.decimals : 0
multiplierIndex: d.selectedHolding && d.selectedHolding.decimals ? d.selectedHolding.decimals : 0
maxInputBalance: (root.swapSide === SwapInputPanel.SwapSide.Receive || !d.isSelectedHoldingValidAsset) ? Number.POSITIVE_INFINITY
: maxSendButton.maxSafeValue

11
ui/app/AppLayouts/Wallet/popups/swap/SwapModal.qml
View File

@ -24,6 +24,8 @@ StatusDialog {
required property SwapInputParamsForm swapInputParamsForm
required property SwapModalAdaptor swapAdaptor
property var plainTokensBySymbolModel: swapAdaptor.walletAssetsStore.walletTokensStore.plainTokensBySymbolModel
objectName: "swapModal"
implicitWidth: 556
@ -156,6 +158,7 @@ StatusDialog {
currencyStore: root.swapAdaptor.currencyStore
flatNetworksModel: root.swapAdaptor.swapStore.flatNetworks
processedAssetsModel: root.swapAdaptor.walletAssetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: root.plainTokensBySymbolModel
tokenKey: root.swapInputParamsForm.fromTokensKey
tokenAmount: root.swapInputParamsForm.fromTokenAmount
@ -168,9 +171,12 @@ StatusDialog {
swapExchangeButtonWidth: swapExchangeButton.width
onSelectedHoldingIdChanged: root.swapInputParamsForm.fromTokensKey = selectedHoldingId
onValueChanged: {
onRawValueChanged: {
if(root.swapInputParamsForm.fromTokensKey === selectedHoldingId) {
root.swapInputParamsForm.fromTokenAmount = !tokenAmount && value === 0 ? "" : value.toLocaleString(locale, 'f', -128)
const amount = !tokenAmount && value === 0 ? "" :
SQUtils.AmountsArithmetic.div(SQUtils.AmountsArithmetic.fromString(rawValue),
SQUtils.AmountsArithmetic.fromNumber(1, rawValueMultiplierIndex)).toString()
root.swapInputParamsForm.fromTokenAmount = amount
}
}
onValueValidChanged: d.fetchSuggestedRoutes()
@ -189,6 +195,7 @@ StatusDialog {
currencyStore: root.swapAdaptor.currencyStore
flatNetworksModel: root.swapAdaptor.swapStore.flatNetworks
processedAssetsModel: root.swapAdaptor.walletAssetsStore.groupedAccountAssetsModel
plainTokensBySymbolModel: root.plainTokensBySymbolModel
tokenKey: root.swapInputParamsForm.toTokenKey
tokenAmount: root.swapAdaptor.validSwapProposalReceived && root.swapAdaptor.toToken ? root.swapAdaptor.swapOutputData.toTokenAmount: root.swapInputParamsForm.toTokenAmount

5
ui/app/AppLayouts/Wallet/views/TokenSelectorAssetDelegate.qml
View File

@ -1,6 +1,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.15
import StatusQ.Core 0.1
import StatusQ.Components 0.1
@ -16,6 +17,7 @@ ItemDelegate {
required property string name
required property string symbol
required property string currencyBalanceAsString
required property string iconSource
// expected structure: balancesModel -> model.balances submodel [chainId: int, balance: BigIntString] + flatNetworks [account:string, iconUrl: string]
required property var balancesModel
@ -34,7 +36,7 @@ ItemDelegate {
icon.width: 32
icon.height: 32
icon.source: Constants.tokenIcon(symbol)
icon.source: iconSource
enabled: interactive
@ -55,6 +57,7 @@ ItemDelegate {
Layout.preferredWidth: root.icon.width
Layout.preferredHeight: root.icon.height
image.source: root.icon.source
image.sourceSize: Qt.size(width*root.Screen.devicePixelRatio, height*root.Screen.devicePixelRatio)
}
ColumnLayout {

5
ui/app/AppLayouts/Wallet/views/TokenSelectorView.qml
View File

@ -6,7 +6,7 @@ StatusListView {
id: root
// expected model structure:
// tokensKey, name, symbol, decimals, currencyBalanceAsString (computed), marketDetails, balances -> [ chainId, address, balance, iconUrl ]
// tokensKey, name, symbol, decimals, currencyBalanceAsString (computed), iconSource, marketDetails, balances -> [ chainId, address, balance, iconUrl ]
// output API
signal tokenSelected(string tokensKey)
@ -20,7 +20,8 @@ StatusListView {
tokensKey: model.tokensKey
name: model.name
symbol: model.symbol
currencyBalanceAsString: model.currencyBalanceAsString
currencyBalanceAsString: model.currencyBalanceAsString ?? ""
iconSource: model.iconSource
balancesModel: model.balances
onAssetSelected: (tokensKey) => root.tokenSelected(tokensKey)