Merge branch 'v2/dev' of https://github.com/vitwit/resolute into pava…

…nia1/authz-illustrations
vitwit · Sep 13, 2024 · a29e8fb · a29e8fb
2 parents c224e08 + 26c901b
commit a29e8fb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/frontend/public/metamask.svg b/frontend/public/metamask.svg
diff --git a/frontend/src/components/common/Footer.tsx b/frontend/src/components/common/Footer.tsx
@@ -11,8 +11,8 @@ const Footer = () => {
             height={20}
             alt="resolute-logo"
           /> */}
-        <p className="text-h1">RESOLUTE</p>
-        <p className="text-b1 opacity-50">Powered by vitwit</p>
+        <p className="text-h1 !font-semibold tracking-[1.5px]">RESOLUTE</p>
+        <p className="text-b1 opacity-50">Powered by Vitwit</p>
       </div>
 
       <div className="text-b1">
@@ -33,9 +33,9 @@ const Footer = () => {
             alt="telegram-logo"
             // className="w-5 h-5"
           />
-          <p className="">telegram</p>
+          <p className="capitalize">telegram</p>
         </a>
-        <div className='v-line !h-10'></div>
+        <div className="v-line !h-10"></div>
         <a
           className="flex gap-2 items-center"
           href="https://github.com/vitwit/resolute"
@@ -49,9 +49,9 @@ const Footer = () => {
             alt="github-logo"
             // className="w-6 h-6"
           />
-          <p> github</p>
+          <p className="capitalize"> github</p>
         </a>
-        <div className='v-line !h-10'></div>
+        <div className="v-line !h-10"></div>
         <a
           className="flex gap-2 items-center"
           href="https://twitter.com/vitwit_"
@@ -65,9 +65,9 @@ const Footer = () => {
             alt="twitter-logo"
             // className="w-6 h-6"
           />
-          <p>twitter</p>
+          <p className="capitalize">twitter</p>
         </a>
-        <div className='v-line !h-10'></div>
+        <div className="v-line !h-10"></div>
         <a
           className="flex gap-2 items-center"
           href="https://www.youtube.com/@vitwit8623"
@@ -81,7 +81,7 @@ const Footer = () => {
             alt="youtube-logo"
             className="w-6 h-6"
           />
-          <p>youtube</p>
+          <p className="capitalize">youtube</p>
         </a>
       </div>
     </div>

diff --git a/frontend/src/components/main-layout/ConnectWallet.tsx b/frontend/src/components/main-layout/ConnectWallet.tsx
@@ -114,7 +114,8 @@ const ConnectWallet = () => {
                   height={100}
                   alt={wallet.name}
                 />
-                <p className="text-b1">{wallet.name}</p>
+                <p className="text-b1">
+                  {wallet.name === "Metamask" ? "Metamask Snap":wallet.name}</p>
               </div>
             ))}
             <div className="p-6 h-[18px]"></div>

diff --git a/frontend/src/components/main-layout/TopBar.tsx b/frontend/src/components/main-layout/TopBar.tsx
@@ -38,15 +38,15 @@ const TopBar = () => {
         <nav className="flex justify-between items-center px-4 py-2">
           <div className="flex items-center space-x-1">
             <Link href="/" legacyBehavior>
-              <a className="flex items-center space-x-1">
+              <a className="flex items-center gap-1">
                 <Image
                   src="/vitwit-logo.svg"
-                  width={35}
+                  width={32}
                   height={21}
                   alt="Resolute"
 
                 />
-                <span className="text-h1">RESOLUTE</span>
+                <span className="text-h1 !font-semibold tracking-[1.5px]">RESOLUTE</span>
               </a>
             </Link>
           </div>

diff --git a/frontend/src/utils/constants.ts b/frontend/src/utils/constants.ts
@@ -15,7 +15,7 @@ export const SUPPORTED_WALLETS = [
   },
   {
     name: 'Metamask',
-    logo: '/metamask.png',
+    logo: '/metamask.svg',
   }
 ];
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ export const SUPPORTED_WALLETS = [ @@
       },
       {
         name: 'Metamask',
-        logo: '/metamask.png',
+        logo: '/metamask.svg',
       }
     ];
@@ Expand Down @@