diff --git a/src/component/CategoryComponent.js b/src/component/CategoryComponent.js
index 3a5610f..ffeda10 100644
--- a/src/component/CategoryComponent.js
+++ b/src/component/CategoryComponent.js
@@ -34,32 +34,6 @@ export const CategoryComponent = observer((props) => {
       dataIndex: "name",
       key: "name",
     },
-    // {
-    //     title: "Gangguan",
-    //     dataIndex: "status",
-    //     key: "status",
-    //     render: (text, record) => (
-    //         <Tag
-    //             color={record?.status === "ACTIVE" ? "blue" : "#E3E8EE"}
-    //             style={{color: "#4F566B"}}
-    //         >
-    //             {capitalize(record?.status)}
-    //         </Tag>
-    //     ),
-    // },
-    // {
-    //     title: "Tersedia",
-    //     dataIndex: "tersedia",
-    //     key: "tersedia",
-    //     render: (text, record) => (
-    //         <Tag
-    //             color={record?.status === "ACTIVE" ? "blue" : "#E3E8EE"}
-    //             style={{color: "#4F566B"}}
-    //         >
-    //             {record?.status === "ACTIVE" ? " Ya" : "Tidak"}
-    //         </Tag>
-    //     ),
-    // },
     {
       title: "Action",
       key: "action",
diff --git a/src/component/ProductComponent.js b/src/component/ProductComponent.js
index a942cb0..5af5ac9 100644
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@@ -79,23 +79,16 @@ export const ProductComponent = observer((props) => {
           currency: "IDR",
         }).format(text),
     },
-    // {
-    //     title: "Gangguan",
-    //     dataIndex: "status",
-    //     key: "status",
-    //     render: (text, record) => (
-    //         <Tag
-    //             color={record?.status === "ACTIVE" ? "blue" : "#E3E8EE"}
-    //             style={{color: "#4F566B"}}
-    //         >
-    //             {capitalize(record?.status)}
-    //         </Tag>
-    //     ),
-    // },
     {
       title: "Supplier",
-      dataIndex: "supplier",
-      key: "supplier",
+      dataIndex: "supplier_name",
+      key: "supplier_name",
+      
+    },
+    {
+      title: "Sub Category",
+      dataIndex: "sub_categories_name",
+      key: "sub_categories_name",
     },
     {
       title: "Tersedia",
@@ -128,6 +121,8 @@ export const ProductComponent = observer((props) => {
     },
   ];
   if (store.authentication.userData.role !== "Admin") columns.pop();
+  //if (store.authentication.userData.role !== "Admin") columns.shift();
+  if (store.authentication.userData.role !== "Admin") delete columns[4];
   const deleteData = async (id) => {
     try {
       console.log(id);
diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index 9607112..c0afcee 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -143,7 +143,7 @@ export const DetailUser = observer(() => {
     },
     {
       route: LINKS.USER_DETAIL,
-      name: <span style={{ fontWeight: "bold" }}>Detail User</span>,
+      name: <span style={{ fontWeight: "bold" }}>Detail Anggota</span>,
     },
   ];
 
diff --git a/src/pages/Membership/Membership.js b/src/pages/Membership/Membership.js
index e0db3b2..1b8b73e 100644
--- a/src/pages/Membership/Membership.js
+++ b/src/pages/Membership/Membership.js
@@ -1,13 +1,27 @@
-import React, {useContext, useEffect, useState} from "react";
-import {Button, Card, Col, Divider, Form, InputNumber, List, message, Modal, Row, Space, Table, Tag} from "antd";
-import {useStore} from "../../utils/useStore";
-import {observer} from "mobx-react-lite";
-import {DownloadOutlined, PlusSquareOutlined} from "@ant-design/icons";
-import {MembershipModal} from "./MembershipModal";
-import {BreadcumbComponent} from "../../component/BreadcumbComponent";
-import {LINKS} from "../../routes/app";
-import {useHistory} from "react-router-dom";
-import {ModalLoaderContext} from "../../utils/modal";
+import React, { useContext, useEffect, useState } from "react";
+import {
+  Button,
+  Card,
+  Col,
+  Divider,
+  Form,
+  InputNumber,
+  List,
+  message,
+  Modal,
+  Row,
+  Space,
+  Table,
+  Tag,
+} from "antd";
+import { useStore } from "../../utils/useStore";
+import { observer } from "mobx-react-lite";
+import { DownloadOutlined, PlusSquareOutlined } from "@ant-design/icons";
+import { MembershipModal } from "./MembershipModal";
+import { BreadcumbComponent } from "../../component/BreadcumbComponent";
+import { LINKS } from "../../routes/app";
+import { useHistory } from "react-router-dom";
+import { ModalLoaderContext } from "../../utils/modal";
 
 export const Membership = observer(() => {
   const history = useHistory();
@@ -129,75 +143,11 @@ export const Membership = observer(() => {
           currency: "IDR",
         }).format(text),
     },
-    {
-      title: "Status",
-      dataIndex: "isActive",
-      key: "isActive",
-      render: (text, record) => (
-        <Tag
-          color={record?.isActive === true ? "processing" : "#E3E8EE"}
-          style={{ color: "#4F566B" }}
-        >
-          {record?.isActive === true ? " ACTIVE" : "INACTIVE"}
-        </Tag>
-      ),
-    },
     {
       title: "Action",
       key: "action",
       render: (text, record) => (
         <Space size="middle">
-          {/* {store.authentication.userData.role === "Admin" && */}
-           <Button
-                  type={record?.isActive === true ? "danger" : "primary"}
-                  onClick={() => changeStatus(record?.id, record?.isActive)}
-              >
-                  {record?.isActive === true ? "Inactive" : "Active"}
-              </Button>
-              {/* } */}
-              {/* <Button
-                  onClick={() => {
-                      setDestination(record?.id);
-                      console.log(record?.id);
-                      setIsVisibleTopUpModal(true);
-                  }}
-              >
-                  <DownloadOutlined/> Top Up Saldo
-              </Button> */}
-              {/* {store.authentication.userData.role === "Admin" &&  */}
-              <Button
-                  onClick={() => {
-                      let record2 = record;
-                      delete record2.password;
-                      record2.isChangePassword = false;
-
-                      setInitialData({
-                          ...record2,
-                          // roleId: record.roles.id,
-                      });
-                      setVisibleModal(true);
-                  }}
-              >
-                  Edit
-              </Button>
-              {/* }
-              {store.authentication.userData.role === "Admin" && */}
-               <Button
-                  onClick={() => {
-                      let record2 = record;
-                      delete record2.password;
-                      record2.isChangePassword = true;
-
-                      setInitialData({
-                          ...record2,
-                          // roleId: record.roles.id,
-                      });
-                      setVisibleModal(true);
-                  }}
-              >
-                  Ganti Password
-              </Button>
-              {/* } */}
           <Button
             onClick={() => {
               setDestination(record?.id);
@@ -207,18 +157,15 @@ export const Membership = observer(() => {
           >
             <DownloadOutlined /> Top Up Saldo
           </Button>
-          {/* {store.authentication.userData.role === "Admin" && ( */}
-            <Button
-              onClick={async () => {
-                await store.transaction.getDataHistoryTopUp(record.id);
-                history.push(LINKS.USER_DETAIL.replace(":id", record.id));
-                console.log(record.id);
-              }}
-            >
-              Detail
-            </Button>
-          {/* ) */}
-          {/* } */}
+          <Button
+            onClick={async () => {
+              await store.transaction.getDataHistoryTopUp(record.id);
+              history.push(LINKS.USER_DETAIL.replace(":id", record.id));
+              console.log(record.id);
+            }}
+          >
+            Detail
+          </Button>
         </Space>
       ),
     },
@@ -264,7 +211,7 @@ export const Membership = observer(() => {
       setConfirmLoading(true);
       modalLoader.setLoading(true);
       try {
-        const response=await store.membership.create(data);
+        const response = await store.membership.create(data);
         response?.body?.statusCode === 201 || response?.body?.statusCode === 200
           ? message.success("Berhasil Tambah Member Baru")
           : message.error("Gagal Tambah Member Baru");
@@ -319,11 +266,11 @@ export const Membership = observer(() => {
               dataSource={store.membership.data}
               bordered
               pagination={{
-                  pageSize: store.membership.pageSize,
-                  total: store.membership.totalData,
-                  current: store.membership.page + 1,
-                  showSizeChanger: true,
-                  simple: false,
+                pageSize: store.membership.pageSize,
+                total: store.membership.totalData,
+                current: store.membership.page + 1,
+                showSizeChanger: true,
+                simple: false,
               }}
               onChange={async (page) => {
                 let pageNumber = page.current;
@@ -341,17 +288,17 @@ export const Membership = observer(() => {
               itemLayout="horizontal"
               position={"top"}
               pagination={{
-                  onChange: async (page) => {
-                      store.membership.pageSize = page.pageSize;
-                      store.membership.page = page.current - 1;
-                      modalLoader.setLoading(true);
-                      await getData();
-                      modalLoader.setLoading(false);
-                  },
-                  pageSize: store.membership.pageSize,
-                  total: store.membership.totalData,
-                  current: store.membership.page + 1,
-                  style: {marginBottom: "1rem", marginRight: "1rem"},
+                onChange: async (page) => {
+                  store.membership.pageSize = page.pageSize;
+                  store.membership.page = page.current - 1;
+                  modalLoader.setLoading(true);
+                  await getData();
+                  modalLoader.setLoading(false);
+                },
+                pageSize: store.membership.pageSize,
+                total: store.membership.totalData,
+                current: store.membership.page + 1,
+                style: { marginBottom: "1rem", marginRight: "1rem" },
               }}
               dataSource={store.membership.data}
               style={{ padding: 0 }}