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: Airdrop section of deployed NFT doesn't seem to apply darkmode 

- fix some colors to look correct in dark mode too
- update/unbreak the corresponding storybook pages

Fixes #11289
This commit is contained in:
Lukáš Tinkl 2023-06-29 18:02:27 +02:00 committed by Lukáš Tinkl
parent 7a7394628e
commit b5f2c52b05
15 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
storybook/pages/EditAirdropViewPage.qml
View File

@ -135,7 +135,6 @@ SplitView {
const view = loader.item const view = loader.item
view.airdropFees = response view.airdropFees = response
} }
} }
@ -183,7 +182,6 @@ SplitView {
expression: model.index ? "Optimism" : "Arbitrum" expression: model.index ? "Optimism" : "Arbitrum"
}, },
ExpressionRole { ExpressionRole {
readonly property string icon1: "network/Network=Optimism" readonly property string icon1: "network/Network=Optimism"
readonly property string icon2: "network/Network=Arbitrum" readonly property string icon2: "network/Network=Arbitrum"
@ -220,12 +218,19 @@ SplitView {
name: "infiniteSupply" name: "infiniteSupply"
expression: !(model.index % 4) expression: !(model.index % 4)
}, },
ExpressionRole {
name: "accountName"
expression: "StatusAccount"
},
ExpressionRole {
name: "contractUniqueKey"
expression: "contractUniqueKey_" + model.index
},
ExpressionRole { ExpressionRole {
name: "chainName" name: "chainName"
expression: model.index ? "Ethereum Mainnet" : "Goerli" expression: model.index ? "Ethereum Mainnet" : "Goerli"
}, },
ExpressionRole { ExpressionRole {
readonly property string icon1: "network/Network=Ethereum" readonly property string icon1: "network/Network=Ethereum"
readonly property string icon2: "network/Network=Testnet" readonly property string icon2: "network/Network=Testnet"
@ -239,7 +244,6 @@ SplitView {
value: TokenCategories.Category.Community value: TokenCategories.Category.Community
} }
Component.onCompleted: { Component.onCompleted: {
Qt.callLater(() => editAirdropView.assetsModel = this) Qt.callLater(() => editAirdropView.assetsModel = this)
} }

3
storybook/pages/EditPermissionViewPage.qml
View File

@ -32,10 +32,11 @@ SplitView {
channelsModel: ChannelsModel {} channelsModel: ChannelsModel {}
communityDetails: QtObject { communityDetails: QtObject {
readonly property string id: "sox"
readonly property string name: "Socks" readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks readonly property string image: ModelsData.icons.socks
readonly property string color: "red" readonly property string color: "red"
readonly property string owner: isOwnerCheckBox.checked readonly property bool owner: isOwnerCheckBox.checked
} }
onCreatePermissionClicked: { onCreatePermissionClicked: {

2
storybook/pages/MintTokensSettingsPanelPage.qml
View File

@ -44,7 +44,7 @@ SplitView {
onMintCollectible: logs.logEvent("CommunityMintTokensSettingsPanel::mintCollectible") onMintCollectible: logs.logEvent("CommunityMintTokensSettingsPanel::mintCollectible")
onMintAsset: logs.logEvent("CommunityMintTokensSettingsPanel::mintAssets") onMintAsset: logs.logEvent("CommunityMintTokensSettingsPanel::mintAssets")
onDeleteToken: logs.logEvent("CommunityMintTokensSettingsPanel::deleteToken: " + key) onDeleteToken: logs.logEvent("CommunityMintTokensSettingsPanel::deleteToken: " + tokenKey)
} }
} }

2
storybook/pages/PermissionsViewPage.qml
View File

@ -47,9 +47,11 @@ SplitView {
} }
communityDetails: QtObject { communityDetails: QtObject {
readonly property string id: "sox"
readonly property string name: "Socks" readonly property string name: "Socks"
readonly property string image: ModelsData.icons.socks readonly property string image: ModelsData.icons.socks
readonly property string color: "red" readonly property string color: "red"
readonly property bool owner: true
} }
function log(method, index) { function log(method, index) {

1
storybook/pages/SortableTokenHoldersPanelPage.qml
View File

@ -21,6 +21,7 @@ SplitView {
Rectangle { Rectangle {
anchors.fill: holdersPanel anchors.fill: holdersPanel
color: "transparent"
border.color: "lightgray" border.color: "lightgray"
anchors.margins: -1 anchors.margins: -1
} }

6
storybook/pages/StatusTxProgressBarPage.qml
View File

@ -66,12 +66,8 @@ SplitView {
error: failureCheckBox.checked error: failureCheckBox.checked
isLayer1: mainnetCheckbox.checked isLayer1: mainnetCheckbox.checked
confirmations: confirmationsSlider.value confirmations: confirmationsSlider.value
duration: durationSlider.to
progress: durationSlider.value
chainName: isLayer1 ? "Mainnet" :"Optimism" chainName: isLayer1 ? "Mainnet" :"Optimism"
confirmationTimeStamp: 1670419848 timeStamp: 1670419848
finalisationTimeStamp: 1670419848
failedTimeStamp: 1670419848
} }
} }
} }

