Merge pull request 'dev' (#32) from dev into main

Reviewed-on: #32

src/Constants/Constants.js

@@ -237,21 +237,9 @@ export const decryptString = (ciphertext) => {
   return originalText;
 };
 
-// export const SUPER_ADMIN_ID = Number(import.meta.env.VITE_SUPER_ADMIN_ID) || 1
-// export const MAKER_ID = import.meta.env.VITE_MAKER_ID || 1
-// export const CHECKER_ID = import.meta.env.VITE_CHECKER_ID || 2
-
-// export const isMaker = (role = decryptString(localStorage?.getItem("role"))) => role === import.meta.env.VITE_MAKER;
-// export const isChecker = (role = decryptString(localStorage?.getItem("role"))) => role === import.meta.env.VITE_CHECKER;
-
-export const SUPER_ADMIN_ID = Number(import.meta.env?.VITE_SUPER_ADMIN_ID) || 1;
-export const MAKER_ID = Number(import.meta.env?.VITE_MAKER_ID) || 1;
-export const CHECKER_ID = Number(import.meta.env?.VITE_CHECKER_ID) || 2;
-
-export const isMaker = (role = decryptString(localStorage?.getItem("role") || "")) => 
-    role === (import.meta.env?.VITE_MAKER || "");
-
-export const isChecker = (role = decryptString(localStorage?.getItem("role") || "")) => 
-    role === (import.meta.env?.VITE_CHECKER || "");
-
+export const SUPER_ADMIN_ID = Number(import.meta.env.VITE_SUPER_ADMIN_ID) || 1
+export const MAKER_ID = import.meta.env.VITE_MAKER_ID || 1
+export const CHECKER_ID = import.meta.env.VITE_CHECKER_ID || 2
 
+export const isMaker = (role = decryptString(localStorage?.getItem("role"))) => role === import.meta.env.VITE_MAKER;
+export const isChecker = (role = decryptString(localStorage?.getItem("role"))) => role === import.meta.env.VITE_CHECKER;

src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx

@@ -122,14 +122,8 @@ const InvestorDetails = () => {
     Country: item?.country?.countryName,
     "Phone Number": item?.principal?.mobileNumber, // Skipping integer conversion, as this is likely a string
     "E-mail ID": item?.principal?.emailAddress,
-    "Wallet Balance":parseFloat(item?.WalletBalance_InInvCur || 0).toLocaleString(undefined, {
-      minimumFractionDigits: 2, 
-      maximumFractionDigits: 2, 
-    }), // Skipping integer conversion, as this is likely a string
-    "Investor Portfolio": parseFloat(item?.Portfolio_InInvCur || 0).toLocaleString(undefined, {
-      minimumFractionDigits: 2, 
-      maximumFractionDigits: 2, 
-    }),
+    "Wallet Balance": item?.principal?.WalletBalance_InInvCur, // Skipping integer conversion, as this is likely a string
+    "Investor Portfolio": item?.principal?.Portfolio_InInvCur,
     // Type: item?.investor_type?.investorTypeName,
     // Status: item.ioStatus ? "Ban" : "Unban",
     "KYC Status": item.KYCStatus ? "Completed" : "Not complete",

src/Routes/Nav.js

@@ -33,7 +33,6 @@ import { LiaCrownSolid } from "react-icons/lia";
 import { PiCrownDuotone } from "react-icons/pi";
 import { HiOutlineBanknotes } from "react-icons/hi2";
 import { AtSignIcon } from "@chakra-ui/icons";
-import { isMaker, MAKER_ID } from "../Constants/Constants";
 
 export const nav = [
   {
@@ -110,7 +109,7 @@ export const nav = [
     title: "Fawateer Deposit",
     submenu: [
       {
-        title: isMaker() ? "Approve Create" : "Approve Request",
+        title: "Approver Request",
         path: "/fawateer",
         icon: RiMoneyDollarBoxLine,
       },