fix(site): fixes

unionlabs · Oct 18, 2023 · cf999ce · cf999ce
1 parent 3016472
commit cf999ce
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 56 deletions.
diff --git a/site/src/lib/Ethers.svelte b/site/src/lib/Ethers.svelte
@@ -2,13 +2,12 @@
     import { ethers } from "ethers";
     import { onMount } from 'svelte';
 
-
     let provider;
     let signer;
 
     onMount(async () => {
         console.log("connecting to ethereum")
-        provider = new ethers.providers.Web3Provider(window.ethereum, "any")
+        provider = new ethers.providers.Web3Provider(window.ethereum, "any");
         provider.on("network", (newNetwork, oldNetwork) => {
         // When a Provider makes its initial connection, it emits a "network"
         // event with a null oldNetwork along with the newNetwork. So, if the

diff --git a/site/src/lib/initClients.ts b/site/src/lib/initClients.ts
diff --git a/site/src/lib/stores/wallets.ts b/site/src/lib/stores/wallets.ts
@@ -3,9 +3,11 @@ import type { Writable } from 'svelte/store';
 import type { Tendermint37Client } from '@cosmjs/tendermint-rpc';
 import type { SigningStargateClient } from '@cosmjs/stargate';
 import type { AccountData, Coin } from '@cosmjs/amino';
+import type { ApolloClient, InMemoryCache, NormalizedCacheObject } from '@apollo/client';
 
 export const tendermintClient: Writable<Tendermint37Client | null> = writable(null);
 export const stargateClient: Writable<SigningStargateClient | null> = writable(null);
 export const unionAccount: Writable<AccountData | null> = writable(null);
 export const unionBalance: Writable<Coin | null> = writable(null);
-export const apolloClient: Writable<ApolloClient | null> = writable(null);
+export const apolloClient: Writable<ApolloClient<NormalizedCacheObject> | null> = writable(null);
+export const ethersProvider: Writable<any | null> = writable(null);
diff --git a/site/src/lib/transferDemo.ts b/site/src/lib/transferDemo.ts
@@ -78,8 +78,10 @@ const GET_UNO_FROM_FAUCET = gql`
 export const getUnoFromFaucet = async () => {
 	const uAccount = get(unionAccount);
 	const apollo = get(apolloClient);
-	if (uAccount === null) {
-		console.error('trying to get uno from faucet before accounts are loaded');
+	if (uAccount === null || apollo === null) {
+		console.error(
+			'trying to get uno from faucet before accounts are loaded or apollo client has not been init'
+		);
 		return;
 	}
 
@@ -129,3 +131,5 @@ export const getBalance = async () => {
 	}
 	unionBalance.set(await sgClient.getBalance(uAccount.address, 'muno'));
 };
+
+export const setupEthers = async () => {};
diff --git a/site/src/routes/blog/start-of-the-endgame/+page.md b/site/src/routes/blog/start-of-the-endgame/+page.md
@@ -11,13 +11,14 @@ published: true
 	import TokenTransfer from '$lib/TokenTransfer.svelte';
 	// import Ethers from '$lib/Ethers.svelte';
 	import { browser } from '$app/environment';
-	import { initClients, getBalanceWorker } from '$lib/transferDemo';
+	import { initClients, getBalanceWorker, setupEthers } from '$lib/transferDemo';
 	import { onMount } from 'svelte';
 
 	onMount(async () => {
 		if (browser) {
 			await initClients();
 			getBalanceWorker();
+			setupEthers();
 		}
 	})
 </script>