28
storybook/src/Models/AssetsModel.qml
View File

@ -9,49 +9,63 @@ ListModel {
iconSource: ModelsData.assets.socks, iconSource: ModelsData.assets.socks,
name: "Unisocks", name: "Unisocks",
shortName: "SOCKS", shortName: "SOCKS",
category: TokenCategories.Category.Community symbol: "SOCKS",
category: TokenCategories.Category.Community,
communityId: ""
}, },
{ {
key: "zrx", key: "zrx",
iconSource: ModelsData.assets.zrx, iconSource: ModelsData.assets.zrx,
name: "Ox", name: "Ox",
shortName: "ZRX", shortName: "ZRX",
category: TokenCategories.Category.Community symbol: "ZRX",
category: TokenCategories.Category.Community,
communityId: ""
}, },
{ {
key: "1inch", key: "1inch",
iconSource: ModelsData.assets.inch, iconSource: ModelsData.assets.inch,
name: "1inch", name: "1inch",
shortName: "1INCH", shortName: "1INCH",
category: TokenCategories.Category.Own symbol: "1INCH",
category: TokenCategories.Category.Own,
communityId: ""
}, },
{ {
key: "Aave", key: "Aave",
iconSource: ModelsData.assets.aave, iconSource: ModelsData.assets.aave,
name: "Aave", name: "Aave",
shortName: "AAVE", shortName: "AAVE",
category: TokenCategories.Category.Own symbol: "AAVE",
category: TokenCategories.Category.Own,
communityId: ""
}, },
{ {
key: "Amp", key: "Amp",
iconSource: ModelsData.assets.amp, iconSource: ModelsData.assets.amp,
name: "Amp", name: "Amp",
shortName: "AMP", shortName: "AMP",
category: TokenCategories.Category.Own symbol: "AMP",
category: TokenCategories.Category.Own,
communityId: ""
}, },
{ {
key: "Dai", key: "Dai",
iconSource: ModelsData.assets.dai, iconSource: ModelsData.assets.dai,
name: "Dai", name: "Dai",
shortName: "DAI", shortName: "DAI",
category: TokenCategories.Category.General symbol: "DAI",
category: TokenCategories.Category.General,
communityId: ""
}, },
{ {
key: "snt", key: "snt",
iconSource: ModelsData.assets.snt, iconSource: ModelsData.assets.snt,
name: "snt", name: "snt",
shortName: "snt", shortName: "snt",
category: TokenCategories.Category.General symbol: "snt",
category: TokenCategories.Category.General,
communityId: ""
} }
] ]

20
storybook/src/Models/CollectiblesModel.qml
View File

