diff --git a/src/Images/dash_icon_3n.png b/src/Images/dash_icon_3n.png
new file mode 100644
index 0000000..07686be
Binary files /dev/null and b/src/Images/dash_icon_3n.png differ
diff --git a/src/Images/dash_icon_6n.png b/src/Images/dash_icon_6n.png
new file mode 100644
index 0000000..4c6af97
Binary files /dev/null and b/src/Images/dash_icon_6n.png differ
diff --git a/src/Pages/Dashboard/Dashbaord.jsx b/src/Pages/Dashboard/Dashbaord.jsx
index 55514e6..21eb122 100644
--- a/src/Pages/Dashboard/Dashbaord.jsx
+++ b/src/Pages/Dashboard/Dashbaord.jsx
@@ -22,10 +22,10 @@ import { useGetDashboardMasterQuery } from "../../Services/dashboard.service";
import InvestmentOpportunities from "./InvestmentOpportunities";
import IconOne from '../../Images/dash_icon_1.svg';
import IconTwo from '../../Images/dash_icon_2.svg';
-import IconThree from '../../Images/dash_icon_3.svg';
+import IconThree from '../../Images/dash_icon_3n.png';
import IconFour from '../../Images/dash_icon_4.svg'
import IconFive from '../../Images/dash_icon_5.svg';
-import IconSix from '../../Images/dash_icon_6.svg';
+import IconSix from '../../Images/dash_icon_6n.png';
import IconSeven from '../../Images/dash_icon_7.svg'
// const panddingReguest = [
@@ -225,12 +225,12 @@ const Dashbaord = ({ showSearch = false }) => {
Pending Request
-
+
{panddingReguest.map((item, index) => (
-
+
-
+
{item.label}
@@ -246,16 +246,22 @@ const Dashbaord = ({ showSearch = false }) => {
User Activity
-
+
{userActivity.map((item, index) => (
-
+
-
+
+ {item.icon === IconSix ? (
+
+ ) : (
+
+ )}
+
{
))}
-
+
@@ -292,11 +298,11 @@ const Dashbaord = ({ showSearch = false }) => {
>
{data?.data?.userActivity?.openedAppToday?.percentage} %
-
+
Users that opened the app today
-
+
{
?.number || 0
).toLocaleString()}
-
+
Users who logged in during the last month
@@ -318,19 +324,21 @@ const Dashbaord = ({ showSearch = false }) => {
-
+
-
+
{
: data?.data?.userActivity?.newKYCVerifications
?.last30days}
-
+
New KYC verification
@@ -388,7 +396,7 @@ const Dashbaord = ({ showSearch = false }) => {
Investment Opportunities
-
+
{
{closedOpportunities.map((item, index) => (
-
+
-
+
{item.label}
@@ -440,7 +448,7 @@ const Dashbaord = ({ showSearch = false }) => {
Wallet Balances
-
+
${" "}
@@ -461,7 +469,7 @@ const Dashbaord = ({ showSearch = false }) => {
{walletCase.slice(0, 4).map((item, index) => (
-
+
{item.amount}
@@ -474,7 +482,7 @@ const Dashbaord = ({ showSearch = false }) => {
{walletCase.slice(4).map((item, index) => (
-
+
{item.amount}
diff --git a/src/Pages/Dashboard/InvestmentOpportunities.jsx b/src/Pages/Dashboard/InvestmentOpportunities.jsx
index ac71812..f06e633 100644
--- a/src/Pages/Dashboard/InvestmentOpportunities.jsx
+++ b/src/Pages/Dashboard/InvestmentOpportunities.jsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Input, Select, Text, useToast } from "@chakra-ui/react";
+import { Badge, Box, HStack, Input, Select, Text, useToast } from "@chakra-ui/react";
import React, { useContext, useEffect, useState } from "react";
import { OPACITY_ON_LOAD } from "../../Layout/animations";
import GlobalStateContext from "../../Contexts/GlobalStateContext";
@@ -60,25 +60,25 @@ const InvestmentOpportunities = ({ showSearch = true, selectStyle = {} }) => {
),
"Amount Remaining %": (
-
+
- {`${parseFloat(item?.Amount_remaining_per || 0).toLocaleString(
+ {parseFloat(item?.Amount_remaining_per || 0).toLocaleString(
undefined,
{
minimumFractionDigits: 2,
maximumFractionDigits: 2,
}
- )} %`}
+ )}%
),
"Total Deal Size": (
- {`$ ${parseFloat(item?.Deal_size || 0).toLocaleString(undefined, {
+ ${parseFloat(item?.Deal_size || 0).toLocaleString(undefined, {
minimumFractionDigits: 2,
maximumFractionDigits: 2,
- })}`}
+ })}
),