1 files changed, 9 insertions, 2 deletions
diff --git a/web_src/js/features/heatmap.js b/web_src/js/features/heatmap.js
index d1cb43dde0..07ecaee461 100644
--- a/web_src/js/features/heatmap.js
+++ b/web_src/js/features/heatmap.js
@@ -7,8 +7,15 @@ export default async function initHeatmap() {
   if (!el) return;
 
   try {
-    const values = JSON.parse(el.dataset.heatmapData).map(({contributions, timestamp}) => {
-      return {date: new Date(timestamp * 1000), count: contributions};
+    const heatmap = {};
+    JSON.parse(el.dataset.heatmapData).forEach(({contributions, timestamp}) => {
+      // Convert to user timezone and sum contributions by date
+      const dateStr = new Date(timestamp * 1000).toDateString();
+      heatmap[dateStr] = (heatmap[dateStr] || 0) + contributions;
+    });
+
+    const values = Object.keys(heatmap).map((v) => {
+      return {date: new Date(v), count: heatmap[v]};
     });
 
     const View = Vue.extend({