Fix notes

Author: lkazberova

src/components/Firebase/firebase.js

@@ -24,11 +24,8 @@ class Firebase {
     /* Firebase APIs */
 
     this.auth = app.auth();
-
-    /* FireStore */
     this.db = app.firestore();
-    const settings = { timestampsInSnapshots: true};
-    this.db.settings(settings);
+    this.db.settings({ timestampsInSnapshots: true});
 
     /* Social Sign In Method Provider */
 

src/components/Home/index.js

@@ -23,13 +23,13 @@ class HomePage extends Component {
         snapshot.forEach(doc => (users[doc.id] = doc.data()));
 
         this.setState({
-          users: users,
+          users,
         });
       });
   }
 
   componentWillUnmount() {
-    this.unsubscribe && this.unsubscribe();
+    this.unsubscribe();
   }
 
   render() {

src/components/Messages/Messages.js

@@ -29,21 +29,24 @@ class Messages extends Component {
       .orderBy('createdAt', 'desc')
       .limit(this.state.limit) // firestore doesn't have limitLast, so we use combination of order desc and limit
       .onSnapshot(snapshot => {
-        let messageList = [];
+        let messages;
 
-        snapshot.forEach(doc =>
-          messageList.push({ ...doc.data(), uid: doc.id }),
-        );
+        if (snapshot.size) {
+          messages = [];
+          snapshot.forEach(doc =>
+            messages.push({ ...doc.data(), uid: doc.id }),
+          );
+        }
 
         this.setState({
-          messages: messageList.reverse(),
+          messages,
           loading: false,
         });
       });
   };
 
   componentWillUnmount() {
-    this.unsubscribe && this.unsubscribe();
+    this.unsubscribe();
   }
 
   onChangeText = event => {

src/components/Users/UserItem.js

@@ -32,7 +32,7 @@ class UserItem extends Component {
   }
 
   componentWillUnmount() {
-    this.unsubscribe && this.unsubscribe();
+    this.unsubscribe();
   }
 
   onSendPasswordResetEmail = () => {

src/components/Users/UserList.js

@@ -21,21 +21,21 @@ class UserList extends Component {
     this.unsubscribe = this.props.firebase
       .users()
       .onSnapshot(snapshot => {
-        let usersList = [];
+        let users = [];
 
         snapshot.forEach(doc =>
-          usersList.push({ ...doc.data(), uid: doc.id }),
+          users.push({ ...doc.data(), uid: doc.id }),
         );
 
         this.setState({
-          users: usersList,
+          users,
           loading: false,
         });
       });
   }
 
   componentWillUnmount() {
-    this.unsubscribe && this.unsubscribe();
+    this.unsubscribe();
   }
 
   render() {