diff --git a/public/main.profile.dart.js b/public/main.profile.dart.js
index 8034d9edf328..968002670a69 100644
--- a/public/main.profile.dart.js
+++ b/public/main.profile.dart.js
@@ -47826,21 +47826,27 @@
       t3 = t3 ? B.AlwaysScrollableScrollPhysics_null : _null;
       return new A.ListView(t1, padding, scrollDirection, false, controller, primary, t3, _null, shrinkWrap, _null, 0, _null, t2, B.DragStartBehavior_1, B.ScrollViewKeyboardDismissBehavior_0, _null, B.Clip_1, _null);
     },
-    ListView$builder(controller, itemBuilder, itemCount, padding, physics, scrollDirection, shrinkWrap) {
+    ListView$builder(controller, itemBuilder, itemCount, padding, physics, primary, scrollDirection, shrinkWrap) {
       var t1, _null = null;
       if (physics == null) {
-        t1 = controller == null && scrollDirection === B.Axis_1;
+        if (primary !== true)
+          t1 = primary == null && controller == null && scrollDirection === B.Axis_1;
+        else
+          t1 = true;
         t1 = t1 ? B.AlwaysScrollableScrollPhysics_null : _null;
       } else
         t1 = physics;
-      return new A.ListView(new A.SliverChildBuilderDelegate(itemBuilder, itemCount, true, true, true, A.sliver___kDefaultSemanticIndexCallback$closure(), _null), padding, scrollDirection, false, controller, _null, t1, _null, shrinkWrap, _null, 0, _null, itemCount, B.DragStartBehavior_1, B.ScrollViewKeyboardDismissBehavior_0, _null, B.Clip_1, _null);
+      return new A.ListView(new A.SliverChildBuilderDelegate(itemBuilder, itemCount, true, true, true, A.sliver___kDefaultSemanticIndexCallback$closure(), _null), padding, scrollDirection, false, controller, primary, t1, _null, shrinkWrap, _null, 0, _null, itemCount, B.DragStartBehavior_1, B.ScrollViewKeyboardDismissBehavior_0, _null, B.Clip_1, _null);
     },
-    ListView$separated(controller, itemBuilder, itemCount, padding, separatorBuilder, shrinkWrap) {
-      var _null = null,
-        t1 = Math.max(0, itemCount * 2 - 1),
-        t2 = controller == null && true;
+    ListView$separated(controller, itemBuilder, itemCount, padding, primary, separatorBuilder, shrinkWrap) {
+      var t2, _null = null,
+        t1 = Math.max(0, itemCount * 2 - 1);
+      if (primary !== true)
+        t2 = primary == null && controller == null && true;
+      else
+        t2 = true;
       t2 = t2 ? B.AlwaysScrollableScrollPhysics_null : _null;
-      return new A.ListView(new A.SliverChildBuilderDelegate(new A.ListView$separated_closure(itemBuilder, separatorBuilder), t1, true, true, true, new A.ListView$separated_closure0(), _null), padding, B.Axis_1, false, controller, _null, t2, _null, shrinkWrap, _null, 0, _null, itemCount, B.DragStartBehavior_1, B.ScrollViewKeyboardDismissBehavior_0, _null, B.Clip_1, _null);
+      return new A.ListView(new A.SliverChildBuilderDelegate(new A.ListView$separated_closure(itemBuilder, separatorBuilder), t1, true, true, true, new A.ListView$separated_closure0(), _null), padding, B.Axis_1, false, controller, primary, t2, _null, shrinkWrap, _null, 0, _null, itemCount, B.DragStartBehavior_1, B.ScrollViewKeyboardDismissBehavior_0, _null, B.Clip_1, _null);
     },
     GridView$count(childAspectRatio, children, crossAxisCount, crossAxisSpacing, mainAxisSpacing, padding, physics, primary, shrinkWrap) {
       var t3, _null = null,
@@ -93147,6 +93153,9 @@
       this._debugLifecycleState = t0;
       this._framework$_element = null;
     },
+    ScrollableListViewBuilder$(itemBuilder, itemCount, padding, primary, scrollController, separatorBuilder) {
+      return new A.ScrollableListViewBuilder(itemBuilder, separatorBuilder, itemCount, scrollController, padding, primary, null);
+    },
     ScrollableListView: function ScrollableListView(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _.children = t0;
@@ -93162,14 +93171,15 @@
       _._debugLifecycleState = t0;
       _._framework$_element = null;
     },
-    ScrollableListViewBuilder: function ScrollableListViewBuilder(t0, t1, t2, t3, t4, t5) {
+    ScrollableListViewBuilder: function ScrollableListViewBuilder(t0, t1, t2, t3, t4, t5, t6) {
       var _ = this;
       _.itemBuilder = t0;
       _.separatorBuilder = t1;
       _.itemCount = t2;
       _.scrollController = t3;
       _.padding = t4;
-      _.key = t5;
+      _.primary = t5;
+      _.key = t6;
     },
     _ScrollableListViewBuilderState: function _ScrollableListViewBuilderState(t0) {
       var _ = this;
@@ -93624,7 +93634,7 @@
       var _ = this;
       _.dataTableSource = null;
       _._firstRowIndex = 0;
-      _._widget = _._entity_list$_controller = null;
+      _._widget = null;
       _._debugLifecycleState = t0;
       _._framework$_element = null;
     },
@@ -175591,7 +175601,7 @@
       t1.toString;
       A.Color$fromARGB(255, 255, 255, 255);
       listWidgets.push(A.GestureDetector$(_null, A.Container$(_null, A.Row$(t1.header, B.CrossAxisAlignment_2, B.MainAxisAlignment_2, B.MainAxisSize_1, _null), B.Clip_0, t1.headerBackgroundColor, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null), B.DragStartBehavior_1, false, _null, _null, _null, _null, _null, _null, _null, new A.BoardListState_build_closure(_this, context), _null, _null, _null, _null, _null, _null, _null, _null, new A.BoardListState_build_closure0(_this), new A.BoardListState_build_closure1(), new A.BoardListState_build_closure2(_this, context), _null, _null, _null, _null));
-      listWidgets.push(A.Container$(_null, new A.Flexible(1, B.FlexFit_1, A.ListView$builder(_this.boardListController, new A.BoardListState_build_closure3(_this), _this._widget.items.length, _null, new A.ClampingScrollPhysics(_null), B.Axis_1, true), _null), B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null));
+      listWidgets.push(A.Container$(_null, new A.Flexible(1, B.FlexFit_1, A.ListView$builder(_this.boardListController, new A.BoardListState_build_closure3(_this), _this._widget.items.length, _null, new A.ClampingScrollPhysics(_null), _null, B.Axis_1, true), _null), B.Clip_0, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null));
       listWidgets.push(_this._widget.footer);
       backgroundColor = A.Color$fromARGB(255, 255, 255, 255);
       t1 = _this._widget;
@@ -176068,7 +176078,7 @@
       t3 = t2._positions;
       if (t3.length !== 0)
         $.WidgetsBinding__instance.SchedulerBinding__postFrameCallbacks.push(new A.BoardViewState_build_closure(_this));
-      listWidget = A.ListView$builder(t2, new A.BoardViewState_build_closure0(_this), _this._widget.lists.length, _null, new A.ClampingScrollPhysics(_null), B.Axis_0, false);
+      listWidget = A.ListView$builder(t2, new A.BoardViewState_build_closure0(_this), _this._widget.lists.length, _null, new A.ClampingScrollPhysics(_null), _null, B.Axis_0, false);
       stackWidgets = A._setArrayType([listWidget], type$.JSArray_Widget);
       if (_this.dy != null) {
         t4 = context.dependOnInheritedWidgetOfExactType$1$0(type$.MediaQuery).data;
@@ -200069,7 +200079,8 @@
       t2._pageOpener.setInitialDetailPage$1(new A._DetailArguments(packageName, A.List_List$of(new A.MappedListIterable(t1, new A._PackagesViewState__initDefaultDetailPage_closure(data), t3), false, t3._eval$1("ListIterable.E"))));
     },
     _packagesList$4(context, selectedId, data, drawSelection) {
-      return A.ListView$builder(null, new A._PackagesViewState__packagesList_closure(this, data, drawSelection, selectedId), data.packages.length + 1, null, null, B.Axis_1, false);
+      var _null = null;
+      return A.ListView$builder(_null, new A._PackagesViewState__packagesList_closure(this, data, drawSelection, selectedId), data.packages.length + 1, _null, _null, _null, B.Axis_1, false);
     }
   };
   A._PackagesViewState_licenses_closure.prototype = {
@@ -315541,7 +315552,7 @@
       t1 = A.TextField$(true, B.List_empty1, false, _null, _null, _null, _null, _null, 2, t1, true, _null, true, _null, false, _null, _null, _null, _null, _null, _null, 1, _null, _null, false, "\u2022", new A._CountryPickerDialogState_build_closure(_this), _null, _null, _null, false, _null, _null, B.EdgeInsets_20_20_20_20, _null, _null, _null, _null, _null, _null, _null, B.TextAlign_4, _null, B.TextCapitalization_30, _null, _null, _null);
       t3 = _this.___CountryPickerDialogState__filteredCountries_A;
       t3 === $ && A.throwUnnamedLateFieldNI();
-      return A.Dialog$(_null, _null, A.Container$(_null, A.Column$(A._setArrayType([new A.Padding(new A.EdgeInsets(0, 0, 0, 0), t1, _null), new A.SizedBox(_null, 20, _null, _null), A.Expanded$(A.ListView$builder(_null, new A._CountryPickerDialogState_build_closure0(_this, context), t3.length, _null, _null, B.Axis_1, true), 1)], type$.JSArray_Widget), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), B.Clip_0, _null, _null, _null, _null, _null, _null, _null, new A.EdgeInsets(10, 10, 10, 10), _null, _null, _null), B.Clip_0, _null, new A.EdgeInsets(t2, 24, t2, 24), _null);
+      return A.Dialog$(_null, _null, A.Container$(_null, A.Column$(A._setArrayType([new A.Padding(new A.EdgeInsets(0, 0, 0, 0), t1, _null), new A.SizedBox(_null, 20, _null, _null), A.Expanded$(A.ListView$builder(_null, new A._CountryPickerDialogState_build_closure0(_this, context), t3.length, _null, _null, _null, B.Axis_1, true), 1)], type$.JSArray_Widget), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), B.Clip_0, _null, _null, _null, _null, _null, _null, _null, new A.EdgeInsets(10, 10, 10, 10), _null, _null, _null), B.Clip_0, _null, new A.EdgeInsets(t2, 24, t2, 24), _null);
     }
   };
   A._CountryPickerDialogState_build_closure.prototype = {
@@ -424674,7 +424685,7 @@
     call$3(context, onSelected, options) {
       var _null = null,
         t1 = A.Theme_of(context).cardColor;
-      return new A.Theme(this.theme, new A.Align(B.Alignment_m1_m1, _null, _null, A.Material$(B.Duration_200000, true, _null, new A.AppBorder(A.Container$(_null, new A.ScrollableListViewBuilder(new A._EntityDropdownState_build__closure5(this.$this, this.state, onSelected, options), _null, J.get$length$asx(options), _null, _null, _null), B.Clip_0, t1, new A.BoxConstraints(0, 1 / 0, 0, 270), _null, _null, _null, _null, _null, _null, _null, _null, 250), _null, _null, _null, false, _null), B.Clip_0, _null, 4, _null, _null, _null, _null, _null, B.MaterialType_0), _null), _null);
+      return new A.Theme(this.theme, new A.Align(B.Alignment_m1_m1, _null, _null, A.Material$(B.Duration_200000, true, _null, new A.AppBorder(A.Container$(_null, A.ScrollableListViewBuilder$(new A._EntityDropdownState_build__closure5(this.$this, this.state, onSelected, options), J.get$length$asx(options), _null, false, _null, _null), B.Clip_0, t1, new A.BoxConstraints(0, 1 / 0, 0, 270), _null, _null, _null, _null, _null, _null, _null, _null, 250), _null, _null, _null, false, _null), B.Clip_0, _null, 4, _null, _null, _null, _null, _null, B.MaterialType_0), _null), _null);
     },
     $signature: 2343
   };
@@ -424811,12 +424822,11 @@
   };
   A._EntityDropdownDialogState_build__createList.prototype = {
     call$0() {
-      var _null = null,
-        t1 = this.$this,
+      var t1 = this.$this,
         t2 = J.where$1$ax(t1._widget.entityList, new A._EntityDropdownDialogState_build__createList_closure(t1)),
         t3 = t2.$ti._eval$1("WhereIterable<Iterable.E>"),
         matches = A.List_List$of(new A.WhereIterable(t2, new A._EntityDropdownDialogState_build__createList_closure0(t1), t3), true, t3._eval$1("Iterable.E"));
-      return new A.ScrollableListViewBuilder(new A._EntityDropdownDialogState_build__createList_closure1(t1, matches, this._selectEntity), _null, matches.length, _null, _null, _null);
+      return A.ScrollableListViewBuilder$(new A._EntityDropdownDialogState_build__createList_closure1(t1, matches, this._selectEntity), matches.length, null, false, null, null);
     },
     $signature: 141
   };
