2 files changed, 5 insertions, 29 deletions
diff --git a/src/screens/profile/ProfileScreen.tsx b/src/screens/profile/ProfileScreen.tsx
index 0d6af21e..6d9ef020 100644
--- a/src/screens/profile/ProfileScreen.tsx
+++ b/src/screens/profile/ProfileScreen.tsx
@@ -1,15 +1,9 @@
 import React from 'react';
 import {StatusBar} from 'react-native';
-import Animated from 'react-native-reanimated';
 import {Content, TabsGradient} from '../../components';
 import {RouteProp} from '@react-navigation/native';
 import {MainStackParams} from '../../routes/';
 
-/**r
- * Profile Screen for a user's profile
- * including posts, messaging, and settings
- */
-
 type ProfileScreenRouteProps = RouteProp<MainStackParams, 'Profile'>;
 
 interface ProfileOnboardingProps {
@@ -19,31 +13,11 @@ interface ProfileOnboardingProps {
 const ProfileScreen: React.FC<ProfileOnboardingProps> = ({route}) => {
   const {screenType} = route.params;
   let {userXId} = route.params;
-  const y = Animated.useValue(0);
-
-  /**
-   * This is a double safety check to avoid app crash.
-   * Checks if the required userXId is present in the store, if not userXId is set to dummy id
-   */
-  // if (userXId && !(userXId in useStore().getState().userX[screenType])) {
-  //   userXId = DUMMY_USERID;
-  // }
-
-  /**
-   * Code under useFocusEffect gets executed every time the screen comes under focus / is being viewed by the user.
-   * This is done to reset the users stored in our store for the Search screen.
-   * Read more about useFocusEffect here : https://reactnavigation.org/docs/function-after-focusing-screen/
-   */
-  // useFocusEffect(() => {
-  //   if (!userXId) {
-  //     dispatch(resetScreenType(screenType));
-  //   }
-  // });
 
   return (
     <>
       <StatusBar barStyle="dark-content" />
-      <Content {...{y, userXId, screenType}} />
+      <Content {...{userXId, screenType}} />
       <TabsGradient />
     </>
   );
diff --git a/src/screens/profile/SettingsScreen.tsx b/src/screens/profile/SettingsScreen.tsx
index 05e051b5..ecc3bafd 100644
--- a/src/screens/profile/SettingsScreen.tsx
+++ b/src/screens/profile/SettingsScreen.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useContext} from 'react';
 import {
   SafeAreaView,
   SectionList,
@@ -17,6 +17,7 @@ import {BackgroundGradientType} from '../../types';
 import {normalize, SCREEN_HEIGHT} from '../../utils/layouts';
 import SettingsCell from './SettingsCell';
 import {useNavigation} from '@react-navigation/core';
+import {ChatContext} from '../../App';
 
 const SettingsScreen: React.FC = () => {
   const dispatch = useDispatch();
@@ -24,6 +25,7 @@ const SettingsScreen: React.FC = () => {
   const {suggested_people_linked} = useSelector(
     (state: RootState) => state.user.profile,
   );
+  const {chatClient} = useContext(ChatContext);
 
   return (
     <>
@@ -49,7 +51,7 @@ const SettingsScreen: React.FC = () => {
                 <TouchableOpacity
                   style={styles.logoutContainerStyles}
                   onPress={() => {
-                    dispatch(logout());
+                    dispatch(logout(chatClient));
                     navigation.reset({
                       index: 0,
                       routes: [{name: 'SuggestedPeople'}],