From 6d59633fed7dbe1ddf6d4cecef6a5207d9335a72 Mon Sep 17 00:00:00 2001
From: Jakub Kosmydel <104823336+kosmydel@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:31:04 +0100
Subject: [PATCH] Revert optional status changes

---
 .../home/sidebar/AvatarWithOptionalStatus.js  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/pages/home/sidebar/AvatarWithOptionalStatus.js b/src/pages/home/sidebar/AvatarWithOptionalStatus.js
index 80130d50555c..e1ff3982a0cc 100644
--- a/src/pages/home/sidebar/AvatarWithOptionalStatus.js
+++ b/src/pages/home/sidebar/AvatarWithOptionalStatus.js
@@ -29,13 +29,14 @@ function AvatarWithOptionalStatus({emojiStatus, isCreateMenuOpen}) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const showSettingsPage = useCallback(() => {
+    const showStatusPage = useCallback(() => {
         if (isCreateMenuOpen) {
             // Prevent opening Settings page when click profile avatar quickly after clicking FAB icon
             return;
         }
 
-        Navigation.navigate(ROUTES.SETTINGS);
+        Navigation.setShouldPopAllStateOnUP();
+        Navigation.navigate(ROUTES.SETTINGS_STATUS);
     }, [isCreateMenuOpen]);
 
     return (
@@ -44,15 +45,17 @@ function AvatarWithOptionalStatus({emojiStatus, isCreateMenuOpen}) {
             <PressableWithoutFeedback
                 accessibilityLabel={translate('sidebarScreen.buttonMySettings')}
                 role={CONST.ROLE.BUTTON}
-                onPress={showSettingsPage}
+                onPress={showStatusPage}
                 style={[styles.sidebarStatusAvatar]}
             >
-                <Text
-                    style={styles.emojiStatusLHN}
-                    numberOfLines={1}
-                >
-                    {emojiStatus}
-                </Text>
+                <Tooltip text={translate('statusPage.status')}>
+                    <Text
+                        style={styles.emojiStatusLHN}
+                        numberOfLines={1}
+                    >
+                        {emojiStatus}
+                    </Text>
+                </Tooltip>
             </PressableWithoutFeedback>
         </View>
     );