From 859bf200cac43fed4ed8cf50240bc148125e8d8e Mon Sep 17 00:00:00 2001
From: "ajat91.sudrajat" <ajat91.sudrajat@gmail.com>
Date: Thu, 27 Jan 2022 12:12:27 +0700
Subject: [PATCH] Bug Fixing

---
 src/pages/Membership/DetailUser.js | 63 +++++++++++++++++-------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/pages/Membership/DetailUser.js b/src/pages/Membership/DetailUser.js
index ca191eb..5e411a9 100644
--- a/src/pages/Membership/DetailUser.js
+++ b/src/pages/Membership/DetailUser.js
@@ -469,9 +469,11 @@ export const DetailUser = observer(() => {
                 Ganti Password
               </Button>
               {((store.authentication.userData.role === "Sales" &&
-                store.membership.dataDetail.is_rejected === true) ||
+                store.membership.dataDetail.is_rejected === true &&
+                store.membership.dataDetail.is_active === false) ||
                 (store.authentication.userData.role === "Supervisor" &&
-                  store.membership.dataDetail.is_rejected === true)) && (
+                  store.membership.dataDetail.is_rejected === true &&
+                  store.membership.dataDetail.is_active === false)) && (
                 <Button
                   style={{
                     backgroundColor: "#1bb91d",
@@ -566,19 +568,21 @@ export const DetailUser = observer(() => {
                         <Text strong>Foto Toko</Text>
                         <Text>
                           <Row>
-                            {store.authentication.listImage?store.authentication.listImage.map(
-                              (item, index) => (
-                                <Image
-                                  key={index}
-                                  src={
-                                    item
-                                      ? `${appConfig.apiUrl}/config/image/${item}`
-                                      : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
-                                  }
-                                  style={{ width: "10vw", marginRight: 15 }}
-                                />
-                              )
-                            ) : ""}
+                            {store.authentication.listImage
+                              ? store.authentication.listImage.map(
+                                  (item, index) => (
+                                    <Image
+                                      key={index}
+                                      src={
+                                        item
+                                          ? `${appConfig.apiUrl}/config/image/${item}`
+                                          : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
+                                      }
+                                      style={{ width: "10vw", marginRight: 15 }}
+                                    />
+                                  )
+                                )
+                              : ""}
                           </Row>
                         </Text>
                       </Col>
@@ -608,17 +612,21 @@ export const DetailUser = observer(() => {
                     <Text strong>Foto Toko</Text>
                     <Text>
                       <Row>
-                        {store.authentication.listImage?store.authentication.listImage.map((item, index) => (
-                          <Image
-                            key={index}
-                            src={
-                              item
-                                ? `${appConfig.apiUrl}/config/image/${item}`
-                                : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
-                            }
-                            style={{ width: "10vw", marginRight: 15 }}
-                          />
-                        )):""}
+                        {store.authentication.listImage
+                          ? store.authentication.listImage.map(
+                              (item, index) => (
+                                <Image
+                                  key={index}
+                                  src={
+                                    item
+                                      ? `${appConfig.apiUrl}/config/image/${item}`
+                                      : "https://st4.depositphotos.com/14953852/24787/v/600/depositphotos_247872612-stock-illustration-no-image-available-icon-vector.jpg"
+                                  }
+                                  style={{ width: "10vw", marginRight: 15 }}
+                                />
+                              )
+                            )
+                          : ""}
                       </Row>
                     </Text>
                   </Col>
@@ -815,7 +823,8 @@ export const DetailUser = observer(() => {
                                 description={
                                   <div style={{}}>
                                     <p>
-                                    <small>Pembeli : {item.buyer}</small> <br />
+                                      <small>Pembeli : {item.buyer}</small>{" "}
+                                      <br />
                                       <small>Price : {item.price}</small> <br />
                                       <small>
                                         Tujuan : {item.transaction_destination}