Merge pull request #112 from nspcc-dev/fix/111-endless_reloading

Endless reloading after connect wallet

Author: roman-khimov

src/App.js

@@ -148,21 +148,8 @@ export const App = () => {
 	};
 
 	useEffect(() => {
-		if (localStorage['wc@2:client//session:settled'] === '[]') {
-			onDisconnectWallet();
-		}
-	}, [wcSdk]); // eslint-disable-line react-hooks/exhaustive-deps
-
-	useEffect(() => {
-		if (wcSdk.isConnected()) {
-			onPopup('success', 'Wallet connected');
-			if (localStorage.walletData && JSON.parse(localStorage.walletData).expiry > new Date().getTime()) {
-				const walletDataTemp = JSON.parse(localStorage.walletData);
-				setWalletData(walletDataTemp);
-			} else {
-				if (localStorage.walletData) {
-					localStorage.removeItem('walletData');
-				}
+		if (process.env.REACT_APP_WC_PROJECT_ID && process.env.REACT_APP_WC_PROJECT_ID !== '') {
+			if (wcSdk.isConnected()) {
 				setWalletData({
 					type: wcSdk.session.namespaces.neo3.accounts[0].split(':')[0],
 					net: wcSdk.session.namespaces.neo3.accounts[0].split(':')[1],
@@ -173,12 +160,22 @@ export const App = () => {
 						object: {}
 					}
 				});
+				onPopup('success', 'Wallet connected');
+				onModal();
+
+				if (location.pathname.indexOf('/profile') === -1) {
+					document.location.href = "/profile";
+				}
+			} else if (walletData) {
+				onDisconnectWallet();
+				if (location.pathname !== '/') {
+					document.location.href = "/";
+				}
 			}
-			onModal();
-		} else if (walletData) {
-			onDisconnectWallet();
+		} else {
+			onModal('failed', 'Error: Global variable REACT_APP_WC_PROJECT_ID is not set.');
 		}
-	}, [wcSdk.isConnected()]); // eslint-disable-line react-hooks/exhaustive-deps
+	}, [wcSdk]); // eslint-disable-line react-hooks/exhaustive-deps
 
 	const onResetContainerForm = () => {
 		setContainerForm({
@@ -212,7 +209,6 @@ export const App = () => {
 		if (!walletDataTemp.expiry || walletDataTemp.expiry < new Date().getTime()) {
 			walletDataTemp.expiry = new Date().getTime() + 7200000;
 		}
-		localStorage.setItem('walletData', JSON.stringify(walletDataTemp));
 		setWalletData(walletDataTemp);
 	}
 
@@ -490,7 +486,6 @@ export const App = () => {
 	const onDisconnectWallet = async () => {
 		await wcSdk.disconnect();
 		onPopup('success', 'Wallet disconnected');
-		localStorage.removeItem('walletData');
 		setWalletData(null);
 	};
 
@@ -1395,7 +1390,10 @@ export const App = () => {
 			<Navbar>
 				<Navbar.Brand>
 					<Navbar.Item renderAs="div">
-						<Link to="/" style={{ lineHeight: 0 }}>
+						<Link
+							to={walletData ? "/profile" : "/"}
+							style={{ lineHeight: 0 }}
+						>
 							<img
 								src="/img/logo.svg"
 								alt="logo"
@@ -1409,8 +1407,6 @@ export const App = () => {
 					path="/"
 					element={<Home
 						onConnectWallet={onConnectWallet}
-						walletData={walletData}
-						location={location}
 					/>}
 				/>
 				<Route
@@ -1445,7 +1441,7 @@ export const App = () => {
 							alt="neo logo"
 						/>
 					</a>
-					<span class="social_pipe">
+					<span className="social_pipe">
 						<a className="neospcc" href="https://nspcc.io/" target="_blank" rel="noopener noreferrer">
 							<img
 								src="/img/socials/neo_spcc.svg"

src/Home.js

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import {
 	Container,
 	Section,
@@ -11,18 +11,8 @@ import {
 
 const Home = ({
 		onConnectWallet,
-		walletData,
-		location,
 	}) => {
 
-	useEffect(() => {
-		if (walletData && !walletData.balance && walletData.account) {
-			if (location.pathname.indexOf('/profile') === -1 && process.env.REACT_APP_WC_PROJECT_ID && process.env.REACT_APP_WC_PROJECT_ID !== '') {
-				document.location.href = "/profile";
-			}
-		}
-	}, [walletData]); // eslint-disable-line react-hooks/exhaustive-deps
-
 	return (
 		<Container
 			id="login"

src/Profile.js

@@ -66,9 +66,6 @@ const Profile = ({
 	}, [isLoadContainers]); // eslint-disable-line react-hooks/exhaustive-deps
 
 	useEffect(() => {
-		if (!localStorage['wc@2:client:0.3//session'] || localStorage['wc@2:client:0.3//session'] === '[]' || !process.env.REACT_APP_WC_PROJECT_ID) {
-			document.location.href = "/";
-		}
 		if (walletData && walletData.account && !isLoading) {
 			onNeoBalance();
 			onNeoFSBalance();