From 0a8d80196f4da2ed76c1c814fb70905c52685f80 Mon Sep 17 00:00:00 2001
From: The-Yearly <theyearlysclub@gmail.com>
Date: Fri, 16 May 2025 16:45:04 +0530
Subject: [PATCH] Resolved All Issues

---
 src/app/(main)/dashboard/DashboardEdit.tsx | 6 +++++-
 src/app/(main)/dashboard/DashboardPage.tsx | 4 ++--
 src/components/messages.ts                 | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsx
index 50b3f89f4..5be687b38 100644
--- a/src/app/(main)/dashboard/DashboardEdit.tsx
+++ b/src/app/(main)/dashboard/DashboardEdit.tsx
@@ -56,7 +56,11 @@ export function DashboardEdit({ teamId }: { teamId: string }) {
     const [removed] = orderedWebsites.splice(source.index, 1);
     orderedWebsites.splice(destination.index, 0, removed);
 
-    setOrder(orderedWebsites.map(website => website?.id || 0));
+    setOrder(
+      orderedWebsites
+        .map(website => website?.id)
+        .filter((id): id is string => typeof id === 'string'),
+    );
     setEdited(true);
   }
   function handleActiveWebsites(id: string) {
diff --git a/src/app/(main)/dashboard/DashboardPage.tsx b/src/app/(main)/dashboard/DashboardPage.tsx
index 9085903a4..46faf059b 100644
--- a/src/app/(main)/dashboard/DashboardPage.tsx
+++ b/src/app/(main)/dashboard/DashboardPage.tsx
@@ -15,7 +15,7 @@ export function DashboardPage() {
   const { teamId, renderTeamUrl } = useTeamUrl();
   const { showCharts, editing, isEdited, websiteActive } = useDashboard();
   const { dir } = useLocale();
-  const pageSize = isEdited ? 10 : 200;
+  const pageSize = isEdited ? 200 : 10;
   const handleEdit = () => {
     saveDashboard({ editing: true });
   };
@@ -59,7 +59,7 @@ export function DashboardPage() {
                 <Pager
                   page={page}
                   pageSize={pageSize}
-                  count={websiteActive.length}
+                  count={result?.count}
                   onPageChange={handlePageChange}
                 />
               </>
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 63e90c78a..7c829e34b 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -390,7 +390,7 @@ export const messages = defineMessages({
   },
   noWebsitesToggled: {
     id: 'message.no-websites-toggled',
-    defaultMessage: 'You haven't toggled any websites',
+    defaultMessage: 'You have not toggled any websites',
   },
 
   noTeamWebsites: {