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

Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master

Browse Source
This commit is contained in:
Olusesan Ameye
2023-07-17 12:49:59 +00:00
committed by Gogs
parent 8b3c586456 42e80c7a11
commit 4e960a2f53
3 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
+33 -28
View File
@@ -1,7 +1,6 @@
import React from "react"; import React from "react";
function CompleteConfirmCredit({ onClose, confirmCredit }) { function CompleteConfirmCredit({ onClose, confirmCredit }) {
console.log(confirmCredit);
const { data } = confirmCredit; const { data } = confirmCredit;
return ( return (
<div className="logout-modal-body w-full flex flex-col items-center"> <div className="logout-modal-body w-full flex flex-col items-center">
@@ -53,38 +52,44 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
<h1 className="text-xl font-semibold text-dark-gray dark:text-white tracking-tighter my-1"> <h1 className="text-xl font-semibold text-dark-gray dark:text-white tracking-tighter my-1">
{data?.result == "Charge success" {data?.result == "Charge success"
? "Credit was Successful!" ? "Credit was Successful!"
: data?.result} : "Credit was Unsuccessful"}
</h1> </h1>
</div> </div>
<div className="flex items-center gap-8"> {data?.internal_return >= 0 ? (
<h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1"> <>
Amount({data?.currency || ""}) <div className="flex items-center gap-8">
</h1> <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
<span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1"> Amount({data?.currency || ""})
{`${data?.symbol || ""} ${ </h1>
Number(data?.amount * 0.01).toLocaleString() || "" <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
}`} {`${data?.symbol || ""} ${
</span> Number(data?.amount * 0.01).toLocaleString() || ""
</div> }`}
</span>
</div>
<div className="flex items-center gap-8"> <div className="flex items-center gap-8">
<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">
Wallet Balance Wallet Balance
</h1> </h1>
<span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1"> <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
{data?.curr_balance} {data?.curr_balance}
</span> </span>
</div> </div>
<div className="flex items-center gap-8"> <div className="flex items-center gap-8">
<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">
Confirmation Number Confirmation Number
</h1> </h1>
<span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1"> <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
{data?.confirmation} {data?.confirmation}
</span> </span>
</div> </div>
</>
) : (
<div className="h-[160px]"></div>
)}
</div> </div>
</div> </div>
</div> </div>
src/components/MyWallet/Popup/ConfirmAddFund.jsx
+3 -3
View File
@@ -11,7 +11,7 @@ function ThePaymentText({ value, type }) {
type === "new" type === "new"
? cardDetails.cardNum[0] === "4" ? cardDetails.cardNum[0] === "4"
? "Visa" ? "Visa"
: value[0] === "5" : cardDetails.cardNum[0] == "5"
? "Master" ? "Master"
: "ATM" : "ATM"
: value.description; : value.description;
@@ -223,7 +223,7 @@ function ConfirmAddFund({
amount: amount * 100, amount: amount * 100,
cardnumber: cardNum.replace(/\s/g, ""), cardnumber: cardNum.replace(/\s/g, ""),
credit_reference, credit_reference,
cvc: cvv, cvc: String(cvv).length === 1 ? `0${cvv}` : String(cvv),
description: address, description: address,
exp_month: expirationMonth, exp_month: expirationMonth,
exp_year: expirationYear, exp_year: expirationYear,
@@ -269,7 +269,7 @@ function ConfirmAddFund({
acceptConfirm: { loader: false }, acceptConfirm: { loader: false },
}, },
})); }));
setTimeout(() => onClose, 10000) setTimeout(() => onClose, 10000);
console.log(error); console.log(error);
} }
}; };
src/components/MyWallet/Popup/CreditPopup.jsx
+14 -7
View File
@@ -24,13 +24,20 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
<div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto"> <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
<div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple"> <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple">
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide"> <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
{confirmCredit?.show?.acceptConfirm?.loader {confirmCredit?.show?.acceptConfirm?.state &&
? "Confirming Credit..." confirmCredit?.data?.internal_return < 0 ? (
: confirmCredit?.show?.awaitConfirm?.state "Credit Unsuccessful"
? "Confirm Credit Add" ) : (
: confirmCredit?.show?.acceptConfirm?.state <>
? "Credit Add Completed" {confirmCredit?.show?.acceptConfirm?.loader
: "Add Credit"} ? "Confirming Credit..."
: confirmCredit?.show?.awaitConfirm?.state
? "Confirm Credit Add"
: confirmCredit?.show?.acceptConfirm?.state
? "Credit Add Completed"
: "Add Credit"}
</>
)}
</h1> </h1>
<button <button
type="button" type="button"