status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(ActivityCenter): Fix unreadNotificationsCount availability on every section 

Close #7674
This commit is contained in:
MishkaRogachev 2022-10-01 16:07:14 +04:00 committed by Mikhail Rogachev
parent 1784a98df3
commit 9d103e5b07
8 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/AppLayouts/Browser/BrowserLayout.qml
View File

@ -26,6 +26,7 @@ import "stores"
StatusSectionLayout {
id: root
property var globalStore
property var sendTransactionModal
@ -34,7 +35,9 @@ StatusSectionLayout {
tab.item.url = _internal.determineRealURL(url)
}
notificationCount: root.globalStore.unreadNotificationsCount
onNotificationButtonClicked: Global.openActivityCenterPopup()
QtObject {
id: _internal

2
ui/app/AppLayouts/CommunitiesPortal/stores/CommunitiesStore.qml
View File

@ -21,6 +21,8 @@ QtObject {
property var advancedModule: profileSectionModule.advancedModule
property bool isCommunityHistoryArchiveSupportEnabled: advancedModule? advancedModule.isCommunityHistoryArchiveSupportEnabled : false
property var activityCenterModuleInst: activityCenterModule
property var activityCenterList: activityCenterModuleInst.activityNotificationsModel
property int unreadNotificationsCount: activityCenterList.unreadCount
// TODO: Could the backend provide directly 2 filtered models??
//property var featuredCommunitiesModel: root.communitiesModuleInst.curatedFeaturedCommunities

3
ui/app/AppLayouts/Node/stores/RootStore.qml
View File

@ -5,7 +5,10 @@ import utils 1.0
QtObject {
id: root
property var activityCenterModuleInst: activityCenterModule
property var activityCenterList: activityCenterModuleInst.activityNotificationsModel
property int unreadNotificationsCount: activityCenterList.unreadCount
property var nodeModelInst: nodeModel
// property var profileModelInst: profileModel

4
ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml
View File

@ -5,7 +5,11 @@ import AppLayouts.Chat.stores 1.0
QtObject {
id: root
property string backButtonName
property var activityCenterModuleInst: activityCenterModule
property var activityCenterList: activityCenterModuleInst.activityNotificationsModel
property int unreadNotificationsCount: activityCenterList.unreadCount
property var aboutModuleInst: aboutModule

5
ui/app/AppLayouts/Wallet/stores/RootStore.qml
View File

@ -9,7 +9,6 @@ QtObject {
id: root
property string backButtonName: ""
property int unreadNotificationsCount: activityCenterList.unreadCount
property var currentAccount: Constants.isCppApp ? walletSectionAccounts.currentAccount: walletSectionCurrent
property var accounts: walletSectionAccounts.model
property var generatedAccounts: walletSectionAccounts.generated
@ -24,6 +23,10 @@ QtObject {
property string signingPhrase: walletSection.signingPhrase
property string mnemonicBackedUp: walletSection.isMnemonicBackedUp
property var activityCenterModuleInst: activityCenterModule
property var activityCenterList: activityCenterModuleInst.activityNotificationsModel
property int unreadNotificationsCount: activityCenterList.unreadCount
property var walletTokensModule: walletSectionAllTokens
property var tokens: walletSectionAllTokens.all

4
ui/app/AppLayouts/stores/RootStore.qml
View File

@ -14,6 +14,10 @@ QtObject {
property var communitiesModuleInst: communitiesModule
property var observedCommunity: communitiesModuleInst.observedCommunity
property var activityCenterModuleInst: activityCenterModule
property var activityCenterList: activityCenterModuleInst.activityNotificationsModel
property int unreadNotificationsCount: activityCenterList.unreadCount
property bool newVersionAvailable: false
property string latestVersion
property string downloadURL

2
ui/app/mainui/activitycenter/panels/ActivityCenterPopupTopBarPanel.qml
View File

@ -88,7 +88,7 @@ Item {
StatusToolTip {
visible: hideReadNotificationsBtn.hovered
offset: hideReadNotificationsBtn.width
offset: width / 4
text: root.hideReadNotifications ? qsTr("Show read notifications") : qsTr("Hide read notifications")
}
}

2
ui/app/mainui/activitycenter/views/ActivityNotificationBase.qml
View File

@ -30,7 +30,7 @@ Item {
Loader {
id: badgeLoader
anchors.top: bodyLoader.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.leftMargin: 61 // TODO find a way to align with the text of the message
}