From 496d3c8441d18793ae5dae84c8a51a16166df913 Mon Sep 17 00:00:00 2001
From: Sale Djenic <aleksandardjenic@status.im>
Date: Thu, 29 Jul 2021 10:32:40 +0200
Subject: [PATCH] fix(@desktop/chat): click on "Notification settings" doesn't
 take the user to that section

Click on "Notification settings" in activity center takes user to profile tab, but not to the
notification section there, but to the last selected section. That is fixed now. Also marking
selected section within profile section is fixed now.

Fixes: #3049
---
 ui/app/AppLayouts/Profile/LeftTab/Menu.qml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml
index cfe8e037ac..7ceda6fc48 100644
--- a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml
+++ b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml
@@ -10,7 +10,7 @@ ScrollView {
     readonly property int btnheight: 42
     readonly property int w: 340
     property var changeProfileSection: function (sectionId) {
-        profileCurrentIndex = sectionId
+        Config.currentMenuTab = sectionId
     }
     contentHeight: menuItems.height + 24
 
@@ -27,11 +27,11 @@ ScrollView {
                 menuItemId: modelData.id
                 text: modelData .text
                 source: "../../../img/profile/" + modelData.filename
-                active: profileMenu.profileCurrentIndex === modelData.id
+                active: Config.currentMenuTab === modelData.id
                 Layout.fillWidth: true
                 width: profileMenu.width
                 onClicked: {
-                    Config.currentMenuTab = modelData.id;
+                    Config.currentMenuTab = modelData.id
                 }
             }
         }
@@ -49,12 +49,12 @@ ScrollView {
                 menuItemId: modelData.id
                 text: modelData .text
                 source: "../../../img/profile/" + modelData.filename
-                active: profileMenu.profileCurrentIndex === modelData.id
+                active: Config.currentMenuTab === modelData.id
                 visible: modelData.ifEnabled !== "browser" || appSettings.isBrowserEnabled
                 Layout.fillWidth: true
                 width: profileMenu.width
                 onClicked: function () {
-                    Config.currentMenuTab = modelData.id;
+                    Config.currentMenuTab = modelData.id
                 }
             }
         }
@@ -69,22 +69,16 @@ ScrollView {
                 menuItemId: modelData.id
                 text: modelData.text
                 source: "../../../img/profile/" + modelData.filename
-                active: profileMenu.profileCurrentIndex === modelData.id
+                active: Config.currentMenuTab === modelData.id
                 Layout.fillWidth: true
                 width: profileMenu.width
                 onClicked: function () {
                     if (modelData.function === "exit") {
                         return Qt.quit()
                     }
-                    Config.currentMenuTab = modelData.id;
+                    Config.currentMenuTab = modelData.id
                 }
             }
         }
     }
 }
-
-/*##^##
-Designer {
-    D{i:0;formeditorColor:"#ffffff";height:500;width:340}
-}
-##^##*/