fix: chat dialog and notification dot (#221)

fetchai · Mar 23, 2023 · a3d576c · a3d576c
1 parent 797016e
commit a3d576c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/packages/extension/src/pages/chat/index.tsx b/packages/extension/src/pages/chat/index.tsx
@@ -175,7 +175,6 @@ const ChatView = () => {
     if (
       !userState?.messagingPubKey.publicKey &&
       !userState?.messagingPubKey.privacySetting &&
-      !userState?.accessToken.length &&
       !loadingChats &&
       !authFail
     ) {

diff --git a/packages/extension/src/pages/setting/chat/index.tsx b/packages/extension/src/pages/setting/chat/index.tsx
@@ -85,10 +85,8 @@ export const ChatSettings: FunctionComponent = observer(() => {
       fetchBlockList();
       setLoadingChatSettings(false);
     };
-    if (
-      (!userState.accessToken.length || !userState.messagingPubKey.length) &&
-      !loadingChatSettings
-    )
+
+    if (!userState.messagingPubKey.length && !loadingChatSettings)
       setJWTAndFetchMsgPubKey();
   }, [current.chainId, walletAddress]);
 

diff --git a/packages/extension/src/pages/setting/index.tsx b/packages/extension/src/pages/setting/index.tsx
@@ -6,6 +6,7 @@ import style from "./style.module.scss";
 import { useLanguage } from "../../languages";
 import { useIntl } from "react-intl";
 import { observer } from "mobx-react-lite";
+import { userDetails } from "@chatStore/user-slice";
 import {
   userChatActive,
   WalletConfig,
@@ -25,6 +26,7 @@ export const SettingPage: FunctionComponent = observer(() => {
   const current = chainStore.current;
   const accountInfo = accountStore.getAccount(current.chainId);
   const config: WalletConfig = useSelector(walletConfig);
+  const userState = useSelector(userDetails);
   const paragraphLang = language.automatic
     ? intl.formatMessage(
         {
@@ -111,23 +113,26 @@ export const SettingPage: FunctionComponent = observer(() => {
             []
           )}
         />
-        <PageButton
-          style={{ cursor: isChatActive ? "pointer" : "not-allowed" }}
-          paragraph={
-            isChatActive ? "" : "You need FET balance to use this feature"
-          }
-          title={"Chat"}
-          onClick={() => {
-            if (isChatActive)
-              history.push({
-                pathname: "/setting/chat",
-              });
-          }}
-          icons={useMemo(
-            () => [<i key="next" className="fas fa-chevron-right" />],
-            []
-          )}
-        />
+        {(userState.messagingPubKey?.publicKey?.length ||
+          userState.messagingPubKey?.privacySetting?.length) && (
+          <PageButton
+            style={{ cursor: isChatActive ? "pointer" : "not-allowed" }}
+            paragraph={
+              isChatActive ? "" : "You need FET balance to use this feature"
+            }
+            title={"Chat"}
+            onClick={() => {
+              if (isChatActive)
+                history.push({
+                  pathname: "/setting/chat",
+                });
+            }}
+            icons={useMemo(
+              () => [<i key="next" className="fas fa-chevron-right" />],
+              []
+            )}
+          />
+        )}
         {config.notiphyWhitelist !== undefined &&
           config.notiphyWhitelist.length !== 0 &&
           config.notiphyWhitelist.indexOf(accountInfo.bech32Address) !== -1 && (

diff --git a/packages/extension/src/utils/populate-notifications.ts b/packages/extension/src/utils/populate-notifications.ts
@@ -25,6 +25,9 @@ export const fetchAndPopulateNotifications = async (walletAddress: string) => {
   );
 
   store.dispatch(
-    setNotifications({ allNotifications: Object.values(notifications) })
+    setNotifications({
+      unreadNotification: Object.values(notifications).length > 0,
+      allNotifications: Object.values(notifications),
+    })
   );
 };