diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index f2daca7..d83631e 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -215,12 +215,13 @@ export const ProductComponent = observer((props) => {
     store.product.visibleModalFilterProduct = false;
   };
 
-  const handleCancelFilter = () => {
+  const handleCancelFilter = async () => {
     store.product.filterSubCategory = null;
     store.product.filterSupplier = null;
-    setFilterSubCategories([]);
-    setFilterSupplier([]);
+    // setFilterSubCategories([]);
+    // setFilterSupplier([]);
     store.product.visibleModalFilterProduct = false;
+    await store.product.getData();
   };
 
   const handleSubmitFilter = async () => {
@@ -471,10 +472,13 @@ export const ProductComponent = observer((props) => {
         visible={store.product.visibleModalFilterProduct}
         title={"Filter"}
         footer={footerLayoutFilter}
-        onCancel={() => {
-          setFilterSupplier([]);
-          setFilterSubCategories([]);
+        onCancel={async () => {
+          // setFilterSupplier([]);
+          // setFilterSubCategories([]);
+          store.product.filterSupplier = null;
+          store.product.filterSubCategory = null;
           store.product.visibleModalFilterProduct = false;
+          await store.product.getData();
         }}
       >
         <Row>
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 28b5b77..d1bcb5f 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -95,15 +95,22 @@ export const Membership = observer(() => {
   };
 
   const handleRemoveFilter = async () => {
+    store.membership.filterMembership = null;
+    store.membership.filterPartner = null;
     setFilterMembership([]);
     setFilterPartner([]);
     store.membership.visibleModalFilterMembership = false;
+    //await getData();
     await store.membership.getData();
   };
-  const handleCancelFilter = () => {
-    setFilterMembership([]);
-    setFilterPartner([]);
+  const handleCancelFilter = async () => {
+    store.membership.filterMembership = null;
+    store.membership.filterPartner = null;
+    // setFilterMembership([]);
+    // setFilterPartner([]);
     store.membership.visibleModalFilterMembership = false;
+    //await getData();
+    await store.membership.getData();
   };
 
   const handleSubmitFilter = async () => {
@@ -511,19 +518,23 @@ export const Membership = observer(() => {
         onCreate={async (data) => {
           onSubmit(data);
         }}
-        onCancel={() => {
+        onCancel={async () => {
           setInitialData({});
           setVisibleModal(false);
+          await store.membership.getData();
         }}
       />
       <Modal
         visible={store.membership.visibleModalFilterMembership}
         title={"Filter"}
         footer={footerLayoutFilter}
-        onCancel={() => {
-          setFilterMembership([]);
-          setFilterPartner([]);
+        onCancel={async() => {
+          // setFilterMembership([]);
+          // setFilterPartner([]);
+          store.membership.filterMembership = null;
+          store.membership.filterPartner = null;
           store.membership.visibleModalFilterMembership = false;
+          await store.membership.getData();
         }}
       >
         <Row>
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index 8c9f3fa..6fd9e47 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -64,11 +64,12 @@ export const Profile = observer(() => {
     store.transaction.visibleModalFilterTransaction = false;
   };
 
-  const handleCancelFilter = () => {
+  const handleCancelFilter = async() => {
     store.transaction.filterStart = null;
-    form.resetFields();
+    //form.resetFields();
     store.transaction.filterEnd = null;
     store.transaction.visibleModalFilterTransaction = false;
+    await store.transaction.getDataHistoryTransaction();
   };
 
   const handleSubmitFilter = async () => {
@@ -426,9 +427,12 @@ export const Profile = observer(() => {
         visible={store.transaction.visibleModalFilterTransaction}
         title={"Filter"}
         footer={footerLayoutFilter}
-        onCancel={() => {
-          form.resetFields();
+        onCancel={async() => {
+          //form.resetFields();
+          store.transaction.filterStart = null;
+          store.transaction.filterEnd = null;
           store.transaction.visibleModalFilterTransaction = false;
+          await store.transaction.getDataHistoryTransaction();
         }}
       >
         <Row>