diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart index 846fc0834..62d4fcad9 100644 --- a/lib/redux/app/app_actions.dart +++ b/lib/redux/app/app_actions.dart @@ -1143,8 +1143,8 @@ void handleEntitiesActions( void selectEntity({ @required BuildContext context, @required BaseEntity entity, - bool longPress, - bool forceView, + bool longPress = false, + bool forceView = false, }) { final store = StoreProvider.of(context); final state = store.state; diff --git a/lib/ui/dashboard/dashboard_sidebar.dart b/lib/ui/dashboard/dashboard_sidebar.dart index bd03e2d24..52aafdbaa 100644 --- a/lib/ui/dashboard/dashboard_sidebar.dart +++ b/lib/ui/dashboard/dashboard_sidebar.dart @@ -207,7 +207,7 @@ class _QuoteSidebar extends StatelessWidget { }, separatorBuilder: (context, index) => ListDivider(), ), - label2: localization.pastDueInvoices + + label2: localization.expiredQuotes + (expriedQuotes.isNotEmpty ? ' (${expriedQuotes.length})' : ''), list2: expriedQuotes.isEmpty ? null @@ -224,7 +224,7 @@ class _QuoteSidebar extends StatelessWidget { ), label3: (selectedIds ?? []).isEmpty ? null - : localization.selectedInvoices + ' (${selectedIds.length})', + : localization.selectedQuotes + ' (${selectedIds.length})', list3: (selectedIds ?? []).isEmpty ? null : ListView.separated( @@ -319,8 +319,8 @@ class _DashboardSidebar extends StatelessWidget { child: Row( children: [ Expanded( - child: Text(label3 ?? '', - style: textTheme.bodyText2)), + child: + Text(label3 ?? '', style: textTheme.bodyText2)), IconButton( visualDensity: VisualDensity.compact, icon: Icon(Icons.clear), @@ -333,8 +333,8 @@ class _DashboardSidebar extends StatelessWidget { ) ], ), - padding: const EdgeInsets.symmetric( - horizontal: 16, vertical: 8), + padding: + const EdgeInsets.symmetric(horizontal: 16, vertical: 8), width: double.infinity, ), ), diff --git a/lib/ui/quote/quote_list_item.dart b/lib/ui/quote/quote_list_item.dart index b842c03ba..ad01b876b 100644 --- a/lib/ui/quote/quote_list_item.dart +++ b/lib/ui/quote/quote_list_item.dart @@ -77,7 +77,7 @@ class QuoteListItem extends StatelessWidget { children: [ Padding( padding: const EdgeInsets.only(right: 16), - child: showCheckbox + child: isInMultiselect ? IgnorePointer( ignoring: listUIState.isInMultiselect(), child: Checkbox( @@ -160,7 +160,7 @@ class QuoteListItem extends StatelessWidget { onTap: () => selectEntity(entity: quote, context: context), onLongPress: () => selectEntity( entity: quote, context: context, longPress: true), - leading: showCheckbox + leading: isInMultiselect ? IgnorePointer( ignoring: listUIState.isInMultiselect(), child: Checkbox(