@@ -425394,7 +425404,7 @@
       var _this = this, _null = null,
         t1 = _this.child;
       if (t1 == null)
-        t1 = new A.ScrollableListView(_this.children, _null, _null, _null, false, _null);
+        t1 = new A.ScrollableListView(_this.children, _null, _null, true, false, _null);
       return A.FocusScope$(false, A.Form$(_null, t1, _this.formKey), _null, _this.focusNode);
     }
   };
@@ -427690,7 +427700,7 @@
       activities = t2.getActivities$2$invoiceId$typeId(invoice.id, "6");
       if (!activities.get$iterator(activities).moveNext$0())
         return new A.HelpText(t1.get$noHistory(t1), _null);
-      return new A.ScrollableListViewBuilder(new A._InvoiceEmailViewState__buildHistory_closure(activities), _null, activities.get$length(activities), _null, _null, _null);
+      return A.ScrollableListViewBuilder$(new A._InvoiceEmailViewState__buildHistory_closure(activities), activities.get$length(activities), _null, false, _null, _null);
     },
     build$1(context) {
       var t2, t3, t4, t5, t6, t7, t8, _this = this, _null = null,
@@ -431889,14 +431899,31 @@
     build$1(context) {
       var t1 = this._widget,
         t2 = t1.separatorBuilder,
-        t3 = t1.padding,
-        t4 = t1.itemBuilder,
-        t5 = t1.itemCount;
-      t1 = t1.scrollController;
-      if (t2 != null)
-        t1 = A.ListView$separated(t1 == null ? this._scrollable_listview$_scrollController : t1, t4, t5, t3, t2, true);
-      else
-        t1 = A.ListView$builder(t1 == null ? this._scrollable_listview$_scrollController : t1, t4, t5, t3, null, B.Axis_1, true);
+        t3 = t1.primary,
+        t4 = t1.padding,
+        t5 = t1.itemBuilder,
+        t6 = t1.itemCount;
+      if (t2 != null) {
+        if (t3)
+          t1 = null;
+        else {
+          t1 = t1.scrollController;
+          if (t1 == null)
+            t1 = this._scrollable_listview$_scrollController;
+        }
+        t2 = A.ListView$separated(t1, t5, t6, t4, t3, t2, true);
+        t1 = t2;
+      } else {
+        if (t3)
+          t1 = null;
+        else {
+          t1 = t1.scrollController;
+          if (t1 == null)
+            t1 = this._scrollable_listview$_scrollController;
+        }
+        t3 = A.ListView$builder(t1, t5, t6, t4, null, t3, B.Axis_1, true);
+        t1 = t3;
+      }
       return t1;
     }
   };
@@ -433141,7 +433168,6 @@
     initState$0() {
       var t1, entityType, state, entityList, entityMap, entityState, t2, t3, entityUIState, selectedIndex, rowsPerPage, _this = this;
       _this.super$State$initState();
-      _this._entity_list$_controller = A.ScrollController$(0, true);
       t1 = _this._widget;
       entityType = t1.entityType;
       state = t1.state;
@@ -433172,10 +433198,6 @@
       t1.entityMap = state.getEntityMap$1(t2.entityType);
       _this.dataTableSource.notifyListeners$0();
     },
-    dispose$0() {
-      this._entity_list$_controller.dispose$0();
-      this.super$State$dispose();
-    },
     build$1(context) {
       var t3, isInMultiselect, entityList, entityMap, countSelected, isList, t4, t5, t6, shouldSelectEntity, entityId, entities, t7, firstEntity, actions, t8, t9, t10, t11, t12, t13, t14, _this = this, _null = null,
         store = A.StoreProvider_of(context, type$.legacy_AppState),
@@ -433284,7 +433306,7 @@
   };
   A._EntityListState_build_closure7.prototype = {
     call$0() {
-      var t2, t3, rowsPerPage, t4, t5, t6, t7, _this = this, _null = null,
+      var t2, t3, rowsPerPage, t4, t5, t6, _this = this, _null = null,
         t1 = type$.JSArray_legacy_Widget;
       if (_this.isList) {
         t1 = A._setArrayType([], t1);
@@ -433307,7 +433329,7 @@
         }
         t2 = _this.entityList;
         t3 = J.getInterceptor$asx(t2);
-        t1.push(new A.Flexible(1, B.FlexFit_1, t3.get$isEmpty(t2) ? new A.HelpText(A.Localizations_of(_this.context, B.Type_AppLocalization_KyD, type$.legacy_AppLocalization).get$clickPlusToAddItem(), _null) : new A.ScrollableListViewBuilder(new A._EntityListState_build__closure1(_this.$this, t2), new A._EntityListState_build__closure2(t2), t3.get$length(t2) + 2, _null, B.EdgeInsets_0_20_0_20, _null), _null));
+        t1.push(new A.Flexible(1, B.FlexFit_1, t3.get$isEmpty(t2) ? new A.HelpText(A.Localizations_of(_this.context, B.Type_AppLocalization_KyD, type$.legacy_AppLocalization).get$clickPlusToAddItem(), _null) : A.ScrollableListViewBuilder$(new A._EntityListState_build__closure1(_this.$this, t2), t3.get$length(t2) + 2, B.EdgeInsets_0_20_0_20, false, _null, new A._EntityListState_build__closure2(t2)), _null));
         return A.Column$(t1, B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_0, B.VerticalDirection_1);
       } else {
         t2 = _this.state;
@@ -433331,16 +433353,15 @@
           t1.push(new A.ListFilterMessage(t4, t3, new A._EntityListState_build__closure3(t2), new A._EntityListState_build__closure4(_this.store), false, _null));
         }
         t3 = _this.$this;
-        t4 = t3._entity_list$_controller;
-        t5 = _this.listUIState;
-        t6 = A._setArrayType([], type$.JSArray_legacy_DataColumn_2);
+        t4 = _this.listUIState;
+        t5 = A._setArrayType([], type$.JSArray_legacy_DataColumn_2);
         if (!_this.isInMultiselect)
-          t6.push(new A.DataColumn0(new A.SizedBox(_null, _null, _null, _null), _null));
-        B.JSArray_methods.addAll$1(t6, J.map$1$1$ax(t3._widget.tableColumns, new A._EntityListState_build__closure5(t3, _this.context, _this.entityType, t2), type$.legacy_DataColumn));
+          t5.push(new A.DataColumn0(new A.SizedBox(_null, _null, _null, _null), _null));
+        B.JSArray_methods.addAll$1(t5, J.map$1$1$ax(t3._widget.tableColumns, new A._EntityListState_build__closure5(t3, _this.context, _this.entityType, t2), type$.legacy_DataColumn));
         t2 = t3.dataTableSource;
-        t7 = t5.sortField;
-        t7 = J.contains$1$asx(t3._widget.tableColumns, t7) ? J.indexOf$1$asx(t3._widget.tableColumns, t7) : 0;
-        t1.push(A.Expanded$(A.SingleChildScrollView$(new A.Padding(B.EdgeInsets_0_16_0_16, new A.AppPaginatedDataTable(t6, t7, t5.sortAscending, new A._EntityListState_build__closure6(t3, _this.entityList, rowsPerPage, _this.entityMap, t5), t3._firstRowIndex, new A._EntityListState_build__closure7(t3), rowsPerPage, A._setArrayType([10, 25, 50, 100], type$.JSArray_legacy_int), new A._EntityListState_build__closure8(_this.store), t2, _null), _null), t4, B.DragStartBehavior_1, _null, _null, _null, _null, false, B.Axis_1), 1));
+        t6 = t4.sortField;
+        t6 = J.contains$1$asx(t3._widget.tableColumns, t6) ? J.indexOf$1$asx(t3._widget.tableColumns, t6) : 0;
+        t1.push(A.Expanded$(A.SingleChildScrollView$(new A.Padding(B.EdgeInsets_0_16_0_16, new A.AppPaginatedDataTable(t5, t6, t4.sortAscending, new A._EntityListState_build__closure6(t3, _this.entityList, rowsPerPage, _this.entityMap, t4), t3._firstRowIndex, new A._EntityListState_build__closure7(t3), rowsPerPage, A._setArrayType([10, 25, 50, 100], type$.JSArray_legacy_int), new A._EntityListState_build__closure8(_this.store), t2, _null), _null), _null, B.DragStartBehavior_1, _null, _null, true, _null, false, B.Axis_1), 1));
         return A.Column$(t1, B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1);
       }
     },
