fix: notification enable disable when frequent wallet user change (#225)

fetchai · Mar 24, 2023 · e3db6cb · e3db6cb
1 parent a3d576c
commit e3db6cb
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/packages/extension/src/layouts/bottom-nav/index.tsx b/packages/extension/src/layouts/bottom-nav/index.tsx
@@ -58,8 +58,16 @@ const NotificationTab = () => {
   const accountInfo = accountStore.getAccount(current.chainId);
   const config: WalletConfig = useSelector(walletConfig);
   const notificationInfo: NotificationSetup = useSelector(notificationsDetails);
+  const [isComingSoon, setIsComingSoon] = useState<boolean>(true);
 
   useEffect(() => {
+    setIsComingSoon(
+      config.notiphyWhitelist === undefined
+        ? true
+        : config.notiphyWhitelist.length !== 0 &&
+            config.notiphyWhitelist.indexOf(accountInfo.bech32Address) === -1
+    );
+
     const notificationFlag =
       localStorage.getItem(`turnNotifications-${accountInfo.bech32Address}`) ||
       "true";
@@ -75,27 +83,19 @@ const NotificationTab = () => {
         isNotificationOn: notificationFlag == "true",
       })
     );
-  }, [accountInfo.bech32Address]);
-
-  const isComingSoon = () => {
-    return (
-      config.notiphyWhitelist !== undefined &&
-      config.notiphyWhitelist.length !== 0 &&
-      config.notiphyWhitelist.indexOf(accountInfo.bech32Address) === -1
-    );
-  };
+  }, [accountInfo.bech32Address, config.notiphyWhitelist]);
 
   return (
     <>
-      {!isComingSoon() &&
+      {!isComingSoon &&
         notificationInfo.unreadNotification &&
         notificationInfo.isNotificationOn && <span className={style.bellDot} />}
       <Tab
         title={"Notification"}
         icon={bellOnGreyIcon}
         activeTabIcon={bellOnBlueIcon}
         path={"/notification"}
-        disabled={isComingSoon()}
+        disabled={isComingSoon}
         tooltip={"Coming Soon"}
       />
     </>