From 078d26317f125948f0d40458164a91f202590d94 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Tue, 24 Oct 2023 15:26:24 +0100 Subject: [PATCH 1/2] family balance added --- src/components/FamilyAcc/FamilyManageTabs.jsx | 2 +- .../FamilyAcc/Tabs/FamilyWallet.jsx | 72 ++++++++++++++++++- src/services/UsersService.js | 12 ++++ 3 files changed, 82 insertions(+), 4 deletions(-) diff --git a/src/components/FamilyAcc/FamilyManageTabs.jsx b/src/components/FamilyAcc/FamilyManageTabs.jsx index 74edfa1..ddd8e35 100644 --- a/src/components/FamilyAcc/FamilyManageTabs.jsx +++ b/src/components/FamilyAcc/FamilyManageTabs.jsx @@ -167,7 +167,7 @@ export default function FamilyManageTabs({ /> ), Profile: , - wallet: , + wallet: , }; // Default tab component diff --git a/src/components/FamilyAcc/Tabs/FamilyWallet.jsx b/src/components/FamilyAcc/Tabs/FamilyWallet.jsx index 7992735..1558d7e 100644 --- a/src/components/FamilyAcc/Tabs/FamilyWallet.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyWallet.jsx @@ -1,8 +1,74 @@ -import React from 'react' +import React, { useEffect, useState } from 'react' + +import usersService from '../../../services/UsersService' + +import LoadingSpinner from '../../Spinners/LoadingSpinner' +import { PriceFormatter } from '../../Helpers/PriceFormatter' +import { localImgLoad } from '../../../lib' +import background from '../../../assets/images/bg-sky-blue.jpg' + +function FamilyWallet({familyData}) { + const apiUrl = new usersService() + + let [familyWallet, setFamilyWallet] = useState({loading:true, data: []}) + + useEffect(()=>{ + apiUrl.getFamilyWallet({family_uid:familyData?.uid}).then(res => { + setFamilyWallet({loading:false, data: res?.data?.result_list || []}) + }).catch(error => { + setFamilyWallet({loading:false, data: []}) + }) + },[]) -function FamilyWallet() { return ( -
FamilyWallet
+
+ {familyWallet.loading ? +
+ +
+ : + familyWallet?.data?.length > 0 ? +
+ {familyWallet?.data?.map((wallet, index)=>( +
+
+
+ currency-icon +
+
+
+

+ Balance: +

+

+ {PriceFormatter( + Number(wallet.amount) * 0.01, + wallet.code, + wallet.country, + "text-base" + )} +

+
+
+
+
+ ))} +
+ : +

No Wallet Found!

+ } +
) } diff --git a/src/services/UsersService.js b/src/services/UsersService.js index e1670fd..4fa3c3c 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -1078,6 +1078,18 @@ class usersService { return this.postAuxEnd("/suggeststatus", postData); } + // FUNCTION TO GET FAMILY WALLET + getFamilyWallet(reqData) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 22012, + ...reqData, + }; + return this.postAuxEnd("/familywallet", postData); + } + /* - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(username) - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(password) From e59c83d2164e10f1176475a30e567bc0bf8a24fa Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Tue, 24 Oct 2023 17:45:10 +0100 Subject: [PATCH 2/2] made balance container take whole width --- src/components/FamilyAcc/Tabs/FamilyWallet.jsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/FamilyAcc/Tabs/FamilyWallet.jsx b/src/components/FamilyAcc/Tabs/FamilyWallet.jsx index 1558d7e..92af941 100644 --- a/src/components/FamilyAcc/Tabs/FamilyWallet.jsx +++ b/src/components/FamilyAcc/Tabs/FamilyWallet.jsx @@ -28,14 +28,14 @@ function FamilyWallet({familyData}) { : familyWallet?.data?.length > 0 ? -
+
{familyWallet?.data?.map((wallet, index)=>( -
-
+
-

+

Balance:

{PriceFormatter( Number(wallet.amount) * 0.01, wallet.code, wallet.country, - "text-base" + "" )}