From 0411ab82f03efb691616d1560c4ce0fd03aaf445 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Wed, 9 Oct 2024 17:56:54 +0100
Subject: [PATCH] currency fixed

---
 .../MyActiveJobs/ActiveJobMessage.jsx         | 12 +++++-----
 src/components/MyActiveJobs/ActiveJobs.jsx    | 22 ++++++++++---------
 .../WalletComponent/PurchasesTable.jsx        |  4 ++--
 .../WalletComponent/RecentActivityTable.jsx   |  4 ++--
 src/components/customTabs/TabButton.jsx       |  2 +-
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/components/MyActiveJobs/ActiveJobMessage.jsx b/src/components/MyActiveJobs/ActiveJobMessage.jsx
index 7d27384..ab826bc 100644
--- a/src/components/MyActiveJobs/ActiveJobMessage.jsx
+++ b/src/components/MyActiveJobs/ActiveJobMessage.jsx
@@ -19,8 +19,7 @@ export default function ActiveJobMessage({ activeJobMesList }) {
     // }
 
   return (
-    <div className='flex flex-col justify-between'>
-    <div className="w-full h-full min-h-[250px] max-h-[300px] overflow-y-auto">
+    <div className="w-full h-full max-h-[345px] 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'>
@@ -71,9 +70,10 @@ export default function ActiveJobMessage({ activeJobMesList }) {
         </table>
     </div>
 
-    {/* PAGINATION BUTTON */}
-    {/* <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> */}
-    {/* END OF PAGINATION BUTTON */}
-    </div>
+    // <div className='flex flex-col justify-between'>
+    // PAGINATION BUTTON
+    // <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    // END OF PAGINATION BUTTON
+    // </div>
   )
 }
diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx
index ab87ba9..5a2704d 100644
--- a/src/components/MyActiveJobs/ActiveJobs.jsx
+++ b/src/components/MyActiveJobs/ActiveJobs.jsx
@@ -390,8 +390,8 @@ function ActiveJobs(props) {
         {/* end of job details */}
       </div>
 
-      <div className="my-4 py-[20px] bg-white dark:bg-black px-4 rounded-2xl shadow-md lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0">
-        <div className="w-full lg:w-1/2 mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
+      <div className="my-4 py-[20px] bg-white dark:bg-black px-4 rounded-2xl shadow-md grid grid-cols-1 lg:grid-cols-2 gap-3">
+        <div className="w-full mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
           <div className="">
             <h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
               Actions
@@ -545,14 +545,16 @@ function ActiveJobs(props) {
         </div>
 
         {/* MESSAGE SECTION */}
-        <div className="w-full lg:w-1/2">
-          <div className="mb-4">
-            <AttachFile
-              data={props.details}
-              showOnData={true}
-              fontSize={'text-lg'}
-            />
-          </div>
+        <div className="w-full flex flex-col">
+          {props.details &&
+            <div className="mb-4">
+              <AttachFile
+                data={props.details}
+                showOnData={true}
+                fontSize={'text-lg'}
+              />
+            </div>
+          }
           <div className="flex justify-between items-center gap-5">
             <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
               <span>Message</span>
diff --git a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
index 192af14..2494055 100644
--- a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
+++ b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
@@ -33,8 +33,8 @@ function PurchasesTable({purchase}) {
                     <td className="p-4">{item.added_date}<br />
                     <b>{item.confirmation} </b>
                     </td>
-                    <td className="p-4 text-right">{currencySymbol('', item.amount)}</td>
-                    <td className="p-4 text-right">{currencySymbol('', item.fee)}</td>
+                    <td className="p-4 text-right">{currencySymbol(item.currency, item.amount)}</td>
+                    <td className="p-4 text-right">{currencySymbol(item.currency, item.fee)}</td>
                 </tr>
                 ))}
             </tbody>
diff --git a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
index 5da7b6a..69cee2a 100644
--- a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
+++ b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
@@ -40,9 +40,9 @@ function RecentActivityTable({ payment }) {
                   dangerouslySetInnerHTML={{ __html: item.recipient }}
                 ></td>
                 <td className="p-4 text-right">
-                  {currencySymbol('', item.amount)}
+                  {currencySymbol(item.currency, item.amount)}
                   <br />
-                  {currencySymbol('', item.fee)}
+                  {currencySymbol(item.currency, item.fee)}
                 </td>
                 <td className="p-4">{item.status}</td>
               </tr>
diff --git a/src/components/customTabs/TabButton.jsx b/src/components/customTabs/TabButton.jsx
index 24b4878..93f79dd 100644
--- a/src/components/customTabs/TabButton.jsx
+++ b/src/components/customTabs/TabButton.jsx
@@ -4,7 +4,7 @@ import Icons from '../Helpers/Icons'
 export default function TabButton({ 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 lg:mb-11 mb-2 mr-6 lg:mr-0 float-left lg:float-none overflow-hidden ${
+      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}
-- 
2.34.1