Merge branch 'no-wallet-view' of WrenchBoard/Users-Wrench into master

This commit is contained in:
2024-06-20 17:02:36 +00:00
committed by Gogs
2 changed files with 22 additions and 10 deletions
@@ -145,6 +145,7 @@ export default function Login() {
localStorage.setItem("member_id", `${res.data.member_id}`); localStorage.setItem("member_id", `${res.data.member_id}`);
localStorage.setItem("uid", `${res.data.uid}`); localStorage.setItem("uid", `${res.data.uid}`);
localStorage.setItem("session_token", `${res.data.session}`); localStorage.setItem("session_token", `${res.data.session}`);
localStorage.setItem("wallet_status", `${res.data.wallet_status}`);
if (res.data?.account_type == "FAMILY") { if (res.data?.account_type == "FAMILY") {
sessionStorage.setItem("family_uid", res.data?.family_uid); sessionStorage.setItem("family_uid", res.data?.family_uid);
sessionStorage.setItem("parent_uid", res.data?.parent_uid); sessionStorage.setItem("parent_uid", res.data?.parent_uid);
+21 -10
View File
@@ -11,7 +11,7 @@ import { useSelector } from "react-redux";
export default function WalletHeader(props) { export default function WalletHeader(props) {
const {userDetails: { account_type }} = useSelector((state) => state?.userDetails); const {userDetails: { account_type, wallet_status }} = useSelector((state) => state?.userDetails);
// debugger; // debugger;
//props.myWalletList.result_list //props.myWalletList.result_list
let { pathname } = useLocation(); let { pathname } = useLocation();
@@ -22,6 +22,7 @@ export default function WalletHeader(props) {
props.setBalanceDropdown.toggle(); props.setBalanceDropdown.toggle();
else navigate("/my-wallet", { replace: true }); else navigate("/my-wallet", { replace: true });
} }
console.log('props.myWalletList', wallet_status)
return ( return (
<> <>
{account_type == 'FULL' ? {account_type == 'FULL' ?
@@ -49,6 +50,7 @@ export default function WalletHeader(props) {
</h3> </h3>
</div> </div>
<div className="content px-7 pb-7"> <div className="content px-7 pb-7">
{(wallet_status == '1' || localStorage.getItem('wallet_status')== '1') ?
<ul> <ul>
{props.myWalletList && {props.myWalletList &&
props.myWalletList?.length > 0 && props.myWalletList?.length > 0 &&
@@ -176,17 +178,25 @@ export default function WalletHeader(props) {
{/* </div>*/} {/* </div>*/}
{/*</li>*/} {/*</li>*/}
</ul> </ul>
:
<div className='p-2 w-full flex gap-4 items-center'>
<img className='w-[100px!important] h-auto' src={localImgLoad('images/icons/wallet.svg')} alt='Wallet Icon' />
<p className='text-lg text-red-500'>We do not currently support wallets in your area. We are diligently working on it. </p>
</div>
}
{(wallet_status == '1' || localStorage.getItem('wallet_status')== '1') &&
<div className="add-money-btn flex justify-center items-center mt-3"> <div className="add-money-btn flex justify-center items-center mt-3">
{/* <button {/* <button
onClick={() => { onClick={() => {
if(pathname == '/my-wallet') props.setBalanceDropdown.toggle() if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
else navigate('/my-wallet', {replace: true}) else navigate('/my-wallet', {replace: true})
}} }}
type="button" type="button"
className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white" className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
> >
Manage Manage
</button> */} </button> */}
<Link <Link
to="/my-wallet" to="/my-wallet"
onClick={onWalletClick} onClick={onWalletClick}
@@ -195,6 +205,7 @@ export default function WalletHeader(props) {
Manage Manage
</Link> </Link>
</div> </div>
}
</div> </div>
</div> </div>
</div> </div>