IO-2381 Disabled Cancel Appt Button

client/src/components/job-at-change/schedule-event.component.jsx

@@ -29,11 +29,11 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -208,6 +208,14 @@ export function ScheduleEventComponent({
             <Button>{t("appointments.actions.sendreminder")}</Button>
           </Dropdown>
         ) : null}
+        {event.arrived ? (
+          <Button
+            // onClick={() => handleCancel(event.id)}
+            disabled={event.arrived}
+          >
+            {t("appointments.actions.cancel")}
+          </Button>
+        ) : (
           <Popover
             trigger="click"
             disabled={event.arrived}
@@ -248,6 +256,8 @@ export function ScheduleEventComponent({
               {t("appointments.actions.cancel")}
             </Button>
           </Popover>
+        )}
+
         {event.isintake ? (
           <Button
             disabled={event.arrived}

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -137,6 +137,9 @@ export function JobsDetailHeaderActions({
       <Menu.Item
         disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
       >
+        {job.status !== bodyshop.md_ro_statuses.default_scheduled ? (
+          t("menus.jobsactions.cancelallappointments")
+        ) : (
           <Popover
             trigger="click"
             disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
@@ -194,6 +197,7 @@ export function JobsDetailHeaderActions({
           >
             {t("menus.jobsactions.cancelallappointments")}
           </Popover>
+        )}
       </Menu.Item>
       <Menu.Item
         disabled={