revert

AngleProtocol · Jan 7, 2025 · 80c3637 · 80c3637
1 parent 8146656
commit 80c3637
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/merkl.config.ts b/merkl.config.ts
@@ -115,27 +115,6 @@ export default createConfig({
     dollar: "$0,0.##a",
   },
   themes: {
-    ignite: {
-      base: createColoring(["#1755F4", "#FF7900", "#0D1530"], ["#1755F4", "#FF7900", "#FFFFFF"]),
-      info: createColoring(["#2ABDFF", "#2ABDFF", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      good: createColoring(["#40B66B", "#40B66B", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      warn: createColoring(["#ff9600", "#ff9600", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-    },
-    merkl: {
-      base: createColoring(["#1755F4", "#FF7900", "#0D1530"], ["#1755F4", "#FF7900", "#FFFFFF"]),
-      info: createColoring(["#2ABDFF", "#2ABDFF", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      good: createColoring(["#40B66B", "#40B66B", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      warn: createColoring(["#ff9600", "#ff9600", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-    },
-    backoffice: {
-      base: createColoring(["#8B8D98", "#9984D2", "#000000"], ["#8B8D98", "#9984D2", "#FFFFFF"]),
-      info: createColoring(["#2ABDFF", "#2ABDFF", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      good: createColoring(["#40B66B", "#40B66B", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      warn: createColoring(["#ff9600", "#ff9600", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-      harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
-    },
     puffer: {
       base: createColoring(["#2A35BD", "#BFFF37", "#FFFFFF"], ["#2A35BD", "#BFFF37", "#FFFFFF"]),
       info: createColoring(["#2ABDFF", "#2ABDFF", "#131620"], ["#FFFFFF", "#40B66B", "white"]),

diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
@@ -123,14 +123,14 @@ export default function Header() {
               <Group className="hidden lg:flex items-center" size="xl">
                 {Object.entries(routes)
                   .filter(([key]) => !["home", "faq", "docs"].includes(key))
-                  .map(([key, route]) => {
+                  .map(([key, { route }]) => {
                     return (
                       <Button
                         className={`${["faq"].includes(key) ? "uppercase" : "capitalize"}`}
                         look="soft"
                         size="lg"
                         key={`${key}-link`}
-                        to={route?.route}>
+                        to={route}>
                         {key}
                       </Button>
                     );

diff --git a/src/routes/_merkl.(home).tsx b/src/routes/_merkl.(home).tsx
@@ -4,7 +4,7 @@ import { I18n } from "src/I18n";
 import Hero from "src/components/composite/Hero";
 
 export const meta: MetaFunction = () => {
-  return [{ title: "Puffer" }];
+  return [{ title: "Merkl" }];
 };
 
 export default function Index() {

diff --git a/src/routes/_merkl.opportunities.$chain.$type.$id.tsx b/src/routes/_merkl.opportunities.$chain.$type.$id.tsx
@@ -16,7 +16,7 @@ import { ErrorHeading } from "src/components/layout/ErrorHeading";
 import useOpportunity from "src/hooks/resources/useOpportunity";
 import { v4 as uuidv4 } from "uuid";
 
-export async function loader({ params: { id, type, chain: chainId } }: LoaderFunctionArgs) {
+export async function loader({ params: { id, type, chain: chainId }, request }: LoaderFunctionArgs) {
   if (!chainId || !id || !type) throw "";
 
   const chain = await ChainService.get({ name: chainId });

diff --git a/src/routes/_merkl.users.$address.claims.tsx b/src/routes/_merkl.users.$address.claims.tsx
@@ -19,6 +19,7 @@ export default function Index() {
     <Container>
       <Space size="md" />
       <HistoricalClaimsLibrary claims={claimWiped} />
+      <Space size="md" />
     </Container>
   );
 }