chore: resolve conflict

Mississippi-Labs · Nov 9, 2023 · 626d4ae · 626d4ae
2 parents bd18888 + 0989e5a
commit 626d4ae
Show file tree

Hide file tree

Showing 16 changed files with 32,503 additions and 15 deletions.
diff --git a/packages/client/.env b/packages/client/.env
@@ -1,2 +1,2 @@
-VITE_CHAIN_ID=4242
+VITE_CHAIN_ID=33784
 TEST_CHAIN_ID=31337
diff --git a/packages/client/src/_theme.scss b/packages/client/src/_theme.scss
@@ -1 +1 @@
-$cellSize: 48px;
+$cellSize: 72px;
diff --git a/packages/client/src/components/Fog/styles.scss b/packages/client/src/components/Fog/styles.scss
@@ -5,7 +5,7 @@
     top: -150vh;
     width: 300vw;
     height: 300vh;
-    background: radial-gradient(circle closest-side at 50% 50%, #00000000 200px, #000000ff 24%);
+    background: radial-gradient(circle closest-side at 50% 50%, #00000000 300px, #000000ff 64%);
     pointer-events: none;
     // display: none;
 }
diff --git a/packages/client/src/mud/getNetworkConfig.ts b/packages/client/src/mud/getNetworkConfig.ts
@@ -6,8 +6,8 @@ const worlds = worldsJson as Partial<Record<string, { address: string; blockNumb
 
 export async function getNetworkConfig() {
   const params = new URLSearchParams(window.location.search);
-  // const chainId = Number(params.get("chainId") || params.get("chainid") || (import.meta.env.DEV ? import.meta.env.TEST_CHAIN_ID : import.meta.env.VITE_CHAIN_ID) || 31337);
-  const chainId = 33784;
+  const chainId = Number(params.get("chainId") || params.get("chainid") || (import.meta.env.DEV ? import.meta.env.TEST_CHAIN_ID : import.meta.env.VITE_CHAIN_ID) || 31337);
+  // const chainId = 33784;
   // const chainId = 31337;
   // const chainId = 421613;
   // console.log(supportedChains);