From bcb41c6110571b6d8c82153bd21781df537f632f Mon Sep 17 00:00:00 2001
From: Szymon Szlachtowicz <38212223+Szymx95@users.noreply.github.com>
Date: Thu, 27 Jan 2022 12:13:12 +0100
Subject: [PATCH] Add loading state and rename chat component (#205)

---
 packages/react-chat-example/src/index.tsx            | 10 +++++++---
 packages/react-chat/src/components/Chat/ChatBody.tsx |  6 +++---
 .../react-chat/src/components/Chat/ChatTopbar.tsx    |  6 +++---
 packages/react-chat/src/components/ChatLoader.tsx    |  8 ++++++--
 .../{ReactChat.tsx => DappConnectCommunityChat.tsx}  | 12 +++++++++---
 packages/react-chat/src/contexts/configProvider.tsx  |  2 --
 .../react-chat/src/contexts/messengerProvider.tsx    |  9 +++++++--
 .../react-chat/src/hooks/messenger/useMessenger.ts   |  8 +++++++-
 packages/react-chat/src/index.ts                     |  4 ++--
 9 files changed, 44 insertions(+), 21 deletions(-)
 rename packages/react-chat/src/components/{ReactChat.tsx => DappConnectCommunityChat.tsx} (87%)

diff --git a/packages/react-chat-example/src/index.tsx b/packages/react-chat-example/src/index.tsx
index b63fd3b4..142d1c9d 100644
--- a/packages/react-chat-example/src/index.tsx
+++ b/packages/react-chat-example/src/index.tsx
@@ -1,4 +1,8 @@
-import { darkTheme, lightTheme, ReactChat } from "@waku/react-chat-sdk";
+import {
+  DappConnectCommunityChat,
+  darkTheme,
+  lightTheme,
+} from "@waku/react-chat-sdk";
 import React, { useRef, useState } from "react";
 import ReactDOM from "react-dom";
 import styled from "styled-components";
@@ -73,10 +77,10 @@ function DragDiv() {
           }}
         />
         <FloatingDiv className={showChat ? "" : "hide"}>
-          <ReactChat
+          <DappConnectCommunityChat
             theme={theme ? lightTheme : darkTheme}
+            communityKey={process.env.COMMUNITY_KEY ?? ""}
             config={{
-              communityKey: process.env.COMMUNITY_KEY ?? "",
               environment: process.env.ENV ?? "",
               dappUrl: "https://0.0.0.0:8080",
             }}
diff --git a/packages/react-chat/src/components/Chat/ChatBody.tsx b/packages/react-chat/src/components/Chat/ChatBody.tsx
index 688224e0..5dcb7b7e 100644
--- a/packages/react-chat/src/components/Chat/ChatBody.tsx
+++ b/packages/react-chat/src/components/Chat/ChatBody.tsx
@@ -85,7 +85,7 @@ export function ChatBody({
   editGroup,
   setEditGroup,
 }: ChatBodyProps) {
-  const { messenger, activeChannel, communityData } = useMessengerContext();
+  const { activeChannel, loadingMessenger } = useMessengerContext();
 
   const narrow = useNarrow();
   const className = useMemo(() => (narrow ? "narrow" : ""), [narrow]);
@@ -106,11 +106,11 @@ export function ChatBody({
     }
   }, [narrow]);
 
