fix: minor fixes

Author: Dara Hayes

client/src/App.tsx

@@ -14,11 +14,8 @@ import { withAuth } from './services/auth.service';
 import { ApolloOfflineClient } from 'offix-client';
 import { ApolloProvider } from 'react-apollo-hooks'
 import { useOffixClient } from 'react-offix-hooks';
-import { useCacheService } from './services/cache.service'
 
 const Router: React.FC = () => {
-  console.log('renderApp')
-  useCacheService()
   return (
     <BrowserRouter>
       <AnimatedSwitch>

client/src/components/ChatRoomScreen/MessagesList.tsx

@@ -4,6 +4,7 @@ import { useEffect, useRef } from 'react';
 import styled, { css } from 'styled-components';
 import { useInfiniteScroll } from '../../hooks/use-infinite-scroll';
 import { useAdjustedScroll } from '../../hooks/use-adjusted-scroll';
+import { useUseMessageAddedSubscription } from '../../services/cache.service';
 
 const Container = styled.div`
   position: relative;
@@ -109,6 +110,8 @@ const MessagesList: React.FC<MessagesListProps> = ({
   });
   const adjustScroll = useAdjustedScroll(selfRef);
 
+  useUseMessageAddedSubscription()
+
   useEffect(() => {
     if (!selfRef.current) return;
 

client/src/components/ChatRoomScreen/index.tsx

@@ -112,6 +112,7 @@ const ChatRoom: React.FC<ChatRoomScreenParams> = ({ history, chatId }) => {
   const { after, limit, setAfter } = usePagination();
   const { data, loading, fetchMore } = useGetChatQuery({
     variables: { chatId, after, limit },
+    fetchPolicy: 'cache-and-network'
   });
 
 const [addMessage] = useOfflineMutation(addMessageMutation);

client/src/components/ChatsListScreen/ChatsList.tsx

@@ -93,7 +93,7 @@ const ChatsList: React.FC<ChatsListProps> = ({ history }) => {
   );
   const prefetchChat = useGetChatPrefetch();
 
-  const { data } = useChatsQuery();
+  const { data } = useChatsQuery({ fetchPolicy: 'cache-and-network' });
 
   if (data === undefined || data.chats === undefined) {
     return null;

client/src/components/UsersList.tsx

@@ -55,7 +55,7 @@ interface ChildComponentProps {
 }
 
 const UsersList: React.FC<ChildComponentProps> = ({ dispatch, selectedUsers }) => {
-  const { data, loading: loadingUsers } = useUsersListQuery();
+  const { data, loading: loadingUsers } = useUsersListQuery({ fetchPolicy: 'cache-and-network' });
 
   if (data === undefined) return null;
   const users = data.users;

client/src/services/auth.service.tsx

@@ -3,6 +3,7 @@ import { useContext, useCallback } from 'react';
 import { useApolloClient } from 'react-apollo-hooks';
 import { Redirect } from 'react-router-dom';
 import { useMeQuery, User, useSignInMutation, useSignUpMutation } from '../graphql/types';
+import { useCacheService } from '../services/cache.service';
 
 const MyContext = React.createContext<User | null>(null);
 
@@ -25,6 +26,8 @@ export const withAuth = <P extends object>(
     const signOut = useSignOut();
     const { data, error, loading } = useMeQuery();
 
+    useCacheService();
+
     if (loading) return null;
 
     if (data === undefined) return null;

client/src/services/cache.service.ts

@@ -13,7 +13,18 @@ import {
 
 type Client = ApolloClient<any> | DataProxy;
 
+export const useUseMessageAddedSubscription = () => {
+  useMessageAddedSubscription({
+    onSubscriptionData: ({ client, subscriptionData: { data } }) => {
+      if (data) {
+        writeMessage(client, data.messageAdded);
+      }
+    },
+  });
+}
+
 export const useCacheService = () => {
+
   useMessageAddedSubscription({
     onSubscriptionData: ({ client, subscriptionData: { data } }) => {
       if (data) {