From 8530b2d1a0eeae0dba9e70f2cd93d7428dcb4f4e Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 17 Jul 2023 15:52:28 +0100
Subject: [PATCH] Digits Fixed and SignOut text variable

---
 .env                                          |   2 +
 .env.development                              |   4 +-
 .env.production                               |   8 +-
 .../MyWallet/Popup/AddFundDollars.jsx         |   6 +-
 .../MyWallet/Popup/CompleteConfirmCredit.jsx  |  11 +-
 .../MyWallet/Popup/ConfirmAddFund.jsx         |   2 +-
 src/components/Partials/Layout.jsx            |   3 +-
 src/components/Partials/MobileSideBar.jsx     | 131 +++++++++---------
 src/components/Partials/Sidebar.jsx           |   4 +-
 9 files changed, 93 insertions(+), 78 deletions(-)

diff --git a/.env b/.env
index 8fa972e..f372687 100644
--- a/.env
+++ b/.env
@@ -68,6 +68,8 @@ REACT_APP_APPLE_REDIRECT_URL='http://localhost:9082/login/auth/apple'
 REACT_APP_MAX_FILE_SIZE=1000000
 REACT_APP_TOTAL_NUM_FILE=4
 
+REACT_APP_LOGOUT_TEXT="Sign Out"
+
 
 #apigate.lotus.g1.wrenchboard.com:76.209.103.227
 #apigate.orion.g1.wrenchboard.com:76.209.103.227
diff --git a/.env.development b/.env.development
index 6a9a063..2c25759 100644
--- a/.env.development
+++ b/.env.development
@@ -41,4 +41,6 @@ REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https:
 REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/
 
 REACT_APP_MAX_FILE_SIZE=1000000
-REACT_APP_TOTAL_NUM_FILE=4
\ No newline at end of file
+REACT_APP_TOTAL_NUM_FILE=4
+
+REACT_APP_LOGOUT_TEXT="Sign Out"
\ No newline at end of file
diff --git a/.env.production b/.env.production
index e949b83..7b3c27f 100644
--- a/.env.production
+++ b/.env.production
@@ -12,8 +12,8 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com"
 #REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
 #REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
 
-REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
-REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
+REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
@@ -48,4 +48,6 @@ REACT_APP_FACEBOOK_REDIRECT_URL="https://users.wrenchboard.com/login/auth/flogin
 DISABLE_ESLINT_PLUGIN=true
 
 REACT_APP_MAX_FILE_SIZE=1000000
-REACT_APP_TOTAL_NUM_FILE=4
\ No newline at end of file
+REACT_APP_TOTAL_NUM_FILE=4
+
+REACT_APP_LOGOUT_TEXT="Sign Out"
\ No newline at end of file
diff --git a/src/components/MyWallet/Popup/AddFundDollars.jsx b/src/components/MyWallet/Popup/AddFundDollars.jsx
index b60c3ae..b89d70e 100644
--- a/src/components/MyWallet/Popup/AddFundDollars.jsx
+++ b/src/components/MyWallet/Popup/AddFundDollars.jsx
@@ -382,7 +382,11 @@ function AddFundDollars(props) {
                                           expireMonth.map((item, index) => (
                                             <option
                                               key={index}
-                                              value={item.value}
+                                              value={
+                                                Number(item.value) < 10
+                                                  ? "0" + item.value
+                                                  : item.value
+                                              }
                                             >
                                               {item.name}
                                             </option>
diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
index 62e3e05..6b9d24d 100644
--- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
+++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
@@ -9,7 +9,12 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
           <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl">
             <div className="px-4 md:p-8 py-4 add-fund-info">
               <div className="field w-full mb-3 min-h-[45px]">
-                <div className="flex flex-col gap-4">
+                <div
+                  className={`flex flex-col gap-4 ${
+                    data?.result !== "Charge success" &&
+                    "h-[328px] items-center justify-center"
+                  }`}
+                >
                   {/* Success Icon for now */}
                   <div className="flex items-center w-full justify-center">
                     {data?.result == "Charge success" ? (
@@ -87,9 +92,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
                         </span>
                       </div>
                     </>
-                  ) : (
-                    <div className="h-[160px]"></div>
-                  )}
+                  ) : null}
                 </div>
               </div>
             </div>
diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index a0fa4ff..4d530cb 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).length === 1 ? `0${cvv}` : String(cvv),
+      cvc: cvv,
       description: address,
       exp_month: expirationMonth,
       exp_year: expirationYear,
diff --git a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx
index ea29f0b..c4cf303 100644
--- a/src/components/Partials/Layout.jsx
+++ b/src/components/Partials/Layout.jsx
@@ -8,7 +8,6 @@ import Header from "./Header";
 import MobileSidebar from "./MobileSideBar";
 import RightSideBar from "./RightSideBar";
 import Sidebar from "./Sidebar";
