From efc3671970948c1d106524d78b3837f253e72680 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 12 Apr 2020 16:26:16 +0300
Subject: [PATCH] Refactor

---
 lib/redux/payment/payment_actions.dart    | 38 +++++++++++------------
 lib/redux/payment/payment_middleware.dart |  8 ++---
 lib/redux/payment/payment_reducer.dart    |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart
index bb3218ea2..5ca8062c1 100644
--- a/lib/redux/payment/payment_actions.dart
+++ b/lib/redux/payment/payment_actions.dart
@@ -43,9 +43,9 @@ class EditPayment extends AbstractNavigatorAction
   final bool force;
 }
 
-class RefundPayment extends AbstractNavigatorAction
+class ViewRefundPayment extends AbstractNavigatorAction
     implements PersistUI, PersistPrefs {
-  RefundPayment(
+  ViewRefundPayment(
       {@required this.payment,
       @required NavigatorState navigator,
       this.completer,
@@ -297,6 +297,22 @@ class FilterPaymentsByEntity implements PersistUI {
   final EntityType entityType;
 }
 
+class StartPaymentMultiselect {}
+
+class AddToPaymentMultiselect {
+  AddToPaymentMultiselect({@required this.entity});
+
+  final BaseEntity entity;
+}
+
+class RemoveFromPaymentMultiselect {
+  RemoveFromPaymentMultiselect({@required this.entity});
+
+  final BaseEntity entity;
+}
+
+class ClearPaymentMultiselect {}
+
 void handlePaymentAction(
     BuildContext context, List<BaseEntity> payments, EntityAction action) {
   if (payments.isEmpty) {
@@ -313,7 +329,7 @@ void handlePaymentAction(
       editEntity(context: context, entity: payment);
       break;
     case EntityAction.refund:
-      store.dispatch(RefundPayment(
+      store.dispatch(ViewRefundPayment(
         navigator: Navigator.of(context),
         payment: payment,
       ));
@@ -357,19 +373,3 @@ void handlePaymentAction(
       break;
   }
 }
-
-class StartPaymentMultiselect {}
-
-class AddToPaymentMultiselect {
-  AddToPaymentMultiselect({@required this.entity});
-
-  final BaseEntity entity;
-}
-
-class RemoveFromPaymentMultiselect {
-  RemoveFromPaymentMultiselect({@required this.entity});
-
-  final BaseEntity entity;
-}
-
-class ClearPaymentMultiselect {}
diff --git a/lib/redux/payment/payment_middleware.dart b/lib/redux/payment/payment_middleware.dart
index 51b8179a3..362f65af6 100644
--- a/lib/redux/payment/payment_middleware.dart
+++ b/lib/redux/payment/payment_middleware.dart
@@ -21,7 +21,7 @@ List<Middleware<AppState>> createStorePaymentsMiddleware([
   final viewPaymentList = _viewPaymentList();
   final viewPayment = _viewPayment();
   final editPayment = _editPayment();
-  final showRefundPayment = _showRefundPayment();
+  final viewRefundPayment = _viewRefundPayment();
   final loadPayments = _loadPayments(repository);
   //final loadPayment = _loadPayment(repository);
   final savePayment = _savePayment(repository);
@@ -35,7 +35,7 @@ List<Middleware<AppState>> createStorePaymentsMiddleware([
     TypedMiddleware<AppState, ViewPaymentList>(viewPaymentList),
     TypedMiddleware<AppState, ViewPayment>(viewPayment),
     TypedMiddleware<AppState, EditPayment>(editPayment),
-    TypedMiddleware<AppState, RefundPayment>(showRefundPayment),
+    TypedMiddleware<AppState, ViewRefundPayment>(viewRefundPayment),
     TypedMiddleware<AppState, LoadPayments>(loadPayments),
     //TypedMiddleware<AppState, LoadPayment>(loadPayment),
     TypedMiddleware<AppState, SavePaymentRequest>(savePayment),
@@ -66,9 +66,9 @@ Middleware<AppState> _editPayment() {
   };
 }
 
-Middleware<AppState> _showRefundPayment() {
+Middleware<AppState> _viewRefundPayment() {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
-    final action = dynamicAction as RefundPayment;
+    final action = dynamicAction as ViewRefundPayment;
 
     if (!action.force &&
         hasChanges(store: store, context: action.context, action: action)) {
diff --git a/lib/redux/payment/payment_reducer.dart b/lib/redux/payment/payment_reducer.dart
index 19915bf07..6a2a28250 100644
--- a/lib/redux/payment/payment_reducer.dart
+++ b/lib/redux/payment/payment_reducer.dart
@@ -35,7 +35,7 @@ final editingReducer = combineReducers<PaymentEntity>([
     return action.payments[0];
   }),
   TypedReducer<PaymentEntity, EditPayment>(_updateEditing),
-  TypedReducer<PaymentEntity, RefundPayment>(_updateEditing),
+  TypedReducer<PaymentEntity, ViewRefundPayment>(_updateEditing),
   TypedReducer<PaymentEntity, UpdatePayment>((payment, action) {
     return action.payment.rebuild((b) => b..isChanged = true);
   }),