Merge branch 'develop' into 'devops-staging'

Bug Fixing

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

src/pages/App/DesktopLayout.js

@@ -24,7 +24,8 @@ import {
   AppstoreOutlined,
   DollarCircleOutlined,
   UsergroupAddOutlined,
-  UnorderedListOutlined
+  UnorderedListOutlined,
+  FormOutlined
 } from "@ant-design/icons";
 import { AppRoute, LINKS } from "../../routes/app";
 import { useStore } from "../../utils/useStore";
@@ -158,7 +159,7 @@ export const DesktopLayout = observer(() => {
                   </Menu.Item>
                   <Menu.Item key="konfirmasi">
                     <Link to={LINKS.KONFIRMASI}>
-                      <IdcardOutlined />
+                      <FormOutlined />
                       <span>Konfirmasi Retail</span>
                     </Link>
                   </Menu.Item>

src/pages/App/MenuList.js

@@ -23,6 +23,7 @@ import {
   PieChartOutlined,
   UsergroupAddOutlined,
   UnorderedListOutlined,
+  FormOutlined,
 } from "@ant-design/icons";
 import { observer } from "mobx-react-lite";
 import { useStore } from "../../utils/useStore";
@@ -85,7 +86,7 @@ export const MenuList = observer((props) => {
           </Menu.Item>
           <Menu.Item key="konfirmasi">
             <Link to={LINKS.KONFIRMASI}>
-              <IdcardOutlined />
+              <FormOutlined />
               <span>Konfirm Retail</span>
             </Link>
           </Menu.Item>

src/pages/Membership/Konfirmasi.js

@@ -110,8 +110,8 @@ export const Konfirmasi = observer(() => {
             setToko(record);
             setVisibleModalToko(true);
           }}
-          // style={{backgroundColor:"cyan",color:"white"}}
-          type="primary"
+          style={{backgroundColor:"#7c3ea3",color:"white"}}
+          // type="primary"
         >
           Lihat Foto
         </Button>
@@ -630,7 +630,7 @@ export const Konfirmasi = observer(() => {
                 style={
                   store.ui.mediaQuery.isDesktop
                     ? {
-                        width: "29vw",
+                        width: "22vw",
                         borderColor: "salmon",
                         marginLeft: "10px",
                       }
@@ -641,7 +641,7 @@ export const Konfirmasi = observer(() => {
                       }
                 }
               >
-                <Image src={`${gmbr.mobil}`} alt={idx} />
+                <Image src={`${gmbr.mobil}`} alt={idx} preview={false}/>
               </Card>
             ))}
           </Row>