diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index e5fd97f52..9f7f3694c 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -7,9 +7,9 @@ import {
useLocation,
} from 'react-router-dom';
-import { BaseStyles, Box, ThemeProvider } from '@primer/react';
+import { BaseStyles, ThemeProvider } from '@primer/react';
-import { Sidebar } from './components/Sidebar';
+import { AppLayout } from './components/layout/AppLayout';
import { AppContext, AppProvider } from './context/App';
import { AccountsRoute } from './routes/Accounts';
import { FiltersRoute } from './routes/Filters';
@@ -38,8 +38,7 @@ export const App = () => {
-
-
+
{
element={}
/>
-
+
diff --git a/src/renderer/components/fields/Checkbox.tsx b/src/renderer/components/fields/Checkbox.tsx
index 578904836..d7e55dc64 100644
--- a/src/renderer/components/fields/Checkbox.tsx
+++ b/src/renderer/components/fields/Checkbox.tsx
@@ -1,8 +1,8 @@
+import { Stack } from '@primer/react';
import type { FC, ReactNode } from 'react';
-import { CounterLabel, Stack } from '@primer/react';
-
import { cn } from '../../utils/cn';
+import { CustomCounter } from '../primitives/CustomCounter';
import { Tooltip } from './Tooltip';
export interface ICheckbox {
@@ -20,7 +20,7 @@ export const Checkbox: FC = ({
visible = true,
...props
}: ICheckbox) => {
- const counter = props.counter > 0 ? props.counter : undefined;
+ const counter = props?.counter === 0 ? '0' : props.counter;
return (
visible && (
@@ -54,11 +54,12 @@ export const Checkbox: FC = ({
)}
- {counter ? (
-
- {counter}
-
- ) : null}
+ {counter && (
+
+ )}
)
);
diff --git a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
index 6218f5afb..7a2c09b83 100644
--- a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
@@ -200,18 +200,9 @@ exports[`renderer/components/fields/Checkbox.tsx should render - positive counte
Appearance
- 5
-
-
- (
5
- )
@@ -240,18 +231,9 @@ exports[`renderer/components/fields/Checkbox.tsx should render - positive counte
Appearance
- 5
-
-
- (
5
- )
,
@@ -336,18 +318,9 @@ exports[`renderer/components/fields/Checkbox.tsx should render - positive counte
Appearance
- 5
-
-
- (
5
- )
@@ -375,18 +348,9 @@ exports[`renderer/components/fields/Checkbox.tsx should render - positive counte
Appearance
- 5
-
-
- (
5
- )
,
@@ -735,6 +699,11 @@ exports[`renderer/components/fields/Checkbox.tsx should render - zero counter 1`
>
Appearance
+
+ 0
+