@@ -439467,13 +439488,12 @@
       _this.super$State$didChangeDependencies();
     },
     build$1(context) {
-      var _null = null,
-        client = this._widget.viewModel.client,
+      var client = this._widget.viewModel.client,
         activities = client.activities,
         t1 = client.loadedAt;
       if (!(t1 != null && t1 > 0))
-        return new A.LoadingIndicator(_null, false, _null);
-      return new A.ScrollableListViewBuilder(new A._ClientViewActivityState_build_closure(activities), new A._ClientViewActivityState_build_closure0(), activities._list.length, _null, B.EdgeInsets_0_16_0_16, _null);
+        return new A.LoadingIndicator(null, false, null);
+      return A.ScrollableListViewBuilder$(new A._ClientViewActivityState_build_closure(activities), activities._list.length, B.EdgeInsets_0_16_0_16, false, null, new A._ClientViewActivityState_build_closure0());
     }
   };
   A._ClientViewActivityState_build_closure0.prototype = {
@@ -439933,14 +439953,13 @@
       _this.super$State$didChangeDependencies();
     },
     build$1(context) {
-      var _null = null,
-        client = this._widget.viewModel.client,
+      var client = this._widget.viewModel.client,
         t1 = client.ledger._list,
         t2 = A._arrayInstanceType(t1)._eval$1("WhereIterable<1>"),
         ledgers = A.List_List$of(new A.WhereIterable(t1, new A._ClientViewLedgerState_build_closure(), t2), true, t2._eval$1("Iterable.E"));
       if (client.get$isStale())
-        return new A.LoadingIndicator(_null, false, _null);
-      return new A.ScrollableListViewBuilder(new A._ClientViewLedgerState_build_closure0(ledgers, client), new A._ClientViewLedgerState_build_closure1(), ledgers.length + 1, _null, B.EdgeInsets_0_16_0_16, _null);
+        return new A.LoadingIndicator(null, false, null);
+      return A.ScrollableListViewBuilder$(new A._ClientViewLedgerState_build_closure0(ledgers, client), ledgers.length + 1, B.EdgeInsets_0_16_0_16, false, null, new A._ClientViewLedgerState_build_closure1());
     }
   };
   A._ClientViewLedgerState_build_closure.prototype = {
@@ -443702,7 +443721,7 @@
         t2 = t1.uiState.selectedCompanyIndex,
         activities = t1.userCompanyStates._list[t2].userCompany.company.activities;
       t2 = A.Theme_of(context).backgroundColor;
-      return A.Material$(B.Duration_200000, true, _null, new A.ScrollableListViewBuilder(new A.DashboardActivity_build_closure(activities), new A.DashboardActivity_build_closure0(), activities._list.length, _null, _null, _null), B.Clip_0, t2, 0, _null, _null, _null, _null, _null, B.MaterialType_0);
+      return A.Material$(B.Duration_200000, true, _null, A.ScrollableListViewBuilder$(new A.DashboardActivity_build_closure(activities), activities._list.length, _null, false, _null, new A.DashboardActivity_build_closure0()), B.Clip_0, t2, 0, _null, _null, _null, _null, _null, B.MaterialType_0);
     }
   };
   A.DashboardActivity_build_closure0.prototype = {
@@ -444202,7 +444221,7 @@
         t1.push(B.EntityType_task);
       if (company.isModuleEnabled$1(B.EntityType_expense))
         t1.push(B.EntityType_expense);
-      t1 = A._setArrayType([new A.Padding(B.EdgeInsets_0_50_0_0, new A.ScrollableListViewBuilder(new A.DashboardPanels_build_closure4(_this, t2, state, t4, currentInvoiceData, currentPaymentData, currentQuoteData, currentTaskData, currentExpenseData, previousInvoiceData, previousPaymentData, previousQuoteData, previousTaskData, previousExpenseData, userCompanySettings, t1, runningTasks), _null, t2.length + 1, _this.scrollController, _null, _null), _null), _this._header$1(context)], type$.JSArray_legacy_Widget);
+      t1 = A._setArrayType([new A.Padding(B.EdgeInsets_0_50_0_0, A.ScrollableListViewBuilder$(new A.DashboardPanels_build_closure4(_this, t2, state, t4, currentInvoiceData, currentPaymentData, currentQuoteData, currentTaskData, currentExpenseData, previousInvoiceData, previousPaymentData, previousQuoteData, previousTaskData, previousExpenseData, userCompanySettings, t1, runningTasks), t2.length + 1, _null, true, _this.scrollController, _null), _null), _this._header$1(context)], type$.JSArray_legacy_Widget);
       if (state.isLoading || state.isSaving)
         t1.push(A.LinearProgressIndicator$());
       return new A.Stack(B.AlignmentDirectional_m1_m1, _null, B.StackFit_0, B.Clip_1, t1, _null);
@@ -445722,7 +445741,7 @@
         company = t2.userCompanyStates._list[t3].userCompany.company;
       t2 = t1.filter;
       if ((t2 == null ? "" : t2).length !== 0)
-        return new A.ScrollableListViewBuilder(new A._CustomTabBarView_build_closure(_this), _null, J.get$length$asx(t1.filteredList), _null, _null, _null);
+        return A.ScrollableListViewBuilder$(new A._CustomTabBarView_build_closure(_this), J.get$length$asx(t1.filteredList), _null, false, _null, _null);
       t1 = A._setArrayType([A.RefreshIndicator$(new A.DashboardPanels(t1, _this.scrollController, _this.sideTabController, _null), new A._CustomTabBarView_build_closure0(_this, context)), A.RefreshIndicator$(new A.DashboardActivity(t1, _null), new A._CustomTabBarView_build_closure1(_this, context)), A.RefreshIndicator$(new A.DashboardSystemLogs(t1, _null), new A._CustomTabBarView_build_closure2(_this, context))], type$.JSArray_legacy_Widget);
       if (A.getLayout(context) === B.AppLayout_mobile && company.isModuleEnabled$1(B.EntityType_invoice))
         t1.push(new A.InvoiceSidebar(_null));
@@ -445961,13 +445980,13 @@
       t3 = t6 == null ? "" : t6;
       t4 = J.getInterceptor$asx(upcomingInvoices);
       t6 = t4.get$isNotEmpty(upcomingInvoices) ? " (" + A.S(t4.get$length(upcomingInvoices)) + ")" : "";
-      t4 = t4.get$isEmpty(upcomingInvoices) ? _null : new A.ScrollableListViewBuilder(new A.InvoiceSidebar_build_closure(upcomingInvoices), new A.InvoiceSidebar_build_closure0(), t4.get$length(upcomingInvoices), _null, _null, _null);
+      t4 = t4.get$isEmpty(upcomingInvoices) ? _null : A.ScrollableListViewBuilder$(new A.InvoiceSidebar_build_closure(upcomingInvoices), t4.get$length(upcomingInvoices), _null, false, _null, new A.InvoiceSidebar_build_closure0());
       t7 = J.$index$asx(t5.$index(0, t1), "past_due_invoices");
       if (t7 == null)
         t7 = "";
       t8 = J.getInterceptor$asx(pastDueInvoices);
       t9 = t8.get$isNotEmpty(pastDueInvoices) ? " (" + A.S(t8.get$length(pastDueInvoices)) + ")" : "";
-      t8 = t8.get$isEmpty(pastDueInvoices) ? _null : new A.ScrollableListViewBuilder(new A.InvoiceSidebar_build_closure1(pastDueInvoices), new A.InvoiceSidebar_build_closure2(), t8.get$length(pastDueInvoices), _null, _null, _null);
+      t8 = t8.get$isEmpty(pastDueInvoices) ? _null : A.ScrollableListViewBuilder$(new A.InvoiceSidebar_build_closure1(pastDueInvoices), t8.get$length(pastDueInvoices), _null, false, _null, new A.InvoiceSidebar_build_closure2());
       t10 = selectedIds == null;
       if (J.get$isEmpty$asx(t10 ? A._setArrayType([], type$.JSArray_legacy_String) : selectedIds))
         t1 = _null;
@@ -445981,7 +446000,7 @@
         t2 = _null;
       else {
         t5 = t10 ? _null : selectedIds._list.length;
-        t5 = new A.ScrollableListViewBuilder(new A.InvoiceSidebar_build_closure3(t2, selectedIds), new A.InvoiceSidebar_build_closure4(), t5, _null, _null, _null);
+        t5 = A.ScrollableListViewBuilder$(new A.InvoiceSidebar_build_closure3(t2, selectedIds), t5, _null, false, _null, new A.InvoiceSidebar_build_closure4());
         t2 = t5;
       }
       return A._DashboardSidebar$(B.EntityType_invoice, t3 + t6, t7 + t9, t1, t4, t8, t2);
@@ -446049,7 +446068,7 @@
       t3 = t6 == null ? "" : t6;
       t4 = J.getInterceptor$asx(recentPayments);
       t6 = t4.get$isNotEmpty(recentPayments) ? " (" + A.S(t4.get$length(recentPayments)) + ")" : "";
-      t4 = t4.get$isEmpty(recentPayments) ? _null : new A.ScrollableListViewBuilder(new A.PaymentSidebar_build_closure(recentPayments), new A.PaymentSidebar_build_closure0(), t4.get$length(recentPayments), _null, _null, _null);
+      t4 = t4.get$isEmpty(recentPayments) ? _null : A.ScrollableListViewBuilder$(new A.PaymentSidebar_build_closure(recentPayments), t4.get$length(recentPayments), _null, false, _null, new A.PaymentSidebar_build_closure0());
       t7 = selectedIds == null;
       if (J.get$isEmpty$asx(t7 ? A._setArrayType([], type$.JSArray_legacy_String) : selectedIds))
         t1 = _null;
@@ -446063,7 +446082,7 @@
         t2 = _null;
       else {
         t5 = t7 ? _null : selectedIds._list.length;
-        t5 = new A.ScrollableListViewBuilder(new A.PaymentSidebar_build_closure1(t2, selectedIds), new A.PaymentSidebar_build_closure2(), t5, _null, _null, _null);
+        t5 = A.ScrollableListViewBuilder$(new A.PaymentSidebar_build_closure1(t2, selectedIds), t5, _null, false, _null, new A.PaymentSidebar_build_closure2());
         t2 = t5;
       }
       return A._DashboardSidebar$(B.EntityType_payment, t3 + t6, _null, t1, t4, _null, t2);
@@ -446123,13 +446142,13 @@
       t3 = t6 == null ? "" : t6;
       t4 = J.getInterceptor$asx(upcomingQuotes);
       t6 = t4.get$isNotEmpty(upcomingQuotes) ? " (" + A.S(t4.get$length(upcomingQuotes)) + ")" : "";
-      t4 = t4.get$isEmpty(upcomingQuotes) ? _null : new A.ScrollableListViewBuilder(new A.QuoteSidebar_build_closure(upcomingQuotes), new A.QuoteSidebar_build_closure0(), t4.get$length(upcomingQuotes), _null, _null, _null);
+      t4 = t4.get$isEmpty(upcomingQuotes) ? _null : A.ScrollableListViewBuilder$(new A.QuoteSidebar_build_closure(upcomingQuotes), t4.get$length(upcomingQuotes), _null, false, _null, new A.QuoteSidebar_build_closure0());
       t7 = J.$index$asx(t5.$index(0, t1), "expired_quotes");
       if (t7 == null)
         t7 = "";
       t8 = J.getInterceptor$asx(expriedQuotes);
       t9 = t8.get$isNotEmpty(expriedQuotes) ? " (" + A.S(t8.get$length(expriedQuotes)) + ")" : "";
-      t8 = t8.get$isEmpty(expriedQuotes) ? _null : new A.ScrollableListViewBuilder(new A.QuoteSidebar_build_closure1(expriedQuotes), new A.QuoteSidebar_build_closure2(), t8.get$length(expriedQuotes), _null, _null, _null);
+      t8 = t8.get$isEmpty(expriedQuotes) ? _null : A.ScrollableListViewBuilder$(new A.QuoteSidebar_build_closure1(expriedQuotes), t8.get$length(expriedQuotes), _null, false, _null, new A.QuoteSidebar_build_closure2());
       t10 = selectedIds == null;
       if (J.get$isEmpty$asx(t10 ? A._setArrayType([], type$.JSArray_legacy_String) : selectedIds))
         t1 = _null;
@@ -446143,7 +446162,7 @@
         t2 = _null;
       else {
         t5 = t10 ? _null : selectedIds._list.length;
-        t5 = new A.ScrollableListViewBuilder(new A.QuoteSidebar_build_closure3(t2, selectedIds), new A.QuoteSidebar_build_closure4(), t5, _null, _null, _null);
+        t5 = A.ScrollableListViewBuilder$(new A.QuoteSidebar_build_closure3(t2, selectedIds), t5, _null, false, _null, new A.QuoteSidebar_build_closure4());
         t2 = t5;
       }
       return A._DashboardSidebar$(B.EntityType_quote, t3 + t6, t7 + t9, t1, t4, t8, t2);
@@ -446215,13 +446234,13 @@
       t3 = t6 == null ? "" : t6;
       t4 = J.getInterceptor$asx(runningTasks);
       t6 = t4.get$isNotEmpty(runningTasks) ? " (" + A.S(t4.get$length(runningTasks)) + ")" : "";
-      t4 = t4.get$isEmpty(runningTasks) ? _null : new A.ScrollableListViewBuilder(new A.TaskSidebar_build_closure(runningTasks), new A.TaskSidebar_build_closure0(), t4.get$length(runningTasks), _null, _null, _null);
+      t4 = t4.get$isEmpty(runningTasks) ? _null : A.ScrollableListViewBuilder$(new A.TaskSidebar_build_closure(runningTasks), t4.get$length(runningTasks), _null, false, _null, new A.TaskSidebar_build_closure0());
       t7 = J.$index$asx(t5.$index(0, t1), "recent_tasks");
       if (t7 == null)
         t7 = "";
       t8 = J.getInterceptor$asx(recentTasks);
       t9 = t8.get$isNotEmpty(recentTasks) ? " (" + A.S(t8.get$length(recentTasks)) + ")" : "";
-      t8 = t8.get$isEmpty(recentTasks) ? _null : new A.ScrollableListViewBuilder(new A.TaskSidebar_build_closure1(recentTasks), new A.TaskSidebar_build_closure2(), t8.get$length(recentTasks), _null, _null, _null);
+      t8 = t8.get$isEmpty(recentTasks) ? _null : A.ScrollableListViewBuilder$(new A.TaskSidebar_build_closure1(recentTasks), t8.get$length(recentTasks), _null, false, _null, new A.TaskSidebar_build_closure2());
       t10 = selectedIds == null;
       if (J.get$isEmpty$asx(t10 ? A._setArrayType([], type$.JSArray_legacy_String) : selectedIds))
         t1 = _null;
@@ -446235,7 +446254,7 @@
         t2 = _null;
       else {
         t5 = t10 ? _null : selectedIds._list.length;
-        t5 = new A.ScrollableListViewBuilder(new A.TaskSidebar_build_closure3(t2, selectedIds), new A.TaskSidebar_build_closure4(), t5, _null, _null, _null);
+        t5 = A.ScrollableListViewBuilder$(new A.TaskSidebar_build_closure3(t2, selectedIds), t5, _null, false, _null, new A.TaskSidebar_build_closure4());
         t2 = t5;
       }
       return A._DashboardSidebar$(B.EntityType_quote, t3 + t6, t7 + t9, t1, t4, t8, t2);
@@ -446303,7 +446322,7 @@
       t3 = t6 == null ? "" : t6;
       t4 = J.getInterceptor$asx(recentExpenses);
       t6 = t4.get$isNotEmpty(recentExpenses) ? " (" + A.S(t4.get$length(recentExpenses)) + ")" : "";
-      t4 = t4.get$isEmpty(recentExpenses) ? _null : new A.ScrollableListViewBuilder(new A.ExpenseSidbar_build_closure(recentExpenses), new A.ExpenseSidbar_build_closure0(), t4.get$length(recentExpenses), _null, _null, _null);
+      t4 = t4.get$isEmpty(recentExpenses) ? _null : A.ScrollableListViewBuilder$(new A.ExpenseSidbar_build_closure(recentExpenses), t4.get$length(recentExpenses), _null, false, _null, new A.ExpenseSidbar_build_closure0());
       t7 = selectedIds == null;
       if (J.get$isEmpty$asx(t7 ? A._setArrayType([], type$.JSArray_legacy_String) : selectedIds))
         t1 = _null;
@@ -446317,7 +446336,7 @@
         t2 = _null;
       else {
         t5 = t7 ? _null : selectedIds._list.length;
-        t5 = new A.ScrollableListViewBuilder(new A.ExpenseSidbar_build_closure1(t2, selectedIds), new A.ExpenseSidbar_build_closure2(), t5, _null, _null, _null);
+        t5 = A.ScrollableListViewBuilder$(new A.ExpenseSidbar_build_closure1(t2, selectedIds), t5, _null, false, _null, new A.ExpenseSidbar_build_closure2());
         t2 = t5;
       }
       return A._DashboardSidebar$(B.EntityType_expense, t3 + t6, _null, t1, t4, _null, t2);
@@ -454768,8 +454787,9 @@
     },
     _updateColumns$0() {
       var includedLineItems, hasTax1, hasTax2, hasTax3, hasAnyTax, customField1, customField2, customField3, customField4, t3, pdfColumns, t4, _i, column, t5, _this = this,
+        _s8_ = "discount",
         _s9_ = "unit_cost",
-        _s8_ = "quantity",
+        _s8_0 = "quantity",
         viewModel = _this._widget.viewModel,
         lineItems = viewModel.invoice.lineItems,
         state = viewModel.state,
@@ -454792,7 +454812,7 @@
       t3 = type$.legacy_String;
       t2 = J.map$1$1$ax(t2.getFieldsForSection$1(t1 ? "task_columns" : "product_columns"), new A._InvoiceEditItemsDesktopState__updateColumns_closure3(), t3);
       pdfColumns = A.List_List$of(t2, true, t2.$ti._eval$1("ListIterable.E"));
-      if (_this._widget.isTasks)
+      if (_this._widget.isTasks) {
         if (pdfColumns.length === 0)
           pdfColumns = A._setArrayType(["service", "description", "rate", "hours"], type$.JSArray_legacy_String);
         else {
@@ -454812,29 +454832,37 @@
             pdfColumns = t1;
           }
         }
-      else if (pdfColumns.length === 0)
-        pdfColumns = A._setArrayType(["item", "description", "unit_cost", "quantity"], type$.JSArray_legacy_String);
-      else {
-        if (!B.JSArray_methods.contains$1(pdfColumns, "item")) {
-          t1 = A._setArrayType(["item"], type$.JSArray_legacy_String);
-          B.JSArray_methods.addAll$1(t1, pdfColumns);
-          pdfColumns = t1;
-        }
-        if (!B.JSArray_methods.contains$1(pdfColumns, _s9_)) {
-          t1 = A.List_List$of(pdfColumns, true, t3);
-          t1.push(_s9_);
-          pdfColumns = t1;
-        }
-        if (!B.JSArray_methods.contains$1(pdfColumns, _s8_) && company.enableProductQuantity) {
-          t1 = A.List_List$of(pdfColumns, true, t3);
-          t1.push(_s8_);
-          pdfColumns = t1;
+        t1 = company.enableProductDiscount;
+        if (t1 && !B.JSArray_methods.contains$1(pdfColumns, _s8_))
+          B.JSArray_methods.add$1(pdfColumns, _s8_);
+      } else {
+        if (pdfColumns.length === 0)
+          pdfColumns = A._setArrayType(["item", "description", "unit_cost", "quantity"], type$.JSArray_legacy_String);
+        else {
+          if (!B.JSArray_methods.contains$1(pdfColumns, "item")) {
+            t1 = A._setArrayType(["item"], type$.JSArray_legacy_String);
+            B.JSArray_methods.addAll$1(t1, pdfColumns);
+            pdfColumns = t1;
+          }
+          if (!B.JSArray_methods.contains$1(pdfColumns, _s9_)) {
+            t1 = A.List_List$of(pdfColumns, true, t3);
+            t1.push(_s9_);
+            pdfColumns = t1;
+          }
+          if (!B.JSArray_methods.contains$1(pdfColumns, _s8_0) && company.enableProductQuantity) {
+            t1 = A.List_List$of(pdfColumns, true, t3);
+            t1.push(_s8_0);
+            pdfColumns = t1;
+          }
         }
+        t1 = company.enableProductDiscount;
+        if (t1 && !B.JSArray_methods.contains$1(pdfColumns, _s8_))
+          B.JSArray_methods.add$1(pdfColumns, _s8_);
       }
       if (hasAnyTax && !B.JSArray_methods.contains$1(pdfColumns, "tax")) {
-        t1 = A.List_List$of(pdfColumns, true, t3);
-        t1.push("tax");
-        pdfColumns = t1;
+        t2 = A.List_List$of(pdfColumns, true, t3);
+        t2.push("tax");
+        pdfColumns = t2;
       }
       if (company.getCustomFieldLabel$1(customField1).length !== 0 && !B.JSArray_methods.contains$1(pdfColumns, customField1))
         B.JSArray_methods.add$1(pdfColumns, customField1);
@@ -454844,40 +454872,40 @@
         B.JSArray_methods.add$1(pdfColumns, customField3);
       if (company.getCustomFieldLabel$1(customField4).length !== 0 && !B.JSArray_methods.contains$1(pdfColumns, customField4))
         B.JSArray_methods.add$1(pdfColumns, customField4);
-      t1 = _this._invoice_edit_items_desktop$_columns;
-      B.JSArray_methods.clear$0(t1);
-      for (t2 = pdfColumns.length, t3 = !company.enableProductQuantity, t4 = company.enableProductDiscount, _i = 0; _i < pdfColumns.length; pdfColumns.length === t2 || (0, A.throwConcurrentModificationError)(pdfColumns), ++_i) {
+      t2 = _this._invoice_edit_items_desktop$_columns;
+      B.JSArray_methods.clear$0(t2);
+      for (t3 = pdfColumns.length, t4 = !company.enableProductQuantity, _i = 0; _i < pdfColumns.length; pdfColumns.length === t3 || (0, A.throwConcurrentModificationError)(pdfColumns), ++_i) {
         column = pdfColumns[_i];
         if ("item" === column || "service" === column)
-          t1.push("item");
+          t2.push("item");
         else if ("description" === column)
-          t1.push("description");
+          t2.push("description");
         else if ("unit_cost" === column || "rate" === column)
-          t1.push(_s9_);
+          t2.push(_s9_);
         else {
           if ("quantity" === column || "hours" === column)
-            t5 = !t3 || _this._widget.isTasks;
+            t5 = !t4 || _this._widget.isTasks;
           else
             t5 = false;
           if (t5)
-            t1.push(_s8_);
+            t2.push(_s8_0);
           else if (("product1" === column || "task1" === column) && company.getCustomFieldLabel$1(customField1).length !== 0)
-            t1.push("custom1");
+            t2.push("custom1");
           else if (("product2" === column || "task2" === column) && company.getCustomFieldLabel$1(customField2).length !== 0)
-            t1.push("custom2");
+            t2.push("custom2");
           else if (("product3" === column || "task3" === column) && company.getCustomFieldLabel$1(customField3).length !== 0)
-            t1.push("custom3");
+            t2.push("custom3");
           else if (("product4" === column || "task4" === column) && company.getCustomFieldLabel$1(customField4).length !== 0)
-            t1.push("custom4");
+            t2.push("custom4");
           else if ("tax" === column) {
             if (hasTax1)
-              t1.push("tax1");
+              t2.push("tax1");
             if (hasTax2)
-              t1.push("tax2");
+              t2.push("tax2");
             if (hasTax3)
-              t1.push("tax3");
-          } else if ("discount" === column && t4)
-            t1.push("discount");
+              t2.push("tax3");
+          } else if ("discount" === column && t1)
+            t2.push(_s8_);
         }
       }
     },
@@ -455535,7 +455563,7 @@
       var _this = this, _null = null,
         highlightedIndex = A.AutocompleteHighlightedOption_of(context),
         t1 = A.Theme_of(context).cardColor;
-      return new A.Theme(_this.theme, new A.Align(B.Alignment_m1_m1, _null, _null, A.Material$(B.Duration_200000, true, _null, new A.AppBorder(A.Container$(_null, new A.ScrollableListViewBuilder(new A._InvoiceEditItemsDesktopState_build___closure14(options, highlightedIndex, _this.state, onSelected, _this.invoice, _this.company), _null, J.get$length$asx(options), _null, _null, _null), B.Clip_0, t1, new A.BoxConstraints(0, 1 / 0, 0, 270), _null, _null, _null, _null, _null, _null, _null, _null, 250), _null, _null, _null, false, _null), B.Clip_0, _null, 4, _null, _null, _null, _null, _null, B.MaterialType_0), _null), _null);
+      return new A.Theme(_this.theme, new A.Align(B.Alignment_m1_m1, _null, _null, A.Material$(B.Duration_200000, true, _null, new A.AppBorder(A.Container$(_null, A.ScrollableListViewBuilder$(new A._InvoiceEditItemsDesktopState_build___closure14(options, highlightedIndex, _this.state, onSelected, _this.invoice, _this.company), J.get$length$asx(options), _null, false, _null, _null), B.Clip_0, t1, new A.BoxConstraints(0, 1 / 0, 0, 270), _null, _null, _null, _null, _null, _null, _null, _null, 250), _null, _null, _null, false, _null), B.Clip_0, _null, 4, _null, _null, _null, _null, _null, B.MaterialType_0), _null), _null);
     },
     $signature: 2638
   };
