diff --git a/apps/OpenSign/src/components/AppendFormInForm.js b/apps/OpenSign/src/components/AppendFormInForm.js
index 47679d033..4f757e5bf 100644
--- a/apps/OpenSign/src/components/AppendFormInForm.js
+++ b/apps/OpenSign/src/components/AppendFormInForm.js
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from "react";
import Parse from "parse";
import axios from "axios";
+import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const";
const AppendFormInForm = (props) => {
const [name, setName] = useState("");
@@ -293,14 +294,16 @@ const AppendFormInForm = (props) => {
diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js
index a95f903bf..002686390 100644
--- a/apps/OpenSign/src/components/LoginGoogle.js
+++ b/apps/OpenSign/src/components/LoginGoogle.js
@@ -2,6 +2,8 @@ import React, { useState, useRef } from "react";
import Parse from "parse";
import jwtDecode from "jwt-decode";
import { useScript } from "../hook/useScript";
+import ModalUi from "../primitives/ModalUi";
+import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const";
/*
* `GoogleSignInBtn`as it's name indicates it render google sign in button
@@ -231,118 +233,94 @@ const GoogleSignInBtn = ({
)}
-
- {isModal && (
-
-
-
-
-
Sign up form
-
-
-
-
-
-
+
+
- )}
+
+
+
+ setUserDetails({
+ ...userDetails,
+ Company: e.target.value
+ })
+ }
+ required
+ />
+
+
+
+
+ setUserDetails({
+ ...userDetails,
+ Destination: e.target.value
+ })
+ }
+ required
+ />
+
+
+
+
+
+
+
);
};
diff --git a/apps/OpenSign/src/components/fields/SignersInput.js b/apps/OpenSign/src/components/fields/SignersInput.js
index af6016931..6cfb93dc0 100644
--- a/apps/OpenSign/src/components/fields/SignersInput.js
+++ b/apps/OpenSign/src/components/fields/SignersInput.js
@@ -147,6 +147,7 @@ const SignersInput = (props) => {
right: "auto",
bottom: "auto",
transform: "translate(-50%, -50%)",
+ border: "1px transparent",
padding: 0
},
overlay: {
@@ -158,18 +159,15 @@ const SignersInput = (props) => {
>
-
- Add Signer
-
-
diff --git a/apps/OpenSign/src/constant/const.js b/apps/OpenSign/src/constant/const.js
index b2401db56..4f7ded0f8 100644
--- a/apps/OpenSign/src/constant/const.js
+++ b/apps/OpenSign/src/constant/const.js
@@ -5,3 +5,5 @@ export const rejectBtn =
"bg-[#ffffff] rounded-sm shadow-md text-[12px] font-semibold uppercase text-black py-1.5 px-4 focus:outline-none text-center border-[1px] border-[#b4b4b4]";
export const submitBtn =
"bg-[#32a3ac] rounded-sm shadow-md text-[12px] font-semibold uppercase text-white py-1.5 px-4 focus:outline-none text-center";
+export const modalSubmitBtnColor = "#17a2b8";
+export const modalCancelBtnColor = "white";
diff --git a/apps/OpenSign/src/json/plansArr.json b/apps/OpenSign/src/json/plansArr.json
index 8d337fdb0..90ab47bdc 100644
--- a/apps/OpenSign/src/json/plansArr.json
+++ b/apps/OpenSign/src/json/plansArr.json
@@ -27,7 +27,7 @@
"planName": "THANKS PLAN",
"currency": "$",
"price": "29.99",
- "subtitle": "Use code 'FREEBETA' to get this for free(First 1000 users)",
+ "subtitle": "Use code
'FREEBETA' to get this for free(First 1000 users)",
"btnText": "Subscribe",
"url": "https://subscriptions.zoho.in/subscribe/ef798486e6a0a11ea65f2bae8f2af901dbadf3175d495584fd25b9af5d2f2b9e/thanks",
"target": "_self",
diff --git a/apps/OpenSign/src/routes/Form.js b/apps/OpenSign/src/routes/Form.js
index 0bf604eaa..1069753e6 100644
--- a/apps/OpenSign/src/routes/Form.js
+++ b/apps/OpenSign/src/routes/Form.js
@@ -148,6 +148,7 @@ const Forms = (props) => {
const dropboxCancel = async () => {};
const handleSubmit = async (e) => {
e.preventDefault();
+ e.stopPropagation();
setIsSubmit(true);
try {
const currentUser = Parse.User.current();
diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/routes/Login.js
index 53d349211..04c49ac2f 100644
--- a/apps/OpenSign/src/routes/Login.js
+++ b/apps/OpenSign/src/routes/Login.js
@@ -11,6 +11,8 @@ import GoogleSignInBtn from "../components/LoginGoogle";
import { NavLink, useNavigate, useLocation } from "react-router-dom";
import login_img from "../assets/images/login_img.svg";
import { useWindowSize } from "../hook/useWindowSize";
+import ModalUi from "../primitives/ModalUi";
+import { modalCancelBtnColor, modalSubmitBtnColor } from "../constant/const";
function Login(props) {
const navigate = useNavigate();
@@ -1131,100 +1133,76 @@ function Login(props) {
{state.toastDescription}
- {isModal && (
-
-
-
-
-
- Additional Info
-
-
-
-
-
-
-
+
+
- )}
+
+
+
+ setUserDetails({
+ ...userDetails,
+ Destination: e.target.value
+ })
+ }
+ required
+ />
+
+
+ handleSubmitbtn(e)}
+ style={{
+ marginRight: 10,
+ backgroundColor: modalSubmitBtnColor
+ }}
+ >
+ Login
+
+
+ Cancel
+
+
+
+
>
) : (
{
-
{item.subtitle}
+
+ {item.subtitle.includes("<") ? (
+
+ ) : (
+
{item.subtitle}
+ )}
+