Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: navigation hide #23

Merged
merged 1 commit into from
Jan 18, 2022
Merged

fix: navigation hide #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function App({ Component, pageProps }) {
const { account, provider, chainId } = state
const isSupportCurrentNetwork = SUPPORT_NETWORKS.includes(chainId)

const [autoLoginState, actions] = useAsync(async() => {
const [autoLoginState, actions] = useAsync(async () => {
if (!sigInLocal || !accountInLocal) return
const cachedProvider = await createProvider(undefined, (id) => dispatch({ type: "SET_CHAIN_ID", chainId: id }))
if (!cachedProvider) return
Expand All @@ -37,14 +37,18 @@ function App({ Component, pageProps }) {
const signer = web3Provider.getSigner()
const address = await signer.getAddress()
const network = await web3Provider.getNetwork()
if (address !== accountInLocal) return
dispatch({
type: 'SET_WEB3_PROVIDER',
provider: cachedProvider,
web3Provider,
account: address,
chainId: network.chainId,
})
if (address !== accountInLocal) {
removeLocalAccount()
removeLocalSig()
} else {
dispatch({
type: 'SET_WEB3_PROVIDER',
provider: cachedProvider,
web3Provider,
account: address,
chainId: network.chainId,
})
}
})

useMountEffect(actions.execute)
Expand All @@ -66,7 +70,7 @@ function App({ Component, pageProps }) {
return { state, dispatch }
}, [state, dispatch])

const connectWallet = useCallback(async function() {
const connectWallet = useCallback(async function () {
const provider = await createProvider(undefined, (id) => dispatch({ type: "SET_CHAIN_ID", chainId: id }))
if (provider.chainId !== '0x13881') {
await switchNetwork(provider)
Expand Down Expand Up @@ -102,7 +106,7 @@ function App({ Component, pageProps }) {
})
}, [])

const disconnectWallet = async() => {
const disconnectWallet = async () => {
dispatch({
type: 'SET_WEB3_PROVIDER',
provider: undefined,
Expand Down Expand Up @@ -156,7 +160,6 @@ function App({ Component, pageProps }) {
{renderActionButton()}
</div>
</div>

{
sigInLocal && account && isSupportCurrentNetwork &&
<div className="absolute top-8 right-8 text-right fixed">
Expand Down Expand Up @@ -212,6 +215,9 @@ function App({ Component, pageProps }) {
</Menu>
</div>
}
<div className="flex justify-around">
<Navigation/>
</div>
</nav>
<Web3Context.Provider value={web3ContextValue}>
<Component {...pageProps} />
Expand Down