Merge remote-tracking branch 'old/main' into puffer-branding

AngleProtocol · Dec 16, 2024 · a6dc822 · a6dc822
2 parents efc72d3 + 7b41a58
commit a6dc822
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 33 deletions.
diff --git a/merkl.config.ts b/merkl.config.ts
@@ -42,34 +42,13 @@ import { eip712WalletActions } from "viem/zksync";
 import { coinbaseWallet, walletConnect } from "wagmi/connectors";
 
 export default createConfig({
-  appName: "Merkl",
-  modes: ["dark", "light"],
-  defaultTheme: "ignite",
+  appName: "Puffer",
+  modes: ["light"],
+  defaultTheme: "puffer",
   deposit: false,
   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", "#BFFF38", "#FFFFFF"], ["#2A35BD", "#BFFF38", "#FFFFFF"]),
+      base: createColoring(["#2A35BD", "#F5F9FF", "#FFFFFF"], ["#2A35BD", "#F5F9FF", "#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"]),
@@ -128,13 +107,12 @@ export default createConfig({
     // },
   },
   socials: {
-    discord: "",
-    telegram: "https://t.me/+2T0RNabX2ANkMzAx",
-    x: "https://x.com/zksyncignite",
-    github: "",
+    discord: "https://discord.com/invite/pufferfi",
+    telegram: "https://t.me/puffer_fi",
+    x: "https://x.com/puffer_finance",
+    github: "https://github.com/PufferFinance",
   },
   links: {
-    docs: "https://docs.merkl.xyz/",
     merkl: "https://merkl.xyz/",
     merklTermsConditions: "https://app.merkl.xyz/merklTerms.pdf",
     merklPrivacy: "https://privacy.angle.money",
@@ -192,8 +170,8 @@ export default createConfig({
         customStoragePrefix: "wagmi",
         projectId: "26c912aadd2132cd869a5edc00aeea0f",
         metadata: {
-          name: "Merkl Lite",
-          description: "Merkl Lite",
+          name: "Puffer",
+          description: "Puffer",
           url: "https://app.merkl.xyz.com",
           icons: [],
         },

diff --git a/src/customer/assets/fonts/Recoleta-Bold.otf b/src/customer/assets/fonts/Recoleta-Bold.otf
diff --git a/src/customer/assets/fonts/Recoleta-Bold.ttf b/src/customer/assets/fonts/Recoleta-Bold.ttf
diff --git a/src/customer/assets/fonts/Recoleta-Bold.woff b/src/customer/assets/fonts/Recoleta-Bold.woff
diff --git a/src/customer/assets/fonts/Recoleta-Bold.woff2 b/src/customer/assets/fonts/Recoleta-Bold.woff2
diff --git a/src/root.tsx b/src/root.tsx
@@ -45,7 +45,6 @@ export const clientLoader = Cache.wrap("root", 300);
 
 export default function App() {
   const data = useLoaderData<typeof loader>();
-
   return (
     <DAppProvider
       chains={data.chains}