@@ -28,7 +28,7 @@ function App({ Component, pageProps }) {
28
28
const { account, provider, chainId } = state
29
29
const isSupportCurrentNetwork = SUPPORT_NETWORKS . includes ( chainId )
30
30
31
- const [ autoLoginState , actions ] = useAsync ( async ( ) => {
31
+ const [ autoLoginState , actions ] = useAsync ( async ( ) => {
32
32
if ( ! sigInLocal || ! accountInLocal ) return
33
33
const cachedProvider = await createProvider ( undefined , ( id ) => dispatch ( { type : "SET_CHAIN_ID" , chainId : id } ) )
34
34
if ( ! cachedProvider ) return
@@ -37,14 +37,18 @@ function App({ Component, pageProps }) {
37
37
const signer = web3Provider . getSigner ( )
38
38
const address = await signer . getAddress ( )
39
39
const network = await web3Provider . getNetwork ( )
40
- if ( address !== accountInLocal ) return
41
- dispatch ( {
42
- type : 'SET_WEB3_PROVIDER' ,
43
- provider : cachedProvider ,
44
- web3Provider,
45
- account : address ,
46
- chainId : network . chainId ,
47
- } )
40
+ if ( address !== accountInLocal ) {
41
+ removeLocalAccount ( )
42
+ removeLocalSig ( )
43
+ } else {
44
+ dispatch ( {
45
+ type : 'SET_WEB3_PROVIDER' ,
46
+ provider : cachedProvider ,
47
+ web3Provider,
48
+ account : address ,
49
+ chainId : network . chainId ,
50
+ } )
51
+ }
48
52
} )
49
53
50
54
useMountEffect ( actions . execute )
@@ -66,7 +70,7 @@ function App({ Component, pageProps }) {
66
70
return { state, dispatch }
67
71
} , [ state , dispatch ] )
68
72
69
- const connectWallet = useCallback ( async function ( ) {
73
+ const connectWallet = useCallback ( async function ( ) {
70
74
const provider = await createProvider ( undefined , ( id ) => dispatch ( { type : "SET_CHAIN_ID" , chainId : id } ) )
71
75
if ( provider . chainId !== '0x13881' ) {
72
76
await switchNetwork ( provider )
@@ -102,7 +106,7 @@ function App({ Component, pageProps }) {
102
106
} )
103
107
} , [ ] )
104
108
105
- const disconnectWallet = async ( ) => {
109
+ const disconnectWallet = async ( ) => {
106
110
dispatch ( {
107
111
type : 'SET_WEB3_PROVIDER' ,
108
112
provider : undefined ,
@@ -156,7 +160,6 @@ function App({ Component, pageProps }) {
156
160
{ renderActionButton ( ) }
157
161
</ div >
158
162
</ div >
159
-
160
163
{
161
164
sigInLocal && account && isSupportCurrentNetwork &&
162
165
< div className = "absolute top-8 right-8 text-right fixed" >
@@ -212,6 +215,9 @@ function App({ Component, pageProps }) {
212
215
</ Menu >
213
216
</ div >
214
217
}
218
+ < div className = "flex justify-around" >
219
+ < Navigation />
220
+ </ div >
215
221
</ nav >
216
222
< Web3Context . Provider value = { web3ContextValue } >
217
223
< Component { ...pageProps } />
0 commit comments