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

src/components/MyWallet/Popup/ConfirmAddFund.jsx

@@ -25,13 +25,6 @@ function ConfirmAddFund({
     status: false,
   }); // STATE FOR API REQUEST
 
-  // const [ConfirmCredit, setConfirmCredit] = useState({
-  //   show: false,
-  //   loader: false,
-  //   msg: "",
-  //   data: {},
-  // });
-
   const apiURL = new usersService();
   const navigate = useNavigate();
 
@@ -131,14 +124,18 @@ function ConfirmAddFund({
         return;
       }
 
-      setConfirmCredit((prev) => ({
+      return setTimeout(
-        ...prev,
+        () =>
-        show: {
+          setConfirmCredit((prev) => ({
-          awaitConfirm: { loader: false, state: false },
+            ...prev,
-          acceptConfirm: { loader: false, state: true },
+            show: {
-        },
+              awaitConfirm: { loader: false, state: false },
-        data: _response,
+              acceptConfirm: { loader: false, state: true },
-      }));
+            },
+            data: _response,
+          })),
+        1500
+      );
     } catch (error) {
       setConfirmCredit((prev) => ({
         ...prev,
@@ -170,7 +167,8 @@ function ConfirmAddFund({
           <div className="px-4 md:p-8 py-4 add-fund-info">
             <div className="field w-full mb-3 min-h-[45px]">
               {confirmCredit?.show?.awaitConfirm?.state ? (
-                <div className="flex flex-col gap-4">
+                <div className="flex flex-col gap-2">
+                  {/* Amount */}
                   <div
                     className={`flex items-center ${
                       __confirmCountry == "US" ? "gap-14" : "gap-4"
@@ -185,6 +183,40 @@ function ConfirmAddFund({
                       }`}
                     </span>
                   </div>
+                  {/* Transaction Fee */}
+                  <div
+                    className={`flex items-center border-b border-gray-600 ${
+                      __confirmCountry == "US" ? "gap-[2.7rem]" : "gap-4"
+                    }`}
+                  >
+                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                      Transaction Fee
+                    </h1>
+                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                      {`${walletItem?.symbol} ${
+                        Number(__confirmData?.fee).toLocaleString() || ""
+                      }`}
+                    </span>
+                  </div>
+                  {/* Total */}
+                  <div
+                    className={`flex items-center ${
+                      __confirmCountry == "US" ? "gap-[8rem]" : "gap-4"
+                    }`}
+                  >
+                    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                      Total
+                    </h1>
+                    <span className="text-xl font-bold text-dark-gray dark:text-white tracking-tighter my-1">
+                      {`${walletItem?.symbol} ${
+                        (
+                          Number(__confirmData?.amount) +
+                          Number(__confirmData?.fee)
+                        ).toLocaleString() || ""
+                      }`}
+                    </span>
+                  </div>
+
                   {__confirmCountry == "US" && (
                     <div className="flex items-center gap-8">
                       <label
@@ -220,9 +252,10 @@ function ConfirmAddFund({
 
           <div
             className={
-              __confirmCountry == "US" ? "min-h-[163px]" : "min-h-[200px]"
+              __confirmCountry == "US" ? "min-h-[96px]" : "min-h-[200px]"
             }
           ></div>
+          <hr />
           <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
             <button
               className="px-4 h-11 flex justify-center items-center border-gradient text-base rounded-full"

src/components/MyWallet/Popup/CreditPopup.jsx

@@ -60,7 +60,7 @@ const CreditPopup = ({ details, onClose, situation, walletItem }) => {
         </div>
         <div className="logout-modal-body w-full flex flex-col items-center">
           {confirmCredit?.show?.acceptConfirm?.loader ? (
-            <div className="h-[33rem] flex items-center justify-center">
+            <div className="h-[32rem] flex items-center justify-center">
               <LoadingSpinner size="12" color="sky-blue" />
             </div>
           ) : (