PR fixes

lib/src/screens/dashboard/widgets/filter_widget.dart

@@ -82,7 +82,7 @@ class FilterWidget extends StatelessWidget {
                                   final content = item.onChanged != null
                                       ? Observer(
                                           builder: (_) => StandardCheckbox(
-                                                value: item.value.value,
+                                                value: item.value(),
                                                 caption: item.caption,
                                                 gradientBackground: true,
                                                 borderColor: Theme.of(context).dividerColor,

lib/store/dashboard/trade_filter_store.dart

@@ -8,60 +8,61 @@ part'trade_filter_store.g.dart';
 class TradeFilterStore = TradeFilterStoreBase with _$TradeFilterStore;
 
 abstract class TradeFilterStoreBase with Store {
-  TradeFilterStoreBase();
+  TradeFilterStoreBase() : displayXMRTO = true,
+        displayChangeNow = true,
+        displaySideShift = true,
+        displayMorphToken = true,
+        displaySimpleSwap = true;
 
-  Observable<bool> displayXMRTO = Observable(true);
+  @observable
-  Observable<bool> displayAllTrades = Observable(true);
+  bool displayXMRTO;
-  Observable<bool> displayChangeNow = Observable(true);
+
-  Observable<bool> displaySideShift = Observable(true);
+  @observable
-  Observable<bool> displayMorphToken = Observable(true);
+  bool displayChangeNow;
-  Observable<bool> displaySimpleSwap = Observable(true);
+
+  @observable
+  bool displaySideShift;
+
+  @observable
+  bool displayMorphToken;
+
+  @observable
+  bool displaySimpleSwap;
+
+  @computed
+  bool get displayAllTrades => displayChangeNow && displaySideShift && displaySimpleSwap;
 
   @action
   void toggleDisplayExchange(ExchangeProviderDescription provider) {
     switch (provider) {
       case ExchangeProviderDescription.changeNow:
-        displayAllTrades.value = false;
+        displayChangeNow = !displayChangeNow;
-        displayChangeNow.value = !displayChangeNow.value;
-        if (displayChangeNow.value && displaySideShift.value && displaySimpleSwap.value) {
-          displayAllTrades.value = true;
-        }
         break;
       case ExchangeProviderDescription.sideShift:
-        displayAllTrades.value = false;
+        displaySideShift = !displaySideShift;
-        displaySideShift.value = !displaySideShift.value;
-        if (displayChangeNow.value && displaySideShift.value && displaySimpleSwap.value) {
-          displayAllTrades.value = true;
-        }
         break;
       case ExchangeProviderDescription.simpleSwap:
-        displayAllTrades.value = false;
+        displaySimpleSwap = !displaySimpleSwap;
-        displaySimpleSwap.value = !displaySimpleSwap.value;
-        if (displayChangeNow.value && displaySideShift.value && displaySimpleSwap.value) {
-          displayAllTrades.value = true;
-        }
         break;
       case ExchangeProviderDescription.xmrto:
-        displayXMRTO.value = !displayXMRTO.value;
+        displayXMRTO = !displayXMRTO;
         break;
       case ExchangeProviderDescription.morphToken:
-        displayMorphToken.value = !displayMorphToken.value;
+        displayMorphToken = !displayMorphToken;
         break;
       case ExchangeProviderDescription.all:
-        displayAllTrades.value = !displayAllTrades.value;
+        if (displayAllTrades) {
-        if (displayAllTrades.value) {
+          displayChangeNow = false;
-          displayChangeNow.value = true;
+          displaySideShift = false;
-          displaySideShift.value = true;
+          displayXMRTO = false;
-          displayXMRTO.value = true;
+          displayMorphToken = false;
-          displayMorphToken.value = true;
+          displaySimpleSwap = false;
-          displaySimpleSwap.value = true;
+        } else {
-        }
+          displayChangeNow = true;
-        if (!displayAllTrades.value) {
+          displaySideShift = true;
-          displayChangeNow.value = false;
+          displayXMRTO = true;
-          displaySideShift.value = false;
+          displayMorphToken = true;
-          displayXMRTO.value = false;
+          displaySimpleSwap = true;
-          displayMorphToken.value = false;
-          displaySimpleSwap.value = false;
         }
         break;
     }
@@ -70,24 +71,22 @@ abstract class TradeFilterStoreBase with Store {
   List<TradeListItem> filtered({required List<TradeListItem> trades, required WalletBase wallet}) {
     final _trades =
     trades.where((item) => item.trade.walletId == wallet.id).toList();
-    final needToFilter = !displayChangeNow.value || !displaySideShift.value
+    final needToFilter = !displayAllTrades;
-        || !displayXMRTO.value || !displayMorphToken.value
-        || !displaySimpleSwap.value;
 
     return needToFilter
         ? _trades
         .where((item) =>
-    (displayXMRTO.value &&
+    (displayXMRTO &&
         item.trade.provider == ExchangeProviderDescription.xmrto) ||
-        (displaySideShift.value &&
+        (displaySideShift &&
             item.trade.provider == ExchangeProviderDescription.sideShift) ||
-        (displayChangeNow.value &&
+        (displayChangeNow &&
             item.trade.provider ==
                 ExchangeProviderDescription.changeNow) ||
-        (displayMorphToken.value &&
+        (displayMorphToken &&
             item.trade.provider ==
                 ExchangeProviderDescription.morphToken)
-        ||(displaySimpleSwap.value &&
+        ||(displaySimpleSwap &&
             item.trade.provider ==
                 ExchangeProviderDescription.simpleSwap))
         .toList()

lib/store/dashboard/transaction_filter_store.dart

@@ -10,11 +10,14 @@ class TransactionFilterStore = TransactionFilterStoreBase
     with _$TransactionFilterStore;
 
 abstract class TransactionFilterStoreBase with Store {
-  TransactionFilterStoreBase();
+  TransactionFilterStoreBase() : displayIncoming = true,
+        displayOutgoing = true;
 
-  Observable<bool> displayAll = Observable(true);
+  @observable
-  Observable<bool> displayIncoming = Observable(true);
+  bool displayIncoming;
-  Observable<bool> displayOutgoing = Observable(true);
+
+  @observable
+  bool displayOutgoing;
 
   @observable
   DateTime? startDate;
@@ -22,40 +25,30 @@ abstract class TransactionFilterStoreBase with Store {
   @observable
   DateTime? endDate;
 
+  @computed
+  bool get displayAll => displayIncoming && displayOutgoing;
+
   @action
-  void toggleIAll() {
+  void toggleAll() {
-    displayAll.value = (!displayAll.value);
+    if (displayAll) {
-    if (displayAll.value) {
+      displayOutgoing = false;
-      displayOutgoing.value = true;
+      displayIncoming = false;
-      displayIncoming.value = true;
+    } else {
-    }
+      displayOutgoing = true;
-    if (!displayAll.value) {
+      displayIncoming = true;
-      displayOutgoing.value = false;
-      displayIncoming.value = false;
     }
   }
 
+
   @action
   void toggleIncoming() {
-    displayIncoming.value = (!displayIncoming.value);
+    displayIncoming = !displayIncoming;
-    if (displayIncoming.value && displayOutgoing.value) {
-      displayAll.value = true;
-    }
-    if (!displayIncoming.value || !displayOutgoing.value) {
-      displayAll.value = false;
-    }
   }
 
 
   @action
   void toggleOutgoing() {
-    displayOutgoing.value = (!displayOutgoing.value);
+    displayOutgoing = !displayOutgoing;
-    if (displayIncoming.value && displayOutgoing.value) {
-      displayAll.value = true;
-    }
-    if (!displayIncoming.value || !displayOutgoing.value) {
-      displayAll.value = false;
-    }
   }
 
   @action
@@ -66,8 +59,7 @@ abstract class TransactionFilterStoreBase with Store {
 
   List<TransactionListItem> filtered({required List<TransactionListItem> transactions}) {
     var _transactions = <TransactionListItem>[];
-    final needToFilter = !displayOutgoing.value ||
+    final needToFilter = !displayAll ||
-        !displayIncoming.value ||
         (startDate != null && endDate != null);
 
     if (needToFilter) {
@@ -79,11 +71,11 @@ abstract class TransactionFilterStoreBase with Store {
               && (endDate?.isAfter(item.transaction.date) ?? false);
         }
 
-        if (allowed && (!displayOutgoing.value || !displayIncoming.value)) {
+        if (allowed && (!displayAll)) {
-          allowed = (displayOutgoing.value &&
+          allowed = (displayOutgoing &&
               item.transaction.direction ==
                   TransactionDirection.outgoing) ||
-              (displayIncoming.value &&
+              (displayIncoming &&
                   item.transaction.direction == TransactionDirection.incoming);
         }
 

lib/view_model/dashboard/dashboard_view_model.dart

@@ -59,15 +59,15 @@ abstract class DashboardViewModelBase with Store {
     filterItems = {
       S.current.transactions: [
         FilterItem(
-            value: transactionFilterStore.displayAll,
+            value: () => transactionFilterStore.displayAll,
             caption: S.current.all_transactions,
-            onChanged:  transactionFilterStore.toggleIAll),
+            onChanged:  transactionFilterStore.toggleAll),
         FilterItem(
-            value: transactionFilterStore.displayIncoming,
+            value: () => transactionFilterStore.displayIncoming,
             caption: S.current.incoming,
             onChanged:transactionFilterStore.toggleIncoming),
         FilterItem(
-            value: transactionFilterStore.displayOutgoing,
+            value: () => transactionFilterStore.displayOutgoing,
             caption: S.current.outgoing,
             onChanged: transactionFilterStore.toggleOutgoing),
         // FilterItem(
@@ -77,22 +77,22 @@ abstract class DashboardViewModelBase with Store {
       ],
       S.current.trades: [
         FilterItem(
-            value: tradeFilterStore.displayAllTrades,
+            value: () => tradeFilterStore.displayAllTrades,
             caption: S.current.all_trades,
             onChanged: () => tradeFilterStore
                 .toggleDisplayExchange(ExchangeProviderDescription.all)),
         FilterItem(
-            value: tradeFilterStore.displayChangeNow,
+            value: () => tradeFilterStore.displayChangeNow,
             caption: ExchangeProviderDescription.changeNow.title,
             onChanged: () => tradeFilterStore
                 .toggleDisplayExchange(ExchangeProviderDescription.changeNow)),
         FilterItem(
-            value:  tradeFilterStore.displaySideShift,
+            value: () => tradeFilterStore.displaySideShift,
             caption: ExchangeProviderDescription.sideShift.title,
             onChanged: () => tradeFilterStore
                 .toggleDisplayExchange(ExchangeProviderDescription.sideShift)),
         FilterItem(
-            value:  tradeFilterStore.displaySimpleSwap,
+            value: () => tradeFilterStore.displaySimpleSwap,
             caption: ExchangeProviderDescription.simpleSwap.title,
             onChanged: () => tradeFilterStore
                 .toggleDisplayExchange(ExchangeProviderDescription.simpleSwap)),

lib/view_model/dashboard/filter_item.dart

@@ -6,7 +6,7 @@ class FilterItem {
     required this.caption,
     required this.onChanged});
 
-  Observable<bool> value;
+  bool Function() value;
   String caption;
   Function onChanged;
 }