-  if (messenger && communityData && activeChannel) {
+  if (!loadingMessenger && activeChannel) {
     return (
       <Wrapper>
         <ChatBodyWrapper className={className}>
-          {editGroup && communityData ? (
+          {editGroup ? (
             <ChatCreation
               setEditGroup={setEditGroup}
               activeChannel={activeChannel}
diff --git a/packages/react-chat/src/components/Chat/ChatTopbar.tsx b/packages/react-chat/src/components/Chat/ChatTopbar.tsx
index d93e1a89..23af853d 100644
--- a/packages/react-chat/src/components/Chat/ChatTopbar.tsx
+++ b/packages/react-chat/src/components/Chat/ChatTopbar.tsx
@@ -63,7 +63,7 @@ export function ChatTopbar({
   showMembers,
   setEditGroup,
 }: ChatTopbarProps) {
-  const { messenger, activeChannel, communityData } = useMessengerContext();
+  const { activeChannel, loadingMessenger } = useMessengerContext();
 
   const narrow = useNarrow();
   const [showChannelMenu, setShowChannelMenu] = useState(false);
@@ -77,7 +77,7 @@ export function ChatTopbar({
       className={narrow && showState !== ChatBodyState.Chat ? "narrow" : ""}
     >
       <ChannelWrapper className={narrow ? "narrow" : ""}>
-        {messenger && communityData ? (
+        {!loadingMessenger ? (
           <>
             {narrow && (
               <CommunityWrap className={narrow ? "narrow" : ""}>
@@ -110,7 +110,7 @@ export function ChatTopbar({
         </TopBtn>
         {!narrow && <ActivityButton />}
       </MenuWrapper>
-      {!messenger && !communityData && <Loading />}
+      {loadingMessenger && <Loading />}
       {showChannelMenu && (
         <ChannelMenu
           channel={activeChannel}
diff --git a/packages/react-chat/src/components/ChatLoader.tsx b/packages/react-chat/src/components/ChatLoader.tsx
index 135cdb4c..cd1a3072 100644
--- a/packages/react-chat/src/components/ChatLoader.tsx
+++ b/packages/react-chat/src/components/ChatLoader.tsx
@@ -11,13 +11,17 @@ import {
 import { Chat } from "./Chat";
 import { IdentityLoader } from "./Form/IdentityLoader";
 
-export function ChatLoader() {
+type ChatLoaderProps = {
+  communityKey: string;
+};
+
+export function ChatLoader({ communityKey }: ChatLoaderProps) {
   const [userCreationState] = useUserCreationState();
 
   if (userCreationState === UserCreationState.NotCreating)
     return (
       <IdentityProvider>
-        <MessengerProvider>
+        <MessengerProvider communityKey={communityKey}>
           <ChatStateProvider>
             <Chat />
           </ChatStateProvider>
diff --git a/packages/react-chat/src/components/ReactChat.tsx b/packages/react-chat/src/components/DappConnectCommunityChat.tsx
similarity index 87%
rename from packages/react-chat/src/components/ReactChat.tsx
rename to packages/react-chat/src/components/DappConnectCommunityChat.tsx
index 2cac6e07..ec648ca1 100644
--- a/packages/react-chat/src/components/ReactChat.tsx
+++ b/packages/react-chat/src/components/DappConnectCommunityChat.tsx
@@ -16,13 +16,19 @@ import { Theme } from "../styles/themes";
 
 import { ChatLoader } from "./ChatLoader";
 
-interface ReactChatProps {
+interface DappConnectCommunityChatProps {
   theme: Theme;
+  communityKey: string;
   config: ConfigType;
   fetchMetadata?: (url: string) => Promise<Metadata | undefined>;
 }
 
-export function ReactChat({ theme, config, fetchMetadata }: ReactChatProps) {
+export function DappConnectCommunityChat({
+  theme,
+  config,
+  fetchMetadata,
+  communityKey,
+}: DappConnectCommunityChatProps) {
   const ref = useRef<HTMLHeadingElement>(null);
   return (
     <ConfigProvider config={config}>
@@ -35,7 +41,7 @@ export function ReactChat({ theme, config, fetchMetadata }: ReactChatProps) {
                   <ToastProvider>
                     <Wrapper ref={ref}>
                       <GlobalStyle />
-                      <ChatLoader />
+                      <ChatLoader communityKey={communityKey} />
                       <div id="modal-root" />
                     </Wrapper>
                   </ToastProvider>
diff --git a/packages/react-chat/src/contexts/configProvider.tsx b/packages/react-chat/src/contexts/configProvider.tsx
index 8053e427..50c1b395 100644
--- a/packages/react-chat/src/contexts/configProvider.tsx
+++ b/packages/react-chat/src/contexts/configProvider.tsx
@@ -1,13 +1,11 @@
 import React, { createContext, useContext } from "react";
 
 export type ConfigType = {
-  communityKey: string;
   environment: string;
   dappUrl: string;
 };
 
 const ConfigContext = createContext<ConfigType>({
-  communityKey: "",
   environment: "production",
   dappUrl: "",
 });
diff --git a/packages/react-chat/src/contexts/messengerProvider.tsx b/packages/react-chat/src/contexts/messengerProvider.tsx
index 8c3f45aa..0eeefaf8 100644
--- a/packages/react-chat/src/contexts/messengerProvider.tsx
+++ b/packages/react-chat/src/contexts/messengerProvider.tsx
@@ -14,6 +14,7 @@ const MessengerContext = createContext<MessengerType>({
   clearMentions: () => undefined,
   loadPrevDay: async () => undefined,
   loadingMessages: false,
+  loadingMessenger: true,
   communityData: undefined,
   contacts: {},
   setContacts: () => undefined,
@@ -33,12 +34,16 @@ export function useMessengerContext() {
 }
 
 interface MessengerProviderProps {
+  communityKey: string;
   children: React.ReactNode;
 }
 
-export function MessengerProvider({ children }: MessengerProviderProps) {
+export function MessengerProvider({
+  communityKey,
+  children,
+}: MessengerProviderProps) {
   const identity = useIdentity();
   const nickname = useNickname();
-  const messenger = useMessenger(identity, nickname);
+  const messenger = useMessenger(communityKey, identity, nickname);
   return <MessengerContext.Provider value={messenger} children={children} />;
 }
diff --git a/packages/react-chat/src/hooks/messenger/useMessenger.ts b/packages/react-chat/src/hooks/messenger/useMessenger.ts
index 494900eb..e392269a 100644
--- a/packages/react-chat/src/hooks/messenger/useMessenger.ts
+++ b/packages/react-chat/src/hooks/messenger/useMessenger.ts
@@ -36,6 +36,7 @@ export type MessengerType = {
   clearMentions: (id: string) => void;
   loadPrevDay: (id: string, groupChat?: boolean) => Promise<void>;
   loadingMessages: boolean;
+  loadingMessenger: boolean;
   communityData: CommunityData | undefined;
   contacts: Contacts;
   setContacts: React.Dispatch<React.SetStateAction<Contacts>>;
@@ -101,10 +102,10 @@ function useCreateCommunity(
 }
 
 export function useMessenger(
+  communityKey: string,
   identity: Identity | undefined,
   newNickname: string | undefined
 ) {
-  const { communityKey } = useConfig();
   const [activeChannel, setActiveChannel] = useState<ChannelData>({
     id: "",
     name: "",
@@ -238,6 +239,10 @@ export function useMessenger(
     }
   }, [notifications, activeChannel]);
 
+  const loadingMessenger = useMemo(() => {
+    return !communityData || !messenger || !activeChannel;
+  }, [communityData, messenger, activeChannel]);
+
   return {
     messenger,
     messages,
@@ -246,6 +251,7 @@ export function useMessenger(
     clearNotifications,
     loadPrevDay,
     loadingMessages,
+    loadingMessenger,
     communityData,
     contacts,
     setContacts,
diff --git a/packages/react-chat/src/index.ts b/packages/react-chat/src/index.ts
index eed412a1..40f89086 100644
--- a/packages/react-chat/src/index.ts
+++ b/packages/react-chat/src/index.ts
@@ -1,4 +1,4 @@
-import { ReactChat } from "./components/ReactChat";
+import { DappConnectCommunityChat } from "./components/DappConnectCommunityChat";
 import { ConfigType } from "./contexts/configProvider";
 import { darkTheme, lightTheme } from "./styles/themes";
-export { ReactChat, lightTheme, darkTheme, ConfigType };
+export { DappConnectCommunityChat, lightTheme, darkTheme, ConfigType };