Merge branch 'dev' into feat(web)/mobile-and-desktop-svg-banner-homepage

kleros · Sep 1, 2023 · f1ff5e6 · f1ff5e6
2 parents 214f51d + 9afac7c
commit f1ff5e6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/web/src/pages/Courts/CourtDetails/Stats.tsx b/web/src/pages/Courts/CourtDetails/Stats.tsx
@@ -86,7 +86,7 @@ const stats: IStat[] = [
   {
     title: "PNK redistributed",
     coinId: 0,
-    getText: (data) => formatPNK(data?.paidPNK, 18),
+    getText: (data) => formatPNK(data?.paidPNK),
     getSubtext: (data, coinPrice) => formatUSD(Number(formatUnitsWei(data?.paidPNK)) * (coinPrice ?? 0)),
     color: "purple",
     icon: PNKRedistributedIcon,

diff --git a/web/src/pages/Courts/CourtDetails/index.tsx b/web/src/pages/Courts/CourtDetails/index.tsx
@@ -39,7 +39,7 @@ const StyledBreadcrumb = styled(Breadcrumb)`
 `;
 
 const StyledBreadcrumbSkeleton = styled.div`
-  margin-top: 16px;
+  margin-bottom: 12px;
 `;
 
 const CourtDetails: React.FC = () => {

diff --git a/web/src/styles/global-style.ts b/web/src/styles/global-style.ts
@@ -98,4 +98,9 @@ export const GlobalStyle = createGlobalStyle`
       color: ${({ theme }) => theme.primaryText};
     }
   }
+
+  .react-loading-skeleton {
+    --base-color: ${({ theme }) => theme.skeletonBackground};
+    --highlight-color: ${({ theme }) => theme.skeletonHighlight};
+  }
 `;
diff --git a/web/src/styles/themes.ts b/web/src/styles/themes.ts
@@ -35,6 +35,9 @@ export const lightTheme = {
   tintPurple: "#F4F0FA",
 
   transitionSpeed: "0.25s",
+
+  skeletonBackground: "#EBEBEB",
+  skeletonHighlight: "#F5F5F5",
 };
 
 export const darkTheme = {
@@ -72,4 +75,7 @@ export const darkTheme = {
   tintPurple: "#2F0960",
 
   transitionSpeed: "0.25s",
+
+  skeletonBackground: "#3A2270",
+  skeletonHighlight: "#3E307C",
 };
diff --git a/web/src/utils/commify.ts b/web/src/utils/commify.ts
@@ -48,5 +48,7 @@ export function commify(value: string | number): string {
     }
   }
 
+  if (suffix === ".0") suffix = "";
+
   return negative + formatted.join(",") + suffix;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,5 +48,7 @@ export function commify(value: string | number): string { @@
         }
       }
+      if (suffix === ".0") suffix = "";
       return negative + formatted.join(",") + suffix;
     }