perf: ⚡️ connect to polkadot api before connecting wallet

✅ Closes: #166
buidl-labs · Dec 19, 2020 · db43cc7 · db43cc7
1 parent 6797b57
commit db43cc7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/components/common/layouts/base.js b/components/common/layouts/base.js
@@ -44,6 +44,17 @@ const withBaseLayout = (children) => {
 	const { stakingAmount, setTransactionState } = useTransaction((state) =>
 		pick(state, ["stakingAmount", "setTransactionState"])
 	);
+	useEffect(() => {
+		if (isNil(apiInstance) && !isNil(selectedNetwork)) {
+			createPolkadotAPIInstance(selectedNetwork, apiInstance)
+				.then(async (api) => {
+					setApiInstance(api);
+				})
+				.catch((err) => {
+					console.info("Unable to connect to polkadot api!");
+				});
+		}
+	}, [selectedNetwork]);
 	useEffect(() => {
 		if (accounts && accounts.length > 0) {
 			createPolkadotAPIInstance(selectedNetwork, apiInstance)
@@ -73,7 +84,7 @@ const withBaseLayout = (children) => {
 					throw err;
 				});
 		}
-	}, [accounts]);
+	}, [accounts, selectedNetwork]);
 
 	useEffect(() => {
 		// wallet connected state:

diff --git a/components/common/layouts/dashboard.js b/components/common/layouts/dashboard.js
@@ -53,6 +53,18 @@ const withDashboardLayout = (children) => {
 		pick(state, ["stakingAmount", "setTransactionState"])
 	);
 
+	useEffect(() => {
+		if (isNil(apiInstance) && !isNil(selectedNetwork)) {
+			createPolkadotAPIInstance(selectedNetwork, apiInstance)
+				.then(async (api) => {
+					setApiInstance(api);
+				})
+				.catch((err) => {
+					console.info("Unable to connect to polkadot api!");
+				});
+		}
+	}, [selectedNetwork]);
+
 	useEffect(() => {
 		if (accounts && accounts.length > 0) {
 			createPolkadotAPIInstance(selectedNetwork, apiInstance)