status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-14 08:36:39 +00:00
Code Issues Projects Releases Wiki Activity

fix(dapps): Fixing the dApps disabled state if the dapps service is not online

Browse Source 
closes #16883 #16882

1. connect the dapps service online state to the enabled state for the dapps button
2. Fix the connect modal primary action button
3. Align DappsComboBox disabled color with the refresh button disabled color

(cherry picked from commit 2c4f6b5da3d484b8e36f2ec572ba738e490cda40)
This commit is contained in:
Alex Jbanca 2024-12-05 18:46:15 +02:00 committed by Alex Jbanca
parent ad6e1376a7
commit c0aeae5ea5
7 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
storybook/pages/DappsComboBoxPage.qml
View File

@ -19,6 +19,7 @@ SplitView {
anchors.horizontalCenter: parent.horizontalCenter
model: emptyModelCheckbox.checked ? emptyModel : smallModelCheckbox.checked ? smallModel: dappsModel
popup.visible: true
enabled: enabledCheckbox.checked
onPairDapp: console.log("onPairDapp")
}
@ -128,6 +129,12 @@ SplitView {
id: smallModelCheckbox
text: "Small model"
}
CheckBox {
id: enabledCheckbox
text: "Enabled"
checked: true
}
}
}
}

2
ui/app/AppLayouts/Wallet/WalletLayout.qml
View File

@ -42,6 +42,7 @@ Item {
property bool swapEnabled
property bool dAppsEnabled
property bool dAppsVisible
property bool walletConnectEnabled: true
property bool browserConnectEnabled: true
@ -246,6 +247,7 @@ Item {
swapEnabled: root.swapEnabled
dAppsEnabled: root.dAppsEnabled
dAppsVisible: root.dAppsVisible
walletConnectEnabled: root.walletConnectEnabled
browserConnectEnabled: root.browserConnectEnabled

4
ui/app/AppLayouts/Wallet/controls/DappsComboBox.qml
View File

@ -31,6 +31,10 @@ ComboBox {
background: SQP.StatusComboboxBackground {
objectName: "dappsBackground"
active: root.down || root.hovered
Binding on color {
when: !root.enabled
value: Theme.palette.baseColor2
}
}
indicator: null

4
ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
View File

@ -35,6 +35,7 @@ Item {
property alias networkFilter: networkFilter
property bool dAppsEnabled: true
property bool dAppsVisible: true
property bool walletConnectEnabled: true
property bool browserConnectEnabled: true
property var dAppsModel
@ -145,7 +146,8 @@ Item {
Layout.alignment: Qt.AlignTop
spacing: 8
visible: !root.walletStore.showSavedAddresses && root.dAppsEnabled
visible: !root.walletStore.showSavedAddresses && root.dAppsVisible
enabled: root.dAppsEnabled
walletConnectEnabled: root.walletConnectEnabled
connectorEnabled: root.browserConnectEnabled
model: root.dAppsModel

2
ui/app/AppLayouts/Wallet/views/RightTabBaseView.qml
View File

@ -21,6 +21,7 @@ FocusScope {
property bool swapEnabled
property bool dAppsEnabled
property bool dAppsVisible
property bool walletConnectEnabled
property bool browserConnectEnabled
@ -47,6 +48,7 @@ FocusScope {
networkConnectionStore: root.networkConnectionStore
loginType: root.store.loginType
dAppsEnabled: root.dAppsEnabled
dAppsVisible: root.dAppsVisible
dAppsModel: root.dAppsModel
walletConnectEnabled: root.walletConnectEnabled
browserConnectEnabled: root.browserConnectEnabled

3
ui/app/mainui/AppMain.qml
View File

@ -1681,7 +1681,8 @@ Item {
appMainVisible: appMain.visible
swapEnabled: featureFlagsStore.swapEnabled
hideSignPhraseModal: userAgreementLoader.active
dAppsEnabled: dAppsServiceLoader.item ? dAppsServiceLoader.item.serviceAvailableToCurrentAddress : false
dAppsVisible: dAppsServiceLoader.item ? dAppsServiceLoader.item.serviceAvailableToCurrentAddress : false
dAppsEnabled: dAppsServiceLoader.item ? dAppsServiceLoader.item.isServiceOnline : false
walletConnectEnabled: featureFlagsStore.dappsEnabled
browserConnectEnabled: featureFlagsStore.connectorEnabled
dAppsModel: dAppsServiceLoader.item ? dAppsServiceLoader.item.dappsModel : null

4
ui/imports/shared/popups/walletconnect/ConnectDAppModal.qml
View File

@ -196,8 +196,8 @@ StatusDialog {
if (d.connectionInProgress)
return false
if (!d.connectionAttempted)
return root.selectedChains.length > 0
return root.connectButtonEnabled
return root.selectedChains.length > 0 && root.connectButtonEnabled
return true
}
onClicked: {