chore: small fixes for zksync compatibility (#2)

AngleProtocol · Jan 15, 2025 · d85aa6d · d85aa6d
1 parent 0c89326
commit d85aa6d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/packages/dappkit b/packages/dappkit
diff --git a/src/I18n/en.ts b/src/I18n/en.ts
@@ -1,3 +1,5 @@
+import clientEn from "../../../../I18n/en";
+
 const en = {
   pages: {
     home: {
@@ -40,4 +42,4 @@ const en = {
   },
 };
 
-export default en;
+export default Object.assign(en, clientEn);
diff --git a/src/components/element/historicalClaimsLibrary/HistoricalClaimsRow.tsx b/src/components/element/historicalClaimsLibrary/HistoricalClaimsRow.tsx
@@ -1,5 +1,5 @@
 import { Button, type Component, Icon, mergeClass } from "dappkit";
-import Time from "dappkit";
+import { Time } from "dappkit";
 import { useWalletContext } from "dappkit";
 import { useMemo } from "react";
 import type { ClaimsService } from "../../../modules/claim/claim.service";

diff --git a/src/components/element/opportunity/OpportunityCell.tsx b/src/components/element/opportunity/OpportunityCell.tsx
@@ -1,6 +1,6 @@
 import { Link } from "@remix-run/react";
 import type { BoxProps } from "dappkit";
-import { Box, Button, Divider, Dropdown, Group, Icon, Icons, PrimitiveTag, Text, Title, Value } from "dappkit";
+import { Box, Button, Divider, Dropdown, Fmt, Group, Icon, Icons, PrimitiveTag, Text, Title, Value } from "dappkit";
 import { mergeClass } from "dappkit";
 import { useOverflowingRef } from "dappkit";
 import { useMemo } from "react";

diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx
@@ -4,8 +4,6 @@ import Image from "../../../packages/dappkit/src/components/primitives/Image";
 import merklDarkLogo from "../../assets/images/by-merkl-dark.svg";
 import merklLogo from "../../assets/images/by-merkl.svg";
 import merklConfig from "../../config";
-import customerDarkLogo from "../../customer/assets/images/customer-dark-logo.svg";
-import customerLogo from "../../customer/assets/images/customer-logo.svg";
 import Socials from "../element/Socials";
 
 export default function Footer() {
@@ -20,7 +18,7 @@ export default function Footer() {
               <Image
                 className="w-[125px] lg:w-[165px]"
                 alt={`${merklConfig.appName} logo`}
-                src={mode !== "dark" ? customerDarkLogo : customerLogo}
+                src={mode !== "dark" ? merklConfig.images.logoDark : merklConfig.images.logoLight}
               />
             </Button>
             <Socials />

diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
@@ -1,7 +1,17 @@
 import { useNavigate } from "@remix-run/react";
-import { Button, Container, Dropdown, Group, Icon, SCREEN_BREAKDOWNS, Select, WalletButton, useTheme } from "dappkit";
-import { Image } from "dappkit";
-import { useWalletContext } from "dappkit";
+import {
+  Button,
+  Container,
+  Dropdown,
+  Group,
+  Icon,
+  Image,
+  SCREEN_BREAKDOWNS,
+  Select,
+  WalletButton,
+  useTheme,
+  useWalletContext,
+} from "dappkit";
 import { motion } from "framer-motion";
 import { useCallback, useMemo, useState } from "react";
 import { useMediaQuery } from "react-responsive";
@@ -57,7 +67,7 @@ export default function Header() {
       // Include bridge route only if enabled in config
       merklConfig.header.bridge.enabled ? { bridge } : {},
       rest,
-    );
+    ) as (typeof merklConfig)["routes"];
   }, [user]);
 
   const navigate = useNavigate();
@@ -120,7 +130,7 @@ export default function Header() {
             <Group className="items-center" size="xl">
               <Group className="hidden lg:flex items-center" size="xl">
                 {Object.entries(routes)
-                  .filter(([key]) => !["home", "faq", "docs"].includes(key))
+                  .filter(([key]) => !["home", "docs"].includes(key))
                   .map(([key, route]) => {
                     return (
                       <Button

diff --git a/src/index.generated.ts b/src/index.generated.ts
@@ -1,7 +1,6 @@
 /**
  *
  */
-export * from ".//entry.server";
 export * from ".//root";
 export { default as root } from ".//root";
 export * from ".//entry.client";