From ad70d44fd106c475ff3ecd680ebb41946e4dc363 Mon Sep 17 00:00:00 2001
From: ankit-thanekar007 <ankit.thanekar007@gmail.com>
Date: Wed, 17 Mar 2021 15:59:53 -0700
Subject: Tma 701 - New screens added, refactoring pending

---
 src/components/profile/ProfileMoreInfoDrawer.tsx | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/components')

diff --git a/src/components/profile/ProfileMoreInfoDrawer.tsx b/src/components/profile/ProfileMoreInfoDrawer.tsx
index a77a2e84..d62063a7 100644
--- a/src/components/profile/ProfileMoreInfoDrawer.tsx
+++ b/src/components/profile/ProfileMoreInfoDrawer.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import {Alert, Image, StyleSheet, TouchableOpacity} from 'react-native';
 import {useSelector} from 'react-redux';
 import MoreIcon from '../../assets/icons/more_horiz-24px.svg';
-import PersonOutline from '../../assets/ionicons/person-outline.svg';
 import {TAGG_DARK_BLUE, TAGG_LIGHT_BLUE} from '../../constants';
 import {ERROR_ATTEMPT_EDIT_SP} from '../../constants/strings';
 import {RootState} from '../../store/rootreducer';
@@ -29,7 +28,7 @@ const ProfileMoreInfoDrawer: React.FC<ProfileMoreInfoDrawerProps> = (props) => {
   const isOwnProfile = !userXId || userXName === username;
 
   const goToEditProfile = () => {
-    navigation.push('EditProfile', {
+    navigation.navigate('EditProfile', {
       userId: userId,
       username: username,
     });
@@ -41,9 +40,7 @@ const ProfileMoreInfoDrawer: React.FC<ProfileMoreInfoDrawerProps> = (props) => {
       Alert.alert(ERROR_ATTEMPT_EDIT_SP);
     } else {
       // Sending undefined for updatedSelectedBadges to mark that there was no update yet
-      navigation.push('UpdateSPPicture', {
-        editing: true,
-      });
+      navigation.navigate('SettingsScreen');
       setIsOpen(false);
     }
   };
@@ -81,14 +78,21 @@ const ProfileMoreInfoDrawer: React.FC<ProfileMoreInfoDrawerProps> = (props) => {
           textColor={'black'}
           buttons={[
             [
-              'Edit Suggested',
-              goToUpdateSPProfile,
+              'Settings',
+              goToSettingsPage,
               <Image
-                source={require('../../assets/ionicons/suggested-outlined.png')}
+                source={require('../../assets/images/settings/settings.png')}
+                style={styles.image}
+              />,
+            ],
+            [
+              'Edit Profile',
+              goToEditProfile,
+              <Image
+                source={require('../../assets/images/settings/edit-profile.png')}
                 style={styles.image}
               />,
             ],
-            ['Edit Profile', goToEditProfile, <PersonOutline color="black" />],
           ]}
         />
       )}
-- 
cgit v1.2.3-70-g09d2