From c5ddfa221aa5298ccbae5d4736d7dd165a239cb9 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 20 Jan 2024 22:17:57 -0600
Subject: [PATCH 01/24] more

---
 src/Constants/Copy/howToSteps.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Constants/Copy/howToSteps.js b/src/Constants/Copy/howToSteps.js
index 3b33760..2aa7799 100644
--- a/src/Constants/Copy/howToSteps.js
+++ b/src/Constants/Copy/howToSteps.js
@@ -12,17 +12,16 @@ export const Steps = () => (
         information -- case name, case number, parties, etc. -- and click “Save
         Case”. The modal will close, returning you to the{" "}
         <strong>Case View.</strong>
-      </li>
-      <li>
         On the newly-created case info card, click the “View” button (far right)
         to navigate to its <strong>Case Details View.</strong> Click “Upload
         Document” to surface the Document Upload Modal.
       </li>
       <li>
-        <strong>UPLOAD A DOCUMENT: </strong>On the Document Upload Modal, enter
-        the document title, i.e. “Defendant’s Interrogatories,” and (optionally)
-        the date served. Drag and drop or click to select the request document
-        from your files. <em>The document must be in .pdf format.</em>
+        <strong>UPLOAD YOUR DOCUMENT: </strong>On the Document Upload Modal,
+        enter the document title, i.e. “Defendant’s Interrogatories,” and
+        (optionally) the date served. Drag and drop or click to select the
+        request document from your files.{" "}
+        <em>The document must be in .pdf format.</em>
         <br />{" "}
         <p className="howto-special-para">
           Click “Upload”, and will you automatically navigate to the Document
@@ -30,12 +29,17 @@ export const Steps = () => (
         </p>{" "}
       </li>
       <li>
-        <strong>GENERATE THE DISCOVERY RESPONSE: </strong>Click the “Generate
-        Responses'' button. Novdraft’s Intellidraft AI will generate the
-        response and automatically navigate to the interactive Document Editor.
-        You can edit the responses and save progress anytime by clicking the
-        “Save Changes” button. When you are satisfied, you can download a .docx
-        file by clicking the “Create .docx File” button.
+        <strong>GENERATE THE RESPONSE: </strong>From the Document List View,
+        click the “Generate Responses'' button. Novdraft’s Intellidraft AI will
+        generate the response and automatically navigate to the interactive
+        Document Editor. You can edit the responses and save progress anytime by
+        clicking the “Save Changes” button. When you are satisfied, you can
+        download a .docx file by clicking the “Create .docx File” button.
+      </li>
+      <li>
+        <strong>DOWNLOAD YOUR RESPONSE DOCUMENT: </strong>Click the “Create
+        .Docx' button to downlaod your fully-formatted, ready-to-serve response.
+        Or, if you want, edit first to tailor it to your needs.
       </li>
       <ExclamationTriangle
         style={{ color: "red", marginRight: "6px", marginBottom: "2px" }}

From dea0d304c0fa59f30c34c8e0fe6df2c7837d62ea Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sat, 20 Jan 2024 22:21:46 -0600
Subject: [PATCH 02/24] more

---
 src/Constants/Copy/howToSteps.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Constants/Copy/howToSteps.js b/src/Constants/Copy/howToSteps.js
index 2aa7799..7f89367 100644
--- a/src/Constants/Copy/howToSteps.js
+++ b/src/Constants/Copy/howToSteps.js
@@ -39,7 +39,6 @@ export const Steps = () => (
       <li>
         <strong>DOWNLOAD YOUR RESPONSE DOCUMENT: </strong>Click the “Create
         .Docx' button to downlaod your fully-formatted, ready-to-serve response.
-        Or, if you want, edit first to tailor it to your needs.
       </li>
       <ExclamationTriangle
         style={{ color: "red", marginRight: "6px", marginBottom: "2px" }}

From 875799c507a264d2ecdff46fe34926ebfb23860c Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 15:06:51 -0600
Subject: [PATCH 03/24] more

---
 src/Components/Modals/CreateModal.js     | 22 +---------------------
 src/Constants/Fields/CreateCaseFields.js | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 src/Constants/Fields/CreateCaseFields.js

diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 776c6c3..b81e87a 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -11,6 +11,7 @@ import { collection, setDoc, updateDoc, doc } from "firebase/firestore";
 import { AppContext } from "../../Hooks/useContext/appContext.js";
 import { db } from "../../firebase";
 import { objectMap } from "../../Utils/Object";
+import { createCaseFields as fields } from "../../Constants/Fields/CreateCaseFields.js";
 import "../../styles/modals.scss";
 import {
   getFormDataDefaults,
@@ -29,27 +30,6 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const editCaseId = caseData?.id;
   const isEditing = typeof editCaseId !== "undefined";
 
-  const fields = {
-    caption: { required: true, maxLength: 45 },
-    captionTwo: { required: true, maxLength: 45 },
-    caseNumber: { required: true, maxLength: 45 },
-    judge: { required: true, maxLength: 45 },
-    plaintiffParties: { required: true, maxLength: 45 },
-    defendantParties: { required: true, maxLength: 45 },
-    jurisdiction: { required: true, maxLength: 45 },
-    billingCode: { required: true, maxLength: 45 },
-    venue: { required: true, maxLength: 45 },
-    caseType: { required: true, maxLength: 45 },
-    trialDate: { required: true, maxLength: 45, type: "date" },
-    filedDate: { required: true, maxLength: 45, type: "date" },
-    contactFirstName: { required: true, maxLength: 45 },
-    contactLastName: { required: true, maxLength: 45 },
-    contactEmail: { required: true, maxLength: 45, type: "email" },
-    leadAttorneys: { required: true, maxLength: 45 },
-    lawFirm: { required: false, maxLength: 45 },
-    clientPosition: { required: true, default: "Defendant" },
-  };
-
   const [isBusy, setIsBusy] = useState(false);
   const [data, setData] = useState(
     getFormDataDefaults(fields, isEditing ? caseData : undefined)
diff --git a/src/Constants/Fields/CreateCaseFields.js b/src/Constants/Fields/CreateCaseFields.js
new file mode 100644
index 0000000..8a20778
--- /dev/null
+++ b/src/Constants/Fields/CreateCaseFields.js
@@ -0,0 +1,20 @@
+export const createCaseFields = {
+  caption: { required: true, maxLength: 45 },
+  captionTwo: { required: true, maxLength: 45 },
+  caseNumber: { required: true, maxLength: 45 },
+  judge: { required: true, maxLength: 45 },
+  plaintiffParties: { required: true, maxLength: 45 },
+  defendantParties: { required: true, maxLength: 45 },
+  jurisdiction: { required: true, maxLength: 45 },
+  billingCode: { required: true, maxLength: 45 },
+  venue: { required: true, maxLength: 45 },
+  caseType: { required: true, maxLength: 45 },
+  trialDate: { required: true, maxLength: 45, type: "date" },
+  filedDate: { required: true, maxLength: 45, type: "date" },
+  contactFirstName: { required: true, maxLength: 45 },
+  contactLastName: { required: true, maxLength: 45 },
+  contactEmail: { required: true, maxLength: 45, type: "email" },
+  leadAttorneys: { required: true, maxLength: 45 },
+  lawFirm: { required: false, maxLength: 45 },
+  clientPosition: { required: true, default: "Defendant" },
+};

From d349c98fcc01fb627dd3aea770a6b00604d39dfe Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 15:12:59 -0600
Subject: [PATCH 04/24] more

---
 src/Components/SignupPage/SignupPage.js | 1 -
 src/Utils/Form.js                       | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js
index 900991c..8328b3a 100644
--- a/src/Components/SignupPage/SignupPage.js
+++ b/src/Components/SignupPage/SignupPage.js
@@ -180,7 +180,6 @@ const SignupPage = () => {
             <Row key={`row${j}`}>
               {names.map((name, i) => (
                 <Col key={`${name}${i + fieldsChunkSize * j}`} className="mb-3">
-                  {console.log("data, name", data, name)}
                   <TextInput
                     name={name}
                     value={data[name].value}
diff --git a/src/Utils/Form.js b/src/Utils/Form.js
index 3e44f77..0ac9d9e 100644
--- a/src/Utils/Form.js
+++ b/src/Utils/Form.js
@@ -96,8 +96,10 @@ export const handleFormDataChange = (e, name, data, fields) => {
   return null;
 };
 
-export const isFormDataHasErrors = (data) =>
-  Object.values(data).reduce(
+export const isFormDataHasErrors = (data) => {
+  console.log("data", data);
+  return Object.values(data).reduce(
     (hasErrors, { error }) => hasErrors || error,
     false
   );
+};

From 81f4e07633b4570f968988bc2411b86d15ef5359 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 15:36:58 -0600
Subject: [PATCH 05/24] more

---
 src/Components/Modals/CreateModal.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index b81e87a..489ccc1 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -45,14 +45,13 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const validateData = () => {
     const newData = getValidatedFormData(data, fields);
     const hasErrors = isFormDataHasErrors(newData);
+    console.log("create hasErrors", hasErrors);
     setData(newData);
     return hasErrors ? null : objectMap(({ value }) => value, newData);
   };
 
-  async function saveCaseData() {
-    const dataValues = validateData();
-
-    if (dataValues === null) {
+  async function saveCaseData(dataValues) {
+    if (isBusy) {
       return;
     }
     setIsBusy(true);
@@ -90,10 +89,20 @@ const CreateModal = ({ setShowModal, caseData }) => {
     }
   };
 
-  const handleCreate = () => {
-    if (!isBusy) {
-      void saveCaseData();
+  const handleCreateCase = (e) => {
+    e.preventDefault();
+    const dataValues = validateData();
+
+    if (dataValues === null) {
+      return;
+    } else {
+      try {
+        saveCaseData(dataValues);
+      } catch (err) {
+        console.log(err);
+      }
     }
+
     navigate("/dashboard");
   };
 
@@ -528,7 +537,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
         <Button
           className="primary-button"
           disabled={isBusy}
-          onClick={handleCreate}
+          onClick={handleCreateCase}
           labelText="Save Case"
         />
       </Modal.Footer>

From 11a04add2c186c2407f6c676928409b463994e78 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 15:53:12 -0600
Subject: [PATCH 06/24] more

---
 src/Components/Modals/CreateModal.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 489ccc1..40be97e 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -45,7 +45,6 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const validateData = () => {
     const newData = getValidatedFormData(data, fields);
     const hasErrors = isFormDataHasErrors(newData);
-    console.log("create hasErrors", hasErrors);
     setData(newData);
     return hasErrors ? null : objectMap(({ value }) => value, newData);
   };

From f8896e7baac16cccb0166015ebd19c8b472c470b Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 15:58:13 -0600
Subject: [PATCH 07/24] more

---
 src/Constants/Fields/CreateCaseFields.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Constants/Fields/CreateCaseFields.js b/src/Constants/Fields/CreateCaseFields.js
index 8a20778..01e7b0d 100644
--- a/src/Constants/Fields/CreateCaseFields.js
+++ b/src/Constants/Fields/CreateCaseFields.js
@@ -16,5 +16,5 @@ export const createCaseFields = {
   contactEmail: { required: true, maxLength: 45, type: "email" },
   leadAttorneys: { required: true, maxLength: 45 },
   lawFirm: { required: false, maxLength: 45 },
-  clientPosition: { required: true, default: "Defendant" },
+  clientPosition: { required: true, default: "Plaintiff" },
 };

From 3cb2846f591feba1fddb14f5fdc2ecaf93530a51 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 16:11:27 -0600
Subject: [PATCH 08/24] more

---
 src/Components/Modals/CreateModal.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 40be97e..4a14176 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -29,8 +29,10 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const appUserId = group.appUserId;
   const editCaseId = caseData?.id;
   const isEditing = typeof editCaseId !== "undefined";
-
+  console.log("group", group);
   const [isBusy, setIsBusy] = useState(false);
+  const caseNumCopy =
+    group.state == "New York" ? "Index Number" : "Case Number";
   const [data, setData] = useState(
     getFormDataDefaults(fields, isEditing ? caseData : undefined)
   );
@@ -168,7 +170,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
         <Row>
           <Col className="mb-3">
             {isEditing ? (
-              <div className="edit-modal-label">Index number</div>
+              <div className="edit-modal-label">{caseNumCopy}</div>
             ) : (
               <></>
             )}

From 48bface0d8569dee6dd1f9eded5ef5552b8d8a1e Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 16:22:48 -0600
Subject: [PATCH 09/24] more

---
 src/Components/Modals/CreateModal.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 4a14176..ef34264 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -29,8 +29,8 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const appUserId = group.appUserId;
   const editCaseId = caseData?.id;
   const isEditing = typeof editCaseId !== "undefined";
-  console.log("group", group);
   const [isBusy, setIsBusy] = useState(false);
+  const [newCaseId, setNewCaseId] = useState();
   const caseNumCopy =
     group.state == "New York" ? "Index Number" : "Case Number";
   const [data, setData] = useState(
@@ -64,16 +64,17 @@ const CreateModal = ({ setShowModal, caseData }) => {
         console.log("Error updating case:", err);
       }
     } else {
-      const caseId = uuidv4();
+      const tempId = uuidv4();
+      setNewCaseId(tempId);
       const ownerId = appUserId; // userId;
       const caseData = {
         ownerId,
-        caseId,
+        caseId: newCaseId,
         ...dataValues,
       };
       try {
         const casesRef = collection(db, "cases");
-        await setDoc(doc(casesRef, `${caseId}`), caseData);
+        await setDoc(doc(casesRef, `${newCaseId}`), caseData);
         setShowModal(false);
       } catch (err) {
         console.log("Error creating case:", err);
@@ -104,7 +105,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
       }
     }
 
-    navigate("/dashboard");
+    navigate(`/casedetails/${newCaseId}`);
   };
 
   const radioOptions = [

From c55772c9dc975a3be2af7d6798f11109bd34c223 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 17:01:28 -0600
Subject: [PATCH 10/24] more

---
 src/Components/Case/CaseDetailsPage.js |  1 +
 src/Components/Modals/CreateModal.js   | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js
index 8ddf861..fed3151 100644
--- a/src/Components/Case/CaseDetailsPage.js
+++ b/src/Components/Case/CaseDetailsPage.js
@@ -23,6 +23,7 @@ const CaseDetailsPage = () => {
   const message =
     "Parsing document.  Please be patient, this may take several minutes.";
 
+  console.log("----------->caseId in caseDetails", caseId);
   const handleNavigate = () => {
     navigate("/documents");
   };
diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index ef34264..77dff73 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -64,18 +64,18 @@ const CreateModal = ({ setShowModal, caseData }) => {
         console.log("Error updating case:", err);
       }
     } else {
-      const tempId = uuidv4();
-      setNewCaseId(tempId);
+      const caseId = uuidv4();
       const ownerId = appUserId; // userId;
       const caseData = {
         ownerId,
-        caseId: newCaseId,
+        caseId,
         ...dataValues,
       };
       try {
         const casesRef = collection(db, "cases");
-        await setDoc(doc(casesRef, `${newCaseId}`), caseData);
+        await setDoc(doc(casesRef, `${caseId}`), caseData);
         setShowModal(false);
+        return caseId;
       } catch (err) {
         console.log("Error creating case:", err);
       }
@@ -91,21 +91,26 @@ const CreateModal = ({ setShowModal, caseData }) => {
     }
   };
 
+  const handleCreateCaseNavigation = (caseId) => {
+    console.log("caseId in handleCreateCaseNavigation", caseId);
+  };
+
   const handleCreateCase = (e) => {
     e.preventDefault();
     const dataValues = validateData();
-
+    let caseId;
     if (dataValues === null) {
       return;
     } else {
       try {
-        saveCaseData(dataValues);
+        saveCaseData(dataValues).then((res) => {
+          const caseId = res;
+          navigate(`/casedetails/${caseId}`);
+        });
       } catch (err) {
         console.log(err);
       }
     }
-
-    navigate(`/casedetails/${newCaseId}`);
   };
 
   const radioOptions = [

From 3000e3f188db2e26b633246d776f1e901a5aa05e Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 17:25:26 -0600
Subject: [PATCH 11/24] more

---
 src/Constants/Copy/howToSteps.js | 49 ++++++++++++++------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/Constants/Copy/howToSteps.js b/src/Constants/Copy/howToSteps.js
index 7f89367..b6778b5 100644
--- a/src/Constants/Copy/howToSteps.js
+++ b/src/Constants/Copy/howToSteps.js
@@ -5,48 +5,41 @@ export const Steps = () => (
     <h2 className="doc-header-text">Generate Discovery Responses</h2>
     <ol className="steps-list">
       <li>
-        <strong>CREATE THE CASE: </strong>First, input the case to which the
-        discovery request pertains. Click “Cases” in the top navigation bar to
-        go to the <strong>Case View</strong>. Click the “Create New Case” button
-        (lower right) to surface the Create Case Modal. Enter all relevant
-        information -- case name, case number, parties, etc. -- and click “Save
-        Case”. The modal will close, returning you to the{" "}
-        <strong>Case View.</strong>
-        On the newly-created case info card, click the “View” button (far right)
-        to navigate to its <strong>Case Details View.</strong> Click “Upload
-        Document” to surface the Document Upload Modal.
+        <strong>CREATE THE CASE: </strong> Click “Cases” in the top navigation
+        bar to go to the <strong>Case View</strong>. Click the “Create New Case”
+        button (lower right) to surface the Create Case Modal. Enter all
+        relevant information -- case name, case number, parties, etc. -- and
+        click “Save Case” to open the new case's
+        <strong> Details View.</strong> Click “Upload Document”.
       </li>
       <li>
-        <strong>UPLOAD YOUR DOCUMENT: </strong>On the Document Upload Modal,
-        enter the document title, i.e. “Defendant’s Interrogatories,” and
-        (optionally) the date served. Drag and drop or click to select the
-        request document from your files.{" "}
-        <em>The document must be in .pdf format.</em>
-        <br />{" "}
-        <p className="howto-special-para">
-          Click “Upload”, and will you automatically navigate to the Document
-          List View.
-        </p>{" "}
+        <strong>UPLOAD YOUR DOCUMENT: </strong>You will now see the Document
+        Upload Modal. Enter your discovery request's info: document title, i.e.
+        “Defendant’s Interrogatories,” and (optionally) the date served. Drag
+        and drop the file, or click to select it from your computer's files,{" "}
+        {"  "}
+        then click <strong> “Upload”.</strong>
+        <br /> The upload will begin. Parsing the document usually takes 1 to 2
+        minutes, but be patient - it may take up to 5.
       </li>
       <li>
         <strong>GENERATE THE RESPONSE: </strong>From the Document List View,
         click the “Generate Responses'' button. Novdraft’s Intellidraft AI will
         generate the response and automatically navigate to the interactive
-        Document Editor. You can edit the responses and save progress anytime by
-        clicking the “Save Changes” button. When you are satisfied, you can
-        download a .docx file by clicking the “Create .docx File” button.
+        Document Editor. You can edit the responses and save progress any time
+        by clicking the “Save Changes” button.
       </li>
       <li>
         <strong>DOWNLOAD YOUR RESPONSE DOCUMENT: </strong>Click the “Create
-        .Docx' button to downlaod your fully-formatted, ready-to-serve response.
+        .Docx' button to download your fully-formatted, ready-to-serve response.
       </li>
       <ExclamationTriangle
         style={{ color: "red", marginRight: "6px", marginBottom: "2px" }}
       />
-      <strong>Pro tip:</strong> once you've created a case, you can skip most of
-      these steps. Simply search for the case by entering the case number in the
-      search bar on your Dashboard, click "Express Document Upload" and follow
-      the prompts.
+      <strong>Pro tip:</strong> Once you've created the case, you can skip step
+      one. Simply search for the case by entering the case number in the search
+      bar on your Dashboard, click "Express Document Upload" and follow the
+      prompts.
     </ol>
     <p className="steps-p"></p>
   </div>

From e651c81745ca0ebf573c2c9ac69bf50ded4a670c Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 19:38:26 -0600
Subject: [PATCH 12/24] more

---
 src/Components/Case/CaseDetailsPage.js | 1 -
 src/Components/Modals/CreateModal.js   | 2 +-
 src/Components/Modals/UploadModal.js   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js
index fed3151..8ddf861 100644
--- a/src/Components/Case/CaseDetailsPage.js
+++ b/src/Components/Case/CaseDetailsPage.js
@@ -23,7 +23,6 @@ const CaseDetailsPage = () => {
   const message =
     "Parsing document.  Please be patient, this may take several minutes.";
 
-  console.log("----------->caseId in caseDetails", caseId);
   const handleNavigate = () => {
     navigate("/documents");
   };
diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 77dff73..d5e341f 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -92,7 +92,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
   };
 
   const handleCreateCaseNavigation = (caseId) => {
-    console.log("caseId in handleCreateCaseNavigation", caseId);
+    // console.log("caseId in handleCreateCaseNavigation", caseId);
   };
 
   const handleCreateCase = (e) => {
diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js
index 916c4c1..99bee94 100644
--- a/src/Components/Modals/UploadModal.js
+++ b/src/Components/Modals/UploadModal.js
@@ -124,6 +124,7 @@ const UploadModal = (props) => {
 
     try {
       const response = await processFile();
+      console.log("response in upload modal", response);
       if (response.res?.status !== 200) {
         saveToDb(response.uuidName);
         return;

From d0e06ebe4bf4328e89b5a8985df005e402867afc Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 21:07:45 -0600
Subject: [PATCH 13/24] more

---
 src/Components/Document/DocEditPage.js        | 104 +-----------------
 .../Document/captionHeaders/newYorkCaption.js |  12 +-
 src/styles/docedit-page.scss                  |   4 +-
 3 files changed, 14 insertions(+), 106 deletions(-)

diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js
index c7917eb..108c1f1 100644
--- a/src/Components/Document/DocEditPage.js
+++ b/src/Components/Document/DocEditPage.js
@@ -582,109 +582,7 @@ const DocEditPage = () => {
       : fetchedCase?.defendantParties;
 
   const editingContent = () => {
-    return (
-      <>
-        {headerPicker()}
-        <div className="doc-editing-wrapper">
-          <div className="pleading-header">{headerString}</div>
-          <div>
-            {displayCopy.prelimaryStatement(
-              documentType,
-              respondent,
-              servingParty
-            )}
-          </div>
-          <div className="doc-editing-sub-wrapper">
-            {parsedRogs?.map((rog, i) => (
-              <div className="req-item-outer-div">
-                <div className="request-text-up">
-                  {numberingContent(i)}
-                  {rog?.text}
-                </div>
-                <div className="req-item-inner-div">
-                  <EditElement
-                    value={
-                      responses && responses.length > 2
-                        ? // NEVER CHANGE THIS
-                          responses[i].resp
-                        : null
-                    }
-                    setShowInputEle={setShowInputEle}
-                    showInputEle={
-                      responses && responses.length > 2
-                        ? responses[i].showInputEle
-                        : null
-                    }
-                    handleFocus={handleFocus}
-                    handleEditValue={handleEditValue}
-                    handleBlur={handleBlur}
-                    i={i}
-                  />
-                </div>
-              </div>
-            ))}
-            <div
-              className="docedit-report-container"
-              onClick={() => handleConfirmReport()}
-            >
-              <div className="docedit-report-link">Report an issue</div>
-            </div>
-            <div className="doc-editing-button-container">
-              <div className="generate-button-box">
-                {/*  TODO: add tooltip: "This will save the document and create a .docx file that will (be downloaded?  saved somewhere?" */}
-                <Button
-                  className="primary-button create-gen-button"
-                  onClick={createAndReturnDocx}
-                  labelText={"Create .docx File"}
-                />
-              </div>
-              <div className="details-button-box">
-                <div>
-                  <Button
-                    className="pt-2 pb-2 mr-4 secondary-button edit-back-button"
-                    onClick={handleBack}
-                    labelText="Back To Documents Page"
-                  />
-                </div>
-                <div>
-                  <Button
-                    className="pt-2 pb-2 mr-2 primary-button"
-                    onClick={handleConfirmSave}
-                    labelText="Save Changes"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        {showSaveModal && !isReport && documentId !== null ? (
-          <ConfirmModal
-            onCancel={handleCancelSave}
-            onConfirm={handleSave}
-            buttonLabelText="Confirm Save"
-            modalText={
-              "Are you sure?  This will overrwrite any previously-saved edits."
-            }
-          />
-        ) : null}
-        {showSaveModal && isReport && documentId !== null ? (
-          <ConfirmModal
-            isReport={isReport}
-            onCancel={handleCancelSave}
-            onConfirm={handleReport}
-            buttonLabelText="Report Issue"
-            documentId={documentId}
-            caseId={caseId}
-            appUserId={appUserId}
-            issuetext={issueText}
-            setIssueText={setIssueText}
-            modalText={
-              "Date/time and document id automatically logged. Support will address this within 24 hours."
-            }
-          />
-        ) : null}
-      </>
-    );
+    return <div> {headerPicker()}</div>;
   };
 
   const readyToEdit = fetchedCase && responses.length > 1;
diff --git a/src/Components/Document/captionHeaders/newYorkCaption.js b/src/Components/Document/captionHeaders/newYorkCaption.js
index 4ff9ae8..244b066 100644
--- a/src/Components/Document/captionHeaders/newYorkCaption.js
+++ b/src/Components/Document/captionHeaders/newYorkCaption.js
@@ -12,7 +12,11 @@ const NewYorkCaption = (props) => {
         <div className="docedit-uppercol2">
           <span>{fetchedCase?.jurisdiction}</span>
           <span>{fetchedCase?.venue}</span>
-          <div className="docedit-uppercol-divider"></div>
+          <div className="pleading-divider-box">
+            <div>
+              --------------------------------------------------------------------X
+            </div>
+          </div>
         </div>
         <div className="docedit-uppercol3"></div>
       </div>
@@ -44,7 +48,11 @@ const NewYorkCaption = (props) => {
             <div className="content-spacer2"></div>
             <div>Defendant(s)</div>
           </div>
-          <div className="docedit-uppercol-divider"></div>
+          <div className="pleading-divider-box">
+            <div>
+              -------------------------------------------------------------------------X
+            </div>
+          </div>
         </div>
         <div className="docedit-header-col3">
           <div className="scroll-button-box">
diff --git a/src/styles/docedit-page.scss b/src/styles/docedit-page.scss
index 6031ef6..ae58b7e 100644
--- a/src/styles/docedit-page.scss
+++ b/src/styles/docedit-page.scss
@@ -90,10 +90,12 @@
 .docedit-header-row {
   display: flex;
   flex-direction: row;
-  height: 210px;
+  height: 240px;
+  margin-bottom: 12px;
   color: #000000;
   font-weight: 500;
   overflow: hidden;
+  background-color: yellow;
 }
 
 .docedit-header-col1 {

From 2d1f1238ed17feb25d38ca62784ced6d014ed509 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 21:11:07 -0600
Subject: [PATCH 14/24] more

---
 src/Components/Document/DocEditPage.js | 104 ++++++++++++++++++++++++-
 src/styles/docedit-page.scss           |   2 +-
 2 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js
index 108c1f1..e3183b4 100644
--- a/src/Components/Document/DocEditPage.js
+++ b/src/Components/Document/DocEditPage.js
@@ -582,7 +582,109 @@ const DocEditPage = () => {
       : fetchedCase?.defendantParties;
 
   const editingContent = () => {
-    return <div> {headerPicker()}</div>;
+    return (
+      <>
+        <div> {headerPicker()}</div>
+        <div className="doc-editing-wrapper">
+          <div className="pleading-header">{headerString}</div>
+          <div>
+            {displayCopy.prelimaryStatement(
+              documentType,
+              respondent,
+              servingParty
+            )}
+          </div>
+          <div className="doc-editing-sub-wrapper">
+            {parsedRogs?.map((rog, i) => (
+              <div className="req-item-outer-div">
+                <div className="request-text-up">
+                  {numberingContent(i)}
+                  {rog?.text}
+                </div>
+                <div className="req-item-inner-div">
+                  <EditElement
+                    value={
+                      responses && responses.length > 2
+                        ? // NEVER CHANGE THIS
+                          responses[i].resp
+                        : null
+                    }
+                    setShowInputEle={setShowInputEle}
+                    showInputEle={
+                      responses && responses.length > 2
+                        ? responses[i].showInputEle
+                        : null
+                    }
+                    handleFocus={handleFocus}
+                    handleEditValue={handleEditValue}
+                    handleBlur={handleBlur}
+                    i={i}
+                  />
+                </div>
+              </div>
+            ))}
+            <div
+              className="docedit-report-container"
+              onClick={() => handleConfirmReport()}
+            >
+              <div className="docedit-report-link">Report an issue</div>
+            </div>
+            <div className="doc-editing-button-container">
+              <div className="generate-button-box">
+                {/*  TODO: add tooltip: "This will save the document and create a .docx file that will (be downloaded?  saved somewhere?" */}
+                <Button
+                  className="primary-button create-gen-button"
+                  onClick={createAndReturnDocx}
+                  labelText={"Create .docx File"}
+                />
+              </div>
+              <div className="details-button-box">
+                <div>
+                  <Button
+                    className="pt-2 pb-2 mr-4 secondary-button edit-back-button"
+                    onClick={handleBack}
+                    labelText="Back To Documents Page"
+                  />
+                </div>
+                <div>
+                  <Button
+                    className="pt-2 pb-2 mr-2 primary-button"
+                    onClick={handleConfirmSave}
+                    labelText="Save Changes"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        {showSaveModal && !isReport && documentId !== null ? (
+          <ConfirmModal
+            onCancel={handleCancelSave}
+            onConfirm={handleSave}
+            buttonLabelText="Confirm Save"
+            modalText={
+              "Are you sure?  This will overrwrite any previously-saved edits."
+            }
+          />
+        ) : null}
+        {showSaveModal && isReport && documentId !== null ? (
+          <ConfirmModal
+            isReport={isReport}
+            onCancel={handleCancelSave}
+            onConfirm={handleReport}
+            buttonLabelText="Report Issue"
+            documentId={documentId}
+            caseId={caseId}
+            appUserId={appUserId}
+            issuetext={issueText}
+            setIssueText={setIssueText}
+            modalText={
+              "Date/time and document id automatically logged. Support will address this within 24 hours."
+            }
+          />
+        ) : null}
+      </>
+    );
   };
 
   const readyToEdit = fetchedCase && responses.length > 1;
diff --git a/src/styles/docedit-page.scss b/src/styles/docedit-page.scss
index ae58b7e..b39e104 100644
--- a/src/styles/docedit-page.scss
+++ b/src/styles/docedit-page.scss
@@ -249,7 +249,7 @@
   justify-content: center;
   align-items: center;
   width: 60%;
-  margin: 22px auto;
+  margin: 6px auto;
   color: #4e4e4e;
 }
 

From b6126170d5817a6ca4b2bc3bb48a95ebda0f176f Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 21:12:45 -0600
Subject: [PATCH 15/24] more

---
 src/Components/Document/captionHeaders/newYorkCaption.js | 4 ++--
 src/styles/docedit-page.scss                             | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Components/Document/captionHeaders/newYorkCaption.js b/src/Components/Document/captionHeaders/newYorkCaption.js
index 244b066..c8ecae0 100644
--- a/src/Components/Document/captionHeaders/newYorkCaption.js
+++ b/src/Components/Document/captionHeaders/newYorkCaption.js
@@ -14,7 +14,7 @@ const NewYorkCaption = (props) => {
           <span>{fetchedCase?.venue}</span>
           <div className="pleading-divider-box">
             <div>
-              --------------------------------------------------------------------X
+              -----------------------------------------------------------------------X
             </div>
           </div>
         </div>
@@ -50,7 +50,7 @@ const NewYorkCaption = (props) => {
           </div>
           <div className="pleading-divider-box">
             <div>
-              -------------------------------------------------------------------------X
+              ----------------------------------------------------------------------------X
             </div>
           </div>
         </div>
diff --git a/src/styles/docedit-page.scss b/src/styles/docedit-page.scss
index b39e104..12d3818 100644
--- a/src/styles/docedit-page.scss
+++ b/src/styles/docedit-page.scss
@@ -90,12 +90,11 @@
 .docedit-header-row {
   display: flex;
   flex-direction: row;
-  height: 240px;
+  height: 230px;
   margin-bottom: 12px;
   color: #000000;
   font-weight: 500;
   overflow: hidden;
-  background-color: yellow;
 }
 
 .docedit-header-col1 {

From a87517558da4161533a7328da2de5681171571c0 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Mon, 22 Jan 2024 14:38:03 -0600
Subject: [PATCH 16/24] hotfx

---
 src/Components/Modals/UploadModal.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js
index 99bee94..0fce56b 100644
--- a/src/Components/Modals/UploadModal.js
+++ b/src/Components/Modals/UploadModal.js
@@ -42,8 +42,10 @@ const UploadModal = (props) => {
       : process.env.REACT_APP_API_PROD;
 
   async function saveToDb(uuidName) {
+    const createdAt = new Date();
     const data = {
       ownerId: appUserId,
+      createdAt: createdAt,
       documentName: `${uuidName}.pdf`,
       docDescription: docDescription,
       dateServed: dateServed,

From b36413310385056bc674ea123ea145042f69f829 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Mon, 22 Jan 2024 15:13:05 -0600
Subject: [PATCH 17/24] more

---
 src/Components/Document/DocumentListPage.js | 3 ++-
 src/pageElements/Cards.js                   | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js
index 3120e46..981183d 100644
--- a/src/Components/Document/DocumentListPage.js
+++ b/src/Components/Document/DocumentListPage.js
@@ -171,7 +171,7 @@ const DocumentListPage = ({ perPage }) => {
   if (!group) {
     return null;
   }
-
+  console.log("allDocs", allDocs);
   const DesktopContent = () => {
     return (
       <>
@@ -204,6 +204,7 @@ const DocumentListPage = ({ perPage }) => {
                       parentCaseNumber={doc.parentCaseNumber}
                       parentCaseName={doc.parentCaseName}
                       parentCaseId={doc.parentCaseId}
+                      createdAt={doc.createdAt}
                       docType={doc.docType}
                       documentId={doc.documentId}
                       dateServed={doc.dateServed}
diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js
index 90377e8..20ef58b 100644
--- a/src/pageElements/Cards.js
+++ b/src/pageElements/Cards.js
@@ -4,7 +4,7 @@ import { FileEarmarkText } from "react-bootstrap-icons";
 import TextInput from "../pageElements/TextInput";
 import Tooltip from "../pageElements/Tooltip";
 import { InfoCircle } from "react-bootstrap-icons";
-
+import { toDate } from "firebase/firestore";
 export const InfoCard = (props) => {
   const { data, onEdit, onCancel, onSave, onChangeInput, isEditing, isBusy } =
     props;
@@ -273,8 +273,13 @@ export const DocCard = (props) => {
     handleNavigate,
     responseGenerations,
     confirmDelete,
+    createdAt,
   } = props;
-
+  const now = new Date().getTime();
+  const temp = createdAt.toDate();
+  const diff = Math.round((now - temp) / 60 / 1000);
+  const isReportable = diff > 15;
+  console.log("isRpeortable", isReportable);
   const report = (documentId, docType) => {
     console.log("report documentId, docType", documentId, docType);
   };

From f0f59a3d3f131c385d4bf6ac9b37e928907f0219 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Mon, 22 Jan 2024 15:16:23 -0600
Subject: [PATCH 18/24] more

---
 src/pageElements/Cards.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js
index 20ef58b..d6e67eb 100644
--- a/src/pageElements/Cards.js
+++ b/src/pageElements/Cards.js
@@ -286,6 +286,7 @@ export const DocCard = (props) => {
 
   const tooltipText =
     "Parsing is taking a bit longer than usual. This usually resolves within 10 - 15 minutes. If it does not, click “report” and support will address the issue within 24 hours.";
+
   const disabled = docType ? false : true;
   return (
     <div className="doc-card-container">
@@ -294,7 +295,16 @@ export const DocCard = (props) => {
           <FileEarmarkText className="doc-file-icon" size="22px" />
         </div>
         <div className="doc-col2">
-          {title} {disabled ? <Tooltip text={tooltipText} /> : <></>}
+          {title}{" "}
+          {disabled ? (
+            isReportable ? (
+              <Tooltip text={tooltipText} />
+            ) : (
+              <Tooltip text={tooltipText} iconStyle="clock" />
+            )
+          ) : (
+            <></>
+          )}
         </div>
         {dateServed ? (
           <div className="doc-col3">Served: {dateServed}</div>
@@ -304,7 +314,7 @@ export const DocCard = (props) => {
         <div className="doc-col4">
           <div className="jurisdiction-box">{parentCaseName}</div>
         </div>
-        {disabled ? (
+        {disabled && isReportable ? (
           <div className="doc-col5">
             <Button
               labelText="Report"

From 1c28d4a7ebd867c0de26049d5fcb00273d735a76 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Mon, 22 Jan 2024 15:45:07 -0600
Subject: [PATCH 19/24] more

---
 src/pageElements/Cards.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js
index d6e67eb..f85ba6c 100644
--- a/src/pageElements/Cards.js
+++ b/src/pageElements/Cards.js
@@ -276,10 +276,10 @@ export const DocCard = (props) => {
     createdAt,
   } = props;
   const now = new Date().getTime();
-  const temp = createdAt.toDate();
-  const diff = Math.round((now - temp) / 60 / 1000);
+  const uploadedAt = createdAt.toDate();
+  const diff = Math.round((now - uploadedAt) / 60 / 1000);
   const isReportable = diff > 15;
-  console.log("isRpeortable", isReportable);
+  console.log("diff", diff);
   const report = (documentId, docType) => {
     console.log("report documentId, docType", documentId, docType);
   };

From 3e50af38de70d7e55c23fca3f82c8b1fb86e5b87 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Mon, 22 Jan 2024 15:54:22 -0600
Subject: [PATCH 20/24] more

---
 src/pageElements/Cards.js   | 15 +++++++--------
 src/pageElements/Tooltip.js | 12 +++++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js
index f85ba6c..c0e02de 100644
--- a/src/pageElements/Cards.js
+++ b/src/pageElements/Cards.js
@@ -277,17 +277,16 @@ export const DocCard = (props) => {
   } = props;
   const now = new Date().getTime();
   const uploadedAt = createdAt.toDate();
-  const diff = Math.round((now - uploadedAt) / 60 / 1000);
-  const isReportable = diff > 15;
-  console.log("diff", diff);
+  const isReportable = Math.round((now - uploadedAt) / 60 / 1000) > 15;
+  const disabled = docType ? false : true;
+  const tooltipText =
+    "Parsing is taking a bit longer than usual. This usually resolves within 15 minutes. If it does not, click “report” and support will address the issue within 24 hours.";
+  const pendingText =
+    "Parsing in process, please be patient. This should resolve within 10 minutes.";
   const report = (documentId, docType) => {
     console.log("report documentId, docType", documentId, docType);
   };
 
-  const tooltipText =
-    "Parsing is taking a bit longer than usual. This usually resolves within 10 - 15 minutes. If it does not, click “report” and support will address the issue within 24 hours.";
-
-  const disabled = docType ? false : true;
   return (
     <div className="doc-card-container">
       <div className="doc-card-input">
@@ -300,7 +299,7 @@ export const DocCard = (props) => {
             isReportable ? (
               <Tooltip text={tooltipText} />
             ) : (
-              <Tooltip text={tooltipText} iconStyle="clock" />
+              <Tooltip text={pendingText} iconStyle="clock" />
             )
           ) : (
             <></>
diff --git a/src/pageElements/Tooltip.js b/src/pageElements/Tooltip.js
index ba6aa7c..ed6bdf7 100644
--- a/src/pageElements/Tooltip.js
+++ b/src/pageElements/Tooltip.js
@@ -1,17 +1,23 @@
 import { useState } from "react";
 import "../styles/tooltip.scss";
-import { InfoCircle } from "react-bootstrap-icons";
+import { InfoCircle, Clock } from "react-bootstrap-icons";
 
 function Tooltip(props) {
   const [show, setShow] = useState(false);
-  const { text } = props;
+  const { text, iconStyle } = props;
+  const showClock = iconStyle === "clock";
   return (
     <div
       className="tooltip-container"
       onMouseEnter={() => setShow(true)}
       onMouseLeave={() => setShow(false)}
     >
-      <InfoCircle className="infocircle-icon" size="16px" />
+      {showClock ? (
+        <Clock className="infocircle-icon" size="16px" />
+      ) : (
+        <InfoCircle className="infocircle-icon" size="16px" />
+      )}
+
       {show ? <span className="tooltip-text">{text}</span> : <></>}
     </div>
   );

From 434ea2ec9edfbef318d047ff8b6876bec829a3ec Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Mon, 22 Jan 2024 16:32:28 -0600
Subject: [PATCH 21/24] more

---
 src/pageElements/Cards.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js
index c0e02de..965e9f7 100644
--- a/src/pageElements/Cards.js
+++ b/src/pageElements/Cards.js
@@ -295,12 +295,9 @@ export const DocCard = (props) => {
         </div>
         <div className="doc-col2">
           {title}{" "}
-          {disabled ? (
-            isReportable ? (
-              <Tooltip text={tooltipText} />
-            ) : (
-              <Tooltip text={pendingText} iconStyle="clock" />
-            )
+          {disabled && isReportable ? <Tooltip text={tooltipText} /> : <></>}
+          {disabled && !isReportable ? (
+            <Tooltip text={pendingText} iconStyle="clock" />
           ) : (
             <></>
           )}
@@ -359,3 +356,17 @@ export const DocCard = (props) => {
     </div>
   );
 };
+
+/*
+
+          {disabled ? (
+            isReportable ? (
+              <Tooltip text={tooltipText} />
+            ) : (
+              <Tooltip text={pendingText} iconStyle="clock" />
+            )
+          ) : (
+            <></>
+          )}
+
+          */

From b36fe56aa48737ac7535dfb550a919cb0fca3db1 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Mon, 22 Jan 2024 16:34:00 -0600
Subject: [PATCH 22/24] more

---
 src/pageElements/Tooltip.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pageElements/Tooltip.js b/src/pageElements/Tooltip.js
index ed6bdf7..bd10aa8 100644
--- a/src/pageElements/Tooltip.js
+++ b/src/pageElements/Tooltip.js
@@ -3,22 +3,21 @@ import "../styles/tooltip.scss";
 import { InfoCircle, Clock } from "react-bootstrap-icons";
 
 function Tooltip(props) {
-  const [show, setShow] = useState(false);
+  const [showMessage, setShowMessage] = useState(false);
   const { text, iconStyle } = props;
   const showClock = iconStyle === "clock";
   return (
     <div
       className="tooltip-container"
-      onMouseEnter={() => setShow(true)}
-      onMouseLeave={() => setShow(false)}
+      onMouseEnter={() => setShowMessage(true)}
+      onMouseLeave={() => setShowMessage(false)}
     >
       {showClock ? (
         <Clock className="infocircle-icon" size="16px" />
       ) : (
         <InfoCircle className="infocircle-icon" size="16px" />
       )}
-
-      {show ? <span className="tooltip-text">{text}</span> : <></>}
+      {showMessage ? <span className="tooltip-text">{text}</span> : <></>}
     </div>
   );
 }

From 2441bb9c07594b0a43cb6f137265083e83c9aa44 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Tue, 23 Jan 2024 11:05:41 -0600
Subject: [PATCH 23/24] more

---
 src/Components/Account/AccountPage.js | 21 +++++++++++++++++++--
 src/styles/account-page.scss          |  4 ++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Components/Account/AccountPage.js b/src/Components/Account/AccountPage.js
index 1ff370b..76da7cd 100644
--- a/src/Components/Account/AccountPage.js
+++ b/src/Components/Account/AccountPage.js
@@ -6,6 +6,7 @@ import Button from "../../pageElements/Button";
 import { AppContext } from "../../Hooks/useContext/appContext";
 import { AuthContext } from "../../Context/AuthProvider";
 import ProgressBar from "../../pageElements/ProgressBar";
+import ConfirmModal from "../Modals/ConfirmModal";
 
 const AccountPage = () => {
   const navigate = useNavigate();
@@ -15,7 +16,7 @@ const AccountPage = () => {
   const [docsGenerated, setDocsGenerated] = useState(null);
   const [docsAllowed, setDocsAllowed] = useState(10);
   const appUserId = group ? group.appUserId : null;
-
+  const [showModal, setShowModal] = useState(false);
   function getDocumentsCount() {
     if (!appUserId) {
       return;
@@ -36,6 +37,10 @@ const AccountPage = () => {
     return null;
   }
 
+  const handleCancelSub = () => {
+    setShowModal(true);
+    // API call
+  };
   const handleSupport = () => {
     const supReq = "5ac45d12";
     navigate(`/requestpage/${supReq}`);
@@ -178,7 +183,11 @@ const AccountPage = () => {
             </div>
           ) : null}
           <div className="account-subscriptions-actions">
-            <Button className="primary-button" labelText="Cancel Account" />
+            <Button
+              className="primary-button cancel-sub-button"
+              labelText="Cancel Subscription"
+              onClick={() => setShowModal(true)}
+            />
           </div>
         </div>
       </div>
@@ -194,6 +203,14 @@ const AccountPage = () => {
           <div>{telNumberFormat(group.telephone)}</div>
         </div>
       </div>
+      {showModal ? (
+        <ConfirmModal
+          onCancel={() => setShowModal(false)}
+          onConfirm={handleCancelSub}
+          buttonLabelText="Confirm Cancel"
+          modalText="Are you sure?  Your subscription will end at the conclusion of the current billing period."
+        />
+      ) : null}
     </div>
   );
 };
diff --git a/src/styles/account-page.scss b/src/styles/account-page.scss
index 13e1ed1..7a143bb 100644
--- a/src/styles/account-page.scss
+++ b/src/styles/account-page.scss
@@ -87,6 +87,10 @@ $account-support-title-padding: 10px;
   }
 }
 
+.cancel-sub-button {
+  width: 165px;
+}
+
 .account-support {
   display: grid;
   grid-template-columns: 2fr 1fr;

From 3411a3373c609e2b87b4dc3735a32b2b470eac76 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Tue, 23 Jan 2024 11:37:10 -0600
Subject: [PATCH 24/24] more

---
 src/Components/Account/AccountPage.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Components/Account/AccountPage.js b/src/Components/Account/AccountPage.js
index 76da7cd..49613f5 100644
--- a/src/Components/Account/AccountPage.js
+++ b/src/Components/Account/AccountPage.js
@@ -39,7 +39,12 @@ const AccountPage = () => {
 
   const handleCancelSub = () => {
     setShowModal(true);
-    // API call
+    try {
+      //API call(s)
+    } catch (err) {
+      console.log(err);
+    }
+    setShowModal(false);
   };
   const handleSupport = () => {
     const supReq = "5ac45d12";