diff --git a/src/pages/App/DesktopLayout.js b/src/pages/App/DesktopLayout.js
index 884d31b..6a7332b 100644
--- a/src/pages/App/DesktopLayout.js
+++ b/src/pages/App/DesktopLayout.js
@@ -312,16 +312,14 @@ export const DesktopLayout = observer(() => {
)}
- {store.authentication.userData.role !== "Admin" ||
- (store.authentication.userData.role !==
- "Customer Service" && (
+ {store.authentication.userData.role !== "Admin" && (
Dibuat oleh Saya
- ))}
+ )}
)}
{store.authentication.userData.role !== "Admin" && (
diff --git a/src/pages/App/MenuList.js b/src/pages/App/MenuList.js
index 031d504..8cec5e6 100644
--- a/src/pages/App/MenuList.js
+++ b/src/pages/App/MenuList.js
@@ -242,15 +242,14 @@ export const MenuList = observer((props) => {
)}
- {store.authentication.userData.role !== "Admin" ||
- (store.authentication.userData.role !== "Customer Service" && (
+ {store.authentication.userData.role !== "Admin" && (
Dibuat oleh Saya
- ))}
+ )}
)}
{store.authentication.userData.role !== "Admin" && (
diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js
index c5e0e32..eab0725 100644
--- a/src/pages/Profile/Profile.js
+++ b/src/pages/Profile/Profile.js
@@ -36,6 +36,7 @@ export const Profile = observer(() => {
const modalLoader = useContext(ModalLoaderContext);
const [filterStart, setFilterStart] = useState([]);
const [filterEnd, setFilterEnd] = useState([]);
+ const [action, setAction] = useState(false);
const routeData = [
{
@@ -58,19 +59,18 @@ export const Profile = observer(() => {
useEffect(() => {
(async () => {
modalLoader.setLoading(true);
+
await Promise.allSettled([
store.authentication.getProfile(),
store.transaction.getDataHistoryTransaction(),
- store.transaction.getDataHistoryTopUpProfile(
- store.authentication.profileData?.id
-
- ),
]);
+ await store.transaction.getDataHistoryTopUpProfile(
+ store.authentication.profileData?.userDetail?.id
+ );
modalLoader.setLoading(false);
})();
}, []);
-
const handleRemoveFilter = async () => {
store.transaction.filterStart = null;
store.transaction.filterEnd = null;
@@ -399,6 +399,7 @@ export const Profile = observer(() => {
style={{ marginBottom: "1rem", marginLeft: 5 }}
onClick={() => {
store.transaction.visibleModalFilterTransaction = true;
+ setAction(true);
}}
>