From 51b85b5b498e4beedf3051701d104618e853a6f7 Mon Sep 17 00:00:00 2001
From: Szymon Szlachtowicz <38212223+Szymx95@users.noreply.github.com>
Date: Tue, 1 Feb 2022 13:13:30 +0100
Subject: [PATCH] Fix and refactor activity center (#212)

---
 .../ActivityCenter/ActivityButton.tsx         |  22 +++-
 .../ActivityCenter/ActivityCenter.tsx         |  17 ++-
 .../ActivityCenter/ActivityMessage.tsx        |  43 +++++--
 .../components/DappConnectCommunityChat.tsx   |  29 ++---
 .../src/components/Messages/MessageQuote.tsx  |  26 +---
 .../src/components/Messages/MessagesList.tsx  |   2 -
 .../src/components/Messages/UiMessage.tsx     |  44 +------
 .../src/components/Modals/ProfileModal.tsx    |  21 +--
 .../src/contexts/activityProvider.tsx         |  29 -----
 .../src/contexts/messengerProvider.tsx        |   1 +
 .../DappConnectGroupChat.tsx                  |  29 ++---
 .../src/hooks/messenger/useMessages.ts        |   9 +-
 .../src/hooks/messenger/useMessenger.ts       |  55 +++++++-
 .../react-chat/src/hooks/useActivities.ts     | 120 ++++++++++++++++++
 .../src/hooks/useScrollToMessage.ts           |  51 ++++++++
 packages/react-chat/src/models/Activity.ts    |  55 ++++++--
 packages/react-chat/src/models/ChatMessage.ts |   1 +
 17 files changed, 365 insertions(+), 189 deletions(-)
 delete mode 100644 packages/react-chat/src/contexts/activityProvider.tsx
 create mode 100644 packages/react-chat/src/hooks/useActivities.ts
 create mode 100644 packages/react-chat/src/hooks/useScrollToMessage.ts

diff --git a/packages/react-chat/src/components/ActivityCenter/ActivityButton.tsx b/packages/react-chat/src/components/ActivityCenter/ActivityButton.tsx
index 82c04488..939b7ee2 100644
--- a/packages/react-chat/src/components/ActivityCenter/ActivityButton.tsx
+++ b/packages/react-chat/src/components/ActivityCenter/ActivityButton.tsx
@@ -1,8 +1,8 @@
 import React, { useMemo, useRef, useState } from "react";
 import styled from "styled-components";
 
-import { useActivities } from "../../contexts/activityProvider";
 import { useIdentity } from "../../contexts/identityProvider";
+import { useActivities } from "../../hooks/useActivities";
 import { useClickOutside } from "../../hooks/useClickOutside";
 import { TopBtn } from "../Chat/ChatTopbar";
 import { ActivityIcon } from "../Icons/ActivityIcon";
@@ -14,13 +14,17 @@ interface ActivityButtonProps {
 }
 
 export function ActivityButton({ className }: ActivityButtonProps) {
-  const { activities } = useActivities();
+  const { activities, activityDispatch } = useActivities();
   const identity = useIdentity();
   const disabled = useMemo(() => !identity, [identity]);
   const ref = useRef(null);
   useClickOutside(ref, () => setShowActivityCenter(false));
 
   const [showActivityCenter, setShowActivityCenter] = useState(false);
+  const badgeAmount = useMemo(
+    () => activities.filter((activity) => !activity.isRead).length,
+    [activities]
+  );
 
   return (
     <ActivityWrapper ref={ref} className={className}>
@@ -29,22 +33,26 @@ export function ActivityButton({ className }: ActivityButtonProps) {
         disabled={disabled}
       >
         <ActivityIcon />
-        {activities.length > 0 && (
+        {badgeAmount > 0 && (
           <NotificationBagde
             className={
-              activities.length > 99
+              badgeAmount > 99
                 ? "countless"
-                : activities.length > 9
+                : badgeAmount > 9
                 ? "wide"
                 : undefined
             }
           >
-            {activities.length < 100 ? activities.length : "∞"}
+            {badgeAmount < 100 ? badgeAmount : "∞"}
           </NotificationBagde>
         )}
       </TopBtn>
       {showActivityCenter && (
-        <ActivityCenter setShowActivityCenter={setShowActivityCenter} />
+        <ActivityCenter
+          activities={activities}
+          setShowActivityCenter={setShowActivityCenter}
+          activityDispatch={activityDispatch}
+        />
       )}
     </ActivityWrapper>
   );
diff --git a/packages/react-chat/src/components/ActivityCenter/ActivityCenter.tsx b/packages/react-chat/src/components/ActivityCenter/ActivityCenter.tsx
index 1e24d1a0..d35f724f 100644
--- a/packages/react-chat/src/components/ActivityCenter/ActivityCenter.tsx
+++ b/packages/react-chat/src/components/ActivityCenter/ActivityCenter.tsx
@@ -1,8 +1,9 @@
 import React, { useMemo, useState } from "react";
 import styled from "styled-components";
 
-import { useActivities } from "../../contexts/activityProvider";
 import { useMessengerContext } from "../../contexts/messengerProvider";
+import { ActivityAction } from "../../hooks/useActivities";
+import { Activity } from "../../models/Activity";
 import { buttonTransparentStyles } from "../Buttons/buttonStyle";
 import { Tooltip } from "../Form/Tooltip";
 import { HideIcon } from "../Icons/HideIcon";
@@ -12,11 +13,16 @@ import { ShowIcon } from "../Icons/ShowIcon";
 import { ActivityMessage } from "./ActivityMessage";
 
 interface ActivityCenterProps {
+  activities: Activity[];
   setShowActivityCenter: (val: boolean) => void;
+  activityDispatch: React.Dispatch<ActivityAction>;
 }
 
-export function ActivityCenter({ setShowActivityCenter }: ActivityCenterProps) {
-  const { activities } = useActivities();
+export function ActivityCenter({
+  activities,
+  setShowActivityCenter,
+  activityDispatch,
+}: ActivityCenterProps) {
   const { contacts } = useMessengerContext();
 
   const shownActivities = useMemo(
@@ -53,9 +59,7 @@ export function ActivityCenter({ setShowActivityCenter }: ActivityCenterProps) {
         <Btns>
           <BtnWrapper>
             <ActivityBtn
-              onClick={() => {
-                shownActivities.map((activity) => (activity.isRead = true));
-              }}
+              onClick={() => activityDispatch({ type: "setAllAsRead" })}
             >
               <ReadIcon />
             </ActivityBtn>
@@ -76,6 +80,7 @@ export function ActivityCenter({ setShowActivityCenter }: ActivityCenterProps) {
               key={activity.id}
               activity={activity}
               setShowActivityCenter={setShowActivityCenter}
+              activityDispatch={activityDispatch}
             />
           ))}
         </Activities>
diff --git a/packages/react-chat/src/components/ActivityCenter/ActivityMessage.tsx b/packages/react-chat/src/components/ActivityCenter/ActivityMessage.tsx
index 666cc64e..0d26fbc3 100644
--- a/packages/react-chat/src/components/ActivityCenter/ActivityMessage.tsx
+++ b/packages/react-chat/src/components/ActivityCenter/ActivityMessage.tsx
@@ -3,7 +3,9 @@ import styled from "styled-components";
 
 import { useMessengerContext } from "../../contexts/messengerProvider";
 import { useModal } from "../../contexts/modalProvider";
+import { ActivityAction } from "../../hooks/useActivities";
 import { useClickOutside } from "../../hooks/useClickOutside";
+import { useScrollToMessage } from "../../hooks/useScrollToMessage";
 import { Activity } from "../../models/Activity";
 import { equalDate } from "../../utils/equalDate";
 import { DownloadButton } from "../Buttons/DownloadButton";
@@ -41,16 +43,19 @@ const today = new Date();
 type ActivityMessageProps = {
   activity: Activity;
   setShowActivityCenter: (val: boolean) => void;
+  activityDispatch: React.Dispatch<ActivityAction>;
 };
 
 export function ActivityMessage({
   activity,
   setShowActivityCenter,
+  activityDispatch,
 }: ActivityMessageProps) {
   const { contacts, channelsDispatch } = useMessengerContext();
+  const scroll = useScrollToMessage();
   const { setModal } = useModal(ProfileModalName);
   const showChannel = () => {
-    activity.channel &&
+    "channel" in activity &&
       channelsDispatch({ type: "ChangeActive", payload: activity.channel.id }),
       setShowActivityCenter(false);
   };
@@ -66,10 +71,10 @@ export function ActivityMessage({
 
   const [elements, setElements] = useState<
     (string | React.ReactElement | undefined)[]
-  >([activity.message?.content]);
+  >(["message" in activity ? activity.message?.content : undefined]);
 
   useEffect(() => {
-    if (activity.message) {
+    if ("message" in activity) {
       const split = activity.message?.content.split(" ");
       const newSplit = split.flatMap((element, idx) => {
         if (element.startsWith("@")) {
@@ -88,7 +93,7 @@ export function ActivityMessage({
       newSplit.pop();
       setElements(newSplit);
     }
-  }, [activity.message?.content]);
+  }, [activity]);
 
   const ref = useRef(null);
   useClickOutside(ref, () => setShowMenu(false));
@@ -162,10 +167,16 @@ export function ActivityMessage({
               </FlexDiv>
             )}
             <ActivityText>
-              {activity.message?.content && (
-                <div>{elements.map((el) => el)}</div>
+              {"message" in activity && activity.message?.content && (
+                <div
+                  onClick={() => scroll(activity.message, activity.channel.id)}
+                >
+                  {elements.map((el) => el)}
+                </div>
               )}
-              {activity.requestType === "income" && activity.request}
+              {activity.type === "request" &&
+                activity.requestType === "income" &&
+                activity.request}
             </ActivityText>
             {type === "mention" &&
               activity.channel &&
@@ -199,8 +210,10 @@ export function ActivityMessage({
             <>
               <ActivityBtn
                 onClick={() => {
-                  activity.isRead = true;
-                  activity.status = "accepted";
+                  activityDispatch({
+                    type: "setStatus",
+                    payload: { id: activity.id, status: "accepted" },
+                  });
                 }}
                 className="accept"
               >
@@ -208,8 +221,10 @@ export function ActivityMessage({
               </ActivityBtn>
               <ActivityBtn
                 onClick={() => {
-                  activity.isRead = true;
-                  activity.status = "declined";
+                  activityDispatch({
+                    type: "setStatus",
+                    payload: { id: activity.id, status: "declined" },
+                  });
                 }}
                 className="decline"
               >
@@ -240,9 +255,9 @@ export function ActivityMessage({
         {(type === "mention" || type === "reply") && (
           <BtnWrapper>
             <ActivityBtn
-              onClick={() => {
-                activity.isRead = true;
-              }}
+              onClick={() =>
+                activityDispatch({ type: "setAsRead", payload: activity.id })
+              }
               className={`${activity.isRead && "read"}`}
             >
               <ReadMessageIcon isRead={activity.isRead} />
diff --git a/packages/react-chat/src/components/DappConnectCommunityChat.tsx b/packages/react-chat/src/components/DappConnectCommunityChat.tsx
index a80bf4ea..161050e8 100644
--- a/packages/react-chat/src/components/DappConnectCommunityChat.tsx
+++ b/packages/react-chat/src/components/DappConnectCommunityChat.tsx
@@ -3,7 +3,6 @@ import { ThemeProvider } from "styled-components";
 import styled from "styled-components";
 
 import { ConfigType } from "..";
-import { ActivityProvider } from "../contexts/activityProvider";
 import { ChatStateProvider } from "../contexts/chatStateProvider";
 import { ConfigProvider } from "../contexts/configProvider";
 import { FetchMetadataProvider } from "../contexts/fetchMetadataProvider";
@@ -38,21 +37,19 @@ export function DappConnectCommunityChat({
         <NarrowProvider myRef={ref}>
           <FetchMetadataProvider fetchMetadata={fetchMetadata}>
             <ModalProvider>
-              <ActivityProvider>
-                <ToastProvider>
-                  <Wrapper ref={ref}>
-                    <GlobalStyle />
-                    <IdentityProvider>
-                      <MessengerProvider communityKey={communityKey}>
-                        <ChatStateProvider>
-                          <Chat />
-                          <div id="modal-root" />
-                        </ChatStateProvider>
-                      </MessengerProvider>
-                    </IdentityProvider>
-                  </Wrapper>
-                </ToastProvider>
-              </ActivityProvider>
+              <ToastProvider>
+                <Wrapper ref={ref}>
+                  <GlobalStyle />
+                  <IdentityProvider>
+                    <MessengerProvider communityKey={communityKey}>
+                      <ChatStateProvider>
+                        <Chat />
+                        <div id="modal-root" />
+                      </ChatStateProvider>
+                    </MessengerProvider>
+                  </IdentityProvider>
+                </Wrapper>
+              </ToastProvider>
             </ModalProvider>
           </FetchMetadataProvider>
         </NarrowProvider>
diff --git a/packages/react-chat/src/components/Messages/MessageQuote.tsx b/packages/react-chat/src/components/Messages/MessageQuote.tsx
index c006164a..8cf4186d 100644
--- a/packages/react-chat/src/components/Messages/MessageQuote.tsx
+++ b/packages/react-chat/src/components/Messages/MessageQuote.tsx
@@ -1,7 +1,8 @@
-import React, { useCallback } from "react";
+import React from "react";
 import styled from "styled-components";
 
 import { useMessengerContext } from "../../contexts/messengerProvider";
+import { useScrollToMessage } from "../../hooks/useScrollToMessage";
 import { ChatMessage } from "../../models/ChatMessage";
 import { ReplyOn, ReplyTo } from "../Chat/ChatInput";
 import { QuoteSvg } from "../Icons/QuoteIcon";
@@ -23,30 +24,11 @@ type MessageQuoteProps = {
 
 export function MessageQuote({ quote }: MessageQuoteProps) {
   const { contacts } = useMessengerContext();
-  const quoteClick = useCallback(() => {
-    if (quote) {
-      const quoteDiv = document.getElementById(quote.id);
-      if (quoteDiv) {
-        quoteDiv.scrollIntoView({
-          behavior: "smooth",
-          block: "center",
-          inline: "center",
-        });
-        quoteDiv.style.background = "lightblue";
-        quoteDiv.style.transition = "background-color 1000ms linear";
-        window.setTimeout(() => {
-          quoteDiv.style.background = "";
-          window.setTimeout(() => {
-            quoteDiv.style.transition = "";
-          }, 1000);
-        }, 1000);
-      }
-    }
-  }, [quote]);
+  const scroll = useScrollToMessage();
 
   if (quote && quote.sender) {
     return (
-      <QuoteWrapper onClick={quoteClick}>
+      <QuoteWrapper onClick={() => scroll(quote)}>
         <QuoteSvg width={22} height={calcHeight(quote)} />
         <QuoteSender>
           {" "}
diff --git a/packages/react-chat/src/components/Messages/MessagesList.tsx b/packages/react-chat/src/components/Messages/MessagesList.tsx
index f0b724e3..0d8f02e5 100644
--- a/packages/react-chat/src/components/Messages/MessagesList.tsx
+++ b/packages/react-chat/src/components/Messages/MessagesList.tsx
@@ -64,13 +64,11 @@ export function MessagesList({ setReply, channel }: MessagesListProps) {
         <UiMessage
           key={message.id}
           message={message}
-          channel={channel}
           idx={idx}
           prevMessage={shownMessages[idx - 1]}
           setLink={setLink}
           setImage={setImage}
           setReply={setReply}
-          quote={shownMessages.find((msg) => msg.id == message?.responseTo)}
         />
       ))}
     </MessagesWrapper>
diff --git a/packages/react-chat/src/components/Messages/UiMessage.tsx b/packages/react-chat/src/components/Messages/UiMessage.tsx
index 0e700b4d..06bccac3 100644
--- a/packages/react-chat/src/components/Messages/UiMessage.tsx
+++ b/packages/react-chat/src/components/Messages/UiMessage.tsx
@@ -1,14 +1,11 @@
-import { utils } from "@waku/status-communities/dist/cjs";
 import { BaseEmoji } from "emoji-mart";
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useMemo, useRef, useState } from "react";
 import styled from "styled-components";
 
-import { useActivities } from "../../contexts/activityProvider";
 import { useIdentity } from "../../contexts/identityProvider";
 import { useMessengerContext } from "../../contexts/messengerProvider";
 import { useClickOutside } from "../../hooks/useClickOutside";
 import { Reply } from "../../hooks/useReply";
-import { ChannelData } from "../../models/ChannelData";
 import { ChatMessage } from "../../models/ChatMessage";
 import { equalDate } from "../../utils";
 import { ChatMessageContent } from "../Chat/ChatMessageContent";
@@ -38,27 +35,22 @@ import {
 type UiMessageProps = {
   idx: number;
   message: ChatMessage;
-  channel: ChannelData;
   prevMessage: ChatMessage;
   setImage: (img: string) => void;
   setLink: (link: string) => void;
   setReply: (val: Reply | undefined) => void;
-  quote?: ChatMessage;
 };
 
 export function UiMessage({
   message,
-  channel,
   idx,
   prevMessage,
   setImage,
   setLink,
   setReply,
-  quote,
 }: UiMessageProps) {
   const today = new Date();
   const { contacts } = useMessengerContext();
-  const { setActivities } = useActivities();
   const identity = useIdentity();
 
   const contact = useMemo(
@@ -70,38 +62,6 @@ export function UiMessage({
   const [mentioned, setMentioned] = useState(false);
   const [messageReactions, setMessageReactions] = useState<BaseEmoji[]>([]);
 
-  useEffect(() => {
-    if (mentioned)
-      setActivities((prev) => [
-        ...prev,
-        {
-          id: message.date.getTime().toString() + message.content,
-          type: "mention",
-          date: message.date,
-          user: message.sender,
-          message: message,
-          channel: channel,
-        },
-      ]);
-    if (
-      quote &&
-      identity &&
-      quote.sender === utils.bufToHex(identity.publicKey)
-    )
-      setActivities((prev) => [
-        ...prev,
-        {
-          id: message.date.getTime().toString() + message.content,
-          type: "reply",
-          date: message.date,
-          user: message.sender,
-          message: message,
-          channel: channel,
-          quote: quote,
-        },
-      ]);
-  }, [mentioned, message, quote]);
-
   const ref = useRef(null);
   useClickOutside(ref, () => setShowMenu(false));
 
@@ -117,7 +77,7 @@ export function UiMessage({
         </DateSeparator>
       )}
       <MessageWrapper className={`${mentioned && "mention"}`} id={message.id}>
-        <MessageQuote quote={quote} />
+        <MessageQuote quote={message.quote} />
         <UserMessageWrapper ref={messageRef}>
           <IconBtn
             onClick={() => {
diff --git a/packages/react-chat/src/components/Modals/ProfileModal.tsx b/packages/react-chat/src/components/Modals/ProfileModal.tsx
index 9204213b..20334fb9 100644
--- a/packages/react-chat/src/components/Modals/ProfileModal.tsx
+++ b/packages/react-chat/src/components/Modals/ProfileModal.tsx
@@ -2,7 +2,6 @@ import { bufToHex } from "@waku/status-communities/dist/cjs/utils";
 import React, { useEffect, useMemo, useState } from "react";
 import styled from "styled-components";
 
-import { useActivities } from "../../contexts/activityProvider";
 import { useIdentity } from "../../contexts/identityProvider";
 import { useMessengerContext } from "../../contexts/messengerProvider";
 import { useModal } from "../../contexts/modalProvider";
@@ -49,7 +48,6 @@ export const ProfileModal = () => {
     [props]
   );
 
-  const { setActivities } = useActivities();
   const { setToasts } = useToasts();
   const { setModal } = useModal(ProfileModalName);
 
@@ -200,27 +198,14 @@ export const ProfileModal = () => {
             <Btn
               disabled={!request}
               onClick={() => {
-                setActivities((prev) => [
+                setToasts((prev) => [
                   ...prev,
                   {
                     id: id + request,
-                    type: "request",
-                    isRead: true,
-                    date: new Date(),
-                    user: id,
-                    request: request,
-                    requestType: "outcome",
-                    status: "sent",
+                    type: "confirmation",
+                    text: "Contact Request Sent",
                   },
                 ]),
-                  setToasts((prev) => [
-                    ...prev,
-                    {
-                      id: id + request,
-                      type: "confirmation",
-                      text: "Contact Request Sent",
-                    },
-                  ]),
                   setRequestCreation(false),
                   setModal(false),
                   setRequest("");
diff --git a/packages/react-chat/src/contexts/activityProvider.tsx b/packages/react-chat/src/contexts/activityProvider.tsx
deleted file mode 100644
index ac263473..00000000
--- a/packages/react-chat/src/contexts/activityProvider.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React, { createContext, useContext, useState } from "react";
-
-import { Activity } from "../models/Activity";
-
-const ActivityContext = createContext<{
-  activities: Activity[];
-  setActivities: React.Dispatch<React.SetStateAction<Activity[]>>;
-}>({
-  activities: [],
-  setActivities: () => undefined,
-});
-
-export function useActivities() {
-  return useContext(ActivityContext);
-}
-
-interface ActivityProviderProps {
-  children: React.ReactNode;
-}
-
-export function ActivityProvider({ children }: ActivityProviderProps) {
-  const [activities, setActivities] = useState<Activity[]>([]);
-  return (
-    <ActivityContext.Provider
-      value={{ activities, setActivities }}
-      children={children}
-    />
-  );
-}
diff --git a/packages/react-chat/src/contexts/messengerProvider.tsx b/packages/react-chat/src/contexts/messengerProvider.tsx
index 2434527c..08678e83 100644
--- a/packages/react-chat/src/contexts/messengerProvider.tsx
+++ b/packages/react-chat/src/contexts/messengerProvider.tsx
@@ -27,6 +27,7 @@ const MessengerContext = createContext<MessengerType>({
   changeGroupChatName: () => undefined,
   addMembers: () => undefined,
   nickname: undefined,
+  subscriptionsDispatch: () => undefined,
 });
 
 export function useMessengerContext() {
diff --git a/packages/react-chat/src/groupChatComponents/DappConnectGroupChat.tsx b/packages/react-chat/src/groupChatComponents/DappConnectGroupChat.tsx
index 613e7d75..5cd87acd 100644
--- a/packages/react-chat/src/groupChatComponents/DappConnectGroupChat.tsx
+++ b/packages/react-chat/src/groupChatComponents/DappConnectGroupChat.tsx
@@ -3,7 +3,6 @@ import { ThemeProvider } from "styled-components";
 import styled from "styled-components";
 
 import { ConfigType } from "..";
-import { ActivityProvider } from "../contexts/activityProvider";
 import { ChatStateProvider } from "../contexts/chatStateProvider";
 import { ConfigProvider } from "../contexts/configProvider";
 import { FetchMetadataProvider } from "../contexts/fetchMetadataProvider";
@@ -36,21 +35,19 @@ export function DappConnectGroupChat({
         <NarrowProvider myRef={ref}>
           <FetchMetadataProvider fetchMetadata={fetchMetadata}>
             <ModalProvider>
-              <ActivityProvider>
-                <ToastProvider>
-                  <Wrapper ref={ref}>
-                    <GlobalStyle />
-                    <IdentityProvider>
-                      <MessengerProvider communityKey={undefined}>
-                        <ChatStateProvider>
-                          <GroupChat />
-                          <div id="modal-root" />
-                        </ChatStateProvider>
-                      </MessengerProvider>
-                    </IdentityProvider>
-                  </Wrapper>
-                </ToastProvider>
-              </ActivityProvider>
+              <ToastProvider>
+                <Wrapper ref={ref}>
+                  <GlobalStyle />
+                  <IdentityProvider>
+                    <MessengerProvider communityKey={undefined}>
+                      <ChatStateProvider>
+                        <GroupChat />
+                        <div id="modal-root" />
+                      </ChatStateProvider>
+                    </MessengerProvider>
+                  </IdentityProvider>
+                </Wrapper>
+              </ToastProvider>
             </ModalProvider>
           </FetchMetadataProvider>
         </NarrowProvider>
diff --git a/packages/react-chat/src/hooks/messenger/useMessages.ts b/packages/react-chat/src/hooks/messenger/useMessages.ts
index d2480a28..81c1a948 100644
--- a/packages/react-chat/src/hooks/messenger/useMessages.ts
+++ b/packages/react-chat/src/hooks/messenger/useMessages.ts
@@ -14,6 +14,7 @@ import { useNotifications } from "./useNotifications";
 export function useMessages(
   chatId: string,
   identity: Identity | undefined,
+  subscriptions: ((msg: ChatMessage, id: string) => void)[],
   contacts?: Contacts
 ) {
   const [messages, setMessages] = useState<{ [chatId: string]: ChatMessage[] }>(
@@ -28,6 +29,11 @@ export function useMessages(
     (newMessage: ChatMessage | undefined, id: string) => {
       if (newMessage) {
         contacts?.addContact(newMessage.sender);
+        if (newMessage.responseTo) {
+          newMessage.quote = messages[id].find(
+            (msg) => msg.id === newMessage.responseTo
+          );
+        }
         setMessages((prev) => {
           return {
             ...prev,
@@ -39,6 +45,7 @@ export function useMessages(
             ),
           };
         });
+        subscriptions.forEach((subscription) => subscription(newMessage, id));
         incNotification(id);
         if (
           identity &&
@@ -48,7 +55,7 @@ export function useMessages(
         }
       }
     },
-    [contacts, identity]
+    [contacts, identity, subscriptions]
   );
 
   const addMessage = useCallback(
diff --git a/packages/react-chat/src/hooks/messenger/useMessenger.ts b/packages/react-chat/src/hooks/messenger/useMessenger.ts
index 6db032dc..b2d4c656 100644
--- a/packages/react-chat/src/hooks/messenger/useMessenger.ts
+++ b/packages/react-chat/src/hooks/messenger/useMessenger.ts
@@ -6,7 +6,7 @@ import {
   Identity,
   Messenger,
 } from "@waku/status-communities/dist/cjs";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useReducer, useState } from "react";
 
 import { useConfig } from "../../contexts/configProvider";
 import { ChannelData, ChannelsData } from "../../models/ChannelData";
@@ -50,6 +50,7 @@ export type MessengerType = {
   changeGroupChatName: (name: string, chatId: string) => void;
   addMembers: (members: string[], chatId: string) => void;
   nickname: string | undefined;
+  subscriptionsDispatch: (action: SubscriptionAction) => void;
 };
 
 function useCreateMessenger(identity: Identity | undefined) {
@@ -105,11 +106,54 @@ function useCreateCommunity(
   return { community, communityData };
 }
 
+type Subscriptions = {
+  [id: string]: (msg: ChatMessage, id: string) => void;
+};
+
+type SubscriptionAction =
+  | {
+      type: "addSubscription";
+      payload: {
+        name: string;
+        subFunction: (msg: ChatMessage, id: string) => void;
+      };
+    }
+  | { type: "removeSubscription"; payload: { name: string } };
+
+function subscriptionReducer(
+  state: Subscriptions,
+  action: SubscriptionAction
+): Subscriptions {
+  switch (action.type) {
+    case "addSubscription": {
+      if (state[action.payload.name]) {
+        throw new Error("Subscription already exists");
+      }
+      return { ...state, [action.payload.name]: action.payload.subFunction };
+    }
+    case "removeSubscription": {
+      if (state[action.payload.name]) {
+        const newState = { ...state };
+        delete newState[action.payload.name];
+        return newState;
+      }
+      return state;
+    }
+    default:
+      throw new Error("Wrong subscription action type");
+  }
+}
+
 export function useMessenger(
   communityKey: string | undefined,
   identity: Identity | undefined,
   newNickname: string | undefined
 ) {
+  const [subscriptions, subscriptionsDispatch] = useReducer(
+    subscriptionReducer,
+    {}
+  );
+  const subList = useMemo(() => Object.values(subscriptions), [subscriptions]);
   const [channelsState, channelsDispatch] = useChannelsReducer();
   const messenger = useCreateMessenger(identity);
   const { contacts, contactsDispatch, contactsClass, nickname } = useContacts(
@@ -135,7 +179,12 @@ export function useMessenger(
     messages,
     mentions,
     clearMentions,
-  } = useMessages(channelsState?.activeChannel?.id, identity, contactsClass);
+  } = useMessages(
+    channelsState?.activeChannel?.id,
+    identity,
+    subList,
+    contactsClass
+  );
 
   const { community, communityData } = useCreateCommunity(
     messenger,
@@ -259,6 +308,7 @@ export function useMessenger(
         (communityKey && !channelsState.activeChannel.id)
     );
   }, [communityData, messenger, channelsState]);
+
   return {
     messenger,
     messages,
@@ -282,5 +332,6 @@ export function useMessenger(
     changeGroupChatName,
     addMembers,
     nickname,
+    subscriptionsDispatch,
   };
 }
diff --git a/packages/react-chat/src/hooks/useActivities.ts b/packages/react-chat/src/hooks/useActivities.ts
new file mode 100644
index 00000000..b26f89b2
--- /dev/null
+++ b/packages/react-chat/src/hooks/useActivities.ts
@@ -0,0 +1,120 @@
+import { bufToHex } from "@waku/status-communities/dist/cjs/utils";
+import { useEffect, useMemo, useReducer } from "react";
+
+import { useIdentity } from "../contexts/identityProvider";
+import { useMessengerContext } from "../contexts/messengerProvider";
+import { Activities, Activity, ActivityStatus } from "../models/Activity";
+import { ChatMessage } from "../models/ChatMessage";
+
+export type ActivityAction =
+  | { type: "addActivity"; payload: Activity }
+  | { type: "removeActivity"; payload: "string" }
+  | { type: "setAsRead"; payload: string }
+  | { type: "setAllAsRead" }
+  | { type: "setStatus"; payload: { id: string; status: ActivityStatus } };
+
+function activityReducer(
+  state: Activities,
+  action: ActivityAction
+): Activities {
+  switch (action.type) {
+    case "setStatus": {
+      const activity = state[action.payload.id];
+      if (activity && "status" in activity) {
+        activity.status = action.payload.status;
+        activity.isRead = true;
+        return { ...state, [activity.id]: activity };
+      }
+      return state;
+    }
+    case "setAsRead": {
+      const activity = state[action.payload];
+      if (activity) {
+        activity.isRead = true;
+        return { ...state, [activity.id]: activity };
+      }
+      return state;
+    }
+    case "setAllAsRead": {
+      return Object.entries(state).reduce((prev, curr) => {
+        const activity = curr[1];
+        activity.isRead = true;
+        return { ...prev, [curr[0]]: activity };
+      }, {});
+    }
+    case "addActivity": {
+      return { ...state, [action.payload.id]: action.payload };
+    }
+    case "removeActivity": {
+      if (state[action.payload]) {
+        const newState = { ...state };
+        delete newState[action.payload];
+        return newState;
+      } else {
+        return state;
+      }
+    }
+    default:
+      throw new Error("Wrong activity reducer type");
+  }
+}
+
+export function useActivities() {
+  const [activitiesObj, dispatch] = useReducer(activityReducer, {});
+  const activities = useMemo(
+    () => Object.values(activitiesObj),
+    [activitiesObj]
+  );
+  const identity = useIdentity();
+  const userPK = useMemo(
+    () => (identity ? bufToHex(identity.publicKey) : undefined),
+    [identity]
+  );
+  const { subscriptionsDispatch, channels } = useMessengerContext();
+
+  useEffect(() => {
+    if (identity) {
+      const subscribeFunction = (message: ChatMessage, id: string) => {
+        if (message.quote && identity && message.quote.sender === userPK) {
+          const newActivity: Activity = {
+            id: message.date.getTime().toString() + message.content,
+            type: "reply",
+            date: message.date,
+            user: message.sender,
+            message: message,
+            channel: channels[id],
+            quote: message.quote,
+          };
+          dispatch({ type: "addActivity", payload: newActivity });
+        }
+
+        const split = message.content.split(" ");
+        const userMentioned = split.some(
+          (fragment) => fragment.startsWith("@") && fragment.slice(1) == userPK
+        );
+        if (userMentioned) {
+          const newActivity: Activity = {
+            id: message.date.getTime().toString() + message.content,
+            type: "mention",
+            date: message.date,
+            user: message.sender,
+            message: message,
+            channel: channels[id],
+          };
+          dispatch({ type: "addActivity", payload: newActivity });
+        }
+      };
+      subscriptionsDispatch({
+        type: "addSubscription",
+        payload: { name: "activityCenter", subFunction: subscribeFunction },
+      });
+    }
+    return () =>
+      subscriptionsDispatch({
+        type: "removeSubscription",
+        payload: { name: "activityCenter" },
+      });
+  }, [subscriptionsDispatch, identity]);
+
+  return { activities, activityDispatch: dispatch };
+}
diff --git a/packages/react-chat/src/hooks/useScrollToMessage.ts b/packages/react-chat/src/hooks/useScrollToMessage.ts
new file mode 100644
index 00000000..d83101d0
--- /dev/null
+++ b/packages/react-chat/src/hooks/useScrollToMessage.ts
@@ -0,0 +1,51 @@
+import { useCallback, useEffect, useState } from "react";
+
+import { useMessengerContext } from "../contexts/messengerProvider";
+import { ChatMessage } from "../models/ChatMessage";
+
+export function useScrollToMessage() {
+  const scrollToDivId = useCallback((id: string) => {
+    const quoteDiv = document.getElementById(id);
+    if (quoteDiv) {
+      quoteDiv.scrollIntoView({
+        behavior: "smooth",
+        block: "center",
+        inline: "center",
+      });
+      quoteDiv.style.background = "lightblue";
+      quoteDiv.style.transition = "background-color 1000ms linear";
+      window.setTimeout(() => {
+        quoteDiv.style.background = "";
+        window.setTimeout(() => {
+          quoteDiv.style.transition = "";
+        }, 1000);
+      }, 1000);
+    }
+  }, []);
+
+  const { activeChannel, channelsDispatch } = useMessengerContext();
+  const [scrollToMessage, setScrollToMessage] = useState("");
+  const [messageChannel, setMessageChannel] = useState("");
+
+  useEffect(() => {
+    if (scrollToMessage && messageChannel) {
+      if (activeChannel?.id === messageChannel) {
+        scrollToDivId(scrollToMessage);
+        setScrollToMessage("");
+        setMessageChannel("");
+      }
+    }
+  }, [activeChannel, scrollToMessage, messageChannel]);
+
+  const scroll = useCallback((msg: ChatMessage, channelId?: string) => {
+    if (!channelId) {
+      scrollToDivId(msg.id);
+    } else {
+      setMessageChannel(channelId);
+      setScrollToMessage(msg.id);
+      channelsDispatch({ type: "ChangeActive", payload: channelId });
+    }
+  }, []);
+
+  return scroll;
+}
diff --git a/packages/react-chat/src/models/Activity.ts b/packages/react-chat/src/models/Activity.ts
index 97ff869f..8df01491 100644
--- a/packages/react-chat/src/models/Activity.ts
+++ b/packages/react-chat/src/models/Activity.ts
@@ -2,20 +2,47 @@ import { ChannelData } from "./ChannelData";
 import { ChatMessage } from "./ChatMessage";
 import { CommunityData } from "./CommunityData";
 
-export type Activity = {
-  id: string;
-  type: "mention" | "request" | "reply" | "invitation";
-  isRead?: boolean;
-  date: Date;
-  user: string;
-  message?: ChatMessage;
-  channel?: ChannelData;
-  request?: string;
-  requestType?: "outcome" | "income";
-  status?: "sent" | "accepted" | "declined" | "blocked";
-  quote?: ChatMessage;
-  invitation?: CommunityData;
-};
+export type ActivityStatus = "sent" | "accepted" | "declined" | "blocked";
+
+export type Activity =
+  | {
+      id: string;
+      type: "mention";
+      date: Date;
+      user: string;
+      message: ChatMessage;
+      channel: ChannelData;
+      isRead?: boolean;
+    }
+  | {
+      id: string;
+      type: "reply";
+      date: Date;
+      user: string;
+      message: ChatMessage;
+      channel: ChannelData;
+      quote: ChatMessage;
+      isRead?: boolean;
+    }
+  | {
+      id: string;
+      type: "request";
+      date: Date;
+      user: string;
+      isRead?: boolean;
+      request: string;
+      requestType: "outcome" | "income";
+      status: ActivityStatus;
+    }
+  | {
+      id: string;
+      type: "invitation";
+      isRead?: boolean;
+      date: Date;
+      user: string;
+      status: ActivityStatus;
+      invitation?: CommunityData;
+    };
 
 export type Activities = {
   [id: string]: Activity;
diff --git a/packages/react-chat/src/models/ChatMessage.ts b/packages/react-chat/src/models/ChatMessage.ts
index de6fc0ef..20e7d113 100644
--- a/packages/react-chat/src/models/ChatMessage.ts
+++ b/packages/react-chat/src/models/ChatMessage.ts
@@ -12,6 +12,7 @@ export class ChatMessage {
   sender: string;
   image?: string;
   responseTo?: string;
+  quote?: ChatMessage;
   id: string;
 
   constructor(