Improve announcements for loading states in logs tab

synzen · Feb 11, 2025 · 377ed0c · 377ed0c
1 parent 6e4289b
commit 377ed0c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/...es/backend-api/client/src/features/feed/components/UserFeedLogs/DeliveryHistory/index.tsx b/...es/backend-api/client/src/features/feed/components/UserFeedLogs/DeliveryHistory/index.tsx
@@ -160,8 +160,13 @@ export const DeliveryHistory = () => {
         </Box>
       </Box>
       <Box srOnly aria-live="polite">
-        {fetchStatus === "fetching" && `Loading rows ${skip} through ${skip + limit}`}
-        {data && `Finished loading rows ${skip} through ${skip + limit}`}
+        {status === "loading" &&
+          `Loading article delivery history rows ${skip} through ${skip + limit}`}
+        {status === "success" &&
+          `Finished loading article delivery history rows ${skip} through ${skip + limit}`}
+        {status === "success" &&
+          fetchStatus === "fetching" &&
+          `Loading article delivery history rows ${skip} through ${skip + limit}`}
       </Box>
       {status === "loading" && (
         <Center pb={8}>

diff --git a/...ces/backend-api/client/src/features/feed/components/UserFeedLogs/RequestHistory/index.tsx b/...ces/backend-api/client/src/features/feed/components/UserFeedLogs/RequestHistory/index.tsx
@@ -107,8 +107,12 @@ export const RequestHistory = () => {
         </Box>
       </Box>
       <Box srOnly aria-live="polite">
-        {fetchStatus === "fetching" && `Loading rows ${skip} through ${skip + limit}`}
-        {data && `Finished loading rows ${skip} through ${skip + limit}`}
+        {status === "loading" && `Loading request history rows ${skip} through ${skip + limit}`}
+        {status === "success" &&
+          `Finished loading request history rows ${skip} through ${skip + limit}`}
+        {status === "success" &&
+          fetchStatus === "fetching" &&
+          `Loading request history rows ${skip} through ${skip + limit}`}
       </Box>
       {status === "loading" && (
         <Center pb={8}>