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 url unfurling redirects to the wrong place

This commit is contained in:
Alexandra Betouni 2021-10-30 00:17:43 +03:00 committed by Iuri Matias
parent aa5d6e0ce3
commit 848f21cd20
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -32,7 +32,7 @@ StatusAppTwoPanelLayout {
property int profileContentWidth: Math.max(contentMinWidth, Math.min(profileContainer.width * 0.8, contentMaxWidth)) property int profileContentWidth: Math.max(contentMinWidth, Math.min(profileContainer.width * 0.8, contentMaxWidth))
anchors.fill: parent anchors.fill: parent
currentIndex: profileView.store.selectedMenuItem currentIndex: Config.currentMenuTab
onCurrentIndexChanged: { onCurrentIndexChanged: {
if(visibleChildren[0] === ensContainer){ if(visibleChildren[0] === ensContainer){

8
ui/app/AppLayouts/Profile/panels/MenuPanel.qml
View File

@ -13,8 +13,6 @@ Column {
property alias mainMenuItems: mainMenuItems.model property alias mainMenuItems: mainMenuItems.model
property alias settingsMenuItems: settingsMenuItems.model property alias settingsMenuItems: settingsMenuItems.model
property alias extraMenuItems: extraMenuItems.model property alias extraMenuItems: extraMenuItems.model
property int selectedMenuItem
property bool browserMenuItemEnabled: false property bool browserMenuItemEnabled: false
signal menuItemClicked(var menu_item) signal menuItemClicked(var menu_item)
@ -25,7 +23,7 @@ Column {
itemId: model.menu_id itemId: model.menu_id
title: model.text title: model.text
icon.name: model.icon icon.name: model.icon
selected: root.selectedMenuItem === model.menu_id selected: Config.currentMenuTab === model.menu_id
onClicked: root.menuItemClicked(model) onClicked: root.menuItemClicked(model)
} }
} }
@ -39,7 +37,7 @@ Column {
itemId: model.menu_id itemId: model.menu_id
title: model.text title: model.text
icon.name: model.icon icon.name: model.icon
selected: root.selectedMenuItem === model.menu_id selected: Config.currentMenuTab === model.menu_id
onClicked: root.menuItemClicked(model) onClicked: root.menuItemClicked(model)
visible: model.ifEnabled !== "browser" || root.browserMenuItemEnabled visible: model.ifEnabled !== "browser" || root.browserMenuItemEnabled
badge.value: (!mnemonicModule.isBackedUp && (settingsMenuDelegate.title === badge.value: (!mnemonicModule.isBackedUp && (settingsMenuDelegate.title ===
@ -59,7 +57,7 @@ Column {
itemId: model.menu_id itemId: model.menu_id
title: model.text title: model.text
icon.name: model.icon icon.name: model.icon
selected: root.selectedMenuItem === model.menu_id selected: Config.currentMenuTab === model.menu_id
visible: model.ifEnabled !== "browser" || root.browserMenuItemEnabled visible: model.ifEnabled !== "browser" || root.browserMenuItemEnabled
onClicked: root.menuItemClicked(model) onClicked: root.menuItemClicked(model)
} }

1
ui/app/AppLayouts/Profile/stores/RootStore.qml
View File

@ -66,7 +66,6 @@ QtObject {
property int signout_id: 14 property int signout_id: 14
property bool browserMenuItemEnabled: localAccountSensitiveSettings.isBrowserEnabled property bool browserMenuItemEnabled: localAccountSensitiveSettings.isBrowserEnabled
property int selectedMenuItem: 0
property ListModel mainMenuItems: ListModel { property ListModel mainMenuItems: ListModel {
ListElement { ListElement {

3
ui/app/AppLayouts/Profile/views/LeftTabView.qml
View File

@ -40,7 +40,6 @@ Item {
mainMenuItems: store.mainMenuItems mainMenuItems: store.mainMenuItems
settingsMenuItems: store.settingsMenuItems settingsMenuItems: store.settingsMenuItems
extraMenuItems: store.extraMenuItems extraMenuItems: store.extraMenuItems
selectedMenuItem: store.selectedMenuItem
browserMenuItemEnabled: store.browserMenuItemEnabled browserMenuItemEnabled: store.browserMenuItemEnabled
@ -48,7 +47,7 @@ Item {
if (!!menu_item.function_name && menu_item.function_name === "exit") { if (!!menu_item.function_name && menu_item.function_name === "exit") {
return confirmDialog.open() return confirmDialog.open()
} }
store.selectedMenuItem = menu_item.menu_id Config.currentMenuTab = menu_item.menu_id
} }
} }
} }