From af7f27dabd3ddaf8638ecf27e61d368da394d76d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 16 Jul 2020 18:25:58 +0300
Subject: [PATCH] Bug fixes

---
 lib/redux/app/app_state.dart                 | 1 -
 lib/ui/client/view/client_view_activity.dart | 5 +++--
 lib/ui/payment/payment_list_vm.dart          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
index d665f8e4c..6bc5a534d 100644
--- a/lib/redux/app/app_state.dart
+++ b/lib/redux/app/app_state.dart
@@ -617,7 +617,6 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
     //return 'Client Count: ${userCompanyState.clientState.list.length}, Last Updated: ${userCompanyState.lastUpdated}';
     //return 'Token: ${credentials.token} - ${userCompanyStates.map((state) => state?.token?.token ?? '').where((name) => name.isNotEmpty).join(',')}';
     return '\n\nURL: ${authState.url}\nRoute: ${uiState.currentRoute}\nPrev: ${uiState.previousRoute}\nCompany: $companyUpdated${userCompanyState.isStale ? ' [S]' : ''}\nStatic: $staticUpdated${staticState.isStale ? ' [S]' : ''}\n';
-    ;
   }
 }
 
diff --git a/lib/ui/client/view/client_view_activity.dart b/lib/ui/client/view/client_view_activity.dart
index e1c884da6..e3e936013 100644
--- a/lib/ui/client/view/client_view_activity.dart
+++ b/lib/ui/client/view/client_view_activity.dart
@@ -24,9 +24,10 @@ class _ClientViewActivityState extends State<ClientViewActivity> {
 
   @override
   Widget build(BuildContext context) {
-    final activities = widget.viewModel.client.activities;
+    final client = widget.viewModel.client;
+    final activities = client.activities;
 
-    if (activities.isEmpty) {
+    if (!client.areActivitiesLoaded) {
       return LoadingIndicator();
     }
 
diff --git a/lib/ui/payment/payment_list_vm.dart b/lib/ui/payment/payment_list_vm.dart
index 8ca8ed3b1..dbb2c0e93 100644
--- a/lib/ui/payment/payment_list_vm.dart
+++ b/lib/ui/payment/payment_list_vm.dart
@@ -43,7 +43,7 @@ class PaymentListBuilder extends StatelessWidget {
               final payment = state.paymentState.map[paymentId];
               final client = state.clientState.map[payment.clientId] ??
                   ClientEntity(id: payment.clientId);
-              final listState = state.getListState(EntityType.client);
+              final listState = state.getListState(EntityType.payment);
               final isInMultiselect = listState.isInMultiselect();
 
               void showDialog() => showEntityActionsDialog(