Merge pull request #27 from NwinNwin/steven-feedback+modal

Steven feedback+modal
NwinNwin · Sep 20, 2023 · 8f762e0 · 8f762e0
2 parents 07094ed + e3d9caf
commit 8f762e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/components/InfoModal/InfoModal.jsx b/src/components/InfoModal/InfoModal.jsx
@@ -19,21 +19,21 @@ import ImageContainer from "../ImageContainer/ImageContainer";
 import FeedbackModal from "../FeedbackModal/FeedbackModal";
 import { LinkIcon, CheckIcon, EmailIcon, PhoneIcon } from "@chakra-ui/icons";
 
-export default function InfoModal({ setData, isOpen, onClose, onOpen, props }) {
+export default function InfoModal({ setData, isOpen, onClose, props }) {
   const [showEmail, setShowEmail] = useState(false);
   const { onLoginModalOpen } = useContext(DataContext);
   const { user } = UserAuth();
   const navigate = useNavigate();
   const feedbackModalDisclosure = useDisclosure();
   const currentEmail = user?.email;
-  
+
   // function viewEmail() {
   //   if (user) {
   //     setShowEmail(true);
   //   }
   // }
 
-  async function handleDelete() {
+  async function handleResolve() {
     feedbackModalDisclosure.onOpen();
   }
 
@@ -140,7 +140,7 @@ export default function InfoModal({ setData, isOpen, onClose, onOpen, props }) {
                         }
                       }}
                     >
-                      <PhoneIcon /> View Contact
+                      <EmailIcon /> View Contact
                     </Button>
                   ) : (
                     <Button size="lg" variant="outline" colorScheme="blue">
@@ -152,10 +152,10 @@ export default function InfoModal({ setData, isOpen, onClose, onOpen, props }) {
                     colorScheme="green"
                     size={"lg"}
                     gap={2}
-                    onClick={handleDelete}
+                    onClick={handleResolve}
                     isDisabled={props.isresolved ? true : false}
                   >
-                      {currentEmail === props.email ? <CheckIcon /> Resolve : <EmailIcon /> View Contact}
+                    <CheckIcon /> Resolve
                   </Button>
                 )}
                 <Button

diff --git a/src/components/ResultCard/ResultCard.jsx b/src/components/ResultCard/ResultCard.jsx
@@ -82,7 +82,6 @@ export default function ResultCard({ props, setData, onResultsBarClose }) {
       {(infoModalDisclosure.isOpen || id) && (
         <InfoModal
           props={props}
-          onOpen={infoModalDisclosure.onOpen}
           onClose={infoModalDisclosure.onClose}
           isOpen={id === props.id.toString() ? true: infoModalDisclosure.isOpen}
           setData={setData}