Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add wallet only label #1628

Merged
4 commits merged into from
Feb 25, 2022
Merged

Add wallet only label #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60f8723
add wallet only tag to enable modal
smk762 Feb 22, 2022
2501946
alignment
smk762 Feb 22, 2022
6f1dc99
disable swap button for wallet only
smk762 Feb 22, 2022
a273648
code style, fix buttons
smk762 Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions atomic_defi_design/Dex/Components/CoinTypeTag.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ AnimatedRectangle {
height: type_tag.font.pixelSize * 1.5
width: type_tag.width + 8

color: Style.getCoinTypeColor(model.type)
color: Style.getCoinTypeColor(type)

DexLabel {
id: type_tag
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
text: type
color: Style.getCoinTypeTextColor(model.type)
color: Style.getCoinTypeTextColor(type)
font: DexTypo.overLine
}
}
1 change: 1 addition & 0 deletions atomic_defi_design/Dex/Constants/Style.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ QtObject {
case 'ERC-20': return getCoinColor("ETH")
case 'QRC-20': return getCoinColor("QTUM")
case 'Smart Chain': return getCoinColor("KMD")
case 'WALLET ONLY': return "#4D4D4D"
case 'UTXO': return getCoinColor("BTC")
case 'BEP-20': return getCoinColor("BNB")
case 'SLP': return getCoinColor("BCH")
Expand Down
67 changes: 38 additions & 29 deletions atomic_defi_design/Dex/Wallet/EnableCoinModal.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,42 +135,51 @@ BasicModal
}
}

// Icon
DefaultImage
{
id: icon
anchors.left: parent.right
anchors.leftMargin: 8
RowLayout {
anchors.verticalCenter: parent.verticalCenter
source: General.coinIcon(model.ticker)
width: 18
height: 18
anchors.left: parent.right
spacing:6

// Icon
DefaultImage
{
id: icon
Layout.leftMargin: 8
Layout.alignment: Qt.AlignVCenter
source: General.coinIcon(model.ticker)
Layout.preferredWidth: 18
Layout.preferredHeight: 18
}
DefaultText
{
anchors.left: parent.right
anchors.leftMargin: 4
anchors.verticalCenter: parent.verticalCenter
Layout.leftMargin: 4
Layout.alignment: Qt.AlignVCenter
text: model.name + " (" + model.ticker + ")"
}
CoinTypeTag
{
id: typeTag
Layout.leftMargin: 6
Layout.alignment: Qt.AlignVCenter
type: model.type
}

CoinTypeTag
{
id: typeTag
anchors.left: parent.right
anchors.leftMargin: 6
anchors.verticalCenter: parent.verticalCenter
type: model.type
}
CoinTypeTag
{
Layout.leftMargin: 6
Layout.alignment: Qt.AlignVCenter
enabled: General.isIDO(model.ticker)
visible: enabled
type: "IDO"
}

CoinTypeTag
{
anchors.left: typeTag.right
anchors.leftMargin: 6
anchors.verticalCenter: parent.verticalCenter
enabled: General.isIDO(model.ticker)
visible: enabled
type: "IDO"
}
CoinTypeTag
{
Layout.leftMargin: 6
Layout.alignment: Qt.AlignVCenter
enabled: API.app.portfolio_pg.global_cfg_mdl.get_coin_info(model.ticker).is_wallet_only
visible: enabled
type: "WALLET ONLY"
}
}
}
Expand Down
Loading