diff --git a/publisher/src/App.tsx b/publisher/src/App.tsx
index f13d69f5e..a46a5a721 100644
--- a/publisher/src/App.tsx
+++ b/publisher/src/App.tsx
@@ -23,7 +23,6 @@ import { trackNavigation } from "./analytics";
import { DataUpload } from "./components/DataUpload";
import { PageWrapper } from "./components/Forms";
import Header from "./components/Header";
-import { MetricsView } from "./components/MetricsView";
import CreateReports from "./components/Reports/CreateReport";
import ReportDataEntry from "./components/Reports/ReportDataEntry";
import ReviewMetrics from "./components/ReviewMetrics/ReviewMetrics";
@@ -46,7 +45,6 @@ const App: React.FC = (): ReactElement => {
} />
} />
} />
- } />
} />
} />
diff --git a/publisher/src/components/Badge/Badge.tsx b/publisher/src/components/Badge/Badge.tsx
index 0ecc41b1c..7bdd62691 100644
--- a/publisher/src/components/Badge/Badge.tsx
+++ b/publisher/src/components/Badge/Badge.tsx
@@ -28,11 +28,13 @@ export type BadgeProps = {
color: BadgeColors;
disabled?: boolean;
loading?: boolean;
+ noMargin?: boolean;
};
export const BadgeElement = styled.div<{
color?: BadgeColors;
disabled?: boolean;
+ noMargin?: boolean;
}>`
height: 24px;
display: flex;
@@ -40,7 +42,7 @@ export const BadgeElement = styled.div<{
align-items: center;
background: ${({ color, disabled }) => {
if (color === "GREY" || disabled) {
- return palette.highlight.grey9;
+ return palette.highlight.grey8;
}
if (color === "RED") {
return palette.solid.red;
@@ -55,21 +57,22 @@ export const BadgeElement = styled.div<{
}};
color: ${palette.solid.white};
padding: 4px 8px;
- margin-left: 10px;
font-size: 0.65rem;
font-weight: 600;
white-space: nowrap;
text-transform: capitalize;
+ ${({ noMargin }) => !noMargin && `margin-left: 10px;`};
`;
export const Badge: React.FC = ({
color,
disabled,
loading,
+ noMargin,
children,
}) => {
return (
-
+
{children}
{loading && }
diff --git a/publisher/src/components/Menu/Menu.tsx b/publisher/src/components/Menu/Menu.tsx
index a4ea0ee74..d31816fc1 100644
--- a/publisher/src/components/Menu/Menu.tsx
+++ b/publisher/src/components/Menu/Menu.tsx
@@ -37,7 +37,6 @@ enum MenuItems {
LearnMore = "LEARN MORE",
Settings = "SETTINGS",
Agencies = "AGENCIES",
- Metrics = "METRICS",
}
const Menu = () => {
@@ -77,8 +76,6 @@ const Menu = () => {
setActiveMenuItem(MenuItems.CreateReport);
} else if (location.pathname === "/settings") {
setActiveMenuItem(MenuItems.Settings);
- } else if (location.pathname === "/metrics") {
- setActiveMenuItem(MenuItems.Metrics);
} else {
setActiveMenuItem(undefined);
}
@@ -92,14 +89,6 @@ const Menu = () => {
`Welcome, ${userStore.nameOrEmail} at ${userStore.currentAgency.name}`}
- {/* Metrics View */}
-
-
{/* Reports */}