Merge remote-tracking branch 'origin/passport-integration' into front…

…end-passport-integration
1Hive · Jul 22, 2024 · fbee7f3 · fbee7f3
2 parents 4a33f14 + 026966d
commit fbee7f3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/apps/web/providers/urql.tsx b/apps/web/providers/urql.tsx
@@ -10,10 +10,7 @@ import {
 import { getConfigByChain } from "@/constants/contracts";
 import { ChainId } from "@/types";
 
-let urqlRecord: Record<
-  ChainId | "default",
-  [Client, ReturnType<typeof ssrExchange>]
-> = {};
+let urqlRecord: Record<ChainId | "default", [Client, ReturnType<typeof ssrExchange>]> = {};
 
 const isServer = typeof window === "undefined";
 

diff --git a/apps/web/wagmi.config.ts b/apps/web/wagmi.config.ts
@@ -1,13 +1,13 @@
 import { defineConfig } from "@wagmi/cli";
 import { actions } from "@wagmi/cli/plugins";
+import { Abi } from "viem";
+import { abi as alloABI } from "#/contracts/out/Allo.sol/Allo.json";
 import { abi as CVStrategyABI } from "#/contracts/out/CVStrategy.sol/CVStrategy.json";
-import { abi as registryFactoryABI } from "#/contracts/out/RegistryFactory.sol/RegistryFactory.json";
-import { abi as registryCommunityABI } from "#/contracts/out/RegistryCommunity.sol/RegistryCommunity.json";
 import { abi as mockERC20ABI } from "#/contracts/out/ERC20.sol/ERC20.json";
 import { abi as SafeABI } from "#/contracts/out/ISafe.sol/ISafe.json";
-import { abi as alloABI } from "#/contracts/out/Allo.sol/Allo.json";
 import { abi as PassportScorerABI } from "#/contracts/out/PassportScorer.sol/PassportScorer.json";
-import { Abi } from "viem";
+import { abi as registryCommunityABI } from "#/contracts/out/RegistryCommunity.sol/RegistryCommunity.json";
+import { abi as registryFactoryABI } from "#/contracts/out/RegistryFactory.sol/RegistryFactory.json";
 
 export default defineConfig({
   out: "src/generated.ts",

diff --git a/gardens-v2.code-workspace b/gardens-v2.code-workspace
@@ -40,7 +40,10 @@
       "allo-v2/=lib/allo-v2/contracts/",
     ],
     "[typescriptreact]": {
-      "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+      "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+    },
+    "[typescript]": {
+      "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
     },
   },
   "extensions": {
@@ -56,4 +59,4 @@
       "tintinweb.solidity-metrics",
     ],
   },
-}
+}