From b8e4520366cc3c8e1de9e9a8ec33f2444928fe59 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 8 Apr 2024 11:05:12 -0700 Subject: [PATCH] Resolve ES Lint error. --- .../payment-mark-export-button-component.jsx | 9 ++++++--- .../payment-reexport-button.component.jsx | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx b/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx index fc6aab627..8511b7506 100644 --- a/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx +++ b/client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx @@ -8,16 +8,18 @@ import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries"; import { UPDATE_PAYMENT } from "../../graphql/payments.queries"; import { setModalContext } from "../../redux/modals/modals.actions"; import { selectCurrentUser } from "../../redux/user/user.selectors"; +import { selectPayment } from "../../redux/modals/modals.selectors"; const mapStateToProps = createStructuredSelector({ - currentUser: selectCurrentUser + currentUser: selectCurrentUser, + paymentModal: selectPayment }); const mapDispatchToProps = (dispatch) => ({ setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" })) }); -const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser }) => { +const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser, paymentModal }) => { const { t } = useTranslation(); const [insertExportLog, { loading: exportLogLoading }] = useMutation(INSERT_EXPORT_LOG); const [updatePayment, { loading: updatePaymentLoading }] = useMutation(UPDATE_PAYMENT); @@ -56,13 +58,14 @@ const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentCont refetch }, context: { + ...paymentModal.context, ...payment, exportedat: today } }); if (refetch) { - if (context.refetchRequiresContext) { + if (paymentModal.context.refetchRequiresContext) { refetch(paymentUpdateResponse && paymentUpdateResponse.data.update_payments.returning[0]); } else { refetch(); diff --git a/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx b/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx index 39621a2a1..434377e86 100644 --- a/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx +++ b/client/src/components/payment-reexport-button/payment-reexport-button.component.jsx @@ -47,7 +47,7 @@ const PaymentReexportButton = ({ paymentModal, payment, refetch, setPaymentConte }); if (refetch) { - if (context.refetchRequiresContext) { + if (paymentModal.context.refetchRequiresContext) { refetch(paymentUpdateResponse && paymentUpdateResponse.data.update_payments.returning[0]); } else { refetch();