feat: ui changes [SF-1213]

Secured-Finance · Jul 3, 2024 · 4f01327 · 4f01327
1 parent 33c81be
commit 4f01327
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/components/organisms/Header/Header.tsx b/src/components/organisms/Header/Header.tsx
@@ -265,11 +265,11 @@ const PointsTag = ({
 
     if (points) {
         if (points < 1000) {
-            pointsDisplay = `${points} points`;
+            pointsDisplay = `${points} Points`;
         } else if (points < 1000000) {
-            pointsDisplay = `${Math.floor(points / 100) / 10}K points`;
+            pointsDisplay = `${Math.floor(points / 100) / 10}K Points`;
         } else {
-            pointsDisplay = `${Math.floor(points / 100000) / 10}M points`;
+            pointsDisplay = `${Math.floor(points / 100000) / 10}M Points`;
         }
     }
 
@@ -286,7 +286,7 @@ const PointsTag = ({
         <button
             onClick={() => handleOnClick()}
             className={clsx(
-                'typography-mobile-body-5 tablet:typography-desktop-body-4 flex h-8 flex-shrink-0 items-center justify-center gap-1 rounded-lg border border-tertiary-500 bg-tertiary-700/30 px-2.5 py-[5px] font-semibold text-neutral-50 hover:bg-tertiary-700 active:border-transparent tablet:h-10 tablet:rounded-xl',
+                'typography-mobile-body-5 tablet:typography-desktop-body-4 flex h-8 flex-shrink-0 items-center justify-center gap-1 rounded-lg bg-tertiary-700/30 px-2.5 py-[5px] font-semibold text-neutral-50 ring-1 ring-tertiary-500 hover:bg-tertiary-700 active:border-transparent tablet:h-10 tablet:rounded-xl tablet:ring-[1.5px]',
                 {
                     'w-8 tablet:w-10 tablet:pr-2.5': !showPoints,
                     'tablet:pr-3': showPoints,

diff --git a/src/components/organisms/Header/constants.ts b/src/components/organisms/Header/constants.ts
@@ -9,6 +9,11 @@ export const PRODUCTION_LINKS = [
         link: '/portfolio',
         dataCy: 'history',
     },
+    {
+        text: 'Bridge',
+        link: '/bridge',
+        dataCy: 'bridge',
+    },
     {
         text: 'Points',
         link: '/points',
@@ -19,11 +24,6 @@ export const PRODUCTION_LINKS = [
         link: '/campaign',
         dataCy: 'campaign',
     },
-    {
-        text: 'Bridge',
-        link: '/bridge',
-        dataCy: 'bridge',
-    },
 ];
 
 export const DEV_LINKS = [

diff --git a/src/components/pages/PointsDashboard/PointsDashboard.test.tsx b/src/components/pages/PointsDashboard/PointsDashboard.test.tsx
@@ -22,7 +22,7 @@ describe('PointsDashboard Component', () => {
             screen.getByText('Join the Secured Finance Points Program!')
         ).toBeInTheDocument();
         expect(
-            screen.getByRole('button', { name: 'Join' })
+            screen.queryAllByRole('button', { name: 'Connect Wallet' })[1]
         ).toBeInTheDocument();
     });
 });
diff --git a/src/components/pages/PointsDashboard/PointsDashboard.tsx b/src/components/pages/PointsDashboard/PointsDashboard.tsx
@@ -346,7 +346,7 @@ const UserPointInfo = ({ chainId }: { chainId: number }) => {
                                 }}
                                 disabled={!isConnected || isLoading || loading}
                             >
-                                Join
+                                {!isConnected ? 'Connect Wallet' : 'Join'}
                             </Button>
                         </>
                     )}

diff --git a/src/utils/links.tsx b/src/utils/links.tsx
@@ -33,7 +33,7 @@ export const LinkList: ExternalLink[] = [
     },
     {
         text: 'Join us on Discord',
-        href: 'https://discord.com/invite/FqrdfQgmjT',
+        href: 'https://discord.gg/3kytCrv3qY',
         icon: <Discord className='h-5 w-5 text-white' />,
     },
 ];
-Original file line number
+Diff line change
@@ Expand Up @@
                                     }}
                                     disabled={!isConnected || isLoading || loading}
                                 >
-                                    Join
+                                    {!isConnected ? 'Connect Wallet' : 'Join'}
                                 </Button>
                             </>
                         )}
@@ Expand Down @@