-import usersService from "../../services/UsersService";
 
 export default function Layout({ children }) {
   const { drawer } = useSelector((state) => state.drawer);
@@ -179,7 +178,7 @@ export default function Layout({ children }) {
                   type="button"
                   className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
                 >
-                  Yes Logout
+                  {`Yes ${process.env.REACT_APP_LOGOUT_TEXT}`}
                 </button>
                 <button
                   onClick={logoutModalHandler}
diff --git a/src/components/Partials/MobileSideBar.jsx b/src/components/Partials/MobileSideBar.jsx
index e6f5356..dfd3f8a 100644
--- a/src/components/Partials/MobileSideBar.jsx
+++ b/src/components/Partials/MobileSideBar.jsx
@@ -8,7 +8,12 @@ import {
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
 
-export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJobList }) {
+export default function MobileSidebar({
+  sidebar,
+  action,
+  logoutModalHandler,
+  myJobList,
+}) {
   let { userDetails } = useSelector((state) => state.userDetails);
   const darkMode = useContext(DarkModeContext);
 
@@ -110,74 +115,72 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
 
         {/* menu and settings item */}
         {userDetails?.account_type !== "FAMILY" && (
-              <div
-                  className={`menu-item transition-all duration-300 ease-in-out ${
-                      sidebar ? "mb-5" : "mb-2"
-                  }`}
-              >
-                <div className="heading mb-5">
-                  <h1 className="title text-xl font-bold text-sky-blue">
-                    Family
-                  </h1>
-                </div>
-                <div className="items">
-                  <ul className="flex flex-col space-y-6">
-                    <ListItem
-                        title="Family Corner"
-                        route="/acc-family"
-                        iconName="new-family"
-                        sidebar={sidebar}
-                    />
-                  </ul>
-                </div>
-              </div>
+          <div
+            className={`menu-item transition-all duration-300 ease-in-out ${
+              sidebar ? "mb-5" : "mb-2"
+            }`}
+          >
+            <div className="heading mb-5">
+              <h1 className="title text-xl font-bold text-sky-blue">Family</h1>
+            </div>
+            <div className="items">
+              <ul className="flex flex-col space-y-6">
+                <ListItem
+                  title="Family Corner"
+                  route="/acc-family"
+                  iconName="new-family"
+                  sidebar={sidebar}
+                />
+              </ul>
+            </div>
+          </div>
         )}
 
         {userDetails?.account_type !== "FAMILY" && (
           <>
             {!userDetails?.post_jobs ? (
-                <div
-                  className={`menu-item transition-all duration-300 ease-in-out bg-[#f0f8ff] dark:bg-dark-white rounded-2xl p-3 ${
-                    sidebar ? "mb-5" : "mb-2 rounded-none p-0"
-                  }`}
-                >
-                  <div className="heading mb-5">
-                    <h1 className="title text-xl font-bold text-sky-blue">
-                      Job Post
-                    </h1>
-                  </div>
-                  <div className="items">
-                    <ul className="flex flex-col space-y-6">
-                      <li className="item group">
-                        <NavLink
-                          to="/start-job"
-                          className={`nav-item flex items-center ${
-                            ((navData) => (navData.isActive ? "active" : ""),
-                            sidebar
-                              ? "justify-start space-x-3.5"
-                              : "justify-center")
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out bg-[#f0f8ff] dark:bg-dark-white rounded-2xl p-3 ${
+                  sidebar ? "mb-5" : "mb-2 rounded-none p-0"
+                }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-sky-blue">
+                    Job Post
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    <li className="item group">
+                      <NavLink
+                        to="/start-job"
+                        className={`nav-item flex items-center ${
+                          ((navData) => (navData.isActive ? "active" : ""),
+                          sidebar
+                            ? "justify-start space-x-3.5"
+                            : "justify-center")
+                        }`}
+                      >
+                        <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                          <Icons name="people-two" />
+                        </span>
+                        <span
+                          className={`item-content group-hover:text-sky-blue text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                            sidebar ? "active flex-1" : "w-0"
                           }`}
                         >
-                          <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                            <Icons name="people-two" />
-                          </span>
-                          <span
-                            className={`item-content group-hover:text-sky-blue text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                              sidebar ? "active flex-1" : "w-0"
-                            }`}
-                          >
-                            Enable Job Post
-                          </span>
-                        </NavLink>
-                      </li>
-                    </ul>
-                  </div>
+                          Enable Job Post
+                        </span>
+                      </NavLink>
+                    </li>
+                  </ul>
                 </div>
+              </div>
             ) : myJobList?.data?.result_list?.length ? (
               <div
-                  className={`menu-item transition-all duration-300 ease-in-out ${
-                      sidebar ? "mb-5" : "mb-2"
-                  }`}
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
               >
                 <div className="heading mb-5">
                   <h1 className="title text-xl font-bold text-sky-blue">
@@ -212,9 +215,9 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
               </div>
             ) : (
               <div
-                  className={`menu-item transition-all duration-300 ease-in-out ${
-                      sidebar ? "mb-5" : "mb-2"
-                  }`}
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
               >
                 <div className="heading mb-5">
                   <h1 className="title text-xl font-bold text-sky-blue">
@@ -245,14 +248,14 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
           className="signout-btn flex items-center space-x-1  p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full"
         >
           <span className="">
-            <Icons name='new-logout' />
+            <Icons name="new-logout" />
           </span>
           <span
             className={`signout-btn-content text-white text-xl font-bold ${
               sidebar ? "active" : ""
             }`}
           >
-            Signout
+            {process.env.REACT_APP_LOGOUT_TEXT}
           </span>
         </button>
       ) : (
diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx
index 379202b..7dfbd32 100644
--- a/src/components/Partials/Sidebar.jsx
+++ b/src/components/Partials/Sidebar.jsx
@@ -273,14 +273,14 @@ export default function Sidebar({
           className="signout-btn flex items-center space-x-1  p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full"
         >
           <span className="">
-            <Icons name='new-logout' />
+            <Icons name="new-logout" />
           </span>
           <span
             className={`signout-btn-content text-white text-xl font-bold ${
               sidebar ? "active" : ""
             }`}
           >
-            Signout
+            {process.env.REACT_APP_LOGOUT_TEXT}
           </span>
         </button>
       ) : (