From 123b8e320ad3ceb7d38c257e4cd97a1788dfb01f Mon Sep 17 00:00:00 2001 From: Boris Melnik Date: Tue, 13 Dec 2022 13:45:26 +0300 Subject: [PATCH] fix(warnings): Fix chat, community settings warnings Fixes: #8293 --- .../panels/communities/CommunityMembersSettingsPanel.qml | 2 +- ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml | 6 +++--- ui/app/AppLayouts/Chat/views/ChatView.qml | 2 +- ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml | 2 +- ui/app/AppLayouts/Onboarding/OnboardingLayout.qml | 3 ++- ui/app/AppLayouts/Onboarding/stores/StartupStore.qml | 6 ++++-- ui/imports/shared/status/StatusStickersPopup.qml | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml index d0b342594e..11f95dc8a3 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml @@ -82,7 +82,7 @@ SettingsPageLayout { if (root.membersModel.count === 0) { return qsTr("No members to search") } else { - return qsTr("Search %1's %n member(s)", "", root.membersModel.count).arg(root.communityName) + return qsTr("Search %1's %n member(s)", "", root.membersModel ? root.membersModel.count : 0).arg(root.communityName) } } panelType: CommunityMembersTabPanel.TabType.AllMembers diff --git a/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml b/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml index 38131785aa..d7239418e7 100644 --- a/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml +++ b/ui/app/AppLayouts/Chat/views/ChatHeaderContentView.qml @@ -20,7 +20,7 @@ Item { property alias searchButton: searchButton property var rootStore - property var chatContentModule: root.rootStore.currentChatContentModule() + property var chatContentModule: root.rootStore.currentChatContentModule() || null property var emojiPopup property int padding: Style.current.halfPadding @@ -287,8 +287,8 @@ Item { } } asset.name: chatContentModule? chatContentModule.chatDetails.icon : "" - asset.isImage: chatContentModule.chatDetails.icon !== "" - asset.isLetterIdenticon: chatContentModule.chatDetails.icon === "" + asset.isImage: chatContentModule && chatContentModule.chatDetails.icon !== "" + asset.isLetterIdenticon: chatContentModule && chatContentModule.chatDetails.icon === "" ringSettings.ringSpecModel: chatContentModule && chatContentModule.chatDetails.type === Constants.chatType.oneToOne ? Utils.getColorHashAsJson(chatContentModule.chatDetails.id) : "" asset.color: chatContentModule? diff --git a/ui/app/AppLayouts/Chat/views/ChatView.qml b/ui/app/AppLayouts/Chat/views/ChatView.qml index a50d1d1da6..4c2cbfc02f 100644 --- a/ui/app/AppLayouts/Chat/views/ChatView.qml +++ b/ui/app/AppLayouts/Chat/views/ChatView.qml @@ -121,7 +121,7 @@ StatusSectionLayout { let chatContentModule = root.rootStore.currentChatContentModule() if (!chatContentModule || !chatContentModule.usersModule) { // New communities have no chats, so no chatContentModule - return 0 + return null } return chatContentModule.usersModule.model } diff --git a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml b/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml index 8082005c5c..1a8abb8ca3 100644 --- a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml +++ b/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml @@ -79,7 +79,7 @@ StatusSectionLayout { id: communityHeader title: community.name - subTitle: qsTr("%n member(s)", "", community.members.count) + subTitle: qsTr("%n member(s)", "", community.members.count || 0) asset.name: community.image asset.color: community.color asset.isImage: true diff --git a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml index 32128690d2..7d3a7ad05a 100644 --- a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml +++ b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml @@ -14,7 +14,8 @@ OnboardingBasePage { property var startupStore: StartupStore {} - backButtonVisible: root.startupStore.currentStartupState.displayBackButton + backButtonVisible: root.startupStore.currentStartupState ? root.startupStore.currentStartupState.displayBackButton + : false onBackClicked: { root.startupStore.backAction() diff --git a/ui/app/AppLayouts/Onboarding/stores/StartupStore.qml b/ui/app/AppLayouts/Onboarding/stores/StartupStore.qml index f8b3799e07..3ad227e271 100644 --- a/ui/app/AppLayouts/Onboarding/stores/StartupStore.qml +++ b/ui/app/AppLayouts/Onboarding/stores/StartupStore.qml @@ -4,8 +4,10 @@ QtObject { id: root property var startupModuleInst: startupModule - property var currentStartupState: startupModuleInst.currentStartupState - property var selectedLoginAccount: startupModuleInst.selectedLoginAccount + property var currentStartupState: startupModuleInst ? startupModuleInst.currentStartupState + : null + property var selectedLoginAccount: startupModuleInst ? startupModuleInst.selectedLoginAccount + : null function backAction() { root.currentStartupState.backAction() diff --git a/ui/imports/shared/status/StatusStickersPopup.qml b/ui/imports/shared/status/StatusStickersPopup.qml index 9dfc17631a..b2c48a2dfe 100644 --- a/ui/imports/shared/status/StatusStickersPopup.qml +++ b/ui/imports/shared/status/StatusStickersPopup.qml @@ -259,7 +259,7 @@ Popup { RowLayout { id: stickersRowLayout - width: inputScrollView.availableWidth + width: installedStickersSV.availableWidth spacing: Style.current.padding Repeater {