wallet API changed

src/components/MyActiveJobs/ActiveJobMessage.jsx

@@ -19,7 +19,7 @@ export default function ActiveJobMessage({ activeJobMesList }) {
     // }
 
   return (
-    <div className="w-full h-full max-h-[345px] overflow-y-auto">
+    <div className="w-full h-full max-h-[343px] overflow-y-auto">
         <table className="wallet-activity w-full table-auto border-collapse text-left">
             <thead className='border-b-2'>
                 <tr className='text-slate-600'>

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -12,7 +12,7 @@ import IndexJobActions from "./JobActions/IndexJobActions";
 import usersService from "../../services/UsersService";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import { SocketValues } from "../Contexts/SocketIOContext";
-import TabButton from "../customTabs/TabButton";
+import ManageJobTab from "../customTabs/ManageJobTab";
 import AttachFile from "../attachmentCom/AttachFile";
 
 import JobDetailPopout from "./JobDetailPopout";
@@ -408,7 +408,7 @@ function ActiveJobs(props) {
                 {/* switch button */}
                 <div className="grid grid-cols-2">
                 {tabs.map((item) => (
-                    <TabButton 
+                    <ManageJobTab 
                         key={item}
                         item={item}
                         selectedTab={selectedTab}
@@ -673,37 +673,46 @@ const PopModal = ({
             </svg>
           </button>
         </div>
-        <div className="job-action-modal-body w-full px-10 py-8 gap-4">
+        <div className="job-action-modal-body w-full px-10 py-2 gap-4">
-          <div className="w-full flex flex-col items-center">
+          <div className="w-full">
             {activeJobMesList.loading ? (
               <LoadingSpinner size="16" color="sky-blue" />
             ) : (
               <div className="message-table h-[500px] overflow-y-auto">
                 <table className="wallet-activity w-full table-auto border-collapse text-left">
-                  <thead className="border-b-2">
+                  {/* <thead className="border-b-0">
                     <tr className="text-slate-600">
-                      <th className="p-2"></th>
+                      <th className="p-0"></th>
                     </tr>
-                  </thead>
+                  </thead> */}
                   {activeJobMesList?.data?.length ? (
                     <tbody>
-                      {activeJobMesList?.data?.map((item, index) => (
+                      {activeJobMesList?.data?.map((item, index) => {
+                        let imageLink = `${activeJobMesList?.image}${localStorage.getItem('session_token')}/contracts/${item.msg_uid}`
+
+                        return (
                         <tr key={index} className="text-slate-500">
                           <td>
-                            <div className="msg_box">
+                            <div className={`msg_box ${item.who}`}>
                               <div className="msg_header">
                                 {item.msg_date} {item.msg_firstname}
                               </div>
-                              <span
+                              {/* <span
                                 className="p-2"
                                 dangerouslySetInnerHTML={{
                                   __html: item.message,
                                 }}
-                              ></span>
+                              ></span> */}
+                              {item.msg_type == 'FILE' ?
+                                <a href={imageLink} target="_blank" className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></a>
+                                :
+                                <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                              }
                             </div>
                           </td>
                         </tr>
-                      ))}
+                        )
+                      })}
                     </tbody>
                   ) : activeJobMesList.error ? (
                     <tbody>

src/components/MyWallet/WalletItemCard.jsx

@@ -73,18 +73,22 @@ export default function WalletItemCard({ walletItem, payment, countries }) {
             </div>
           </div>
         </div>
-
+        
-        <p className="text-lg text-white tracking-wide flex justify-center items-center gap-8">
+        {walletItem.escrow > 0 ? 
-          HOLDINGS :{" "}
+          <p className="text-lg text-white tracking-wide flex justify-center items-center gap-8">
-          <span className="xxs:scale-100 lg:scale-100 xl:scale-125">
+            HOLDINGS :{" "}
-            {PriceFormatter(
+            <span className="xxs:scale-100 lg:scale-100 xl:scale-125">
-              walletItem.escrow * 0.01,
+              {PriceFormatter(
-              walletItem.code,
+                walletItem.escrow * 0.01,
-              undefined,
+                walletItem.code,
-              "text-[1.5rem]"
+                undefined,
-            )}
+                "text-[1.5rem]"
-          </span>
+              )}
-        </p>
+            </span>
+          </p>
+          :
+          null
+        }
 
         <div className="w-full h-[1px] bg-white"></div>
 

src/components/Partials/MobileSideBar.jsx

@@ -92,7 +92,7 @@ export default function MobileSidebar({
               {/* Using mini component reduces the bulk amount of html */}
               <ListItem
                 title={
-                  userDetails?.account_type == "FULL" ? "Dashboard" : "Home"
+                  userDetails?.account_type == "FULL" ? "Home" : "Home"
                 }
                 route="/"
                 sidebar={sidebar}

src/components/Partials/Sidebar.jsx

@@ -112,7 +112,7 @@ export default function Sidebar({
             <ul className="flex flex-col space-y-6">
               {/* Using mini component reduces the bulk amount of html */}
               <ListItem
-                title={userDetails?.account_type == "FULL" ? "Dashboard" : "Home"}
+                title={userDetails?.account_type == "FULL" ? "Home" : "Home"}
                 route="/"
                 sidebar={sidebar}
                 iconName="new-dashboard"

src/components/customTabs/ManageJobTab.jsx

@@ -0,0 +1,23 @@
+import React from 'react'
+import Icons from '../Helpers/Icons'
+
+export default function ManageJobTab({ item='', iconName='', selectedTab='', setSelectedTab=()=>{} }) {
+  return (
+    <button
+      className={`flex lg:space-x-4 space-x-2 hover:text-purple transition-all duration-300 ease-in-out items-center cursor-pointer mb-2 mr-6 lg:mr-0 float-left lg:float-none overflow-hidden ${
+        selectedTab === item ? "text-purple" : " text-thin-light-gray"
+      }`}
+      value={item}
+      name={item}
+      onClick={() => setSelectedTab(item)}
+    >
+      <div>
+        <Icons name={iconName} />
+      </div>
+      <div>
+        <p className="text-18 tracking-wide">{item[0]?.toUpperCase() + item?.slice(1)}</p>
+      </div>
+    </button>
+  )
+}
+

src/services/UsersService.js

@@ -126,7 +126,7 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
     };
-    return this.postAuxEnd("/getwallets", postData);
+    return this.postAuxEnd("/wallets", postData);
   }
   getApiGate() {
     // localStorage.setItem("session_token", ``);