diff --git a/microfrontends/SignDocuments/src/Component/component/modalComponent.js b/microfrontends/SignDocuments/src/Component/component/modalComponent.js index f7a293712..589c5a2ba 100644 --- a/microfrontends/SignDocuments/src/Component/component/modalComponent.js +++ b/microfrontends/SignDocuments/src/Component/component/modalComponent.js @@ -2,13 +2,11 @@ import React from "react"; import Modal from "react-bootstrap/Modal"; import ModalHeader from "react-bootstrap/esm/ModalHeader"; -function ModalComponent({ isShow, type,setIsShowEmail }) { +function ModalComponent({ isShow, type, setIsShowEmail }) { return ( - {type === "pdfFail" ? ( - Failed to load pdf! - ) : type === "signersAlert" ? ( + {type === "signersAlert" ? ( Select signers ) : ( Document Expired! @@ -16,27 +14,26 @@ function ModalComponent({ isShow, type,setIsShowEmail }) { - {type === "pdfFail" ? ( -

Something went wrong failed to load pdf file!

- ) : type === "signersAlert" ? ( + {type === "signersAlert" ? (

Please select signer for add placeholder!

) : (

This Document is no longer available.

)}
+ {type === "signersAlert" &&( + Ok + )}
); diff --git a/microfrontends/SignDocuments/src/Component/login.js b/microfrontends/SignDocuments/src/Component/login.js index ba2f9d99e..c892e7225 100644 --- a/microfrontends/SignDocuments/src/Component/login.js +++ b/microfrontends/SignDocuments/src/Component/login.js @@ -8,7 +8,7 @@ import { useEffect } from "react"; import { useNavigate } from "react-router-dom"; // import { useHistory } from "react-router-dom/cjs/react-router-dom.min"; function Login() { - const { id, userMail, serverUrl } = useParams(); + const { id, userMail,contactBookId, serverUrl } = useParams(); let navigate = useNavigate(); // const history = useHistory(); @@ -137,7 +137,7 @@ function Login() { setLoading(false); //navigate user to on signature page // history.push(`/recipientSignPdf/${id}/${_user.phone}`); - navigate(`/recipientSignPdf/${id}/${_user.phone}`); + navigate(`/recipientSignPdf/${id}/${contactBookId}`); } } catch (error) {} } else { diff --git a/microfrontends/SignDocuments/src/Component/placeHolderSign.js b/microfrontends/SignDocuments/src/Component/placeHolderSign.js index f596425d0..fbc366151 100644 --- a/microfrontends/SignDocuments/src/Component/placeHolderSign.js +++ b/microfrontends/SignDocuments/src/Component/placeHolderSign.js @@ -740,12 +740,12 @@ function PlaceHolderSign() { }; const serverUrl = localStorage.getItem("baseUrl"); const newServer = serverUrl.replaceAll("/", "%2F"); - + const objectId = signerMail[i].objectId; const serverParams = `${newServer}&${localStorage.getItem( "parseAppId" )}&${localStorage.getItem("_appName")}`; - let signPdf = `https://qik-ai-org.github.io/Sign-MicroappV2/#/login/${signersdata.objectId}/${signerMail[i].Email}/${serverParams}`; + let signPdf = `https://qik-ai-org.github.io/Sign-MicroappV2/#/login/${signersdata.objectId}/${signerMail[i].Email}/${objectId}/${serverParams}`; const themeBGcolor = themeColor(); let params = { @@ -1025,7 +1025,7 @@ function PlaceHolderSign() {