WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Few changes

Browse Source
This commit was merged in pull request #307.
This commit is contained in:
Chukwumdiebube Ojinta
2023-07-13 23:12:29 +01:00
parent 20ce9bf749
commit 4e2f120ab5
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/MyWallet/AddFundDollars.jsx
+2 -1
View File
@@ -103,6 +103,7 @@ function AddFundDollars(props) {
amount: Number(props.input), amount: Number(props.input),
currency: props.currency, currency: props.currency,
card: prevCardDetails["payment-card"], card: prevCardDetails["payment-card"],
cardType: "prev",
}; };
return setTimeout(() => { return setTimeout(() => {
@@ -132,7 +133,7 @@ function AddFundDollars(props) {
}); });
}, []); }, []);
const handleClose = props.onClose const handleClose = props.onClose;
return ( return (
<> <>
src/components/MyWallet/AddFundPop.jsx
+1 -1
View File
@@ -118,7 +118,7 @@ function AddFundPop({ _payment, input, setInput, onClose, setConfirmCredit }) {
<button <button
onClick={handleSubmit} onClick={handleSubmit}
type="button" type="button"
className="px-4 py-1 h-11 flex justify-center space-x-1 items-center btn-gradient text-base rounded-full text-white max-w-[100px]" className="px-4 py-1 h-11 flex justify-center space-x-1 items-center btn-gradient text-base rounded-full text-white max-w-[100px] w-full"
> >
{loader ? ( {loader ? (
<LoadingSpinner size="6" color="sky-blue" /> <LoadingSpinner size="6" color="sky-blue" />
src/components/MyWallet/ConfirmAddFund.jsx
+21 -15
View File
@@ -8,6 +8,10 @@ import usersService from "../../services/UsersService";
import { FlutterWaveButton, closePaymentModal } from "flutterwave-react-v3"; import { FlutterWaveButton, closePaymentModal } from "flutterwave-react-v3";
function ConfirmAddFund({ confirmCredit, onClose, walletItem }) { function ConfirmAddFund({ confirmCredit, onClose, walletItem }) {
const __confirmData = confirmCredit?.data;
const __confirmCardDetails = __confirmData.card
? JSON.parse(__confirmData.card)
: "";
let { userDetails } = useSelector((state) => state.userDetails); // TO GET LOGGEDIN USER DETAILS let { userDetails } = useSelector((state) => state.userDetails); // TO GET LOGGEDIN USER DETAILS
let [pageLoading, setPageLoading] = useState(true); let [pageLoading, setPageLoading] = useState(true);
@@ -86,19 +90,11 @@ function ConfirmAddFund({ confirmCredit, onClose, walletItem }) {
onClose: () => {}, onClose: () => {},
}; };
// useEffect(() => { const handlePrevCard = () => {
// // what happens if not data redirect user console.log("Test me")
// if (!data) { }
// navigate("/my-wallet/add-fund", { replace: true });
// } else {
// setPageLoading(false);
// }
// }, []);
const __confirmData = confirmCredit?.data;
const __confirmCardDetails = __confirmData.card
? JSON.parse(__confirmData.card)
: "";
const ThePaymentText = ({ value }) => ( const ThePaymentText = ({ value }) => (
<div className="my-2 flex items-center gap-5"> <div className="my-2 flex items-center gap-5">
@@ -149,7 +145,13 @@ function ConfirmAddFund({ confirmCredit, onClose, walletItem }) {
</div> </div>
)} )}
<div className="flex items-center gap-14"> <div
className={`${
__confirmData?.currency == "US Dollars"
? "gap-14"
: "gap-6"
} flex items-center`}
>
<h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1"> <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
Reference No Reference No
</h1> </h1>
@@ -163,7 +165,7 @@ function ConfirmAddFund({ confirmCredit, onClose, walletItem }) {
</div> </div>
</div> </div>
{/* <hr /> */} {/* <hr /> */}
<div className="min-h-[160px]"></div> <div className={__confirmData?.currency == "US Dollars" ? "min-h-[163px]":"min-h-[200px]"}></div>
<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"
@@ -174,7 +176,11 @@ function ConfirmAddFund({ confirmCredit, onClose, walletItem }) {
{__confirmData?.currency == "US Dollars" && ( {__confirmData?.currency == "US Dollars" && (
<button <button
className="px-4 h-11 flex justify-center items-center btn-gradient text-white text-base rounded-full" className="px-4 h-11 flex justify-center items-center btn-gradient text-white text-base rounded-full"
onClick={() => console.log("Test me")} onClick={
__confirmData?.cardType === "prev"
? handlePrevCard
: () => console.log("Test me")
}
> >
Proceed Proceed
</button> </button>