From 5549b429d64ea077960910ebd13add30265f78bb Mon Sep 17 00:00:00 2001
From: AbdelruhmanSamy <abdelruhman.mohamad04@eng-st.cu.edu.eg>
Date: Tue, 24 Dec 2024 02:35:43 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20(Privacy=20Settings):=20Privacy?=
 =?UTF-8?q?=20settings=20back=20to=20life?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/state/side-bar/sideBar.ts | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/state/side-bar/sideBar.ts b/app/src/state/side-bar/sideBar.ts
index f896c7f6..fd17f9e5 100644
--- a/app/src/state/side-bar/sideBar.ts
+++ b/app/src/state/side-bar/sideBar.ts
@@ -21,7 +21,7 @@ import {
   members,
   permissions,
   channelInfo,
-  editChannelInfo,
+  editChannelInfo
 } from "../../data/sideBar";
 import { pagesStrings } from "types/sideBar";
 
@@ -39,7 +39,7 @@ interface SideBarState {
 
 const initialState: SideBarState = {
   leftSideBar: chats,
-  rightSideBar: groupInfo,
+  rightSideBar: groupInfo
 };
 
 function getSideBarPage(type: number): SideBarView {
@@ -116,20 +116,27 @@ const sideBarSlice = createSlice({
         page: newData.page,
         title: newData.title,
         backView: data?.backView ? data?.backView : newData?.backView,
-        props: { ...newData.props },
+        props: { ...newData.props }
       };
 
+      if (redirect === sideBarPages.SETTINGS_UPDATE) {
+        updatedSideBar.props = { data: data };
+        updatedSideBar.title = data.header;
+      }
       if (redirect === sideBarPages.ADD_ADMINS) {
         updatedSideBar.props = {
           ...updatedSideBar.props,
-          prevBackView: data.prevBackView,
+          prevBackView: data.prevBackView
         };
-      }
-
-      if (redirect === sideBarPages.ADD_MEMBERS) {
+      } else if (redirect === sideBarPages.ADD_MEMBERS) {
+        updatedSideBar.props = {
+          ...updatedSideBar.props,
+          view: data.view
+        };
+      } else if (redirect === sideBarPages.SETTINGS_UPDATE) {
         updatedSideBar.props = {
           ...updatedSideBar.props,
-          view: data.view,
+          props: data
         };
       }
 
@@ -138,8 +145,8 @@ const sideBarSlice = createSlice({
       } else {
         state.rightSideBar = updatedSideBar;
       }
-    },
-  },
+    }
+  }
 });
 
 export const { updateSideBarView, resetRightSideBar, resetLeftSideBar } =