Merge branch 'develop' into 'devops-production'

Bug Fix

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

src/pages/App/DesktopLayout.js

@@ -47,14 +47,7 @@ export const DesktopLayout = observer(() => {
   useEffect(() => {
     (async () => {
       modalLoader.setLoading(true);
-
+      await Promise.allSettled([store.authentication.getProfile()]);
-      await Promise.allSettled([
-        store.authentication.getProfile(),
-        store.transaction.getDataHistoryTransaction(),
-      ]);
-      await store.transaction.getDataHistoryTopUpProfile(
-        store.authentication.profileData?.id
-      );
       modalLoader.setLoading(false);
     })();
   }, []);
@@ -387,7 +380,6 @@ export const DesktopLayout = observer(() => {
         >
           {store.ui.mediaQuery.isMobile && (
             <div
-              className={store.ui.mediaQuery.isMobile ? "shadow" : null}
               style={{
                 top: 0,
                 left: 0,
@@ -513,10 +505,12 @@ export const DesktopLayout = observer(() => {
                   visible={clicked}
                   onVisibleChange={() => setClicked(!clicked)}
                 >
-                  {new Intl.NumberFormat("id-ID", {
+                  {store.authentication.userData.role !== "Admin" &&
+                    new Intl.NumberFormat("id-ID", {
                       style: "currency",
                       currency: "IDR",
                     }).format(store.authentication.profileData?.wallet || 0)}
+
                   <Button
                     size={"default"}
                     type={store.ui.mediaQuery.isDesktop ? "" : "link"}
@@ -570,6 +564,7 @@ export const DesktopLayout = observer(() => {
                   width: "100%",
                 }}
               ></div>
+              {store.authentication.userData.role !== "Admin" && (
                 <Card
                   size="small"
                   title={
@@ -592,6 +587,7 @@ export const DesktopLayout = observer(() => {
                     height: 31,
                   }}
                 ></Card>
+              )}
               <Popover
                 className={store.ui.mediaQuery.isDesktop ? "shadow" : null}
                 autoAdjustOverflow={true}