diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index cf9106cd183f..1d7b00995269 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -47444,7 +47444,7 @@
       _.currencyMap = t10;
       _.counts = t11;
     },
-    chartTasks__closure: function chartTasks__closure(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13) {
+    chartTasks__closure: function chartTasks__closure(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) {
       var _ = this;
       _.totals = t0;
       _.loggedData = t1;
@@ -47459,9 +47459,8 @@
       _.invoice = t10;
       _.currencyMap = t11;
       _.invoiceMap = t12;
-      _.counts = t13;
     },
-    chartTasks___closure: function chartTasks___closure(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13) {
+    chartTasks___closure: function chartTasks___closure(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) {
       var _ = this;
       _.totals = t0;
       _.loggedData = t1;
@@ -47476,7 +47475,6 @@
       _.invoice = t10;
       _.currencyMap = t11;
       _.invoiceMap = t12;
-      _.counts = t13;
     },
     chartExpenses_closure: function chartExpenses_closure(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9) {
       var _ = this;
@@ -319041,14 +319039,17 @@
   };
   O.chartTasks_closure.prototype = {
     call$2: function(int, task) {
-      var t2, t3, invoice, project, group, _this = this, _null = null,
+      var t2, t3, t4, t5, invoice, project, group, t6, _this = this, _null = null,
+        _s8_ = "invoiced",
         t1 = task.clientId,
         client = J.$index$asx(_this.clientMap._map$_map, t1);
       if (client == null)
         client = T.ClientEntity_ClientEntity(_null, t1, _null, _null);
       t2 = _this.invoiceMap;
       t3 = task.invoiceId;
-      invoice = J.$index$asx(t2._map$_map, t3);
+      t4 = t2._map$_map;
+      t5 = J.getInterceptor$asx(t4);
+      invoice = t5.$index(t4, t3);
       if (invoice == null)
         invoice = Q.InvoiceEntity_InvoiceEntity(_null, _null, t1, _null, _null);
       t1 = task.projectId;
@@ -319061,10 +319062,22 @@
         group = Q.GroupEntity_GroupEntity(t1, _null);
       if (!(task.isDeleted || client.isDeleted || project.isDeleted)) {
         t1 = _this.settings;
-        t3 = _this.company;
-        if (task.isBetween$2(t1.startDate$1(t3), t1.endDate$1(t3)))
-          if (t1.matchesCurrency$1(client.settings.currencyId))
-            C.JSArray_methods.forEach$1(task.getTaskTimes$0(), new O.chartTasks__closure(_this.totals, _this.loggedData, _this.invoicedData, _this.paidData, t3, project, client, task, group, t1, invoice, _this.currencyMap, t2, _this.counts));
+        t6 = _this.company;
+        if (task.isBetween$2(t1.startDate$1(t6), t1.endDate$1(t6)))
+          if (t1.matchesCurrency$1(client.settings.currencyId)) {
+            C.JSArray_methods.forEach$1(task.getTaskTimes$0(), new O.chartTasks__closure(_this.totals, _this.loggedData, _this.invoicedData, _this.paidData, t6, project, client, task, group, t1, invoice, _this.currencyMap, t2));
+            if (t3.length !== 0) {
+              t1 = t5.containsKey$1(t4, t3) && t5.$index(t4, t3).statusId === "4";
+              t2 = _this.counts;
+              if (t1)
+                t2.$indexSet(0, "paid", t2.$index(0, "paid") + 1);
+              else
+                t2.$indexSet(0, _s8_, t2.$index(0, _s8_) + 1);
+            } else {
+              t1 = _this.counts;
+              t1.$indexSet(0, "logged", t1.$index(0, "logged") + 1);
+            }
+          }
       }
     },
     $signature: 136
@@ -319072,7 +319085,7 @@
   O.chartTasks__closure.prototype = {
     call$1: function(taskTime) {
       var _this = this;
-      taskTime.getParts$0().forEach$1(0, new O.chartTasks___closure(_this.totals, _this.loggedData, _this.invoicedData, _this.paidData, _this.company, _this.project, _this.client, _this.task, _this.group, _this.settings, _this.invoice, _this.currencyMap, _this.invoiceMap, _this.counts));
+      taskTime.getParts$0().forEach$1(0, new O.chartTasks___closure(_this.totals, _this.loggedData, _this.invoicedData, _this.paidData, _this.company, _this.project, _this.client, _this.task, _this.group, _this.settings, _this.invoice, _this.currencyMap, _this.invoiceMap));
     },
     $signature: 198
   };
@@ -319080,12 +319093,11 @@
     call$2: function(date, duration) {
       var t2, t3, t4, amount, t5, t6, exchangeRate, _this = this, _s6_ = "logged",
         _s8_ = "invoiced",
-        _s4_ = "paid",
         t1 = _this.totals;
       if (t1.$index(0, _s6_).$index(0, date) == null) {
         t1.$index(0, _s6_).$indexSet(0, date, 0);
         t1.$index(0, _s8_).$indexSet(0, date, 0);
-        t1.$index(0, _s4_).$indexSet(0, date, 0);
+        t1.$index(0, "paid").$indexSet(0, date, 0);
         t2 = type$.JSArray_legacy_String;
         _this.loggedData.entityMap.$indexSet(0, date, H.setRuntimeTypeInfo([], t2));
         _this.invoicedData.entityMap.$indexSet(0, date, H.setRuntimeTypeInfo([], t2));
@@ -319117,24 +319129,19 @@
         t3 = _this.invoiceMap._map$_map;
         t5 = J.getInterceptor$x(t3);
         t2 = t5.containsKey$1(t3, t2) && t5.$index(t3, t2).statusId === "4";
-        t3 = _this.counts;
         t4 = t4.id;
         if (t2) {
-          t1 = t1.$index(0, _s4_);
+          t1 = t1.$index(0, "paid");
           t1.$indexSet(0, date, t1.$index(0, date) + amount);
-          t3.$indexSet(0, _s4_, t3.$index(0, _s4_) + 1);
           J.add$1$ax(_this.paidData.entityMap.$index(0, date), t4);
         } else {
           t1 = t1.$index(0, _s8_);
           t1.$indexSet(0, date, t1.$index(0, date) + amount);
-          t3.$indexSet(0, _s8_, t3.$index(0, _s8_) + 1);
           J.add$1$ax(_this.invoicedData.entityMap.$index(0, date), t4);
         }
       } else {
         t1 = t1.$index(0, _s6_);
         t1.$indexSet(0, date, t1.$index(0, date) + amount);
-        t1 = _this.counts;
-        t1.$indexSet(0, _s6_, t1.$index(0, _s6_) + 1);
         J.add$1$ax(_this.loggedData.entityMap.$index(0, date), t4.id);
       }
     },
@@ -319397,12 +319404,9 @@
   };
   A._runningTasks_closure0.prototype = {
     call$2: function(taskA, taskB) {
-      var t2,
-        t1 = taskA.get$startTimestamp();
-      if (t1 == null)
-        t1 = 0;
-      t2 = taskB.get$startTimestamp();
-      return C.JSInt_methods.compareTo$1(t1, t2 == null ? 0 : t2);
+      var t1 = taskB.updatedAt,
+        t2 = taskA.updatedAt;
+      return C.JSInt_methods.compareTo$1(t1, t2);
     },
     $signature: 375
   };
@@ -319426,12 +319430,9 @@
   };
   A._recentTasks_closure0.prototype = {
     call$2: function(taskA, taskB) {
-      var t2,
-        t1 = taskA.get$startTimestamp();
-      if (t1 == null)
-        t1 = 0;
-      t2 = taskB.get$startTimestamp();
-      return C.JSInt_methods.compareTo$1(t1, t2 == null ? 0 : t2);
+      var t1 = taskB.updatedAt,
+        t2 = taskA.updatedAt;
+      return C.JSInt_methods.compareTo$1(t1, t2);
     },
     $signature: 375
   };
@@ -376433,7 +376434,7 @@
       t5 = t1.ChangeNotifier__listeners;
       t5._insertBefore$3$updateFirst(t5._collection$_first, new B._ListenerEntry(_this.get$onTabListener()), false);
       _this._sideTabController = t1;
-      t1 = F.ScrollController$(null, index * 541);
+      t1 = F.ScrollController$(null, index * 539);
       t5 = t1.ChangeNotifier__listeners;
       t5._insertBefore$3$updateFirst(t5._collection$_first, new B._ListenerEntry(_this.get$onScrollListener()), false);
       _this._dashboard_screen$_scrollController = t1;
@@ -376453,7 +376454,7 @@
         return;
       t1 = C.JSArray_methods.get$single(_this._dashboard_screen$_scrollController._positions)._pixels;
       t1.toString;
-      offsetIndex = C.JSNumber_methods.floor$0((t1 + 120) / 541);
+      offsetIndex = C.JSNumber_methods.floor$0((t1 + 120) / 539);
       t1 = _this._sideTabController;
       if (t1._tab_controller$_index !== offsetIndex && offsetIndex < _this._tabs.length) {
         t2 = _this.get$onTabListener();
@@ -376473,8 +376474,8 @@
       index = _this._sideTabController._tab_controller$_index;
       t1 = C.JSArray_methods.get$single(_this._dashboard_screen$_scrollController._positions)._pixels;
       t1.toString;
-      if (index !== C.JSNumber_methods.floor$0((t1 + 120) / 541)) {
-        _this._dashboard_screen$_scrollController.jumpTo$1(index * 541 + 1);
+      if (index !== C.JSNumber_methods.floor$0((t1 + 120) / 539)) {
+        _this._dashboard_screen$_scrollController.jumpTo$1(index * 539 + 1);
         _this._widget.viewModel.onEntityTypeChanged.call$1(_this._tabs[index]);
       }
     },