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

fixed issues after rebase

This commit is contained in:
Sale Djenic 2021-10-28 12:01:10 +02:00 committed by Iuri Matias
parent 59f604349c
commit 05cf431339
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -164,7 +164,7 @@ StatusAppThreePanelLayout {
sourceComponent: localAccountSensitiveSettings.communitiesEnabled && root.rootStore.chatsModelInst.communities.activeCommunity.active ? communtiyColumnComponent : contactsColumnComponent
}
centerPanel: ChatColumn {
centerPanel: ChatColumnView {
id: chatColumn
chatGroupsListViewCount: contactColumnLoader.item.chatGroupsListViewCount
}

4
ui/app/AppLayouts/Onboarding/popups/GenKeyModal.qml
View File

@ -6,8 +6,8 @@ import StatusQ.Controls 0.1
import utils 1.0
import "../../../../shared"
import "../../../../shared/popups"
import shared 1.0
import shared.popups 1.0
import "../panels"
import "../stores"

2
ui/app/AppLayouts/Wallet/controls/TransactionDelegate.qml
View File

@ -141,7 +141,7 @@ Rectangle {
}
StyledText {
id: timeValue
text: new Date(parseInt(timestamp)).toLocaleString(globalSettings.locale)
text: new Date(parseInt(timestamp)).toLocaleString(localAppSettings.locale)
font.pixelSize: Style.current.primaryTextFontSize
anchors.rightMargin: Style.current.smallPadding
}

35
ui/app/AppMain.qml
View File

@ -567,23 +567,24 @@ Item {
onNotificationClicked: {
applicationWindow.makeStatusAppActive()
switch(notificationType){
case Constants.osNotificationType.newContactRequest:
appView.currentIndex = Utils.getAppSectionIndex(Constants.chat)
appMain.openContactsPopup()
break
case Constants.osNotificationType.acceptedContactRequest:
appView.currentIndex = Utils.getAppSectionIndex(Constants.chat)
break
case Constants.osNotificationType.joinCommunityRequest:
case Constants.osNotificationType.acceptedIntoCommunity:
case Constants.osNotificationType.rejectedByCommunity:
appView.currentIndex = Utils.getAppSectionIndex(Constants.community)
break
case Constants.osNotificationType.newMessage:
appView.currentIndex = Utils.getAppSectionIndex(Constants.chat)
break
}
// This is not handled yet.
// switch(notificationType){
// case Constants.osNotificationType.newContactRequest:
// appView.currentIndex = Utils.getAppSectionIndex(Constants.chat)
// appMain.openContactsPopup()
// break
// case Constants.osNotificationType.acceptedContactRequest:
// appView.currentIndex = Utils.getAppSectionIndex(Constants.chat)
// break
// case Constants.osNotificationType.joinCommunityRequest:
// case Constants.osNotificationType.acceptedIntoCommunity:
// case Constants.osNotificationType.rejectedByCommunity:
// appView.currentIndex = Utils.getAppSectionIndex(Constants.community)
// break
// case Constants.osNotificationType.newMessage:
// appView.currentIndex = Utils.getAppSectionIndex(Constants.chat)
// break
// }
}
}