Merged changes to make sure moments view and search work (#62)

1 files changed, 8 insertions, 5 deletions

diff --git a/src/routes/tabs/NavigationBar.tsx b/src/routes/tabs/NavigationBar.tsx
index f05a512b..9cfbe4bf 100644
--- a/src/routes/tabs/NavigationBar.tsx
+++ b/src/routes/tabs/NavigationBar.tsx
@@ -2,8 +2,7 @@ import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
 import React from 'react';
 import {NavigationIcon} from '../../components';
 import {Home, Notifications, Upload} from '../../screens';
-import Profile from '../profile';
-import MomentStackScreen from '../profile/MomentStackScreen';
+import Profile from '../profile/Profile';
 
 const Tabs = createBottomTabNavigator();
 
@@ -36,7 +35,7 @@ const NavigationBar: React.FC = () => {
             ) : (
               <NavigationIcon tab="Notifications" disabled={true} />
             );
-          } else if (route.name === 'MomentStackScreen') {
+          } else if (route.name === 'Profile') {
             return focused ? (
               <NavigationIcon tab="Profile" disabled={false} />
             ) : (
@@ -45,7 +44,7 @@ const NavigationBar: React.FC = () => {
           }
         },
       })}
-      initialRouteName="MomentStackScreen"
+      initialRouteName="Profile"
       tabBarOptions={{
         showLabel: false,
         style: {
@@ -65,7 +64,11 @@ const NavigationBar: React.FC = () => {
       />
       <Tabs.Screen name="Upload" component={Upload} />
       <Tabs.Screen name="Notifications" component={Notifications} />
-      <Tabs.Screen name="MomentStackScreen" component={MomentStackScreen} />
+      <Tabs.Screen
+        name="Profile"
+        component={Profile}
+        initialParams={{isProfileView: false}}
+      />
     </Tabs.Navigator>
   );
 };