From 64f6e55fb6c63867849f6f0e2839a0797c053484 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Tue, 8 Oct 2024 20:09:56 +0100 Subject: [PATCH] currency code added --- src/components/Helpers/PriceFormatter.jsx | 19 +++++++++++++++++++ src/components/History/JobsCompleted.jsx | 7 ++----- src/components/History/RewardsTable.jsx | 18 +++++++++--------- src/components/History/index.jsx | 2 +- .../WalletComponent/PurchasesTable.jsx | 6 ++++-- .../WalletComponent/RecentActivityTable.jsx | 6 ++++-- src/components/Partials/Header.jsx | 2 +- src/components/Partials/MediaHeader.jsx | 2 +- .../Settings/Tabs/ChangePasswordTab.jsx | 2 +- src/components/Settings/index.jsx | 6 +++--- 10 files changed, 45 insertions(+), 25 deletions(-) diff --git a/src/components/Helpers/PriceFormatter.jsx b/src/components/Helpers/PriceFormatter.jsx index 540a399..cf710a1 100644 --- a/src/components/Helpers/PriceFormatter.jsx +++ b/src/components/Helpers/PriceFormatter.jsx @@ -75,4 +75,23 @@ export const AmountTo2DP = ( // return formattedNumber; return formattedNumber; +}; + + + +// FUNCTION TO RETURN CURRENCY SYMBOL +export const currencySymbol = ( + currencyName = "naira", + amount = "00", +) => { + // Cureency Array + let currencyArray = [ + {currencyName:'naira', symbol:'₦'}, + {currencyName:'usd', symbol:'$'}, + ] + + const matchedCurrency = currencyArray.filter(item => item.currencyName.toLocaleLowerCase() == currencyName.toLocaleLowerCase()) + const amountTo2DP = AmountTo2DP(amount) + // return formattedNumber; + return matchedCurrency.length ? <>{matchedCurrency[0].symbol}{amountTo2DP} : <>${amountTo2DP}; }; \ No newline at end of file diff --git a/src/components/History/JobsCompleted.jsx b/src/components/History/JobsCompleted.jsx index b56118f..1ea411b 100644 --- a/src/components/History/JobsCompleted.jsx +++ b/src/components/History/JobsCompleted.jsx @@ -7,7 +7,7 @@ import PaginatedList from '../../components/Pagination/PaginatedList'; import LoadingSpinner from '../Spinners/LoadingSpinner'; -import { AmountTo2DP, PriceFormatter } from '../Helpers/PriceFormatter'; +import { currencySymbol } from '../Helpers/PriceFormatter'; import {NewDateTimeFormatter} from '../../lib/NewDateTimeFormatter' function JobsCompleted() { @@ -76,10 +76,7 @@ function JobsCompleted() { - {AmountTo2DP(item?.price*0.01)} {item?.currency_code} - {/* {PriceFormatter(item?.price*0.01, item?.currency_code)} */} - {/* {date} - {item?.contract} */} + {currencySymbol(item?.currency_code, item?.price*0.01)} ) } diff --git a/src/components/History/RewardsTable.jsx b/src/components/History/RewardsTable.jsx index d9aed8f..44656ac 100644 --- a/src/components/History/RewardsTable.jsx +++ b/src/components/History/RewardsTable.jsx @@ -7,7 +7,7 @@ import PaginatedList from '../../components/Pagination/PaginatedList'; import LoadingSpinner from '../Spinners/LoadingSpinner'; -import { AmountTo2DP } from '../Helpers/PriceFormatter'; +import { currencySymbol } from '../Helpers/PriceFormatter'; export const RewardsTable = memo(() => { @@ -47,7 +47,7 @@ export const RewardsTable = memo(() => { }, []) return ( -
+
{familyRewardHistory.loading ? : familyRewardHistory.data.length ? @@ -55,9 +55,9 @@ export const RewardsTable = memo(() => { - Amount - Date - Confirmation + Amount + Date + Confirmation @@ -65,7 +65,7 @@ export const RewardsTable = memo(() => { let date = new Date(item.added).toLocaleDateString() return ( - +
Reward Logo
@@ -74,9 +74,9 @@ export const RewardsTable = memo(() => {
- {AmountTo2DP(item.amount*0.01)} {item.currency} - {date} - {item.confirmation} + {currencySymbol(item.currency, item.amount*0.01)} + {date} + {item.confirmation} ) } diff --git a/src/components/History/index.jsx b/src/components/History/index.jsx index 04df522..6398c6c 100644 --- a/src/components/History/index.jsx +++ b/src/components/History/index.jsx @@ -127,7 +127,7 @@ export default function History() {
-
+
<> {/* PURCHASE SECTION */} {selectedTab == 'purchases' && diff --git a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx index 3bfd6aa..192af14 100644 --- a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx +++ b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx @@ -3,6 +3,8 @@ import React, {useState} from 'react' import PaginatedList from '../../Pagination/PaginatedList'; import { handlePagingFunc } from '../../Pagination/HandlePagination'; +import { currencySymbol } from '../../Helpers/PriceFormatter'; + function PurchasesTable({purchase}) { const [currentPage, setCurrentPage] = useState(0); @@ -31,8 +33,8 @@ function PurchasesTable({purchase}) { {item.added_date}
{item.confirmation} - {item.amount} - {item.fee} + {currencySymbol('', item.amount)} + {currencySymbol('', item.fee)} ))} diff --git a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx index c8ea4dd..5da7b6a 100644 --- a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx +++ b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx @@ -3,6 +3,8 @@ import React, { useState } from "react"; import PaginatedList from "../../Pagination/PaginatedList"; import { handlePagingFunc } from "../../Pagination/HandlePagination"; +import { currencySymbol } from '../../Helpers/PriceFormatter'; + function RecentActivityTable({ payment }) { const [currentPage, setCurrentPage] = useState(0); const indexOfFirstItem = Number(currentPage); @@ -38,9 +40,9 @@ function RecentActivityTable({ payment }) { dangerouslySetInnerHTML={{ __html: item.recipient }} > - {item.amount} + {currencySymbol('', item.amount)}
- {item.fee} + {currencySymbol('', item.fee)} {item.status} diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx index da3783a..12687dd 100644 --- a/src/components/Partials/Header.jsx +++ b/src/components/Partials/Header.jsx @@ -413,7 +413,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
- {userDetails && userDetails?.account_type !== "FAMILY" && ( + {(userDetails && userDetails?.account_type !== "FAMILY" && Number(process.env.REACT_APP_SHOW_USER_PAGE) == 1) && (
  • diff --git a/src/components/Partials/MediaHeader.jsx b/src/components/Partials/MediaHeader.jsx index 612b775..04f2576 100644 --- a/src/components/Partials/MediaHeader.jsx +++ b/src/components/Partials/MediaHeader.jsx @@ -457,7 +457,7 @@ export default function MediaHeader({ logoutModalHandler, sidebarHandler, backpa
    • - {userDetails && userDetails?.account_type !== "FAMILY" && ( + {(userDetails && userDetails?.account_type !== "FAMILY" && Number(process.env.REACT_APP_SHOW_USER_PAGE) == 1) && (
  • diff --git a/src/components/Settings/Tabs/ChangePasswordTab.jsx b/src/components/Settings/Tabs/ChangePasswordTab.jsx index a4c5eaf..890d0bd 100644 --- a/src/components/Settings/Tabs/ChangePasswordTab.jsx +++ b/src/components/Settings/Tabs/ChangePasswordTab.jsx @@ -120,7 +120,7 @@ export default function ChangePasswordTab() { className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5" htmlFor="old_password" > - Old Password {(inputEmpty && !inputs.old_pwd) && 'required'} + Current Password {(inputEmpty && !inputs.old_pwd) && 'required'}
    diff --git a/src/components/Settings/index.jsx b/src/components/Settings/index.jsx index 643bf44..7669346 100644 --- a/src/components/Settings/index.jsx +++ b/src/components/Settings/index.jsx @@ -91,8 +91,8 @@ export default function Settings({ faq }) { }, { id: 5, - name: "login_activity", - title: "Login Activity", + name: "preferences", + title: "Preferences", iconName: "login-activity", }, { @@ -166,7 +166,7 @@ export default function Settings({ faq }) {
    ), - login_activity: , + preferences: , recent_activities: , password: , faq: , -- 2.34.1