From 0eccd4da8e922529d40600ec907cceff16a40ac0 Mon Sep 17 00:00:00 2001
From: elforjani3 <elforjani3@gmail.com>
Date: Sun, 12 Sep 2021 15:48:11 +0200
Subject: [PATCH] BIG-32: fix close drawer when delete sale receipt.

---
 .../Alerts/Receipts/ReceiptDeleteAlert.js         | 15 ++++++++-------
 .../ReceiptDetailDrawer/ReceiptDetailActionBar.js | 11 +++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/client/src/containers/Alerts/Receipts/ReceiptDeleteAlert.js b/client/src/containers/Alerts/Receipts/ReceiptDeleteAlert.js
index 2e1660ac8..157dc856d 100644
--- a/client/src/containers/Alerts/Receipts/ReceiptDeleteAlert.js
+++ b/client/src/containers/Alerts/Receipts/ReceiptDeleteAlert.js
@@ -1,14 +1,14 @@
 import React from 'react';
 import intl from 'react-intl-universal';
-import {  FormattedMessage as T, FormattedHTMLMessage } from 'components';
+import { FormattedMessage as T, FormattedHTMLMessage } from 'components';
 import { Intent, Alert } from '@blueprintjs/core';
-import { queryCache } from 'react-query';
 
 import { useDeleteReceipt } from 'hooks/query';
 import { AppToaster } from 'components';
 
 import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect';
 import withAlertActions from 'containers/Alert/withAlertActions';
+import withDrawerActions from 'containers/Drawer/withDrawerActions';
 
 import { compose } from 'utils';
 
@@ -24,12 +24,11 @@ function NameDeleteAlert({
 
   // #withAlertActions
   closeAlert,
+
+  // #withDrawerActions
+  closeDrawer,
 }) {
-  
-  const {
-    mutateAsync: deleteReceiptMutate,
-    isLoading
-  } = useDeleteReceipt();
+  const { mutateAsync: deleteReceiptMutate, isLoading } = useDeleteReceipt();
 
   // Handle cancel delete  alert.
   const handleCancelDeleteAlert = () => {
@@ -44,6 +43,7 @@ function NameDeleteAlert({
           message: intl.get('the_receipt_has_been_deleted_successfully'),
           intent: Intent.SUCCESS,
         });
+        closeDrawer('receipt-detail-drawer');
       })
       .catch(() => {})
       .finally(() => {
@@ -74,4 +74,5 @@ function NameDeleteAlert({
 export default compose(
   withAlertStoreConnect(),
   withAlertActions,
+  withDrawerActions
 )(NameDeleteAlert);
diff --git a/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.js b/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.js
index eb2eae415..b6e17c191 100644
--- a/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.js
+++ b/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.js
@@ -34,18 +34,13 @@ function ReceiptDetailActionBar({
 
   // Handle edit sale receipt.
   const onEditReceipt = () => {
-    return receiptId
-      ? (history.push(`/receipts/${receiptId}/edit`),
-        closeDrawer('receipt-detail-drawer'))
-      : null;
+    history.push(`/receipts/${receiptId}/edit`);
+    closeDrawer('receipt-detail-drawer');
   };
 
   // Handle delete sale receipt.
   const onDeleteReceipt = () => {
-    return receiptId
-      ? (openAlert('receipt-delete', { receiptId }),
-        closeDrawer('receipt-detail-drawer'))
-      : null;
+    openAlert('receipt-delete', { receiptId });
   };
   // Handle print receipt.
   const onPrintReceipt = () => {