diff --git a/src/Components/CurrencyInput.jsx b/src/Components/CurrencyInput.jsx index 7aea90c..c6fb280 100644 --- a/src/Components/CurrencyInput.jsx +++ b/src/Components/CurrencyInput.jsx @@ -3,13 +3,13 @@ import { Input } from "@chakra-ui/react"; export const formatCurrency = (value) => { if (!value) return ''; - const [integer, decimal] = value.split('.'); - const formattedInteger = integer.replace(/\B(?=(\d{3})+(?!\d))/g, ','); + const [integer, decimal] = value?.split('.'); + const formattedInteger = integer?.replace(/\B(?=(\d{3})+(?!\d))/g, ','); return decimal ? `${formattedInteger}.${decimal}` : formattedInteger; }; const CurrencyInput = forwardRef(({ value, onChange, ...props }, ref) => { - console.log(props); + const handleChange = (event) => { diff --git a/src/Components/HeaderMain.jsx b/src/Components/HeaderMain.jsx index 167754d..e10cac6 100644 --- a/src/Components/HeaderMain.jsx +++ b/src/Components/HeaderMain.jsx @@ -1,8 +1,9 @@ -import { AddIcon } from "@chakra-ui/icons"; +import { AddIcon, ArrowBackIcon } from "@chakra-ui/icons"; import { Avatar, Box, Button, + HStack, Popover, PopoverArrow, PopoverBody, @@ -14,13 +15,14 @@ import { useColorMode, } from "@chakra-ui/react"; import React, { useContext } from "react"; -import { Link } from "react-router-dom"; +import { Link, useNavigate } from "react-router-dom"; import { IoMdDownload } from "react-icons/io"; import * as XLSX from "xlsx"; import profile from "../assets/proavatar.webp"; import GlobalStateContext from "../Contexts/GlobalStateContext"; import { MdOutlineDarkMode, MdOutlineLightMode } from "react-icons/md"; import logoMini from "../assets/propic.png" +import { BsBack } from "react-icons/bs"; const HeaderMain = ({ link, @@ -30,6 +32,7 @@ const HeaderMain = ({ logOutHandler, slideDirecttion, }) => { + const navigate = useNavigate() const { colorMode, toggleColorMode } = useContext(GlobalStateContext); @@ -42,6 +45,8 @@ const HeaderMain = ({ zIndex={999} > + + {/* navigate(-1)} /> */} */} {title} + diff --git a/src/Components/MobileView.jsx b/src/Components/MobileView.jsx index be6b8a5..d0a4262 100644 --- a/src/Components/MobileView.jsx +++ b/src/Components/MobileView.jsx @@ -2,6 +2,7 @@ import { Box, Button, Heading, + HStack, Image, Modal, ModalContent, @@ -20,16 +21,25 @@ import { LuClock } from "react-icons/lu"; const MobileView = ({ isOpen, onClose, finalRef }) => { return ( -
- - - + + + + + + display={'flex'} + justifyContent={'center'} + h={"600px"} + w={"330px"} + > { /> @@ -207,9 +218,10 @@ const MobileView = ({ isOpen, onClose, finalRef }) => { + + -
); }; diff --git a/src/Constants/Constants.js b/src/Constants/Constants.js index c09566b..8a5decd 100644 --- a/src/Constants/Constants.js +++ b/src/Constants/Constants.js @@ -2,6 +2,34 @@ import dns from "node:dns" + + +export function getTomorrowDate() { + const today = new Date(); + const tomorrow = new Date(today); + tomorrow.setDate(today.getDate() + 1); + + // Format the date as YYYY-MM-DD (ISO 8601) + return tomorrow.toISOString().split('T')[0]; +} + + +export function removeTrailingZeros(value) { + // Convert the value to a number and then to a string + let number = parseFloat(value); + let result = number.toString(); + + // Check if the result contains a decimal point + if (result.includes('.')) { + // Remove trailing zeros if the decimal part is 0 or 00 + result = result.replace(/(\.\d*?)0+$/, '$1'); // Remove trailing zeros + result = result.replace(/\.$/, ''); // Remove the decimal point if it's the last character + } + + return result; +} + + export function getCountdownTimer(utcDateString) { // Parse the UTC datetime string into a Date object const targetDate = new Date(utcDateString); @@ -85,3 +113,20 @@ export async function checkEmailValidity(email) { return false; // Error occurred } } + + +// Function to convert timestamp to readable date format in Gulf timezone +export function formatTimestampInGulfTimezone(timestamp) { + const date = new Date(timestamp); + const options = { + year: 'numeric', + month: 'long', + day: 'numeric', + hour: '2-digit', + minute: '2-digit', + second: '2-digit', + timeZone: 'Asia/Dubai', // Gulf Standard Time (GST) timezone + timeZoneName: 'short' + }; + return date.toLocaleDateString('en-GB', options); +} diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx index a0c05f8..405d59c 100644 --- a/src/Layout/DefaultLayout.jsx +++ b/src/Layout/DefaultLayout.jsx @@ -188,6 +188,30 @@ const DashboardLayout = ({ isOnline }) => { Investor Transactions ); + + + + + case path.startsWith("/deposit-request"): + return ( + + + Deposite pending request + + ); + case path.startsWith("/deposit-history"): + return ( + + + Deposite withdrawal request + + ); + + + + + + case path.startsWith("/withdraw-request"): return ( diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx index d428265..c5f6f22 100644 --- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx +++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx @@ -35,6 +35,8 @@ import NormalTable from "../../../Components/DataTable/NormalTable"; import { useGetDepositRequestQuery } from "../../../Services/deposit.request.service"; import { current } from "@reduxjs/toolkit"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; +import { removeTrailingZeros } from "../../../Constants/Constants"; +import { formatCurrency } from "../../../Components/CurrencyInput"; const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter @@ -100,7 +102,7 @@ const DepositRequest = () => { // ====================================================[Table Filter]================================================================ const filteredData = data?.data?.rows.filter((item) => { // Filter by name (case insensitive) - const name = [item.firstName, item.lastName, item.countryName].filter(Boolean).join(' '); + const name = [item.firstName, item.lastName, item.countryName].filter(Boolean).join(' '); const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); @@ -116,6 +118,9 @@ const DepositRequest = () => { return nameMatches; }); + console.log(data?.data?.rows); + + const extractedArray = filteredData?.map((item, index) => ({ // id: item?.id, "Sr.no": ( @@ -171,9 +176,9 @@ const DepositRequest = () => { ), "Amount in Investor currency": ( - + - {item?.investorAmount} + {formatCurrency(removeTrailingZeros(item?.investorAmount))} {item?.currencyCode} ), @@ -240,7 +245,7 @@ const DepositRequest = () => { onRejectOpen(); }} py={1} - // variant={"solid"} + // variant={"solid"} > @@ -323,7 +328,7 @@ const DepositRequest = () => { isOpen={isConfirmOpen} onClose={onConfirmClose} id={actionId} - // firstField={firstField} + // firstField={firstField} /> - Upload Supporting* + Upload Supporting { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - "Sr.no", + // "Sr.no", "Client ID", "First Name", "Last Name", @@ -162,10 +162,10 @@ const filteredData = data?.data?.rows.filter((item) => { ), "Amount in Investor currency": ( - + {/* */} - {item?.investorAmount} + {item?.investorAmount} {item?.currencyCode} {/* */} diff --git a/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx b/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx index 3e2695f..72ad3e8 100644 --- a/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx +++ b/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx @@ -7,6 +7,7 @@ import { Text, Tooltip, useDisclosure, + useToast, } from "@chakra-ui/react"; import React, { useContext, useEffect, useRef, useState } from "react"; import DataTable from "../../../Components/DataTable/DataTable"; @@ -30,8 +31,10 @@ import { } from "../../../Services/io.service"; import { getFileNameFromPath } from "../../../Constants/Constants"; import ImageViewer from "../../../Components/ImageViewer"; +import ToastBox from "../../../Components/ToastBox"; const IOArtifacts = ({ enableNextTab, index, data }) => { + const toast = useToast() const params = useParams(); const id = params?.id; @@ -110,6 +113,9 @@ const IOArtifacts = ({ enableNextTab, index, data }) => { if (res?.data?.statusCode === 200) { setDeleteAlertVideo(false); setIsLoadingBtn(false); + toast({ + render: () => , + }); } } catch (error) { console.log(error); @@ -120,9 +126,15 @@ const IOArtifacts = ({ enableNextTab, index, data }) => { setIsLoadingBtn(true); try { const res = await deleteImageArtifacts(id); + console.log(res); + if (res?.data?.statusCode === 200) { setDeleteAlertImage(false); setIsLoadingBtn(false); + toast({ + render: () => , + }); + } } catch (error) { console.log(error); diff --git a/src/Pages/IO_Management/CreateIO/IODetails.jsx b/src/Pages/IO_Management/CreateIO/IODetails.jsx index e828255..8425d95 100644 --- a/src/Pages/IO_Management/CreateIO/IODetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IODetails.jsx @@ -34,6 +34,7 @@ import qatar from "../../../assets/qatar_flag.png"; import uae from "../../../assets/uae_flag.png"; import saudi from "../../../assets/saudi_arabia_flag.png"; import { formatDatee } from "../../../Components/FormField"; +import { removeTrailingZeros } from "../../../Constants/Constants"; const schema = yup.object().shape({ investmentNameEnglish: yup @@ -153,22 +154,24 @@ const IODetails = ({ enableNextTab, index, data }) => { }); const miniValue = data?.country?.map( - ({ countryName, flagIcon, minInvestmentAmt, countryCode, id }, index) => { + ({ countryName, flagIcon, minInvestmentAmt, countryCode, id, currency }, index) => { return { id:id, country: countryName, value: minInvestmentAmt, logo: flagIcon, - curr: countryCode, + curr: currency?.currencyCode, }; } ); - const minInvestmentById = IObyID?.data?.minInvestmentAmt?.map(({minInvestmentAmt, country, country_xid})=>{ + + + const minInvestmentById = IObyID?.data?.minInvestmentAmt?.map(({minInvestmentAmt, country, country_xid, })=>{ return{ id:country_xid, country: country?.countryName, - value: minInvestmentAmt, + value: removeTrailingZeros(minInvestmentAmt), logo: country?.flagIcon, curr: country?.countryCode, } @@ -206,7 +209,7 @@ const IODetails = ({ enableNextTab, index, data }) => { investmentNameArabic: IObyID?.data?.investmentNameArabic, descriptionEnglish: IObyID?.data?.descriptionEnglish, descriptionArabic: IObyID?.data?.descriptionArabic, - goalAmount: IObyID?.data?.goalAmount, + goalAmount: removeTrailingZeros(IObyID?.data?.goalAmount), closingDate: formatDatee(IObyID?.data?.closingDate), holdingPeriod: IObyID?.data?.holdingPeriod, ISIN: IObyID?.data?.ISIN, @@ -220,10 +223,10 @@ const IODetails = ({ enableNextTab, index, data }) => { }); } - - }, [id, IObyID]); + + // const minInvestmentById = @@ -351,7 +354,7 @@ const IODetails = ({ enableNextTab, index, data }) => { { label: "Goal Amount", placeHolder: "$00.00", - value: IObyID?.data?.goalAmount, + value: removeTrailingZeros(IObyID?.data?.goalAmount), name: "goalAmount", type: "number", isRequired: true, diff --git a/src/Pages/IO_Management/IOArtifactsAdd.jsx b/src/Pages/IO_Management/IOArtifactsAdd.jsx index 18a530b..1bac077 100644 --- a/src/Pages/IO_Management/IOArtifactsAdd.jsx +++ b/src/Pages/IO_Management/IOArtifactsAdd.jsx @@ -11,13 +11,15 @@ import { FormControl, FormErrorMessage, FormLabel, + Icon, Image, Input, Stack, + Text, useToast, } from "@chakra-ui/react"; import * as yup from "yup"; -import React, { useEffect, useState } from "react"; +import React, { useEffect, useRef, useState } from "react"; import { useForm, Controller } from "react-hook-form"; import { yupResolver } from "@hookform/resolvers/yup"; import CustomAlertDialog from "../../Components/CustomAlertDialog"; @@ -27,6 +29,9 @@ import { } from "../../Services/io.service"; import { useParams } from "react-router-dom"; import ToastBox from "../../Components/ToastBox"; +import { bytesToMB } from "./InvestmentDocuments"; +import { formatTimestampInGulfTimezone } from "../../Constants/Constants"; +import { IoMdRemoveCircleOutline } from "react-icons/io"; const investmentImageSchema = yup.object().shape({ artifactName: yup.string().required("Artifact image name is required"), @@ -53,6 +58,7 @@ const IOArtifactsAdd = ({ const [updateImageArtifacts] = useUpdateImageArtifactsMutation(); const found = data?.find((item) => item?.id === actionId); + const fileInputRef = useRef(null); const { @@ -93,12 +99,15 @@ const IOArtifactsAdd = ({ toast({ render: () => , }); - reset(); setFile(null); setIsLoading(false); setAlert(false); setPreview(null); onClose(); + reset({ + artifactName: "", + artifactPathName: "", + }); } if (res?.error) { @@ -146,6 +155,8 @@ const IOArtifactsAdd = ({ reader.readAsDataURL(file); }; + + const handleSave = () => { handleSubmit(onSubmit)(); }; @@ -162,6 +173,18 @@ const IOArtifactsAdd = ({ setActionId(false); }; + + const handleRemove = () => { + + setFile(null) + setPreview(null) + // Reset the file input value + if (fileInputRef.current) { + fileInputRef.current.value = ""; + } + } + + return ( <> {!preview && @@ -214,12 +238,23 @@ const IOArtifactsAdd = ({ errors.artifactPathName?.message} {preview && ( - Image Preview + <> + Image Preview + + Name: {file?.name} + File size: {bytesToMB(file?.size)} + Last update: {formatTimestampInGulfTimezone(file?.lastModified)} + handleRemove()} _hover={{ bg: "gray.100" }} transition={'all 0-5s'} cursor={'pointer'} position={'absolute'} right={0} p={1} bottom={0} rounded={'lg'} boxSize={7} as={IoMdRemoveCircleOutline} /> + + )} {found && !preview && ( { const [selectedItem, setSelectedItem] = useState(); const [isLoadingg, setIsLoading] = useState(false); const [error, setError] = useState(""); - const [selectedStatusId, setSelectedStatusId] = useState(status?.[0]?.id); + const [selectedStatusId, setSelectedStatusId] = useState(''); const { data } = useGetIOprepopulateDataQuery(); const [updateStatusIo] = useUpdateStatusIoMutation(); - useEffect(() => { - setSelectedStatusId(status?.[0]?.id); - }, [status]); + // useEffect(() => { + // setSelectedStatusId(status?.[0]?.id); + // }, [status]); const handleMenuItemClick = (item, id) => { setSelectedItem(item); @@ -46,7 +46,7 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { const handleSubmit = async () => { if (!selectedStatusId) { - setError("Status is required."); + setError("Please select status"); return; } setError(""); @@ -67,7 +67,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { }; const handleClose = () => { - setSelectedItem("") + setSelectedItem(null) + setSelectedStatusId(null) onClose() } diff --git a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx index 12d42ab..a4f164f 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx @@ -41,6 +41,8 @@ import { TABLE_PAGINATION } from "../../../Constants/Paginations"; import { formatCurrency } from "../../../Components/CurrencyInput"; import { IoIosPhonePortrait } from "react-icons/io"; import MobileView from "../../../Components/MobileView"; +import { ImMobile2 } from "react-icons/im"; +import { removeTrailingZeros } from "../../../Constants/Constants"; // import { debounce } from "./AddIOCharges"; const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter @@ -74,7 +76,7 @@ const ViewIOTable = () => { page: currentPage, size: pageSize, }); - console.log(data); + // ===============================[ Table Header ] const tableHeadRow = [ @@ -85,7 +87,7 @@ const ViewIOTable = () => { "Goal Amount", "Holding Period", "IO Status", - "Priority", + // "Preview", "Action", ]; @@ -105,7 +107,6 @@ const ViewIOTable = () => { return nameMatches && statusMatches; }); - console.log(filteredData); const extractedArray = filteredData?.map((item, index) => ({ "IO ID": ( @@ -141,7 +142,7 @@ const ViewIOTable = () => { "Goal Amount": ( - {item.goalAmount ? formatCurrency(item.goalAmount) : "---"} + {item.goalAmount ? formatCurrency(removeTrailingZeros(item.goalAmount)) : "---"} ), @@ -187,23 +188,36 @@ const ViewIOTable = () => { ), - "Priority": ( - - - View - + "Preview": ( + + + + + + ), Action: ( - + > */} - + {/* */} - { > - + */} {/* { const handleDelete = () => {}; - console.log(extractedArray); return ( diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx index 88ac59f..37b49a8 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx @@ -45,6 +45,9 @@ const ViewIOdata = () => { const { isOpen, onOpen, onClose } = useDisclosure(); const navigate = useNavigate(); const [isEditing, setIsEditing] = useState(false); + const { IODetails, setIODetails } = useContext(GlobalStateContext); + console.log(IODetails?.isInvestedAmount); + const tabs = [ @@ -77,7 +80,13 @@ const ViewIOdata = () => { {tabs.map(({ label }, index) => ( { {tabs.map(({ content }, index) => ( - {content} + {content} ))} diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx index a0c3a2d..6c49f07 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx @@ -42,6 +42,7 @@ import { AddIcon } from "@chakra-ui/icons"; import { GrGallery } from "react-icons/gr"; import Loader01 from "../../../Components/Loaders/Loader01"; import { formatCurrency } from "../../../Components/CurrencyInput"; +import { removeTrailingZeros } from "../../../Constants/Constants"; const ViewIOdataHeader = ({data, isLoading}) => { const params = useParams(); @@ -157,11 +158,6 @@ const filteredMenu = menu?.filter(item => apiTransactionTitles?.includes(item.id - -console.log(IODetails?.ioNAV); -console.log(IODetails?.ioCash); -console.log(IODetails?.ioMVNAV); - @@ -298,7 +294,7 @@ console.log(IODetails?.ioMVNAV); IO NAV - {IODetails?.ioNAV ? formatCurrency(IODetails?.ioNAV) : "00.00"} + {IODetails?.ioNAV ? formatCurrency(removeTrailingZeros(IODetails?.ioNAV)) : "00.00"} @@ -307,7 +303,7 @@ console.log(IODetails?.ioMVNAV); IO cash - {IODetails?.ioCash ? IODetails?.ioCash : "00.00"} + {IODetails?.ioCash ? formatCurrency(removeTrailingZeros(IODetails?.ioCash)) : "00.00"} @@ -316,7 +312,7 @@ console.log(IODetails?.ioMVNAV); IO MV NAV - {IODetails?.ioMVNAV ? formatCurrency(IODetails?.ioMVNAV) : "00.00"} + {IODetails?.ioMVNAV ? formatCurrency(removeTrailingZeros(IODetails?.ioMVNAV)) : "00.00"} diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx index 015655f..42d0753 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx @@ -12,6 +12,7 @@ import * as yup from "yup"; import { yupResolver } from "@hookform/resolvers/yup"; import { formatDate } from "../../Master/Sponser/Sponsers"; import { formatCurrency } from "../../../Components/CurrencyInput"; +import { removeTrailingZeros } from "../../../Constants/Constants"; const schema = yup.object().shape({ investmentNameEnglish: yup @@ -105,7 +106,7 @@ const ViewIOdetails = () => { investmentNameArabic: IObyID?.data?.investmentNameArabic, descriptionEnglish: IObyID?.data?.descriptionEnglish, descriptionArabic: IObyID?.data?.descriptionArabic, - goalAmount: IObyID?.data?.goalAmount, + goalAmount: removeTrailingZeros(IObyID?.data?.goalAmount), closingDate: IObyID?.data?.closingDate, holdingPeriod: IObyID?.data?.holdingPeriod, ISIN: IObyID?.data?.ISIN, @@ -118,16 +119,20 @@ const ViewIOdetails = () => { } }, [id, IObyID]); - const minInvestmentById = IObyID?.data?.minInvestmentAmt?.map(({minInvestmentAmt, country, id})=>{ + const minInvestmentById = IObyID?.data?.minInvestmentAmt?.map(({minInvestmentAmt, country, currencyCode, id})=>{ return{ id:id, country: country?.countryName, - value: minInvestmentAmt, + value: removeTrailingZeros(minInvestmentAmt), logo: country?.flagIcon, - curr: country?.countryCode, + curr: currencyCode, } }) + + console.log(); + + //=======================[ Editor ] const formFields = [ { @@ -258,7 +263,7 @@ const ViewIOdetails = () => { { label: "Goal Amount", placeHolder: "$00.00", - value: IObyID?.data?.goalAmount ? formatCurrency(IObyID?.data?.goalAmount) : "---", + value: IObyID?.data?.goalAmount ? formatCurrency(removeTrailingZeros(IObyID?.data?.goalAmount)) : "---", name: "goalAmount", type: "number", isRequired: true, diff --git a/src/Pages/Master/ExchangeRate/EditExchangeRate.jsx b/src/Pages/Master/ExchangeRate/EditExchangeRate.jsx index 4ea6b74..6b22beb 100644 --- a/src/Pages/Master/ExchangeRate/EditExchangeRate.jsx +++ b/src/Pages/Master/ExchangeRate/EditExchangeRate.jsx @@ -29,6 +29,9 @@ import { useUpdateExchangeRateMutation, } from "../../../Services/exchange.rate.service"; import ToastBox from "../../../Components/ToastBox"; +import { getTomorrowDate } from "../../../Constants/Constants"; + + // Convert date to YYYY-MM-DD format const formatDateValue = (date) => { @@ -73,9 +76,7 @@ const EditExchangeRate = ({ id, setIsLoading }) => { rate: rate, }; const res = await updateExchange({ data, id }); - console.log(res?.data?.statusCode); if (res?.data?.statusCode === 200) { - console.log("hit"); toast({ render: () => , }); @@ -88,7 +89,6 @@ const EditExchangeRate = ({ id, setIsLoading }) => { return ( <> - {" "} { + + Last effective date + + {formatDate(foundObject?.effectiveFrom)} + + Effective from - {formatDate(foundObject?.effectiveFrom)} + {formatDate(getTomorrowDate())} diff --git a/src/Pages/UnderConstruction.jsx b/src/Pages/UnderConstruction.jsx index 56bf614..8349eb6 100644 --- a/src/Pages/UnderConstruction.jsx +++ b/src/Pages/UnderConstruction.jsx @@ -1,7 +1,7 @@ import { Box, Image, Text } from '@chakra-ui/react' import React from 'react' // import noInternet from "../assets/Error.svg" -import robot from "../assets/under-construction.png" +import robot from "../assets/robot.png" const UnderConstruction = ({title, h}) => { return ( @@ -13,7 +13,7 @@ const UnderConstruction = ({title, h}) => { flexDirection={'column'} gap={8} > - + 🚧 Building Something Amazing Just for You! 🚧 ) diff --git a/src/Services/deposit.request.service.js b/src/Services/deposit.request.service.js index 019bd08..2d5ce13 100644 --- a/src/Services/deposit.request.service.js +++ b/src/Services/deposit.request.service.js @@ -9,7 +9,7 @@ import { baseQuery } from "./token.serivce"; export const depositRequest = createApi({ reducerPath: "depositRequest", baseQuery: baseQuery, - tagTypes: ["getDepositRequest"], + tagTypes: ["getDepositRequest", "getDepositHistory"], endpoints: (builder) => ({ getDepositRequest: builder.query({ query: () => `/deposit/admin/pending-requests`, @@ -26,7 +26,7 @@ export const depositRequest = createApi({ method: "PATCH", body: data, }), - invalidatesTags: ["getDepositRequest"], + invalidatesTags: ["getDepositRequest", "getDepositHistory"], }), depositReject: builder.mutation({ @@ -35,12 +35,12 @@ export const depositRequest = createApi({ method: "PATCH", body: data, }), - invalidatesTags: ["getDepositRequest"], + invalidatesTags: ["getDepositRequest", "getDepositHistory"], }), getDepositHistory: builder.query({ query: () => `/deposit/admin/history`, - // providesTags: ["getDepositHistory"], + providesTags: ["getDepositHistory"], }), }), }); diff --git a/src/Services/io.service.js b/src/Services/io.service.js index d200ff3..daa6f5e 100644 --- a/src/Services/io.service.js +++ b/src/Services/io.service.js @@ -50,7 +50,7 @@ export const ioService = createApi({ method: "PATCH", body: data, }), - invalidatesTags: ["getIOById", "getIO"], + invalidatesTags: ["getIOById", "getIO","prePopulate"], }), // =====[Key Merits] diff --git a/src/assets/commingsoon.png b/src/assets/commingsoon.png new file mode 100644 index 0000000..e576b78 Binary files /dev/null and b/src/assets/commingsoon.png differ