diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 31970c0f4..d16d23827 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -189,7 +189,7 @@
         }
 
         var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`;
-        fetch(url)
+        return fetch(url)
             .then(response => {
                 if (!response.ok) {
                     throw new Error('Network response was not ok');
@@ -214,6 +214,7 @@
 
                 createChart('#weeklyChart', labels, deliveredData, failedData);
                 createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData);
+                return data;
             })
             .catch(error => console.error('Error fetching daily stats:', error));
     };
diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js
index 94f3492a1..c77ebe980 100644
--- a/tests/javascripts/activityChart.test.js
+++ b/tests/javascripts/activityChart.test.js
@@ -21,7 +21,7 @@ Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
 beforeAll(done => {
   // Set up the DOM with the D3 script included
   document.body.innerHTML = `
-    <div id="activityChartContainer" data-daily-stats="{{ daily_stats }}" data-daily_stats_by_user="{{ daily_stats_by_user }}">
+    <div id="activityChartContainer"">
       <form class="usa-form">
         <label class="usa-label" for="options">Account</label>
         <select class="usa-select margin-bottom-2" name="options" id="options">
@@ -124,3 +124,26 @@ test('Check HTML content after chart creation', () => {
   expect(container.querySelector('svg')).not.toBeNull();
   expect(container.querySelectorAll('rect').length).toBeGreaterThan(0);
 });
+
+test('Fetches data and creates chart and table correctly', async () => {
+  const mockResponse = {
+    '2024-07-01': { sms: { delivered: 50, failed: 5 } },
+    '2024-07-02': { sms: { delivered: 60, failed: 2 } },
+    '2024-07-03': { sms: { delivered: 70, failed: 1 } },
+    '2024-07-04': { sms: { delivered: 80, failed: 0 } },
+    '2024-07-05': { sms: { delivered: 90, failed: 3 } },
+    '2024-07-06': { sms: { delivered: 100, failed: 4 } },
+    '2024-07-07': { sms: { delivered: 110, failed: 2 } },
+  };
+  global.fetch = jest.fn(() =>
+    Promise.resolve({
+        ok: true,
+        json: () => Promise.resolve(mockResponse),
+    })
+);
+
+const data = await fetchData('service');
+
+expect(global.fetch).toHaveBeenCalledWith('/daily_stats.json');
+expect(data).toEqual(mockResponse);
+});