@@ -456730,9 +456758,9 @@
   };
   A._InvoiceItemSelectorState_build__productList.prototype = {
     call$0() {
-      var _this = this, _null = null,
+      var _this = this,
         t1 = _this.products;
-      return new A.ScrollableListViewBuilder(new A._InvoiceItemSelectorState_build__productList_closure(_this.$this, t1, _this.state, _this.company), _null, t1.length, _null, _null, _null);
+      return A.ScrollableListViewBuilder$(new A._InvoiceItemSelectorState_build__productList_closure(_this.$this, t1, _this.state, _this.company), t1.length, null, false, null, null);
     },
     $signature: 141
   };
@@ -456771,9 +456799,8 @@
   };
   A._InvoiceItemSelectorState_build__taskList.prototype = {
     call$0() {
-      var _null = null,
-        t1 = this.tasks;
-      return new A.ScrollableListViewBuilder(new A._InvoiceItemSelectorState_build__taskList_closure(this.$this, t1, this.state), _null, t1.length, _null, _null, _null);
+      var t1 = this.tasks;
+      return A.ScrollableListViewBuilder$(new A._InvoiceItemSelectorState_build__taskList_closure(this.$this, t1, this.state), t1.length, null, false, null, null);
     },
     $signature: 141
   };
@@ -456810,9 +456837,8 @@
   };
   A._InvoiceItemSelectorState_build__expenseList.prototype = {
     call$0() {
-      var _null = null,
-        t1 = this.expenses;
-      return new A.ScrollableListViewBuilder(new A._InvoiceItemSelectorState_build__expenseList_closure(this.$this, t1, this.state), _null, t1.length, _null, _null, _null);
+      var t1 = this.expenses;
+      return A.ScrollableListViewBuilder$(new A._InvoiceItemSelectorState_build__expenseList_closure(this.$this, t1, this.state), t1.length, null, false, null, null);
     },
     $signature: 141
   };
