From 07bffdbb1773bf39ca747854e2d541d306c9948b Mon Sep 17 00:00:00 2001
From: DeFizerYield <78314301+Y0moo@users.noreply.github.com>
Date: Wed, 22 Dec 2021 23:00:20 +0700
Subject: [PATCH] fix: fixed showing info when user not logged in
---
src/App.jsx | 1 +
src/components/Address/Address.jsx | 6 +++---
src/components/Blockie.jsx | 10 +++-------
src/components/Chains/Chains.jsx | 5 +++--
src/components/NativeBalance.jsx | 5 ++++-
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/App.jsx b/src/App.jsx
index e6b55aece..2d551909f 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -55,6 +55,7 @@ const App = ({ isServerInfo }) => {
useEffect(() => {
const connectorId = window.localStorage.getItem("connectorId");
+ console.log("connectorId", connectorId)
if (isAuthenticated && !isWeb3Enabled && !isWeb3EnableLoading) enableWeb3({ provider: connectorId });
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isAuthenticated, isWeb3Enabled]);
diff --git a/src/components/Address/Address.jsx b/src/components/Address/Address.jsx
index 36b54fad8..2f269522f 100644
--- a/src/components/Address/Address.jsx
+++ b/src/components/Address/Address.jsx
@@ -18,13 +18,13 @@ const styles = {
};
function Address(props) {
- const { account } = useMoralis();
+ const { account, isAuthenticated } = useMoralis();
const [address, setAddress] = useState();
const [isClicked, setIsClicked] = useState(false);
useEffect(() => {
- setAddress(props?.address || account);
- }, [account, props]);
+ setAddress(props?.address || (isAuthenticated && account));
+ }, [account, isAuthenticated, props]);
if (!address) return ;
diff --git a/src/components/Blockie.jsx b/src/components/Blockie.jsx
index 6b42b27f4..b0e8d602c 100644
--- a/src/components/Blockie.jsx
+++ b/src/components/Blockie.jsx
@@ -9,15 +9,11 @@ import { useMoralis } from "react-moralis";
*/
function Blockie(props) {
- const { account } = useMoralis();
- if (!props.address && !account) return ;
+ const { account, isAuthenticated } = useMoralis();
+ if (!props.address && (!account || !isAuthenticated)) return ;
return (
-
+
);
}
diff --git a/src/components/Chains/Chains.jsx b/src/components/Chains/Chains.jsx
index 34e23dc27..258da0357 100644
--- a/src/components/Chains/Chains.jsx
+++ b/src/components/Chains/Chains.jsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { Menu, Dropdown, Button } from "antd";
import { DownOutlined } from "@ant-design/icons";
import { AvaxLogo, PolygonLogo, BSCLogo, ETHLogo } from "./Logos";
-import { useChain } from "react-moralis";
+import { useChain, useMoralis } from "react-moralis";
const styles = {
item: {
@@ -85,6 +85,7 @@ const menuItems = [
function Chains() {
const { switchNetwork, chainId, chain } = useChain();
+ const { isAuthenticated } = useMoralis();
const [selected, setSelected] = useState({});
console.log("chain", chain);
@@ -111,7 +112,7 @@ function Chains() {
);
- if (!chainId) return null;
+ if (!chainId || !isAuthenticated) return null;
return (
diff --git a/src/components/NativeBalance.jsx b/src/components/NativeBalance.jsx
index 60ed74615..8f6300fb3 100644
--- a/src/components/NativeBalance.jsx
+++ b/src/components/NativeBalance.jsx
@@ -1,7 +1,10 @@
-import { useNativeBalance } from "react-moralis";
+import { useMoralis, useNativeBalance } from "react-moralis";
function NativeBalance(props) {
const { data: balance } = useNativeBalance(props);
+ const { account, isAuthenticated } = useMoralis();
+
+ if (!account || !isAuthenticated) return null;
return
{balance.formatted}
;
}