[FOR MASS REVIEW] Multiple contexts(Searched user gets replaced) (#97)

* First commit towards clean code

* Tested things

* Some final touch

* View updates posts

* Cleaned up followers / following

* You won't believe but it works

* Pass avatar uri via props

* Small change

* Small change

* Removed unnecessary jargon

Co-authored-by: Ivan Chen <ivan@thetaggid.com>

2 files changed, 7 insertions, 12 deletions

diff --git a/src/routes/profile/Profile.tsx b/src/routes/profile/Profile.tsx
index abf967c6..bffa22ce 100644
--- a/src/routes/profile/Profile.tsx
+++ b/src/routes/profile/Profile.tsx
@@ -15,7 +15,6 @@ import {RouteProp} from '@react-navigation/native';
  * What will be the First Screen of the stack depends on value of isProfileView (Search if its true else Profile)
  * Trying to explain the purpose of each route on the stack (ACTUALLY A STACK)
  * Profile : To display the logged in user's profile when isProfileView is false, else displays profile of any user the logged in user wants to view.
- * ProfileView : To display profile of a commenter / any user who has commented on a photo.
  * When you click on the profile icon after looking at a user's profile, the stack is reset and you come back to the top of the stack (First screen : Profile in this case)
  * Search : To display the search screen. Search for a user on this screen, click on a result tile and navigate to the same (isProfileView = true).
  * When you click on the search icon after looking at a user's profile, the stack gets reset and you come back to the top of the stack (First screen : Search in this case)
@@ -90,12 +89,6 @@ const Profile: React.FC<ProfileStackProps> = ({route}) => {
         initialParams={{isProfileView: isProfileView}}
       />
       <ProfileStack.Screen
-        name="ProfileView"
-        component={ProfileScreen}
-        options={{headerShown: false}}
-        initialParams={{isProfileView: isProfileView}}
-      />
-      <ProfileStack.Screen
         name="MomentCommentsScreen"
         component={MomentCommentsScreen}
         options={{headerShown: false}}
diff --git a/src/routes/profile/ProfileStack.tsx b/src/routes/profile/ProfileStack.tsx
index b535d90d..cba646f8 100644
--- a/src/routes/profile/ProfileStack.tsx
+++ b/src/routes/profile/ProfileStack.tsx
@@ -1,15 +1,20 @@
 import {createStackNavigator} from '@react-navigation/stack';
-import {MomentType} from '../../types';
+import {MomentType, ProfilePreviewType, SocialAccountType} from '../../types';
 
 export type ProfileStackParams = {
   Search: undefined;
   Profile: {
     isProfileView: boolean;
+    username: string;
+    userId: string;
   };
   SocialMediaTaggs: {
     socialMediaType: string;
     socialMediaHandle: string;
     isProfileView: boolean;
+    name: string;
+    accountData: SocialAccountType;
+    avatar: string;
   };
   CaptionScreen: {
     title: string;
@@ -23,12 +28,9 @@ export type ProfileStackParams = {
     isProfileView: boolean;
     moment_id: string;
   };
-  ProfileView: {
-    isProfileView: boolean;
-  };
   FollowersListScreen: {
-    isProfileView: boolean;
     isFollowers: boolean;
+    list: ProfilePreviewType[];
   };
 };