@@ -458074,13 +458100,12 @@
       _this.super$State$didChangeDependencies();
     },
     build$1(context) {
-      var _null = null,
-        invoice = this._widget.viewModel.invoice,
+      var invoice = this._widget.viewModel.invoice,
         activities = invoice.activities,
         t1 = invoice.loadedAt;
       if (!(t1 != null && t1 > 0))
-        return new A.LoadingIndicator(_null, false, _null);
-      return new A.ScrollableListViewBuilder(new A._InvoiceViewActivityState_build_closure(activities), new A._InvoiceViewActivityState_build_closure0(), activities._list.length, _null, B.EdgeInsets_0_16_0_16, _null);
+        return new A.LoadingIndicator(null, false, null);
+      return A.ScrollableListViewBuilder$(new A._InvoiceViewActivityState_build_closure(activities), activities._list.length, B.EdgeInsets_0_16_0_16, false, null, new A._InvoiceViewActivityState_build_closure0());
     }
   };
   A._InvoiceViewActivityState_build_closure0.prototype = {
@@ -458265,7 +458290,7 @@
         t1 = A.Localizations_of(context, B.Type_AppLocalization_KyD, type$.legacy_AppLocalization);
         return new A.HelpText(t1.get$noHistory(t1), _null);
       }
-      return new A.ScrollableListViewBuilder(new A._InvoiceViewHistoryState_build_closure1(activityList, viewModel, invoice), new A._InvoiceViewHistoryState_build_closure2(), invoice.get$history(invoice).length, _null, B.EdgeInsets_0_16_0_16, _null);
+      return A.ScrollableListViewBuilder$(new A._InvoiceViewHistoryState_build_closure1(activityList, viewModel, invoice), invoice.get$history(invoice).length, B.EdgeInsets_0_16_0_16, false, _null, new A._InvoiceViewHistoryState_build_closure2());
     }
   };
   A._InvoiceViewHistoryState_build_closure.prototype = {
@@ -469890,7 +469915,7 @@
         if (A.getLayout(context) === B.AppLayout_mobile)
           t8.push(new A.Padding(B.EdgeInsets_16_0_16_0, A.Row$(A._setArrayType([new A.Builder(new A.ReportsScreen_build_closure24(_this, t1, reportResult), _null), new A.SizedBox(16, _null, _null, _null), A.Expanded$(new A.AppButton(_null, _null, t1.get$$export(), new A.ReportsScreen_build_closure25(_this, context), _null, _null), 1)], t3), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), _null));
         t8.push(new A.ReportDataTable(t2, new A.ValueKey(t16 + "_" + t6 + "_" + reportsState.selectedGroup, t7)));
-        t1 = new A.ScrollableListView(t8, _null, _null, _null, false, new A.ValueKey(t5 + "_" + t16 + "_" + t11 + "_" + t6, t7));
+        t1 = new A.ScrollableListView(t8, _null, _null, true, false, new A.ValueKey(t5 + "_" + t16 + "_" + t11 + "_" + t6, t7));
       }
       return new A.WillPopScope(A.Scaffold$(t15, _null, t1, _null, t4, t13, _null, _null), new A.ReportsScreen_build_closure26(store), _null);
     }
