fix(spaceward): env variables names (#10)

* fix(spaceward): centralize all env variables in a single file This helps us finding them quickly. * fix(spaceward): name of env variables mismatch * chore(web): use Warden icon in WalletConnect sessions * chore(spaceward): delete dead code
warden-protocol · Feb 15, 2024 · 34d63c2 · 34d63c2
1 parent 005f38e
commit 34d63c2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 226 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -66,8 +66,6 @@ COPY . .
 ENV VITE_FAUCET_URL=%FAUCET_URL%
 ENV VITE_WARDEN_RPC_URL=%WARDEN_RPC_URL%
 ENV VITE_WARDEN_REST_URL=%WARDEN_REST_URL%
-ENV VITE_WARDEN_CHAIN_ID_NUM=%WARDEN_CHAIN_ID_NUM%
-ENV VITE_WARDEN_CHAIN_ID=%WARDEN_CHAIN_ID%
 ENV VITE_WARDEN_CHAIN_NAME=%WARDEN_CHAIN_NAME%
 
 RUN cd spaceward && pnpm run build

diff --git a/spaceward/src/components/faucet-button.tsx b/spaceward/src/components/faucet-button.tsx
@@ -1,11 +1,10 @@
 import { useState } from "react";
+import { env } from "@/env";
 import { useAddressContext } from "@/def-hooks/addressContext";
 import { Button } from "@/components/ui/button";
 
-const FAUCET_URL = import.meta.env.VITE_FAUCET_URL || "/api/faucet";
-
 async function getFaucetTokens(addr: string) {
-	await fetch(FAUCET_URL, {
+	await fetch(env.faucetURL, {
 		method: "POST",
 		body: JSON.stringify({ address: addr }),
 	});
@@ -15,8 +14,6 @@ function FaucetButton() {
 	const [loading, setLoading] = useState(false);
 	const { address } = useAddressContext();
 
-	console.log("FaucetButton", address);
-
 	const getTokens = async () => {
 		setLoading(true);
 		await getFaucetTokens(address);

diff --git a/spaceward/src/def-hooks/walletContext.tsx b/spaceward/src/def-hooks/walletContext.tsx
@@ -1,4 +1,5 @@
 import { createContext, ReactNode, useContext, useState } from "react";
+import { env } from "@/env";
 import { useClient } from "../hooks/useClient";
 import type { Wallet, Nullable, EncodedWallet } from "../utils/interfaces";
 
@@ -39,7 +40,7 @@ export default function WalletProvider({ children }: Props) {
         accounts: [],
       };
       await client.useKeplr({
-        chainName: import.meta.env.VITE_WARDEN_CHAIN_NAME || "Warden Protocol",
+        chainName: env.chainName,
         bip44: {
           coinType: 118,
         },

diff --git a/spaceward/src/env.ts b/spaceward/src/env.ts
@@ -1,9 +1,13 @@
-const apiURL = import.meta.env.VITE_API_COSMOS ?? "http://127.0.0.1:1317";
-const rpcURL = import.meta.env.VITE_WS_TENDERMINT ?? "http://127.0.0.1:26657";
+const apiURL = import.meta.env.VITE_WARDEN_REST_URL ?? "http://127.0.0.1:1317";
+const rpcURL = import.meta.env.VITE_WARDEN_RPC_URL ?? "http://127.0.0.1:26657";
 const prefix = import.meta.env.VITE_ADDRESS_PREFIX ?? "warden";
+const faucetURL = import.meta.env.VITE_FAUCET_URL ?? "/api/faucet";
+const chainName = import.meta.env.VITE_WARDEN_CHAIN_NAME || "Warden Protocol (local)";
 
 export const env = {
   apiURL,
   rpcURL,
   prefix,
+  faucetURL,
+  chainName,
 };
diff --git a/spaceward/src/newclient/ethermint.ts b/spaceward/src/newclient/ethermint.ts
diff --git a/spaceward/src/newclient/index.ts b/spaceward/src/newclient/index.ts
diff --git a/spaceward/src/newclient/keplr.ts b/spaceward/src/newclient/keplr.ts
diff --git a/spaceward/src/routes/walletconnect.tsx b/spaceward/src/routes/walletconnect.tsx
@@ -45,7 +45,7 @@ function useWeb3Wallet(relayUrl: string) {
         name: 'Warden Protocol wallets',
         description: 'Warden Protocol WalletConnect',
         url: 'https://wardenprotocol.org/',
-        icons: ['https://avatars.githubusercontent.com/u/37784886'],
+        icons: ['https://avatars.githubusercontent.com/u/158038121'],
       }
     }).then(async wallet => {
       try {