From 41c30fe704a6a956b931a90b4ebd1197d8327806 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 9 Jun 2021 10:52:33 -0700
Subject: [PATCH] IO-1117 IO-1087

---
 .../job-3rd-party-modal.component.jsx              |  4 +---
 .../print-center-jobs.component.jsx                | 14 ++++++++------
 .../shop-info/shop-info.general.component.jsx      |  1 -
 client/src/translations/en_us/common.json          |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
index 5803c0c6f..f597d156e 100644
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -87,9 +87,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
 
   return (
     <>
-      <Button type="primary" onClick={showModal}>
-        {t("printcenter.jobs.3rdpartypayer")}
-      </Button>
+      <Button onClick={showModal}>{t("printcenter.jobs.3rdpartypayer")}</Button>
       <Modal visible={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
         <Form
           onFinish={handleFinish}
diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
index 5b4f646c1..a77fcfec4 100644
--- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx
+++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
@@ -1,4 +1,4 @@
-import { Card, Col, Input, Row, Typography } from "antd";
+import { Card, Col, Input, Row, Space, Typography } from "antd";
 import _ from "lodash";
 import React, { useState } from "react";
 import { connect } from "react-redux";
@@ -42,10 +42,13 @@ export function PrintCenterJobsComponent({ printCenterModal }) {
         <Col lg={16} md={12} sm={24} className="print-center-list">
           <Card
             extra={
-              <Input.Search
-                onChange={(e) => setSearch(e.target.value)}
-                value={search}
-              />
+              <Space wrap>
+                <Jobd3RdPartyModal jobId={jobId} />
+                <Input.Search
+                  onChange={(e) => setSearch(e.target.value)}
+                  value={search}
+                />
+              </Space>
             }
           >
             <Row gutter={[16, 16]}>
@@ -71,7 +74,6 @@ export function PrintCenterJobsComponent({ printCenterModal }) {
               ))}
             </Row>
           </Card>
-          <Jobd3RdPartyModal jobId={jobId} />
         </Col>
       </Row>
     </div>
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 74170bf3c..9123eddfc 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -261,7 +261,6 @@ export default function ShopInfoGeneral({ form }) {
           label={t("bodyshop.fields.md_categories")}
           rules={[
             {
-              required: true,
               //message: t("general.validation.required"),
               type: "array",
             },
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index e0a98ab1b..31e88c93c 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1732,7 +1732,7 @@
 					"state": "Province/State",
 					"zip": "Postal Code/Zip"
 				},
-				"3rdpartypayer": "Third Party Payer",
+				"3rdpartypayer": "Invoice to Third Party Payer",
 				"appointment_confirmation": "Appointment Confirmation",
 				"appointment_reminder": "Appointment Reminder",
 				"casl_authorization": "CASL Authorization",