change base url and websocket , bug fixes update,accounting history page

src/API/api.ts

@@ -4,9 +4,9 @@ import axios from "axios";
 //   baseURL: "http://10.10.10.64:8080/api/v1/",
 // });
 const instance = axios.create({
-  // baseURL: "https://board-api.ontime-logs.com/api/v1/",
+  baseURL: "https://board-api.ontime-logs.com/api/v1/",
-  baseURL: "https://api.tteld.co/api/v1/",
+  // baseURL: "https://api.tteld.co/api/v1/",
-  // baseURL: "http://10.10.10.64:8000/api/v1/",
+  // baseURL: "http://10.10.10.29:8000/api/v1/",
 });
 
 const token: string | null = localStorage.getItem("access");

src/App.tsx

@@ -286,8 +286,8 @@ const App: React.FC = () => {
         // );
         // taskSocket = new WebSocket(`wss://api.tteld.co/global/?user_id=${admin_id}`);
         taskSocket = new WebSocket(
-          // `wss://board-socket.ontime-logs.com/global/?user_id=${admin_id}`
+          `wss://board-api.ontime-logs.com/global/?user_id=${admin_id}`
-          `wss://ontime-socket.tteld.co/global/?user_id=${admin_id}`
+          // `wss://ontime-socket.tteld.co/global/?user_id=${admin_id}`
           // `ws://10.10.10.64:8000/global/?user_id=${admin_id}`
         );
 

src/Components/Accounting/AccountingHistory.tsx

@@ -467,17 +467,17 @@ const AccountingHistory: React.FC = () => {
           {years.length === 0 ? (
             <Spin spinning={loading} />
           ) : (
-            years.map((year) => (
+            years.map((year) => {
+              const salariesForYear =
+                userData?.salaries?.filter((salary) => salary.year === year) ||
+                [];
+
+              return (
                 <div key={year} style={{ marginBottom: 32 }}>
                   <Title level={3}>{year}</Title>
-                {userData &&
-                  userData.salaries
-                    .filter((salary) => salary.year === year)
-                    .map((filteredSalary) => (
                   <Table
                     loading={loading}
-                        key={filteredSalary.id}
+                    dataSource={salariesForYear}
-                        dataSource={[filteredSalary]}
                     columns={[
                       {
                         title: <img src={tagIcon} alt="" />,
@@ -488,7 +488,6 @@ const AccountingHistory: React.FC = () => {
                       },
                       { title: "Year", dataIndex: "year" },
                       { title: "Month", dataIndex: "month" },
-
                       {
                         title: "Total Charges",
                         dataIndex: "total_charges",
@@ -539,9 +538,9 @@ const AccountingHistory: React.FC = () => {
                     pagination={false}
                     bordered
                   />
-                    ))}
                 </div>
-            ))
+              );
+            })
           )}
         </div>
       </Drawer>

src/Components/Updates/UpdateEdit.tsx

@@ -210,9 +210,9 @@ const UpdateEdit = () => {
                                     //   readOnly
                                     // />
                                   )} */}
-                                  {data?.company.id !== undefined && (
+                                  {data?.company?.id !== null && (
                                     <Input
-                                      defaultValue={data?.company?.name}
+                                      defaultValue={data?.company?.name || " "}
                                       readOnly
                                     />
                                   )}

src/Components/Updates/UpdateTable.tsx

@@ -192,8 +192,8 @@ const UpdateTable = ({
             render: (status: string) => (
               <span>
                 {status === "Done" && <p className="status-done">Done</p>}
-                {status === "Checking" && (
+                {status === "In Progress" && (
-                  <p className="status-in-progress">Checking</p>
+                  <p className="status-in-progress">In Progress</p>
                 )}
                 {status === "New" && <p className="status-new">New</p>}
                 {status === "Setup" && <p className="status-new">Setup</p>}