@@ -470890,7 +470915,7 @@
       var _null = null,
         highlightedIndex = A.AutocompleteHighlightedOption_of(context),
         t1 = A.Theme_of(context).cardColor;
-      return new A.Theme(this.theme, new A.Align(B.Alignment_m1_m1, _null, _null, A.Material$(B.Duration_200000, true, _null, new A.AppBorder(A.Container$(_null, new A.ScrollableListViewBuilder(new A.ReportResult_tableFilters__closure2(highlightedIndex, this.store, options, onSelected), _null, J.get$length$asx(options), _null, _null, _null), B.Clip_0, t1, new A.BoxConstraints(0, 1 / 0, 0, 270), _null, _null, _null, _null, _null, _null, _null, _null, 250), _null, _null, _null, false, _null), B.Clip_0, _null, 4, _null, _null, _null, _null, _null, B.MaterialType_0), _null), _null);
+      return new A.Theme(this.theme, new A.Align(B.Alignment_m1_m1, _null, _null, A.Material$(B.Duration_200000, true, _null, new A.AppBorder(A.Container$(_null, A.ScrollableListViewBuilder$(new A.ReportResult_tableFilters__closure2(highlightedIndex, this.store, options, onSelected), J.get$length$asx(options), _null, false, _null, _null), B.Clip_0, t1, new A.BoxConstraints(0, 1 / 0, 0, 270), _null, _null, _null, _null, _null, _null, _null, _null, 250), _null, _null, _null, false, _null), B.Clip_0, _null, 4, _null, _null, _null, _null, _null, B.MaterialType_0), _null), _null);
     },
     $signature: 2853
   };
@@ -471787,7 +471812,7 @@
       t3 = A.AppDropdownButton$(_null, "", true, t2, _null, t15, new A._AccountManagementState_build_closure1(viewModel, company), _null, false, company.sessionTimeout, t3);
       t5 = J.$index$asx(t4.$index(0, t5), "require_password_with_social_login");
       t2 = t5 == null ? "" : t5;
-      return A.EditScaffold$(_null, t13, new A.AppTabForm(t11, t12, A._setArrayType([new A._AccountOverview(viewModel, _null), new A.ScrollableListView(t1, _null, _null, _null, false, _null), new A.ScrollableListView(t8, _null, _null, _null, false, _null), new A.ScrollableListView(A._setArrayType([A.FormCard$(_null, A._setArrayType([t9, t3, A.BoolDropdownButton$(_null, _null, _null, _null, t2, _null, new A._AccountManagementState_build_closure2(viewModel, company), company.oauthPasswordRequired)], t14), _null, _null, false, _null, false, _null)], t14), _null, _null, _null, false, _null)], t14), t10, _null, _null), _null, _null, _null, false, _null, _null, t7, _null, t6);
+      return A.EditScaffold$(_null, t13, new A.AppTabForm(t11, t12, A._setArrayType([new A._AccountOverview(viewModel, _null), new A.ScrollableListView(t1, _null, _null, true, false, _null), new A.ScrollableListView(t8, _null, _null, true, false, _null), new A.ScrollableListView(A._setArrayType([A.FormCard$(_null, A._setArrayType([t9, t3, A.BoolDropdownButton$(_null, _null, _null, _null, t2, _null, new A._AccountManagementState_build_closure2(viewModel, company), company.oauthPasswordRequired)], t14), _null, _null, false, _null, false, _null)], t14), _null, _null, true, false, _null)], t14), t10, _null, _null), _null, _null, _null, false, _null, _null, t7, _null, t6);
     }
   };
   A._AccountManagementState_didChangeDependencies_closure.prototype = {
@@ -472071,7 +472096,7 @@
         t5 = A.getLayout(context) === B.AppLayout_mobile ? _null : B.IconData_57785_MaterialIcons_null_false;
         B.JSArray_methods.addAll$1(t8, A._setArrayType([new A.Padding(B.EdgeInsets_16_16_16_0, new A.ListDivider(_null), _null), new A.Padding(B.EdgeInsets_16_16_16_16, A.Row$(A._setArrayType([t3, new A.SizedBox(16, _null, _null, _null), A.Expanded$(new A.AppButton(B.MaterialColor_Map_JNc9P_4294198070, t5, t4, new A._AccountOverview_build_closure13(_this, companies, t1, company, t2, context), _null, _null), 1)], t9), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), _null)], t9));
       }
-      return new A.ScrollableListView(t8, _null, _null, _null, false, _null);
+      return new A.ScrollableListView(t8, _null, _null, true, false, _null);
     }
   };
   A._AccountOverview_build__getDataStats.prototype = {
@@ -473633,7 +473658,7 @@
         B.JSArray_methods.addAll$1(t2, A._setArrayType([t1, A.DecoratedFormField$(false, _null, false, _this._purchaseOrderFooterController, _null, true, _null, _null, _null, _null, false, false, _null, B.TextInputType_1_null_null, t4, 4, _null, false, _null, _null, _null, true, _null, _null, B.TextAlign_4, _null)], t15));
       }
       t11.push(A.FormCard$(_null, t2, _null, _null, false, _null, true, _null));
-      t1 = A._setArrayType([new A.ScrollableListView(t10, _null, _null, _null, false, _null), new A.AutofillGroup(new A.ScrollableListView(t20, _null, _null, _null, false, _null), _null), new A.Padding(B.EdgeInsets_20_0_20_0, new A.ScrollableListView(t14, _null, _null, _null, false, _null), _null), new A.ScrollableListView(t11, _null, _null, _null, false, _null)], t15);
+      t1 = A._setArrayType([new A.ScrollableListView(t10, _null, _null, true, false, _null), new A.AutofillGroup(new A.ScrollableListView(t20, _null, _null, true, false, _null), _null), new A.Padding(B.EdgeInsets_20_0_20_0, new A.ScrollableListView(t14, _null, _null, true, false, _null), _null), new A.ScrollableListView(t11, _null, _null, true, false, _null)], t15);
       if (t3) {
         t2 = company.documents;
         t1.push(new A.DocumentGrid(new A.CopyOnWriteList(true, t2._list, A._instanceType(t2)._eval$1("CopyOnWriteList<1>")), new A._CompanyDetailsState_build_closure14(viewModel, context), new A._CompanyDetailsState_build_closure15(viewModel, context), _null, _null));
@@ -475094,7 +475119,7 @@
       t4 = J.$index$asx(t3.$index(0, t4), _s13_);
       t3 = t4 == null ? J.$index$asx(t3.$index(0, _s2_), _s13_) : t4;
       t9.push(A.Row$(A._setArrayType([A.Expanded$(A.OutlinedButton$(A.Text$(t3.toUpperCase(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, new A._DeviceSettingsState_build_closure21(prefState, t1), _null), 1), new A.SizedBox(16, _null, _null, _null), A.Expanded$(A.OutlinedButton$(A.Text$(t1.get$importColors().toUpperCase(), _null, _null, _null, _null, _null, _null, _null, _null, _null), _null, new A._DeviceSettingsState_build_closure22(context, t1, prefState, viewModel), _null), 1)], t7), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null));
-      return A.Scaffold$(t5, _null, new A.AppTabForm(t2, _this._device_settings$_formKey, A._setArrayType([new A.ScrollableListView(t8, _null, _null, _null, false, _null), new A.ScrollableListView(A._setArrayType([t11, A.FormCard$(_null, t9, _null, _null, false, _null, true, _null)], t7), _null, _null, _null, false, _null)], t7), t6, _null, _null), _null, _null, _null, _null, _null);
+      return A.Scaffold$(t5, _null, new A.AppTabForm(t2, _this._device_settings$_formKey, A._setArrayType([new A.ScrollableListView(t8, _null, _null, true, false, _null), new A.ScrollableListView(A._setArrayType([t11, A.FormCard$(_null, t9, _null, _null, false, _null, true, _null)], t7), _null, _null, true, false, _null)], t7), t6, _null, _null), _null, _null, _null, _null, _null);
     }
   };
   A._DeviceSettingsState_build_closure.prototype = {
@@ -477394,7 +477419,7 @@
         B.JSArray_methods.addAll$1(t9, t6);
       }
       t8.push(A.FormCard$(_null, t9, _null, B.CrossAxisAlignment_3, false, _null, true, _null));
-      return A.Scaffold$(t5, _null, new A.AppForm(t2, _null, new A.ScrollableListView(t8, _null, _null, _null, false, _null), t7, _null), _null, _null, _null, _null, _null);
+      return A.Scaffold$(t5, _null, new A.AppForm(t2, _null, new A.ScrollableListView(t8, _null, _null, true, false, _null), t7, _null), _null, _null, _null, _null, _null);
     }
   };
   A._ImportExportState_build_closure0.prototype = {
@@ -478479,7 +478504,7 @@
       t11 = A.List_List$of(new A.MappedListIterable(A._setArrayType(["name", "id_number", "vat_number", "website", "email", "phone", "address1", "address2", _s17_, _s17_0, "country", "custom1", "custom2", "custom3", "custom4"], t4), new A._InvoiceDesignState_build_closure30(), t9), true, t10);
       t14 = A.List_List$of(new A.MappedListIterable(A._setArrayType(["address1", "address2", _s17_, "country"], t4), new A._InvoiceDesignState_build_closure31(), t9), true, t10);
       t17 = settings.getFieldsForSection$1(_s15_);
-      t12 = A._setArrayType([new A.ScrollableListView(t2, _null, _null, _null, false, _null), t13, t15, A.FormCard$(A.MultiSelectList$(t1.get$addField(), t14, false, true, new A._InvoiceDesignState_build_closure32(viewModel, settings), t11, "company", t17), _null, _null, _null, false, _null, true, _null)], t12);
+      t12 = A._setArrayType([new A.ScrollableListView(t2, _null, _null, true, false, _null), t13, t15, A.FormCard$(A.MultiSelectList$(t1.get$addField(), t14, false, true, new A._InvoiceDesignState_build_closure32(viewModel, settings), t11, "company", t17), _null, _null, _null, false, _null, true, _null)], t12);
       if (company.isModuleEnabled$1(B.EntityType_invoice)) {
         t2 = A.List_List$of(new A.MappedListIterable(A._setArrayType(["number", "po_number", "date", "due_date", "amount", "balance", "balance_due", "custom1", "custom2", "custom3", "custom4", "project", "vendor"], t4), new A._InvoiceDesignState_build_closure33(), t9), true, t16);
         B.JSArray_methods.addAll$1(t2, new A.MappedListIterable(A._setArrayType(["balance"], t4), new A._InvoiceDesignState_build_closure34(), t9));
@@ -479464,7 +479489,7 @@
           t15 = "";
         t2.push(A.Row$(A._setArrayType([new A.Expanded(1, B.FlexFit_0, new A.Text(t14, _null, _null, _null, _null, _null, B.TextOverflow_2, _null, 1, _null, _null), _null), new A.Expanded(1, B.FlexFit_0, A.TextFormField$(true, _null, false, _null, _null, _null, _null, _null, 2, B.InputDecoration_C4W, _null, false, _null, t15, _null, new A.ValueKey("__" + t13 + "__", t6), _null, _null, _null, 1, _null, false, new A._LocalizationSettingsState_build_closure14(viewModel, settings, t13), _null, _null, _null, _null, false, _null, _null, _null, B.TextAlign_4, _null, _null, _null), _null), new A.SizedBox(16, _null, _null, _null), A.IconButton$(B.Alignment_0_0, _null, _null, true, new A.Icon(B.IconData_57704_MaterialIcons_null_false, _null, _null, _null), _null, new A._LocalizationSettingsState_build_closure15(viewModel, settings, t13), B.EdgeInsets_8_8_8_8, _null, _null, _null)], t18), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null));
       }
-      return A.EditScaffold$(_null, t7, new A.AppTabForm(t9, t8, A._setArrayType([new A.ScrollableListView(t11, _null, _null, _null, false, _null), new A.ScrollableListView(A._setArrayType([A.FormCard$(_null, t2, _null, B.CrossAxisAlignment_0, false, _null, true, _null)], t18), _null, _null, _null, false, _null)], t18), t10, _null, _null), _null, _null, _null, false, _null, _null, t5, _null, t4);
+      return A.EditScaffold$(_null, t7, new A.AppTabForm(t9, t8, A._setArrayType([new A.ScrollableListView(t11, _null, _null, true, false, _null), new A.ScrollableListView(A._setArrayType([A.FormCard$(_null, t2, _null, B.CrossAxisAlignment_0, false, _null, true, _null)], t18), _null, _null, true, false, _null)], t18), t10, _null, _null), _null, _null, _null, false, _null, _null, t5, _null, t4);
     }
   };
   A._LocalizationSettingsState_dispose_closure.prototype = {
@@ -482264,7 +482289,7 @@
       }
       t5.push(new A.VariablesHelp(template === B.EmailTemplate_quote, B.JSArray_methods.contains$1(A._setArrayType([B.EmailTemplate_payment, B.EmailTemplate_payment_partial], type$.JSArray_legacy_EmailTemplate), template), _null));
       t5.push(new A.SizedBox(_null, 16, _null, _null));
