@bjsdistribution/dms-client-return 0.0.17 → 0.0.18

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.17",
+  "version": "0.0.18",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-daily-overview/return-order-table/return-orders-filters/returnstyles.ts

@@ -292,6 +292,7 @@ export const StyledTable = styled.table`
         border: 1px solid rgba(0, 0, 0, 0.08);
         border-right: none;
         border-left: none;
+        position: relative;
         .actionbox {
           display: flex;
           gap: 5px;

package/src/components/order-view/modalsPopup/ModalManager.tsx

@@ -49,7 +49,7 @@ const ModalManager = () => {
   const [, setNewPayload] = useNewReturnPayload();
   const [, setGrouped] = useGroupedPayload();
   const [, setSelectAll] = useSelectAll();
-  const [forCheck, setStateCheck] = useState(false);
+  // const [forCheck, setStateCheck] = useState(false);
 
   console.log(orderProduct, 'abcabcabcabcabcabcabcabcabcabcabc');
 
@@ -243,6 +243,7 @@ const ModalManager = () => {
   }, [updateResponse]);
 
   //Confirm return popup
+  // Confirm return popup
   const {
     data: response,
     setShouldPerformAction,
@@ -261,28 +262,32 @@ const ModalManager = () => {
   }, [confirmLoading]);
 
   console.log(response, 'response');
+  console.log(newGrouped, 'newGrouped');
 
   const handleConfirmReturn = () => {
     setShouldPerformAction(false);
-    setStateCheck(!forCheck);
-    if (newGrouped.length > 0) {
+
+    if (newGrouped?.length > 0) {
       setShouldPerformAction(true);
     } else {
       setShouldPerformAction(false);
     }
+
     dispatch({ type: 'close' });
   };
 
   useEffect(() => {
-    dispatch({ type: 'close' });
-    setNewGrouped([]);
-    setSelectedReturnOrder([]);
-    setCheck([]);
-    setNewPayload([]);
-    setGrouped([]);
-    setShouldPerformAction(false);
-    setSelectAll(false);
-  }, [response, forCheck]);
+    if (response && !response) {
+      dispatch({ type: 'close' });
+      setNewGrouped([]);
+      setSelectedReturnOrder([]);
+      setCheck([]);
+      setNewPayload([]);
+      setGrouped([]);
+      setShouldPerformAction(false);
+      setSelectAll(false);
+    }
+  }, [response]);
 
   return (
     <>