font changes, greypixel changes

airswap · May 10, 2024 · 5cb0f9e · 5cb0f9e
1 parent 32dd813
commit 5cb0f9e
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 25 deletions.
diff --git a/globals.css b/globals.css
@@ -83,7 +83,7 @@
   font-weight: 200;
   src:
     local('Loos ExtraLight'),
-    url('../src/assets/fonts/Loos-ExtraLight.otf') format('opentype');
+    url('/fonts/Loos-ExtraLight.otf') format('opentype');
 }
 
 @font-face {
@@ -92,7 +92,7 @@
   font-weight: 400;
   src:
     local('Loos Regular'),
-    url('../src/assets/fonts/Loos-Regular.otf') format('opentype');
+    url('/fonts/Loos-Regular.otf') format('opentype');
 }
 
 @font-face {
@@ -101,7 +101,7 @@
   font-weight: 500;
   src:
     local('Loos Medium'),
-    url('../src/assets/fonts/Loos-Medium.otf') format('opentype');
+    url('/fonts/Loos-Medium.otf') format('opentype');
 }
 
 @font-face {
@@ -110,7 +110,7 @@
   font-weight: 700;
   src:
     local('Loos Bold'),
-    url('../src/assets/fonts/Loos-Bold.otf') format('opentype');
+    url('/fonts/Loos-Bold.otf') format('opentype');
 }
 
 @font-face {
@@ -119,5 +119,5 @@
   font-weight: 900;
   src:
     local('Loos Black'),
-    url('../src/assets/fonts/Loos-Black.otf') format('opentype');
+    url('/fonts/Loos-Black.otf') format('opentype');
 }
diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en" class="dark h-full">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="src/assets/favicon.ico" />
+    <link rel="icon" type="image/png" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React + TS</title>
   </head>

diff --git a/src/assets/airswap-logo-with-text.svg → public/airswap-logo-with-text.svg b/src/assets/airswap-logo-with-text.svg → public/airswap-logo-with-text.svg
diff --git a/src/assets/airswap-logo.svg → public/airswap-logo.svg b/src/assets/airswap-logo.svg → public/airswap-logo.svg
diff --git a/src/assets/favicon.ico → public/favicon.ico b/src/assets/favicon.ico → public/favicon.ico
diff --git a/src/assets/fonts/Loos-Black.otf → public/fonts/Loos-Black.otf b/src/assets/fonts/Loos-Black.otf → public/fonts/Loos-Black.otf
diff --git a/src/assets/fonts/Loos-Bold.otf → public/fonts/Loos-Bold.otf b/src/assets/fonts/Loos-Bold.otf → public/fonts/Loos-Bold.otf
diff --git a/src/assets/fonts/Loos-ExtraLight.otf → public/fonts/Loos-ExtraLight.otf b/src/assets/fonts/Loos-ExtraLight.otf → public/fonts/Loos-ExtraLight.otf
diff --git a/src/assets/fonts/Loos-Medium.otf → public/fonts/Loos-Medium.otf b/src/assets/fonts/Loos-Medium.otf → public/fonts/Loos-Medium.otf
diff --git a/src/assets/fonts/Loos-Regular.otf → public/fonts/Loos-Regular.otf b/src/assets/fonts/Loos-Regular.otf → public/fonts/Loos-Regular.otf
diff --git a/src/features/ui/header.tsx b/src/features/ui/header.tsx
@@ -1,10 +1,7 @@
 export const Header = () => {
   return (
     <div className="p-6">
-      <img
-        src="../../src/assets/airswap-logo-with-text.svg"
-        alt="airswap logo"
-      />
+      <img src="/airswap-logo-with-text.svg" alt="airswap logo" />
     </div>
   );
 };
diff --git a/src/hooks/useSetChainId.ts b/src/hooks/useSetChainId.ts
@@ -3,24 +3,33 @@ import { useEffect } from 'react';
 
 type Order =
   | {
-      nonce: number;
-      signerWallet: string;
-      senderWallet: string | null;
-      expiry: number;
-      signerToken: string;
-      signerAmount: string;
-      senderToken: string;
-      senderAmount: string;
-      v: number;
-      r: string;
-      s: string;
-      chainId?: number | undefined;
-      swapContract?: string | undefined;
-      protocolFee?: number | undefined;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      [x: string]: any;
     }
   | undefined;
+// | {
+//     nonce: number;
+//     signerWallet: string;
+//     senderWallet: string | null;
+//     expiry: number;
+//     signerToken: string;
+//     signerAmount: string;
+//     senderToken: string;
+//     senderAmount: string;
+//     v: number;
+//     r: string;
+//     s: string;
+//     chainId?: number | undefined;
+//     swapContract?: string | undefined;
+//     protocolFee?: number | undefined;
+//   }
+// | undefined;
 
-export const useSetChainId = ({ order }: { order: Order }): void => {
+export const useSetChainId = ({
+  order,
+}: {
+  order: Order | undefined;
+}): void => {
   const { setIsSelectDisabled, setSelectedChainId } = useAppStore();
 
   useEffect(() => {