update

App.js

@@ -17,16 +17,6 @@ import HomeScreen from './screens/HomeScreen';
 //import Loading from './components/Loading';
 import Loading from './screens/main/Loading';
 import { firebaseConfig } from './config/firebaseConfig';
-<<<<<<< HEAD
-=======
-import { Text, View } from 'react-native';
-import { styles } from './config/styles';
-
-import HomeScreen from './screens/main/Home_page';
-import RoomScreen from './screens/main/RoomScreen'
-import { Provider} from 'react-redux'
-import { createStore, applyMiddleware } from 'redux';
->>>>>>> devErnesto
 import rootReducer from './redux/reducers'
 
 
@@ -95,16 +85,9 @@ export default class App extends Component {
     return(
       <Provider store={store}>
         <NavigationContainer>
-<<<<<<< HEAD
           <Drawer.Navigator>
             <Drawer.Screen name={" "} options={{drawerLabel: "Home", headerTransparent: true}} children={this.createHomeStack}/>
           </Drawer.Navigator>
-=======
-          <Stack.Navigator initialRouteName="Home">
-            <Stack.Screen name="Home" component={HomeScreen} />
-            <Stack.Screen name="Room" component={RoomScreen} options={({ route }) => ({ title: route.params.thread.name })} />
-          </Stack.Navigator>
->>>>>>> devErnesto
         </NavigationContainer>
       </Provider>
     );

screens/main/Home_page.js

@@ -13,17 +13,6 @@ import { bindActionCreators } from 'redux'
 import { fetchUser } from '../../redux/actions/index'
 
 export function Home_page({navigation}) {
-<<<<<<< HEAD
-
-  return (
-    <TouchableWithoutFeedback style={styles.stdcontainer} onPress={Keyboard.dismiss} accessible={false}>
-        <ImageBackground style={styles.stdcontainer} source={require('../../assets/yellow-white.jpg')}>
-            <CustomButton marginTop={25} title="Calendar" onPress={() => navigation.navigate('Calendar')}/>
-        </ImageBackground>
-    </TouchableWithoutFeedback>
-  );
-}
-=======
   const [threads, setThreads] = useState([]);  
   const [loading, setLoading] = useState(true);
   
@@ -110,24 +99,10 @@ export function Home_page({navigation}) {
         </ImageBackground>
     );
   }
->>>>>>> devErnesto
 
 const mapStateToProps = (store) => ({
   currentUser: store.userState.currentUser
 })
 const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch);
 
-<<<<<<< HEAD
-export default connect(mapStateToProps, mapDispatchProps)(Home_page);
-const mapStateToProps = (store) => ({
-  currentUser: store.userState.currentUser
-})
-const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch);
-
-export default connect(mapStateToProps, mapDispatchProps)(Home_page);
-
-
-
-=======
 export default connect(mapStateToProps, mapDispatchProps)(Home_page);
->>>>>>> devErnesto

screens/main/RoomScreen.js

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> devErnesto
 import React, { useState, useEffect, useCallback } from 'react';
 import { GiftedChat } from 'react-native-gifted-chat';
 import firebase from 'firebase';