From 89c593621232d33299e5e66109f9887549a251a2 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 17 Jul 2023 11:29:50 +0100
Subject: [PATCH 1/3] Some fixes

---
 .../MyWallet/Popup/CompleteConfirmCredit.jsx  | 60 ++++++++++---------
 .../MyWallet/Popup/ConfirmAddFund.jsx         |  4 +-
 src/components/MyWallet/Popup/CreditPopup.jsx |  3 +
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
index 1c13432..51f827f 100644
--- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
+++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
@@ -53,38 +53,44 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
                     <h1 className="text-xl font-semibold text-dark-gray dark:text-white tracking-tighter my-1">
                       {data?.result == "Charge success"
                         ? "Credit was Successful!"
-                        : data?.result}
+                        : "Credit was Unsuccessful"}
                     </h1>
                   </div>
 
-                  <div className="flex items-center gap-8">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Amount({data?.currency || ""})
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {`${data?.symbol || ""} ${
-                        Number(data?.amount * 0.01).toLocaleString() || ""
-                      }`}
-                    </span>
-                  </div>
+                  {data?.internal_return >= 0 ? (
+                    <>
+                      <div className="flex items-center gap-8">
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          Amount({data?.currency || ""})
+                        </h1>
+                        <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          {`${data?.symbol || ""} ${
+                            Number(data?.amount * 0.01).toLocaleString() || ""
+                          }`}
+                        </span>
+                      </div>
 
-                  <div className="flex items-center gap-8">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Wallet Balance
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {data?.curr_balance}
-                    </span>
-                  </div>
+                      <div className="flex items-center gap-8">
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          Wallet Balance
+                        </h1>
+                        <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          {data?.curr_balance}
+                        </span>
+                      </div>
 
-                  <div className="flex items-center gap-8">
-                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      Confirmation Number
-                    </h1>
-                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
-                      {data?.confirmation}
-                    </span>
-                  </div>
+                      <div className="flex items-center gap-8">
+                        <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          Confirmation Number
+                        </h1>
+                        <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                          {data?.confirmation}
+                        </span>
+                      </div>
+                    </>
+                  ) : (
+                    <div className="h-[205px]"></div>
+                  )}
                 </div>
               </div>
             </div>
diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index 4a4dd1a..cc05950 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -11,7 +11,7 @@ function ThePaymentText({ value, type }) {
     type === "new"
       ? cardDetails.cardNum[0] === "4"
         ? "Visa"
-        : value[0] === "5"
+        : value[0] == "5"
         ? "Master"
         : "ATM"
       : value.description;
@@ -223,7 +223,7 @@ function ConfirmAddFund({
       amount: amount * 100,
       cardnumber: cardNum.replace(/\s/g, ""),
       credit_reference,
-      cvc: cvv,
+      cvc: String(cvv),
       description: address,
       exp_month: expirationMonth,
       exp_year: expirationYear,
diff --git a/src/components/MyWallet/Popup/CreditPopup.jsx b/src/components/MyWallet/Popup/CreditPopup.jsx
index b464db0..4d291ea 100644
--- a/src/components/MyWallet/Popup/CreditPopup.jsx
+++ b/src/components/MyWallet/Popup/CreditPopup.jsx
@@ -24,6 +24,9 @@ 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-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">
+            {confirmCredit?.show?.acceptConfirm?.state &&
+              confirmCredit?.data?.internal_return < 0 &&
+              "Credit Unsuccessful"}
             {confirmCredit?.show?.acceptConfirm?.loader
               ? "Confirming Credit..."
               : confirmCredit?.show?.awaitConfirm?.state

From 5d12ab4f62677009ffae37180a1d8e2b2f833f91 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 17 Jul 2023 11:48:03 +0100
Subject: [PATCH 2/3] Made a few changes

---
 .../MyWallet/Popup/CompleteConfirmCredit.jsx  |  2 +-
 .../MyWallet/Popup/ConfirmAddFund.jsx         |  2 +-
 src/components/MyWallet/Popup/CreditPopup.jsx | 22 +++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
index 51f827f..ba5c0a4 100644
--- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
+++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
@@ -89,7 +89,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
                       </div>
                     </>
                   ) : (
-                    <div className="h-[205px]"></div>
+                    <div className="h-[160px]"></div>
                   )}
                 </div>
               </div>
diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index cc05950..dab5c73 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -11,7 +11,7 @@ function ThePaymentText({ value, type }) {
     type === "new"
       ? cardDetails.cardNum[0] === "4"
         ? "Visa"
-        : value[0] == "5"
+        : cardDetails.cardNum[0] == "5"
         ? "Master"
         : "ATM"
       : value.description;
diff --git a/src/components/MyWallet/Popup/CreditPopup.jsx b/src/components/MyWallet/Popup/CreditPopup.jsx
index 4d291ea..d186081 100644
--- a/src/components/MyWallet/Popup/CreditPopup.jsx
+++ b/src/components/MyWallet/Popup/CreditPopup.jsx
@@ -25,15 +25,19 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
         <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">
             {confirmCredit?.show?.acceptConfirm?.state &&
-              confirmCredit?.data?.internal_return < 0 &&
-              "Credit Unsuccessful"}
-            {confirmCredit?.show?.acceptConfirm?.loader
-              ? "Confirming Credit..."
-              : confirmCredit?.show?.awaitConfirm?.state
-              ? "Confirm Credit Add"
-              : confirmCredit?.show?.acceptConfirm?.state
-              ? "Credit Add Completed"
-              : "Add Credit"}
+            confirmCredit?.data?.internal_return < 0 ? (
+              "Credit Unsuccessful"
+            ) : (
+              <>
+                {confirmCredit?.show?.acceptConfirm?.loader
+                  ? "Confirming Credit..."
+                  : confirmCredit?.show?.awaitConfirm?.state
+                  ? "Confirm Credit Add"
+                  : confirmCredit?.show?.acceptConfirm?.state
+                  ? "Credit Add Completed"
+                  : "Add Credit"}
+              </>
+            )}
           </h1>
           <button
             type="button"

From d4472a881aa69a98ef92a727c7fb5f725be4904c Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 17 Jul 2023 12:59:05 +0100
Subject: [PATCH 3/3] Fixed digits

---
 src/components/MyWallet/Popup/CompleteConfirmCredit.jsx | 1 -
 src/components/MyWallet/Popup/ConfirmAddFund.jsx        | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
index ba5c0a4..62e3e05 100644
--- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
+++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
@@ -1,7 +1,6 @@
 import React from "react";
 
 function CompleteConfirmCredit({ onClose, confirmCredit }) {
-  console.log(confirmCredit);
   const { data } = confirmCredit;
   return (
     <div className="logout-modal-body w-full flex flex-col items-center">
diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index dab5c73..a0fa4ff 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -223,7 +223,7 @@ function ConfirmAddFund({
       amount: amount * 100,
       cardnumber: cardNum.replace(/\s/g, ""),
       credit_reference,
-      cvc: String(cvv),
+      cvc: String(cvv).length === 1 ? `0${cvv}` : String(cvv),
       description: address,
       exp_month: expirationMonth,
       exp_year: expirationYear,
@@ -269,7 +269,7 @@ function ConfirmAddFund({
           acceptConfirm: { loader: false },
         },
       }));
-      setTimeout(() => onClose, 10000)
+      setTimeout(() => onClose, 10000);
       console.log(error);
     }
   };