diff --git a/src/component/PartnerComponent.js b/src/component/PartnerComponent.js
index d08a8e5..f80a61b 100644
--- a/src/component/PartnerComponent.js
+++ b/src/component/PartnerComponent.js
@@ -23,6 +23,7 @@ export const PartnerComponent = observer((props) => {
   const { Option } = Select;
   const history = useHistory();
   const [idData, setIdData] = useState("");
+  const [isChangePassword, setIsChangePassword] = useState(false);
   const [confirmLoading, setConfirmLoading] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
 
@@ -62,6 +63,19 @@ export const PartnerComponent = observer((props) => {
       npwp: data.npwp,
       address: data.address,
     });
+    setIsChangePassword(false);
+    store.partner.visibleModalPartner = true;
+    setIdData(data.id);
+  };
+
+  const changePassword = (data) => {
+    // form.setFieldsValue({
+    //   name: data.name,
+    //   npwp: data.npwp,
+    //   address: data.address,
+
+    // });
+    setIsChangePassword(true);
     store.partner.visibleModalPartner = true;
     setIdData(data.id);
   };
@@ -89,8 +103,7 @@ export const PartnerComponent = observer((props) => {
       render: (text, record) => (
         <Tag
           color={record?.status === true ? "processing" : "#E3E8EE"}
-          style={{ color: "#4F566B", cursor: 'pointer' }}
-          onClick={() => changeStatus(record?.id, record?.status)}
+          style={{ color: "#4F566B", cursor: "pointer" }}
         >
           {record?.status === true ? " ACTIVE" : "INACTIVE"}
         </Tag>
@@ -101,25 +114,19 @@ export const PartnerComponent = observer((props) => {
       key: "action",
       render: (text, record) => (
         <Space size="middle">
+          <Button onClick={() => changeStatus(record?.id, record?.status)}>
+            {record?.status === true ? "Inactive" : "Active"}
+          </Button>
           <Button onClick={() => handleEditButton(record)}>Edit</Button>
-          <Button onClick={() => handleDelete(record.id)}>Delete</Button>
+          {/* <Button onClick={() => handleDelete(record.id)}>Delete</Button> */}
+          <Button onClick={() => changePassword(record)}>
+            Change Password
+          </Button>
         </Space>
       ),
     },
   ];
 
-//   const handleEditStatus = async (id)=>{
-//     try {
-//         console.log(id);
-//         await store.partner.delete(id);
-//         message.success("Data Berhasil Dihapus");
-//         history.push(LINKS.PARTNER);
-//       } catch (err) {
-//         console.log("error", err);
-//         message.error("Gagal menghapus");
-//       }
-//   }
-
   const deleteData = async (id) => {
     try {
       console.log(id);
@@ -132,7 +139,6 @@ export const PartnerComponent = observer((props) => {
     }
   };
 
-
   const handleDelete = (id) => {
     Modal.confirm({
       title: "Are you sure delete this record?",
@@ -160,10 +166,10 @@ export const PartnerComponent = observer((props) => {
       setConfirmLoading(true);
       try {
         await store.partner.update(idData, data);
-        message.success("Success Update Data Partner");
+        message.success(isChangePassword ? "Failed Change Partner Password" : "Success Update Data Partner");
         //await store.partner.getData()
       } catch (e) {
-        message.error("Failed Update Data Partner");
+        message.error(isChangePassword ? "Failed Change Partner Password" : "Failed Update Data Partner");
       }
       setConfirmLoading(false);
       store.partner.visibleModalPartner = false;
@@ -211,7 +217,13 @@ export const PartnerComponent = observer((props) => {
 
       <Modal
         visible={store.partner.visibleModalPartner}
-        title={idData ? "Edit Partner" : "Create a new partner"}
+        title={
+          isChangePassword
+            ? "Change Member Password"
+            : idData
+            ? "Edit Partner"
+            : "Create a new partner"
+        }
         okText={idData ? "Edit" : "Create"}
         cancelText="Cancel"
         onCancel={() => {
@@ -232,60 +244,65 @@ export const PartnerComponent = observer((props) => {
         }}
       >
         <Form form={form} layout="vertical">
-          <Form.Item
-            name="name"
-            label="Name"
-            rules={[
+          {!isChangePassword && (
+            <Form.Item
+              name="name"
+              label="Name"
+              rules={[
                 idData
                   ? { required: false }
-                  : { required: true, message: "Please input password name!" }]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            name="owner"
-            label="Owner"
-            rules={[
-              idData
-                ? { required: false }
-                : { required: true, message: "Please input name!" }
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            name="password_account"
-            label="Password Account"
-            rules={[
-              idData
-                ? { required: false }
-                : { required: true, message: "Please input password account!" }
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            name="npwp"
-            label="Npwp"
-            rules={[
-              idData
-                ? { required: false }
-                : { required: true, message: "Please input npwp!" }
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            name="address"
-            label="address"
-            rules={[
-              idData
-                ? { required: false }
-                : { required: true, message: "Please input password address!" }
-            ]}
-          >
-            <Input />
-          </Form.Item>
+                  : { required: true, message: "Please input password name!" },
+              ]}
+            >
+              <Input />
+            </Form.Item>
+          )}
+          {((idData && isChangePassword) || !idData) && (
+            <Form.Item
+              name="password_account"
+              label="Password Account"
+              rules={[
+                idData
+                  ? { required: false }
+                  : {
+                      required: true,
+                      message: "Please input password account!",
+                    },
+              ]}
+            >
+              <Input />
+            </Form.Item>
+          )}
+
+          {!isChangePassword && (
+            <>
+              <Form.Item
+                name="npwp"
+                label="Npwp"
+                rules={[
+                  idData
+                    ? { required: false }
+                    : { required: true, message: "Please input npwp!" },
+                ]}
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item
+                name="address"
+                label="address"
+                rules={[
+                  idData
+                    ? { required: false }
+                    : {
+                        required: true,
+                        message: "Please input password address!",
+                      },
+                ]}
+              >
+                <Input />
+              </Form.Item>
+            </>
+          )}
         </Form>
       </Modal>
     </div>
diff --git a/src/pages/Config/Partner.js b/src/pages/Config/Partner.js
index f6ca7c3..0fb2f57 100644
--- a/src/pages/Config/Partner.js
+++ b/src/pages/Config/Partner.js
@@ -51,10 +51,10 @@ export const Partner = observer(() => {
             <Card>
                 <Row style={{marginBottom: 20}}>
                     <Col span={12}>
-                        <Button>
+                        {/* <Button>
                             <FilterOutlined/>
                             Filter
-                        </Button>
+                        </Button> */}
                     </Col>
                     <Col span={12} style={{textAlign: "right"}}>
                         <Search
@@ -70,20 +70,7 @@ export const Partner = observer(() => {
                         </Button>
                     </Col>
                 </Row>
-                <Tabs
-                    //onChange={handleChangeTabPane}
-                    size="default"
-                    tabBarGutter="50"
-                >
-                    
-                        <TabPane
-                            tab="Partner"
-                            key="1"
-                        >
-                            <PartnerComponent/>
-                        </TabPane>
-                    ))
-                </Tabs>
+                <PartnerComponent />
             </Card>
         </div>
     );
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index 9e74cfb..d27c4f0 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -167,7 +167,11 @@ export const Membership = observer(() => {
         );
         await store.membership.getData();
       } catch (e) {
-        message.error("Failed Update Data Member");
+        message.error(
+          initialData.isChangePassword
+            ? "Failed Update Member Password"
+            : "Failed Update Data Member"
+        );
       }
       setConfirmLoading(false);
       setVisibleModal(false);
diff --git a/src/pages/Membership/MembershipModal.js b/src/pages/Membership/MembershipModal.js
index f59929b..6eb78b4 100644
--- a/src/pages/Membership/MembershipModal.js
+++ b/src/pages/Membership/MembershipModal.js
@@ -17,7 +17,13 @@ export const MembershipModal = ({
   return (
     <Modal
       visible={visible}
-      title={initialData.id ? "Edit Member" : "Create a new Membership"}
+      title={
+        initialData.isChangePassword
+          ? "Change Member Password"
+          : initialData.id
+          ? "Edit Member"
+          : "Create a new Membership"
+      }
       okText={initialData.id ? "Edit" : "Create"}
       cancelText="Cancel"
       onCancel={() => {