-      t1 = A._setArrayType([new A.ScrollableListView(t5, _null, _null, _null, false, _null)], t9);
+      t1 = A._setArrayType([new A.ScrollableListView(t5, _null, _null, true, false, _null)], t9);
       if (t11) {
         t2 = _this._templates_and_reminders$_selectedIndex;
         t1.push(new A.ColoredBox(B.Color_4294967295, new A.ExampleEditor(_this._bodyMarkdown, new A._TemplatesAndRemindersState_build_closure8(_this), new A.ValueKey("__tab_" + t2 + "__", t10)), _null));
@@ -483222,7 +483247,7 @@
       t6 = J.$index$asx(t3.$index(0, t6), _s28_);
       t2 = t6 == null ? J.$index$asx(t3.$index(0, _s2_), _s28_) : t6;
       B.JSArray_methods.addAll$1(t4, A._setArrayType([t5, new A.SizedBox(_null, 8, _null, _null), A.BoolDropdownButton$(_null, _null, t2, _null, t1, _null, new A._UserDetailsState_build_closure11(_this, user), t7.includeDeletedClients)], t10));
-      return A.EditScaffold$(_null, t11, new A.AppTabForm(_this._user_details$_focusNode, t12, A._setArrayType([new A.ScrollableListView(A._setArrayType([t14, new A.Padding(B.EdgeInsets_18_20_18_10, t15, _null), A.FormCard$(_null, t4, _null, _null, false, _null, true, _null)], t10), _null, _null, _null, false, _null), new A.ScrollableListView(A._setArrayType([new A.NotificationSettings(user, new A._UserDetailsState_build_closure12(viewModel, user), _null)], t10), _null, _null, _null, false, _null)], t10), t13, _null, _null), _null, _null, _null, false, _null, _null, t9, _null, t8);
+      return A.EditScaffold$(_null, t11, new A.AppTabForm(_this._user_details$_focusNode, t12, A._setArrayType([new A.ScrollableListView(A._setArrayType([t14, new A.Padding(B.EdgeInsets_18_20_18_10, t15, _null), A.FormCard$(_null, t4, _null, _null, false, _null, true, _null)], t10), _null, _null, true, false, _null), new A.ScrollableListView(A._setArrayType([new A.NotificationSettings(user, new A._UserDetailsState_build_closure12(viewModel, user), _null)], t10), _null, _null, true, false, _null)], t10), t13, _null, _null), _null, _null, _null, false, _null, _null, t9, _null, t8);
     }
   };
   A._UserDetailsState_dispose_closure.prototype = {
@@ -484365,7 +484390,7 @@
       t1 = t1.get$autoArchiveQuote();
       t3 = J.$index$asx(t2.$index(0, t3), "auto_archive_quote_help");
       t2 = t3 == null ? "" : t3;
-      return A.EditScaffold$(_null, t7, new A.AppTabForm(t11, t10, A._setArrayType([new A.ScrollableListView(t14, _null, _null, _null, false, _null), new A.ScrollableListView(A._setArrayType([A.FormCard$(_null, A._setArrayType([t13, A.BoolDropdownButton$(_null, _null, t2, B.IconData_57489_MaterialIcons_null_false, t1, _null, new A._WorkflowSettingsState_build_closure6(viewModel, settings), settings.autoArchiveQuote)], t8), _null, _null, false, _null, true, _null)], t8), _null, _null, _null, false, _null)], t8), t9, _null, _null), _null, _null, _null, false, _null, _null, t5, _null, t4);
+      return A.EditScaffold$(_null, t7, new A.AppTabForm(t11, t10, A._setArrayType([new A.ScrollableListView(t14, _null, _null, true, false, _null), new A.ScrollableListView(A._setArrayType([A.FormCard$(_null, A._setArrayType([t13, A.BoolDropdownButton$(_null, _null, t2, B.IconData_57489_MaterialIcons_null_false, t1, _null, new A._WorkflowSettingsState_build_closure6(viewModel, settings), settings.autoArchiveQuote)], t8), _null, _null, false, _null, true, _null)], t8), _null, _null, true, false, _null)], t8), t9, _null, _null), _null, _null, _null, false, _null, _null, t5, _null, t4);
     }
   };
   A._WorkflowSettingsState_build_closure.prototype = {
@@ -492307,10 +492332,10 @@
       t4.push(A.AnimatedContainer$(_null, A.Column$(A._setArrayType([A.Expanded$(new A.Padding(B.EdgeInsets_16_4_16_4, A.Column$(A._setArrayType([A.Row$(A._setArrayType([A.Expanded$(A.DecoratedFormField$(false, _null, false, _null, _null, true, _null, _null, _null, _null, false, false, _null, new A.TextInputType(2, false, true), t2.get$minAmount(), _null, _null, false, new A._MatchDepositsState_build_closure7(_this), _null, _null, true, _null, _null, B.TextAlign_4, _null), 1), new A.SizedBox(16, _null, _null, _null), A.Expanded$(A.DecoratedFormField$(false, _null, false, _null, _null, true, _null, _null, _null, _null, false, false, _null, new A.TextInputType(2, false, true), t2.get$maxAmount(), _null, _null, false, new A._MatchDepositsState_build_closure8(_this), _null, _null, true, _null, _null, B.TextAlign_4, _null), 1)], t3), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), A.Row$(A._setArrayType([A.Expanded$(A.DatePicker$(false, _null, _null, t2.get$startDate(), _null, new A._MatchDepositsState_build_closure9(_this), _this._startDate, _null), 1), new A.SizedBox(16, _null, _null, _null), A.Expanded$(A.DatePicker$(false, _null, _null, t2.get$endDate(), _null, new A._MatchDepositsState_build_closure10(_this), _this._endDate, _null), 1)], t3), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null)], t3), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null), 1), new A.ListDivider(_null)], t3), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null, _null, B.C__Linear, _null, t7, t8, _null, _null, _null, _null));
       if (_this._matchExisting) {
         t1 = _this._paymentScrollController;
-        B.JSArray_methods.addAll$1(t4, A._setArrayType([A.Expanded$(A.Scrollbar$(A.ListView$separated(t1, new A._MatchDepositsState_build_closure11(_this), _this._transaction_view$_payments.length, _null, new A._MatchDepositsState_build_closure12(), false), t1, true), 1)], t3));
+        B.JSArray_methods.addAll$1(t4, A._setArrayType([A.Expanded$(A.Scrollbar$(A.ListView$separated(t1, new A._MatchDepositsState_build_closure11(_this), _this._transaction_view$_payments.length, _null, _null, new A._MatchDepositsState_build_closure12(), false), t1, true), 1)], t3));
       } else {
         t7 = _this._invoiceScrollController;
-        t3 = A._setArrayType([A.Expanded$(A.Scrollbar$(A.ListView$separated(t7, new A._MatchDepositsState_build_closure13(_this), _this._transaction_view$_invoices.length, _null, new A._MatchDepositsState_build_closure14(), false), t7, true), 1)], t3);
+        t3 = A._setArrayType([A.Expanded$(A.Scrollbar$(A.ListView$separated(t7, new A._MatchDepositsState_build_closure13(_this), _this._transaction_view$_invoices.length, _null, _null, new A._MatchDepositsState_build_closure14(), false), t7, true), 1)], t3);
         t7 = _this._selectedInvoices.length;
         if (t7 !== 0)
           t3.push(new A.Padding(B.EdgeInsets_16_12_16_12, A.Text$("" + t7 + " " + A.S(t2.get$selected(t2)) + " \u2022 " + A.S(A.formatNumber(t1.totalSelected, context, _null, currencyId, B.FormatNumberType_0, true, _null, false)), _null, _null, _null, _null, _null, A.TextStyle$(_null, _null, B.MaterialColor_Map_HFpTk_4288585374, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, true, _null, _null, _null, _null, _null, _null, _null, _null), B.TextAlign_2, _null, _null), _null));
@@ -492868,7 +492893,7 @@
         t8 = A.Duration$(0, 0, 0, 200, 0, 0);
         t4 = _this._showFilter ? 138 : 0;
         t5 = _this._expenseScrollController;
-        B.JSArray_methods.addAll$1(t3, A._setArrayType([t9, new A.ListDivider(_null), A.AnimatedContainer$(_null, A.Column$(A._setArrayType([A.Expanded$(new A.Padding(B.EdgeInsets_16_4_16_4, A.Column$(A._setArrayType([A.Row$(A._setArrayType([A.Expanded$(A.DecoratedFormField$(false, _null, false, _null, _null, true, _null, _null, _null, _null, false, false, _null, new A.TextInputType(2, false, true), t1.get$minAmount(), _null, _null, false, new A._MatchWithdrawalsState_build_closure3(_this), _null, _null, true, _null, _null, B.TextAlign_4, _null), 1), new A.SizedBox(16, _null, _null, _null), A.Expanded$(A.DecoratedFormField$(false, _null, false, _null, _null, true, _null, _null, _null, _null, false, false, _null, new A.TextInputType(2, false, true), t1.get$maxAmount(), _null, _null, false, new A._MatchWithdrawalsState_build_closure4(_this), _null, _null, true, _null, _null, B.TextAlign_4, _null), 1)], t2), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), A.Row$(A._setArrayType([A.Expanded$(A.DatePicker$(false, _null, _null, t1.get$startDate(), _null, new A._MatchWithdrawalsState_build_closure5(_this), _this._startDate, _null), 1), new A.SizedBox(16, _null, _null, _null), A.Expanded$(A.DatePicker$(false, _null, _null, t1.get$endDate(), _null, new A._MatchWithdrawalsState_build_closure6(_this), _this._endDate, _null), 1)], t2), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null)], t2), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null), 1), new A.ListDivider(_null)], t2), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null, _null, B.C__Linear, _null, t8, t4, _null, _null, _null, _null), A.Expanded$(A.Scrollbar$(A.ListView$separated(t5, new A._MatchWithdrawalsState_build_closure7(_this, store, transaction), _this._transaction_view$_expenses.length, _null, new A._MatchWithdrawalsState_build_closure8(), false), t5, true), 1)], t2));
+        B.JSArray_methods.addAll$1(t3, A._setArrayType([t9, new A.ListDivider(_null), A.AnimatedContainer$(_null, A.Column$(A._setArrayType([A.Expanded$(new A.Padding(B.EdgeInsets_16_4_16_4, A.Column$(A._setArrayType([A.Row$(A._setArrayType([A.Expanded$(A.DecoratedFormField$(false, _null, false, _null, _null, true, _null, _null, _null, _null, false, false, _null, new A.TextInputType(2, false, true), t1.get$minAmount(), _null, _null, false, new A._MatchWithdrawalsState_build_closure3(_this), _null, _null, true, _null, _null, B.TextAlign_4, _null), 1), new A.SizedBox(16, _null, _null, _null), A.Expanded$(A.DecoratedFormField$(false, _null, false, _null, _null, true, _null, _null, _null, _null, false, false, _null, new A.TextInputType(2, false, true), t1.get$maxAmount(), _null, _null, false, new A._MatchWithdrawalsState_build_closure4(_this), _null, _null, true, _null, _null, B.TextAlign_4, _null), 1)], t2), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), A.Row$(A._setArrayType([A.Expanded$(A.DatePicker$(false, _null, _null, t1.get$startDate(), _null, new A._MatchWithdrawalsState_build_closure5(_this), _this._startDate, _null), 1), new A.SizedBox(16, _null, _null, _null), A.Expanded$(A.DatePicker$(false, _null, _null, t1.get$endDate(), _null, new A._MatchWithdrawalsState_build_closure6(_this), _this._endDate, _null), 1)], t2), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null)], t2), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null), 1), new A.ListDivider(_null)], t2), B.CrossAxisAlignment_2, _null, B.MainAxisAlignment_0, B.MainAxisSize_1, B.VerticalDirection_1), _null, _null, B.C__Linear, _null, t8, t4, _null, _null, _null, _null), A.Expanded$(A.Scrollbar$(A.ListView$separated(t5, new A._MatchWithdrawalsState_build_closure7(_this, store, transaction), _this._transaction_view$_expenses.length, _null, _null, new A._MatchWithdrawalsState_build_closure8(), false), t5, true), 1)], t2));
         t4 = t7;
         t2 = t6;
       } else {
@@ -492880,12 +492905,12 @@
         t8 = J.$index$asx(t6.$index(0, t7), "search_vendors");
         t4 = A.Row$(A._setArrayType([A.Expanded$(new A.Padding(B.EdgeInsets_22_12_10_12, new A.SearchText(new A._MatchWithdrawalsState_build_closure9(_this), new A._MatchWithdrawalsState_build_closure10(_this), t4, t5, B.JSString_methods.replaceFirst$2(t8 == null ? "" : t8, _s7_, ""), _null), _null), 1), A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_57424_MaterialIcons_null_false, _null, _null), _null, new A._MatchWithdrawalsState_build_closure11(context, t1, viewModel, store, transaction), B.EdgeInsets_8_8_8_8, _null, _null, _null), new A.SizedBox(8, _null, _null, _null)], t2), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null);
         t5 = _this._vendorScrollController;
-        t5 = A.Expanded$(A.Scrollbar$(A.ListView$separated(t5, new A._MatchWithdrawalsState_build_closure12(_this, store, transaction), _this._transaction_view$_vendors.length, _null, new A._MatchWithdrawalsState_build_closure13(), false), t5, true), 1);
+        t5 = A.Expanded$(A.Scrollbar$(A.ListView$separated(t5, new A._MatchWithdrawalsState_build_closure12(_this, store, transaction), _this._transaction_view$_vendors.length, _null, _null, new A._MatchWithdrawalsState_build_closure13(), false), t5, true), 1);
         t8 = _this._categoryFilterController;
         t9 = _this._categoryFocusNode;
         t10 = J.$index$asx(t6.$index(0, t7), _s17_);
         t11 = _this._categoryScrollController;
-        t11 = A._setArrayType([A.Row$(A._setArrayType([A.Expanded$(new A.Padding(B.EdgeInsets_22_12_10_12, new A.SearchText(new A._MatchWithdrawalsState_build_closure14(_this), new A._MatchWithdrawalsState_build_closure15(_this), t8, t9, J.replaceFirst$2$s(t10 == null ? J.$index$asx(t6.$index(0, _s2_), _s17_) : t10, _s7_, ""), _null), _null), 1), A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_57424_MaterialIcons_null_false, _null, _null), _null, new A._MatchWithdrawalsState_build_closure16(context, t1, viewModel, store, transaction), B.EdgeInsets_8_8_8_8, _null, _null, _null), new A.SizedBox(8, _null, _null, _null)], t2), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), new A.ListDivider(_null), A.Expanded$(A.Scrollbar$(A.ListView$separated(t11, new A._MatchWithdrawalsState_build_closure17(_this, store, transaction), _this._categories.length, _null, new A._MatchWithdrawalsState_build_closure18(), false), t11, true), 1)], t2);
+        t11 = A._setArrayType([A.Row$(A._setArrayType([A.Expanded$(new A.Padding(B.EdgeInsets_22_12_10_12, new A.SearchText(new A._MatchWithdrawalsState_build_closure14(_this), new A._MatchWithdrawalsState_build_closure15(_this), t8, t9, J.replaceFirst$2$s(t10 == null ? J.$index$asx(t6.$index(0, _s2_), _s17_) : t10, _s7_, ""), _null), _null), 1), A.IconButton$(B.Alignment_0_0, _null, _null, true, A.Icon$(B.IconData_57424_MaterialIcons_null_false, _null, _null), _null, new A._MatchWithdrawalsState_build_closure16(context, t1, viewModel, store, transaction), B.EdgeInsets_8_8_8_8, _null, _null, _null), new A.SizedBox(8, _null, _null, _null)], t2), B.CrossAxisAlignment_2, B.MainAxisAlignment_0, B.MainAxisSize_1, _null), new A.ListDivider(_null), A.Expanded$(A.Scrollbar$(A.ListView$separated(t11, new A._MatchWithdrawalsState_build_closure17(_this, store, transaction), _this._categories.length, _null, _null, new A._MatchWithdrawalsState_build_closure18(), false), t11, true), 1)], t2);
         t8 = transaction.category;
         if (t8.length !== 0 && _this._selectedCategory == null) {
           t9 = J.$index$asx(t6.$index(0, t7), _s16_);
@@ -496959,13 +496984,12 @@
       _this.super$State$didChangeDependencies();
     },
     build$1(context) {
-      var _null = null,
-        vendor = this._widget.viewModel.vendor,
+      var vendor = this._widget.viewModel.vendor,
         activities = vendor.activities,
         t1 = vendor.loadedAt;
       if (!(t1 != null && t1 > 0))
-        return new A.LoadingIndicator(_null, false, _null);
-      return new A.ScrollableListViewBuilder(new A._VendorViewActivityState_build_closure(activities), new A._VendorViewActivityState_build_closure0(), activities._list.length, _null, B.EdgeInsets_0_16_0_16, _null);
+        return new A.LoadingIndicator(null, false, null);
+      return A.ScrollableListViewBuilder$(new A._VendorViewActivityState_build_closure(activities), activities._list.length, B.EdgeInsets_0_16_0_16, false, null, new A._VendorViewActivityState_build_closure0());
     }
   };
   A._VendorViewActivityState_build_closure0.prototype = {
@@ -507388,7 +507412,7 @@
         _this._widget.toString;
         return B.Center_mtF;
       }
-      return A.ListView$builder(_this.scrollController, new A.PdfPreviewCustomState__createPreview_closure(_this), t1, _this._widget.padding, null, B.Axis_1, false);
+      return A.ListView$builder(_this.scrollController, new A.PdfPreviewCustomState__createPreview_closure(_this), t1, _this._widget.padding, null, null, B.Axis_1, false);
     },
     _zoomPreview$0() {
       var _this = this, _null = null,