@ -8,22 +8,27 @@ ListModel {
key: "Anniversary", key: "Anniversary",
iconSource: ModelsData.collectibles.anniversary, iconSource: ModelsData.collectibles.anniversary,
name: "Anniversary", name: "Anniversary",
symbol: "Anniversary",
category: TokenCategories.Category.Community, category: TokenCategories.Category.Community,
imageUrl: ModelsData.collectibles.anniversary, imageUrl: ModelsData.collectibles.anniversary,
id: 1767698 id: 1767698,
communityId: ""
}, },
{ {
key: "Anniversary2", key: "Anniversary2",
iconSource: ModelsData.collectibles.anniversary, iconSource: ModelsData.collectibles.anniversary,
name: "Anniversary2", name: "Anniversary2",
symbol: "Anniversary2",
category: TokenCategories.Category.Community, category: TokenCategories.Category.Community,
imageUrl: ModelsData.collectibles.anniversary, imageUrl: ModelsData.collectibles.anniversary,
id: 1767699 id: 1767699,
communityId: ""
}, },
{ {
key: "CryptoKitties", key: "CryptoKitties",
iconSource: ModelsData.collectibles.cryptoKitties, iconSource: ModelsData.collectibles.cryptoKitties,
name: "CryptoKitties", name: "CryptoKitties",
symbol: "CryptoKitties",
category: TokenCategories.Category.Own, category: TokenCategories.Category.Own,
subItems: [ subItems: [
{ {
@ -70,23 +75,28 @@ ListModel {
} }
], ],
imageUrl: ModelsData.collectibles.cryptoKitties, imageUrl: ModelsData.collectibles.cryptoKitties,
id: 1767700 id: 1767700,
communityId: ""
}, },
{ {
key: "SuperRare", key: "SuperRare",
iconSource: ModelsData.collectibles.superRare, iconSource: ModelsData.collectibles.superRare,
name: "SuperRare", name: "SuperRare",
symbol: "SuperRare",
category: TokenCategories.Category.Own, category: TokenCategories.Category.Own,
imageUrl: ModelsData.collectibles.superRare, imageUrl: ModelsData.collectibles.superRare,
id: 1767701 id: 1767701,
communityId: ""
}, },
{ {
key: "Custom", key: "Custom",
iconSource: ModelsData.collectibles.custom, iconSource: ModelsData.collectibles.custom,
name: "Custom Collectible", name: "Custom Collectible",
symbol: "Custom",
category: TokenCategories.Category.General, category: TokenCategories.Category.General,
imageUrl: ModelsData.collectibles.custom, imageUrl: ModelsData.collectibles.custom,
id: 1767764 id: 1767764,
communityId: ""
} }
] ]

2
storybook/src/Models/MintedTokensModel.qml
View File

@ -84,7 +84,7 @@ QtObject {
transferable: false, transferable: false,
remoteSelfDestruct: true, remoteSelfDestruct: true,
chainId: 5, chainId: 5,
chainName: "Curstom", chainName: "Custom",
chainIcon: ModelsData.networks.custom, chainIcon: ModelsData.networks.custom,
accountName: "Other Account" accountName: "Other Account"
}, },

4
storybook/src/Models/ModelsData.qml
View File

@ -78,7 +78,3 @@ QtObject {
readonly property string _long: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum." readonly property string _long: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
} }
} }

2
ui/app/AppLayouts/Communities/controls/AddressesInputList.qml
View File

@ -50,7 +50,7 @@ Control {
background: Rectangle { background: Rectangle {
radius: Style.current.radius radius: Style.current.radius
color: Theme.palette.indirectColor1 color: Theme.palette.statusListItem.backgroundColor
} }
contentItem: StatusListView { contentItem: StatusListView {

2
ui/app/AppLayouts/Communities/controls/MembersSelectorPanel.qml
View File

@ -61,7 +61,7 @@ Control {
d.delegateHeight * root.count) d.delegateHeight * root.count)
radius: Style.current.radius radius: Style.current.radius
color: Theme.palette.indirectColor1 color: Theme.palette.statusListItem.backgroundColor
StatusListView { StatusListView {
id: listView id: listView

1
ui/app/AppLayouts/Communities/panels/NoHoldersPanel.qml
View File

@ -17,6 +17,7 @@ Control {
horizontalPadding: 56 horizontalPadding: 56
background: Rectangle { background: Rectangle {
color: Theme.palette.statusListItem.backgroundColor
radius: Style.current.radius radius: Style.current.radius
border.color: Theme.palette.baseColor2 border.color: Theme.palette.baseColor2
} }

2
ui/app/AppLayouts/Communities/views/EditAirdropView.qml
View File

@ -603,7 +603,7 @@ StatusScrollView {
background: Rectangle { background: Rectangle {
radius: Style.current.radius radius: Style.current.radius
color: Theme.palette.indirectColor1 color: Theme.palette.statusListItem.backgroundColor
} }
contentItem: Loader { contentItem: Loader {

4
ui/imports/shared/panels/SequenceColumnLayout.qml
View File

@ -26,7 +26,7 @@ ColumnLayout {
Layout.leftMargin: parent.lineMargin Layout.leftMargin: parent.lineMargin
Layout.preferredWidth: parent.lineWidth Layout.preferredWidth: parent.lineWidth
Layout.preferredHeight: parent.lineHeight Layout.preferredHeight: parent.lineHeight
color: Style.current.separator color: Theme.palette.baseColor4
} }
RowLayout { RowLayout {
@ -50,7 +50,7 @@ ColumnLayout {
color: "transparent" color: "transparent"
border.width: root.lineWidth border.width: root.lineWidth
border.color: Style.current.separator border.color: Theme.palette.baseColor4
} }
} }