Merge branch 'develop' into 'devops-staging'

Bug Fixing

See merge request empatnusabangsa/ppob/ppob-frontend!120

src/pages/App/DesktopLayout.js

@@ -312,16 +312,14 @@ export const DesktopLayout = observer(() => {
                       </Link>
                     </Menu.Item>
                   )}
-                  {store.authentication.userData.role !== "Admin" ||
+                  {store.authentication.userData.role !== "Admin" && (
-                    (store.authentication.userData.role !==
-                      "Customer Service" && (
                       <Menu.Item key="payback-from-user">
                         <Link to={LINKS.PAYBACK_CREATED}>
                           <AlipayOutlined />
                           <span>Dibuat oleh Saya</span>
                         </Link>
                       </Menu.Item>
-                    ))}
+                    )}
                 </SubMenu>
               )}
               {store.authentication.userData.role !== "Admin" && (

src/pages/App/MenuList.js

@@ -242,15 +242,14 @@ export const MenuList = observer((props) => {
               </Link>
             </Menu.Item>
           )}
-          {store.authentication.userData.role !== "Admin" ||
+          {store.authentication.userData.role !== "Admin" && (
-            (store.authentication.userData.role !== "Customer Service" && (
               <Menu.Item key="payback-from-user">
                 <Link to={LINKS.PAYBACK_CREATED}>
                   <FileProtectOutlined />
                   <span>Dibuat oleh Saya</span>
                 </Link>
               </Menu.Item>
-            ))}
+            )}
         </SubMenu>
       )}
       {store.authentication.userData.role !== "Admin" && (

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);
                   }}
                 >
                   <FilterOutlined />