Compare commits

...

2 Commits

Author SHA1 Message Date
Ebube 4876ba80c1 Changed name to back 2023-07-24 15:07:22 +01:00
Ebube 71f799d157 Checked Errors in Wallet Page and made some tiny fixes 2023-07-24 15:01:03 +01:00
5 changed files with 21 additions and 17 deletions
@@ -487,7 +487,7 @@ function AddFundDollars(props) {
{/* Postal Code and State */} {/* Postal Code and State */}
<div className="sm:grid gap-5 grid-cols-3 my-2"> <div className="sm:grid gap-5 grid-cols-3 my-2">
<div className="field w-full mb-6 xl:mb-0 col-span-1"> <div className="field w-full xl:mb-0 col-span-1">
<InputCom <InputCom
fieldClass="px-6" fieldClass="px-6"
spanTag="*" spanTag="*"
@@ -521,7 +521,7 @@ function AddFundDollars(props) {
</div> </div>
</div> </div>
<div className="md:px-8 md:pt-4 px-4 pt-2 add-fund-btn flex justify-end items-center gap-3"> <div className="md:px-8 add-fund-btn flex justify-end items-center gap-3">
<button <button
className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center border-gradient text-base rounded-full" className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center border-gradient text-base rounded-full"
onClick={handleClose} onClick={handleClose}
@@ -291,6 +291,17 @@ function ConfirmAddFund({
} }
}; };
const getBack = () => {
setConfirmCredit((prev) => ({
...prev,
show: {
awaitConfirm: { loader: false, state: false },
acceptConfirm: { loader: false, state: false },
},
data: {},
}));
}
return ( return (
<div className="content-wrapper w-full h-[32rem]"> <div className="content-wrapper w-full h-[32rem]">
<div className="w-full mb-10"> <div className="w-full mb-10">
@@ -359,9 +370,9 @@ function ConfirmAddFund({
<div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4"> <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
<button <button
className="px-4 h-11 flex justify-center items-center border-gradient text-base rounded-full" className="px-4 h-11 flex justify-center items-center border-gradient text-base rounded-full"
onClick={onClose} onClick={getBack}
> >
Cancel Back
</button> </button>
{__confirmCountry === "US" && ( {__confirmCountry === "US" && (
<button <button
@@ -89,11 +89,11 @@ function ConfirmNairaWithdraw({
loading: false, loading: false,
status: false, status: false,
}), }),
1500 5000
); );
} }
setRequestStatus({ setRequestStatus({
message: "transfer successful", message: "Transfer Successful!",
loading: false, loading: false,
status: true, status: true,
}); });
@@ -60,14 +60,6 @@ function ConfirmTransfer({ payment, wallet }) {
}); });
}; };
useEffect(() => {
// what happens if not state redirect user
if (!state) {
navigate("/my-wallet/transfer-fund", { replace: true });
} else {
setPageLoading(false);
}
}, []);
return ( return (
<div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin"> <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
{pageLoading ? ( {pageLoading ? (
@@ -1,6 +1,5 @@
import { Form, Formik } from "formik"; import { Form, Formik } from "formik";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { useNavigate } from "react-router-dom";
import usersService from "../../../services/UsersService"; import usersService from "../../../services/UsersService";
import InputCom from "../../Helpers/Inputs/InputCom"; import InputCom from "../../Helpers/Inputs/InputCom";
import ModalCom from "../../Helpers/ModalCom"; import ModalCom from "../../Helpers/ModalCom";
@@ -13,7 +12,7 @@ function NairaWithdraw({
state, state,
setShowConfirmNairaWithdraw, setShowConfirmNairaWithdraw,
}) { }) {
const apiCall = new usersService(); const apiCall = new usersService();
const [tab, setTab] = useState("previous"); const [tab, setTab] = useState("previous");
let [requestStatus, setRequestStatus] = useState(false); let [requestStatus, setRequestStatus] = useState(false);
@@ -630,7 +629,9 @@ function NairaWithdraw({
className="text-slate-500 text-lg" className="text-slate-500 text-lg"
value="" value=""
> >
No Options Found! {allCountries.data?.length
? "Select..."
: "No Options Found!"}
</option> </option>
)} )}
</select> </select>