wallet refresh

Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master
Added New Login
2023-07-24 11:58:09 +01:00 · 2023-07-23 23:40:59 +00:00 · 2023-07-23 23:59:20 +01:00 · 2023-07-23 07:47:54 -04:00 · 2023-07-23 10:20:40 +00:00 · 2023-07-23 07:18:56 +01:00
155 changed files with 5744 additions and 13825 deletions
@@ -42,13 +42,34 @@ REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
 REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
 REACT_APP_GOOGLE_REDIRECT_URL=http://localhost:9082/login/auth/

-REACT_APP_FACEBOOK_CLIENT_ID=390204307987009
-REACT_APP_FACEBOOK_CLIENT_SECRET=19f778e312f2ab96d147bacb612910c2
-REACT_APP_FACEBOOK_CLIENT_SCOPE="email, public_profile"
+#Real Account
+REACT_APP_FACEBOOK_CLIENT_ID2=390204307987009
+REACT_APP_FACEBOOK_CLIENT_SECRET2=19f778e312f2ab96d147bacb612910c2
+
+#developenet Account
+REACT_APP_FACEBOOK_CLIENT_ID=677857427521030
+REACT_APP_FACEBOOK_CLIENT_SECRET=4801375f22072d8a75f64483fdd89829
+
+#my Account
+REACT_APP_FACEBOOK_CLIENT_ID3=1598725580610908
+
+
+REACT_APP_FACEBOOK_CLIENT_SCOPE="email,public_profile"
+REACT_APP_FACEBOOK_REDIRECT_URL="http://localhost:9082/login/auth/flogin"
+
+REACT_APP_APPLE_CLIENT_ID='com.wrenchboard.users.client'
+REACT_APP_APPLE_REDIRECT_URL='http://localhost:9082/login/auth/apple'
+
+
+# /* 'client_id' => */ 'com.wrenchboard.users.client',
+# /* 'client_secret' => */ 'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiIsImtpZCI6Ilc1V1RXQzlEVEoifQ.eyJpc3MiOiJKUjM2M0ZFWThSIiwiaWF0IjoxNjU0MDgzODQxLCJleHAiOjE2NTkyNjc4NDEsImF1ZCI6Imh0dHBzOi8vYXBwbGVpZC5hcHBsZS5jb20iLCJzdWIiOiJjb20ud3JlbmNoYm9hcmQudXNlcnMuY2xpZW50In0.TIPMwjS2MgSysqEuw3yu1nrOcrH-6omzerDhx0CadjWn2yCO8wZhQiAlhIFs7F-WPektIJ6h-2BT62yGrILiTA',
+# /* 'redirect_uri' => */ site_url('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
@@ -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
+REACT_APP_TOTAL_NUM_FILE=4
+
+REACT_APP_LOGOUT_TEXT="Sign Out"
@@ -40,7 +40,14 @@ REACT_APP_GOOGLE_CLIENT_SECRET=aozK_2G8UjaCmLgPPkv9abIm
 REACT_APP_GOOGLE_CLIENT_SCOPE="https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile"
 REACT_APP_GOOGLE_REDIRECT_URL=https://users.wrenchboard.com/login/auth/

+REACT_APP_FACEBOOK_CLIENT_ID2=390204307987009
+REACT_APP_FACEBOOK_CLIENT_SECRET2=19f778e312f2ab96d147bacb612910c2
+REACT_APP_FACEBOOK_CLIENT_SCOPE="email,public_profile"
+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
+REACT_APP_TOTAL_NUM_FILE=4
+
+REACT_APP_LOGOUT_TEXT="Sign Out"
@@ -17,6 +17,7 @@
    "flutterwave-react-v3": "^1.3.0",
    "formik": "^2.2.9",
    "react": "^18.2.0",
+    "react-apple-login": "^1.1.6",
    "react-chartjs-2": "^4.1.0",
    "react-countup": "^6.2.0",
    "react-dom": "^18.2.0",
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
@@ -47,6 +47,8 @@ import OffersInterestPage from "./views/OffersInterestPage";
 import ManageInterestOfferPage from './views/ManageInterestOfferPage'
 import MyWaitingJobsPage from "./views/MyWaitingJobsPage";
 import FamilyMarketPage from "./views/FamilyMarketPage";
+import FacebookRedirect from "./views/FacebookRedirect";
+import AppleRedirectPage from "./views/AppleRedirectPage";

 export default function Routers() {
  return (
@@ -56,6 +58,8 @@ export default function Routers() {
        <Route exact path="/login" element={<LoginPage />} />
        <Route exact path="/signup" element={<SignupPage />} />
        <Route exact path="/login/auth" element={<AuthRedirect />} />
+        <Route exact path="/login/auth/flogin" element={<FacebookRedirect />} />
+        <Route exact path="/login/auth/apple" element={<AppleRedirectPage />} />
        <Route
          exact
          path="/forgot-password"
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" id="naira"><path fill="#fff" d="M24,5A19,19,0,1,0,43,24,19,19,0,0,0,24,5Zm7,20a1,1,0,0,1,0,2H29v3A1.94,1.94,0,0,1,27.45,32a2,2,0,0,1-2.26-1.08L20,17.05l0,14a1,1,0,0,1-2,0V27H16a1,1,0,0,1,0-2h2V22H16a1,1,0,0,1,0-2h2V17a1.94,1.94,0,0,1,1.55-1.92,2,2,0,0,1,2.26,1.08L27,30,27,16a1,1,0,0,1,2,0v4h2a1,1,0,0,1,0,2H29v3Z" class="color3b3c3d svgShape"></path><path fill="#e3e3e3" d="M24,48A24,24,0,1,1,48,24,24,24,0,0,1,24,48ZM24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z" class="color3b3c3d svgShape"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16.933 16.933" id="Coin"><path d="M8.452 281.052a7.487 7.487 0 0 0-7.483 7.482 7.485 7.485 0 0 0 7.483 7.48 7.484 7.484 0 0 0 7.48-7.48 7.486 7.486 0 0 0-7.48-7.482zm0 1.232a6.253 6.253 0 0 1 6.248 6.25 6.25 6.25 0 0 1-6.248 6.248c-3.449 0-6.25-2.8-6.25-6.248a6.254 6.254 0 0 1 6.25-6.25zm0 .53a5.717 5.717 0 0 0-5.721 5.72 5.715 5.715 0 0 0 5.72 5.719 5.713 5.713 0 0 0 5.72-5.719 5.715 5.715 0 0 0-5.72-5.72zm-.004 2.011a.265.265 0 0 1 .267.268v.596H9.74a.265.265 0 1 1 0 .529H8.715v2.05h.17c.856 0 1.551.697 1.551 1.555s-.696 1.555-1.549 1.555h-.172v.596a.265.265 0 1 1-.529 0v-.596H7.161a.265.265 0 1 1 0-.53h1.025v-2.05h-.172a1.552 1.552 0 0 1-1.547-1.555c0-.858.694-1.554 1.547-1.554h.172v-.596a.265.265 0 0 1 .262-.268zm-.434 1.393a1.01 1.01 0 0 0-1.018 1.025 1.01 1.01 0 0 0 1.018 1.026h.172v-2.051zm.701 2.58v2.05h.172c.57 0 1.02-.448 1.02-1.025s-.449-1.025-1.022-1.025z" color="#e3e3e3" font-family="sans-serif" font-weight="400" overflow="visible" transform="translate(0 -280.067)" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal" fill="#fff" class="color000000 svgShape"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1792 1792" id="Bank"><path d="m896 78.526 896 358.4v119.466h-119.467q0 24.267-19.133 42-19.133 17.734-45.267 17.734H183.867q-26.134 0-45.267-17.734-19.133-17.733-19.133-42H0V436.926ZM238.933 675.859h238.934v716.8h119.466v-716.8h238.934v716.8h119.466v-716.8h238.934v716.8h119.466v-716.8h238.934v716.8h55.066q26.134 0 45.267 17.733 19.133 17.734 19.133 42v59.734H119.467v-59.734q0-24.266 19.133-42 19.133-17.733 45.267-17.733h55.066v-716.8zm1488.667 896q26.133 0 45.267 17.733 19.133 17.734 19.133 42v119.467H0v-119.467q0-24.266 19.133-42 19.134-17.733 45.267-17.733h1663.2z" fill="#4687ba" class="color000000 svgShape"></path></svg>
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 128 128" viewBox="0 0 128 128" id="Alert"><path fill="#f34093" d="M122.9,100.2L74.3,15.9c-4.6-7.9-16-7.9-20.6,0L5.1,100.2C0.5,108.1,6.2,118,15.4,118h97.3
+		C121.8,118,127.5,108.1,122.9,100.2z M63.9,101c-3.5-0.1-6.7-3.3-6.6-6.8c0.1-3.5,3.3-6.7,6.8-6.6c3.5,0.1,6.7,3.3,6.6,6.8
+		C70.6,98,67.4,101.1,63.9,101z M71.3,51.8c-0.7,7.8-1.5,15.6-2.3,23.4c-0.5,4.4-3.2,6.1-7.3,4.5c-1-0.4-2-2-2.2-3.2
+		C58.6,70,58,63.4,57.3,56.8c-0.3-2.8-0.5-5.6-0.8-8.5c-0.4-3.3,0.6-4.5,4-4.5c1.1,0,2.3,0,3.4,0C72,43.8,72,43.8,71.3,51.8z" class="color343433 svgShape"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" id="Messages"><path fill="#4687ba" d="m447.372 413.112-17.544-52.629c-1-3.002-.674-6.23.775-9.043 13.184-25.615 18.629-55.858 12.925-87.736-8.746-48.868-44.53-89.475-90.943-105.048 11.976 28.924 15.628 61.084 9.645 92.984-12.155 64.837-64.074 116.246-129.191 127.924-8.429 1.512-16.945 2.248-25.396 2.463 19.776 21.336 46.173 36.503 75.619 41.784 31.682 5.682 61.784.393 87.322-12.594 2.802-1.425 6.007-1.742 8.99-.748l52.83 17.61c9.251 3.084 18.052-5.716 14.968-14.967z" class="color173042 svgShape"></path><path fill="#4687ba" d="M177.161 85.744C122.283 95.941 78.306 140.526 68.472 195.47c-5.704 31.878-.259 62.121 12.925 87.736 1.449 2.813 1.775 6.041.776 9.043l-17.545 52.629c-3.083 9.251 5.717 18.051 14.968 14.968l52.83-17.61c2.984-.994 6.19-.677 8.991.748 25.537 12.987 55.638 18.276 87.321 12.594 54.809-9.829 99.281-53.698 109.541-108.428 18.078-96.414-64.733-179.316-161.118-161.406zm34.938 177.536h-68.234c-6.73 0-12.185-5.454-12.185-12.185 0-6.73 5.455-12.185 12.185-12.185h68.234c6.731 0 12.185 5.455 12.185 12.185 0 6.731-5.454 12.185-12.185 12.185zm48.739-48.739H143.864c-6.73 0-12.185-5.454-12.185-12.185 0-6.73 5.455-12.185 12.185-12.185h116.973c6.731 0 12.185 5.455 12.185 12.185.001 6.731-5.453 12.185-12.184 12.185z" class="color173042 svgShape"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="phone" x="0" y="0" version="1.1" viewBox="0 0 29 29" xml:space="preserve"><path d="M5.661 23.339c4.882 4.882 12.796 4.882 17.678 0 4.882-4.882 4.882-12.796 0-17.678s-12.796-4.882-17.678 0C.78 10.543.78 18.457 5.661 23.339zm5.545-16.613l1.86 1.86c.372.372.451.947.193 1.406l-.699 1.241a.781.781 0 0 0 .129.937l4.141 4.141a.781.781 0 0 0 .937.128l1.241-.699a1.173 1.173 0 0 1 1.406.193l1.861 1.861a1.175 1.175 0 0 1 0 1.66l-.881.881a3.135 3.135 0 0 1-3.786.493l-.084-.048a24.54 24.54 0 0 1-8.868-8.681l-.423-.706a3.128 3.128 0 0 1 .469-3.823l.844-.844a1.173 1.173 0 0 1 1.66 0z" fill="#4687ba" class="color000000 svgShape"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" viewBox="0 0 512 512" id="Sms"><circle cx="256" cy="256" r="256" fill="#4687ba" class="color00aebb svgShape"></circle><path fill="#ffffff" d="M256 129.3c-88.4 0-160 52-160 116.2 0 26.6 12.3 51.1 33 70.7-11.6 26.2-22.6 66.2-22.6 66.2 6.1 3.1 60.9-23.9 78.4-32.8 21.4 7.7 45.6 12.1 71.2 12.1 88.4 0 160-52 160-116.2s-71.6-116.2-160-116.2zm-59.2 148.9c-5.2 3.8-12 5.7-20.4 5.7-8.3 0-15.4-2.1-21.4-6.2-6-4.1-8.8-10.3-8.7-18.5l.1-.3h15c0 4.6 1.3 7.9 4 10.1 2.7 2.2 6.3 3.2 10.9 3.2 4.1 0 7.3-.9 9.5-2.6 2.2-1.7 3.3-4 3.3-6.9 0-3-1-5.3-3.1-7.1-2.1-1.8-5.7-3.5-10.9-5.1-8.9-2.7-15.6-5.8-20.3-9.5-4.6-3.6-6.9-8.6-6.9-14.9 0-6.3 2.6-11.5 7.8-15.5 5.2-4 11.8-6 19.9-6 8.5 0 15.4 2.2 20.6 6.5 5.2 4.3 7.7 10 7.5 16.9l-.1.3h-15c0-3.8-1.2-6.8-3.5-8.9-2.3-2.1-5.6-3.1-9.8-3.1-3.8 0-6.8.9-8.8 2.8-2.1 1.8-3.1 4.2-3.1 7 0 2.6 1.1 4.8 3.4 6.4 2.3 1.7 6.2 3.5 11.7 5.3 8.5 2.4 14.9 5.5 19.4 9.4 4.4 3.9 6.7 9 6.7 15.3-.1 6.7-2.7 11.9-7.8 15.7zm99.3 4.7h-15.5v-52.6l-.3-.1-19.1 52.7h-10.5l-19.1-52.8-.3.1v52.7h-15.5v-77.1h20.3l19.6 56.8h.3l19.8-56.8H296v77.1zm62.1-4.7c-5.2 3.8-12 5.7-20.4 5.7-8.3 0-15.4-2.1-21.4-6.2-5.9-4.1-8.8-10.3-8.7-18.5l.1-.3h15c0 4.6 1.3 7.9 4 10.1 2.7 2.2 6.3 3.2 10.9 3.2 4.1 0 7.3-.9 9.5-2.6 2.2-1.7 3.3-4 3.3-6.9 0-3-1-5.3-3.1-7.1-2.1-1.8-5.7-3.5-10.9-5.1-8.9-2.7-15.7-5.8-20.3-9.5-4.6-3.6-6.9-8.6-6.9-14.9 0-6.3 2.6-11.5 7.8-15.5 5.2-4 11.8-6 19.9-6 8.5 0 15.4 2.2 20.6 6.5 5.2 4.3 7.7 10 7.5 16.9l-.1.3h-15c0-3.8-1.2-6.8-3.5-8.9-2.3-2.1-5.6-3.1-9.8-3.1-3.8 0-6.8.9-8.8 2.8-2.1 1.8-3.1 4.2-3.1 7 0 2.6 1.1 4.8 3.4 6.4 2.3 1.7 6.2 3.5 11.7 5.3 8.5 2.4 14.9 5.5 19.4 9.4 4.4 3.9 6.7 9 6.7 15.3-.1 6.7-2.6 11.9-7.8 15.7z" class="colorffffff svgShape"></path></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30" id="Visacard"><g fill="#767fad" class="color303c42 svgShape"><path d="M28 4H2C.897 4 0 4.897 0 6v18c0 1.103.897 2 2 2h26c1.103 0 2-.897 2-2V6c0-1.103-.897-2-2-2zm1 20c0 .551-.449 1-1 1H2c-.551 0-1-.449-1-1V6c0-.551.449-1 1-1h26c.551 0 1 .449 1 1v18z" fill="#5218ed" class="color000000 svgShape"></path><path d="M7.677 14.266a.2.2 0 0 0 .228.053.17.17 0 0 0 .106-.194l-.314-1.368a.121.121 0 0 0-.002-.009c-.113-.39-.47-.449-.729-.459H6.96l-1.768-.002c-.091 0-.17.06-.185.143a.172.172 0 0 0 .121.193c1.078.358 1.96.926 2.55 1.643zM23.535 12.303h-1.15c-.46 0-.724.141-.883.473l-2.383 4.981a.162.162 0 0 0 .014.165c.035.05.094.079.158.079h1.35a.189.189 0 0 0 .176-.112c.165-.404.272-.661.307-.744h.974l1.183.002c.039.151.134.552.173.717.019.08.095.137.184.137h1.177c.057 0 .11-.024.146-.065s.05-.095.038-.146l-1.28-5.351a.185.185 0 0 0-.184-.136zm-1.926 3.675.895-2.138.114.492.39 1.646h-1.4z" fill="#5218ed" class="color000000 svgShape"></path><path d="M11.816 12.38a.193.193 0 0 0-.157-.078h-1.37a.188.188 0 0 0-.175.11L8.511 16.19l-.172-.575a.142.142 0 0 0-.009-.023c-.253-.542-.933-1.39-1.881-2.062-.065-.046-.154-.048-.221-.006s-.097.12-.074.192L7.47 17.87a.187.187 0 0 0 .18.124l1.518-.002a.19.19 0 0 0 .173-.104l2.49-5.344a.162.162 0 0 0-.016-.164zM14.088 12.297h-1.303a.184.184 0 0 0-.186.144l-.989 5.355a.165.165 0 0 0 .042.141c.036.04.088.062.144.062h1.302c.092 0 .17-.061.186-.145l.99-5.354a.164.164 0 0 0-.042-.141.195.195 0 0 0-.144-.062zM17.696 13.452h.05c.51 0 .87.107 1.097.187a.202.202 0 0 0 .16-.011.175.175 0 0 0 .093-.122l.152-.826c.016-.085-.039-.168-.128-.194a4.634 4.634 0 0 0-1.3-.182c-1.607 0-2.735.746-2.744 1.814-.01.79.807 1.231 1.422 1.494.632.269.844.441.841.682-.004.369-.506.536-.97.536a3.676 3.676 0 0 1-1.522-.285.202.202 0 0 0-.163.008.175.175 0 0 0-.095.123l-.161.87a.173.173 0 0 0 .123.193c.444.144 1.064.233 1.66.24h.001c1.705-.001 2.815-.739 2.827-1.88.006-.627-.427-1.1-1.36-1.49-.57-.256-.92-.426-.917-.686 0-.234.32-.47.934-.47z" fill="#5218ed" class="color000000 svgShape"></path></g></svg>
@@ -0,0 +1,69 @@
+import React, { useEffect } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import usersService from '../../../services/UsersService';
+import {updateUserDetails} from "../../../store/UserDetails";
+import { useDispatch } from "react-redux";
+import AuthLayout from "../AuthLayout";
+
+function AppleRedirect() {
+    const location = useLocation();
+    const navigate = useNavigate();
+    const userApi = new usersService();
+    const dispatch = useDispatch()
+
+    const queryParams = new URLSearchParams(location?.search);
+    const codeResponse = queryParams.get("code");
+
+    useEffect(()=>{
+      if(!codeResponse){
+        navigate('/login', {state: {error: true}})
+        return
+      }
+      console.log(codeResponse);
+
+      setTimeout(()=>{ // remove LATER
+        navigate('/login', {state: {error: true}})
+      },2000)
+      
+      /*
+      POST /token HTTP/1.1
+      Host: oauth2.googleapis.com
+      Content-Type: application/x-www-form-urlencoded
+
+      code=4/P7q7W91a-oMsCeLvIaQm6bTrgtp7&
+      client_id=your_client_id&
+      client_secret=your_client_secret&
+      redirect_uri=https%3A//oauth2.example.com/code&
+      grant_type=authorization_code
+      */
+      var reqData = {
+        auth_type: "APPLE",
+        code: codeResponse,
+        redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+      };
+    //   userApi
+    //     .authStart(reqData)
+    //     .then((res) => {
+    //       if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
+    //         localStorage.setItem("member_id", `${res.data.member_id}`);
+    //         localStorage.setItem("uid", `${res.data.uid}`);
+    //         localStorage.setItem("session_token", `${res.data.session}`);
+    //         dispatch(updateUserDetails({...res.data}));
+    //         navigate('/', {replace: true})
+    //         return
+    //       }
+    //       navigate('/login', {state: {error: true}})
+    //     })
+    //     .catch((error) => {
+    //       navigate('/login', {state: {error: true}})
+    //       console.log(error);
+    //     });
+    },[])
+  return (
+    <AuthLayout>
+    <div className='min-h-[70vh]'>Redirecting ... </div>
+  </AuthLayout>
+  )
+}
+
+export default AppleRedirect
@@ -0,0 +1,65 @@
+import React, { useEffect } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import usersService from '../../../services/UsersService';
+import {updateUserDetails} from "../../../store/UserDetails";
+import { useDispatch } from "react-redux";
+import AuthLayout from "../AuthLayout";
+
+function FbookRedirect() {
+    const location = useLocation();
+    const navigate = useNavigate();
+    const userApi = new usersService();
+    const dispatch = useDispatch()
+
+    const queryParams = new URLSearchParams(location?.search);
+    const codeResponse = queryParams.get("code");
+
+    useEffect(()=>{
+      if(!codeResponse){
+        navigate('/login', {state: {error: true}})
+        return
+      }
+      console.log(codeResponse);
+      
+      /*
+      POST /token HTTP/1.1
+      Host: oauth2.googleapis.com
+      Content-Type: application/x-www-form-urlencoded
+
+      code=4/P7q7W91a-oMsCeLvIaQm6bTrgtp7&
+      client_id=your_client_id&
+      client_secret=your_client_secret&
+      redirect_uri=https%3A//oauth2.example.com/code&
+      grant_type=authorization_code
+      */
+      var reqData = {
+        auth_type: "FACEBOOK",
+        code: codeResponse,
+        redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+      };
+    //   userApi
+    //     .authStart(reqData)
+    //     .then((res) => {
+    //       if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
+    //         localStorage.setItem("member_id", `${res.data.member_id}`);
+    //         localStorage.setItem("uid", `${res.data.uid}`);
+    //         localStorage.setItem("session_token", `${res.data.session}`);
+    //         dispatch(updateUserDetails({...res.data}));
+    //         navigate('/', {replace: true})
+    //         return
+    //       }
+    //       navigate('/login', {state: {error: true}})
+    //     })
+    //     .catch((error) => {
+    //       navigate('/login', {state: {error: true}})
+    //       console.log(error);
+    //     });
+    },[])
+  return (
+    <AuthLayout>
+    <div className='min-h-[70vh]'>Redirecting ... </div>
+  </AuthLayout>
+  )
+}
+
+export default FbookRedirect
@@ -1,53 +1,63 @@
 import React, { useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import usersService from '../../../services/UsersService';
+import {updateUserDetails} from "../../../store/UserDetails";
+import { useDispatch } from "react-redux";
+import AuthLayout from "../AuthLayout";

 function Redirect() {
    const location = useLocation();
    const navigate = useNavigate();
    const userApi = new usersService();
+    const dispatch = useDispatch()

    const queryParams = new URLSearchParams(location?.search);
    const codeResponse = queryParams.get("code");

    useEffect(()=>{
-        if(!codeResponse){
-            navigate('/login', {replace: true})
-            return
-        }
-        console.log(codeResponse);
-        /*
-        POST /token HTTP/1.1
-        Host: oauth2.googleapis.com
-        Content-Type: application/x-www-form-urlencoded
+      if(!codeResponse){
+        navigate('/login', {state: {error: true}})
+        return
+      }
+      console.log(codeResponse);
+      /*
+      POST /token HTTP/1.1
+      Host: oauth2.googleapis.com
+      Content-Type: application/x-www-form-urlencoded

-        code=4/P7q7W91a-oMsCeLvIaQm6bTrgtp7&
-        client_id=your_client_id&
-        client_secret=your_client_secret&
-        redirect_uri=https%3A//oauth2.example.com/code&
-        grant_type=authorization_code
-        */
-        var reqData = {
-          auth_type: "GOOGLE",
-          code: codeResponse,
-          redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
-        };
-        userApi
-          .authStart(reqData)
-          .then((res) => {
-            console.log(res.data);
-            if (res.status != 200 || res.internal_return < 0) {
-              return;
-            }
-            // "{"message":"Endpoint not found.","URI":"http:\/\/localhost:9083\/index.php\/en\/wrench\/api\/v1\/authstart"}[]"
-	    alert(JSON.stringify(res.data));
-          })
-          .catch((error) => {
-            console.log(error);
-          });
+      code=4/P7q7W91a-oMsCeLvIaQm6bTrgtp7&
+      client_id=your_client_id&
+      client_secret=your_client_secret&
+      redirect_uri=https%3A//oauth2.example.com/code&
+      grant_type=authorization_code
+      */
+      var reqData = {
+        auth_type: "GOOGLE",
+        code: codeResponse,
+        redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
+      };
+      userApi
+        .authStart(reqData)
+        .then((res) => {
+          if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
+            localStorage.setItem("member_id", `${res.data.member_id}`);
+            localStorage.setItem("uid", `${res.data.uid}`);
+            localStorage.setItem("session_token", `${res.data.session}`);
+            dispatch(updateUserDetails({...res.data}));
+            navigate('/', {replace: true})
+            return
+          }
+          navigate('/login', {state: {error: true}})
+        })
+        .catch((error) => {
+          navigate('/login', {state: {error: true}})
+          console.log(error);
+        });
    },[])
  return (
-    <div>Redirecting ... </div>
+    <AuthLayout>
+    <div className='min-h-[70vh]'>Redirecting ... </div>
+  </AuthLayout>
  )
 }

@@ -1,5 +1,5 @@
 import React, { useEffect, useLayoutEffect, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import linkedInLogo from "../../../assets/images/Linkedin.png";
 import appleLogo from "../../../assets/images/apple-black.svg";
 import facebookLogo from "../../../assets/images/facebook-4.svg";
@@ -9,17 +9,17 @@ import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 // import { GoogleOAuthProvider } from '@react-oauth/google';
-import { googleLogout, useGoogleLogin } from "@react-oauth/google";
+import { useGoogleLogin } from "@react-oauth/google";

 import { useDispatch } from "react-redux";
 import { updateUserDetails } from "../../../store/UserDetails";

 export default function Login() {
  const dispatch = useDispatch();
+  const { state } = useLocation();

-  let [loginType, setLoginType] = useState('');
+  let [loginType, setLoginType] = useState("");

-  const [checked, setValue] = useState(false);
  const [loginLoading, setLoginLoading] = useState(false);

  const [showPassword, setShowPassword] = useState(false);
@@ -29,12 +29,8 @@ export default function Login() {
  // for the catch error
  const [msgError, setMsgError] = useState("");

-  const rememberMe = () => {
-    setValue(!checked);
-  };
-
-   // To Show and Hide Password
-   const togglePasswordVisibility = () => {
+  // To Show and Hide Password
+  const togglePasswordVisibility = () => {
    setShowPassword(!showPassword);
  };

@@ -42,7 +38,7 @@ export default function Login() {
  const handleLoginType = ({ target: { name } }) => {
    setLoginType(name);
    let currentDate = new Date();
-    let expirationDate = new Date(currentDate.getTime() + (24 * 60 * 60 * 1000));
+    let expirationDate = new Date(currentDate.getTime() + 24 * 60 * 60 * 1000);
    // Convert the expiration date to the appropriate format
    let expirationDateString = expirationDate.toUTCString();
    document.cookie = `loginType=${name}; expires=${expirationDateString}; path=/;`;
@@ -77,6 +73,15 @@ export default function Login() {
    }

    if (name == "full") {
+      //checks if email is a valid email address
+      let regEx = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
+      if (regEx.test(email) == false) {
+        setLoginLoading(false);
+        setMsgError("Invalid Email");
+        return setTimeout(() => {
+          setMsgError("");
+        }, 3000);
+      }
      // Post Data Info for normal Login
      postData = {
        username: email,
@@ -105,7 +110,13 @@ export default function Login() {
    userApi
      .logInUser(postData)
      .then((res) => {
-        if (res.status != 200 || res.data.internal_return < 0) {
+        if (
+          res.status != 200 ||
+          res.data.internal_return < 0 ||
+          !res.data.member_id ||
+          !res.data.uid ||
+          !res.data.session
+        ) {
          // setMsgError("Wrong, email/password");
          setLoginError(true);
          setLoginLoading(false);
@@ -115,7 +126,7 @@ export default function Login() {
        localStorage.setItem("uid", `${res.data.uid}`);
        localStorage.setItem("session_token", `${res.data.session}`);
        // localStorage.setItem("session", `${res.data.session}`);
-        dispatch(updateUserDetails({...res.data, loggedIn:true}));
+        dispatch(updateUserDetails({ ...res.data }));
        setTimeout(() => {
          navigate("/", { replace: true });
          setLoginLoading(false);
@@ -146,11 +157,12 @@ export default function Login() {

  // In order to update the selected login type whenever the component renders
  // useEffect(() => {
-      // Clear the loginType cookie if the user switches to loginfull
-      // document.cookie ="loginType=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+  // Clear the loginType cookie if the user switches to loginfull
+  // document.cookie ="loginType=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
  // }, []);

-  useLayoutEffect(()=>{ // checks the cookie in order to set the login type before components mounts
+  useLayoutEffect(() => {
+    // checks the cookie in order to set the login type before components mounts
    // if(document.cookie.includes("loginType=family")){
    //   setLoginType('family')
    // }else if(document.cookie.includes("loginType=full")){
@@ -158,25 +170,34 @@ export default function Login() {
    // }else{
    //   setLoginType('full')
    // }
-    function readCookie(cname) { // checks the cookie in order to set the login type before components mounts
+    function readCookie(cname) {
+      // checks the cookie in order to set the login type before components mounts
      let name = cname + "=";
      let decoded_cookie = decodeURIComponent(document.cookie);
-      let carr = decoded_cookie.split(';');
-      for(let i=0; i<carr.length;i++){
+      let carr = decoded_cookie.split(";");
+      for (let i = 0; i < carr.length; i++) {
        let c = carr[i];
-        while(c.charAt(0)==' '){
-            c=c.substring(1);
+        while (c.charAt(0) == " ") {
+          c = c.substring(1);
        }
-        if(c.indexOf(name) == 0) {
-            return c.substring(name.length, c.length);
+        if (c.indexOf(name) == 0) {
+          return c.substring(name.length, c.length);
        }
      }
-      return 'full'
+      return "full";
    }
-    let loginValue = readCookie('loginType')
-    setLoginType(loginValue)
-  },[])
-  
+    let loginValue = readCookie("loginType");
+    setLoginType(loginValue);
+
+    if (state?.error) {
+      //check if the login path has an error state indicating any social handle login with error
+      setMsgError("Unexpected Error, Please try again soon.");
+      setTimeout(() => {
+        setMsgError("");
+        navigate("/login", { replace: true });
+      }, 4000);
+    }
+  }, []);

  useEffect(() => {
    setMail("");
@@ -218,7 +239,9 @@ export default function Login() {
                <button
                  name="full"
                  className={`login-type-btn px-4 py-1 rounded-t-2xl ${
-                    loginType=='full' ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                    loginType == "full"
+                      ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                      : "bg-white text-[#000] border-t-[2px]"
                  }`}
                  onClick={handleLoginType}
                >
@@ -227,7 +250,9 @@ export default function Login() {
                <button
                  name="family"
                  className={`login-type-btn px-4 py-1 rounded-t-2xl ${
-                    loginType=='family' ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                    loginType == "family"
+                      ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                      : "bg-white text-[#000] border-t-[2px]"
                  }`}
                  onClick={handleLoginType}
                >
@@ -239,7 +264,7 @@ export default function Login() {

              {/* for login component */}
              {
-                loginType == 'full' ? (
+                loginType == "full" ? (
                  //user login component
                  <div className="p-6 input-area login-area border-2 border-[#4687ba] rounded-2xl">
                    <div className="input-item mb-5">
@@ -259,8 +284,8 @@ export default function Login() {
                    <div className="input-item mb-5">
                      <InputCom
                        labelClass="tracking-wider"
-                        fieldClass="sm:px-6 px-2"
-                        value={password}
+                        fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
+                        value={password.replace(/./g, "●")}
                        inputHandler={handlePassword}
                        placeholder="● ● ● ● ● ●"
                        label="Password"
@@ -311,18 +336,26 @@ export default function Login() {
                          brand="Google"
                          onClick={googleLogin}
                        />
-                        <BrandBtn link="#" imgSrc={appleLogo} brand="Apple" />
+                        <BrandBtn
+                          // link={`https://appleid.apple.com/auth/authorize?response_type=code&response_mode=form_post&client_id=${process.env.REACT_APP_APPLE_CLIENT_ID}&redirect_uri=https%3A%2F%2Fwork.wrenchboard.com%2Flogin%2Fauth%2Fapple&state=4b2c4456b7&scope=name+email`}
+                          link={`https://appleid.apple.com/auth/authorize?response_type=code&response_mode=form_post&client_id=${process.env.REACT_APP_APPLE_CLIENT_ID}&redirect_uri=${process.env.REACT_APP_APPLE_REDIRECT_URL}&state=4b2c4456b7&scope=name+email`}
+                          imgSrc={appleLogo}
+                          brand="Apple"
+                          isAnchor={true}
+                        />
                      </div>
                      <div className="sm:flex sm:justify-between sm:items-center sm:space-x-2">
                        <BrandBtn
-                          link="#"
+                          link={`https://www.facebook.com/v14.0/dialog/oauth?client_id=${process.env.REACT_APP_FACEBOOK_CLIENT_ID}&redirect_uri=${process.env.REACT_APP_FACEBOOK_REDIRECT_URL}&scope=${process.env.REACT_APP_FACEBOOK_CLIENT_SCOPE}`}
                          imgSrc={facebookLogo}
                          brand="Facebook"
+                          isAnchor={true}
                        />
                        <BrandBtn
-                          link="#"
+                          // link="https://www.linkedin.com/oauth/v2/authorization?response_type=code&client_id=YOUR_CLIENT_ID&redirect_uri=YOUR_REDIRECT_URI&scope=comma-separated-list-of-scopes&state=YOUR_STATE_VALUE"
                          imgSrc={linkedInLogo}
                          brand="LinkedIn"
+                          isAnchor={true}
                        />
                      </div>
                    </div>
@@ -411,7 +444,7 @@ export default function Login() {
  );
 }

-const BrandBtn = ({ link, imgSrc, brand, onClick }) => {
+const BrandBtn = ({ link, imgSrc, brand, onClick, isAnchor = false }) => {
  // const doGoogle = async () => {
  //   alert("start google");
  // };
@@ -430,19 +463,30 @@ const BrandBtn = ({ link, imgSrc, brand, onClick }) => {
  // const doFacebook = async () => {
  //   alert("start facebook");
  // };
-
  return (
    <div className="w-full sm:w-1/2 flex justify-center bottomMargin">
-      <button
-        onClick={onClick}
-        // href="#dd"
-        className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 dark:bg-[#11131F]  items-center font-medium cursor-pointer"
-      >
-        <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
-        <span className="text-lg text-thin-light-gray font-normal text-[15px]">
-          Continue with {brand}
-        </span>
-      </button>
+      {isAnchor ? (
+        <a
+          href={link}
+          className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 dark:bg-[#11131F]  items-center font-medium cursor-pointer"
+        >
+          <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
+          <span className="text-lg text-thin-light-gray font-normal text-[15px]">
+            Continue with {brand}
+          </span>
+        </a>
+      ) : (
+        <button
+          onClick={onClick}
+          // href="#dd"
+          className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[0.475rem] h-[48px] flex justify-center bg-[#FAFAFA] hover:bg-[#eff2f5] hover:text-[#7e8299] transition duration-300 dark:bg-[#11131F]  items-center font-medium cursor-pointer"
+        >
+          <img className="mr-3 h-6" src={imgSrc} alt="logo-icon(s)" />
+          <span className="text-lg text-thin-light-gray font-normal text-[15px]">
+            Continue with {brand}
+          </span>
+        </button>
+      )}
    </div>
  );
 };
@@ -205,7 +205,7 @@ export default function SignUp() {
                </div>
                <div className="input-item mb-5">
                  <InputCom
-                    fieldClass="px-6"
+                    fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
                    placeholder="● ● ● ● ● ●"
                    label="Password"
                    name="password"
@@ -214,7 +214,7 @@ export default function SignUp() {
                    passIcon={
                      showPassword ? "show-password" : "hide-password"
                    }
-                    value={formData.password}
+                    value={formData.password.replace(/./g, "●")}
                    inputHandler={handleInputChange}
                  />
                </div>
@@ -158,8 +158,8 @@ const SuccessfulComponent = ({
    {/* INPUT */}
    <div className="mb-5">
      <InputCom
-        fieldClass="px-6"
-        value={password}
+        fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
+        value={password?.replace(/./g, "●")}
        inputHandler={handlePassword}
        placeholder="● ● ● ● ● ●"
        label="Password"
@@ -171,8 +171,8 @@ const SuccessfulComponent = ({
    </div>
    <div className="mb-5">
      <InputCom
-        fieldClass="px-6"
-        value={confirmPassword}
+        fieldClass="sm:px-6 px-2 tracking-[0.25em] text-2xl"
+        value={confirmPassword?.replace(/./g, "●")}
        inputHandler={handlePassword}
        placeholder="● ● ● ● ● ●"
        label="Confirm Password"
@@ -31,7 +31,7 @@ export default function BlogItem(props) {
                        </div>
                    </div>
                   <div>
-                       Blog Items Details
+                       Blog Items Details need implenet
                   </div>
                </div>
            </div>
@@ -21,7 +21,8 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
            toast.warn("Remove to Favorite List");
        }
    };
-
+//debugger;
+    const bannerName  =  datas.banner == null ?'default.jpg':datas.banner;
    return (
        <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
            <div className="content">
@@ -32,7 +33,7 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
                        className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
                        style={{
                            background: `url(${localImgLoad(
-                                `images/taskbanners/${datas.banner}`
+                                `images/taskbanners/${bannerName}`
                            )}) center / contain no-repeat`,
                        }}
                    >
@@ -17,21 +17,21 @@ export default function HomeBannerOffersCard(props) {
  return (
    <Link
      to={link_result}
-      className="item w-full block group banner-630-340 bg-cover bg-center"
+      className="item p-2 w-full flex items-center min-h-[340px] bg-alice-blue bg-cover bg-center"
      style={{
        backgroundImage: `url('${imageUrl}')`,
      }}
    >
-      <div className="flex flex-col justify-between h-full">
+      <div className="w-[80%] h-full mx-auto flex flex-col justify-between">
        <div className="content flex justify-between items-center">
-          <div className="siderCardHeader">
-            <h1 className="text-2xl font-bold text-dark-gray dark:text-white tracking-wide">
+          <div className="mb-2">
+            <h1 className="text-2xl lg:text-4xl font-bold text-dark-gray dark:text-white tracking-wide">
              <span className="heroSilderTitle">{props.itemData.title}</span>
            </h1>
          </div>
        </div>
        <div className="flex flex-col justify-around items-center flex-1">
-          <div className="siderCardDescription">
+          <div className="siderCardDescription mb-2">
            {props.itemData.description}
          </div>
          <button className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
@@ -1,26 +1,28 @@
 import React, {
  Suspense,
+  lazy,
  useCallback,
  useEffect,
  useMemo,
  useRef,
  useState,
+  useTransition,
 } from "react";
 import { useReactToPrint } from "react-to-print";
 import profile from "../../assets/images/profile-info-profile.png";
 import usersService from "../../services/UsersService";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import AssignTaskPopout from "./FamilyPopout/AssignTaskPopout";
-import {
-  FamilyWaitlist,
-  FamilyAccount,
-  FamilyProfile,
-  FamilyTasks,
-  ProfileInfo,
-  FamilyPending,
-} from "./Tabs";
 import localImgLoad from "../../lib/localImgLoad";

+// Lazy Imports for components
+const FamilyWaitlist = lazy(() => import("./Tabs/FamilyWaitlist"));
+const FamilyAccount = lazy(() => import("./Tabs/FamilyAccount"));
+const FamilyProfile = lazy(() => import("./Tabs/FamilyProfile"));
+const FamilyTasks = lazy(() => import("./Tabs/FamilyTasks"));
+const ProfileInfo = lazy(() => import("./Tabs/ProfileInfo"));
+const FamilyPending = lazy(() => import("./Tabs/FamilyPending"));
+
 export default function FamilyManageTabs({
  className,
  accountDetails,
@@ -35,14 +37,15 @@ export default function FamilyManageTabs({
  });
  const [errMsg, setErrMsg] = useState("");
  const [familyTaskPopout, setFamilyTaskPopout] = useState(false);
+  const [profileImg, setProfileImg] = useState(profile);
+  const profileImgInput = useRef(null);
+  const [isPending, startTransition] = useTransition();
+  const apiCall = useMemo(() => new usersService(), []);

  const familyPopUpHandler = () => {
    setFamilyTaskPopout((prev) => !prev);
  };

-  const [profileImg, setProfileImg] = useState(profile);
-  const profileImgInput = useRef(null);
-
  const browseProfileImg = () => {
    profileImgInput.current.click();
  };
@@ -57,16 +60,15 @@ export default function FamilyManageTabs({
    }
  };

-  const apiCall = useMemo(() => new usersService(), []);
-
  const manageFamily = useCallback(async () => {
    try {
-      setDetails({
+      setDetails((prevDetails) => ({
+        ...prevDetails,
        familyDetails: { loading: true },
        familyTasks: { loading: true },
        familyWaitList: { loading: true },
        familyPending: { loading: true },
-      });
+      }));

      const { family_uid } = accountDetails;
      const reqData = { family_uid };
@@ -89,22 +91,26 @@ export default function FamilyManageTabs({
        tasksData?.internal_return < 0 ||
        familyWaitData?.internal_return < 0 ||
        familyPendingData?.internal_return < 0
-      )
+      ) {
        return;
+      }

-      setDetails({
-        familyDetails: { loading: false, data: familyData },
-        familyTasks: { loading: false, data: tasksData },
-        familyWaitList: { loading: false, data: familyWaitData },
-        familyPending: { loading: false, data: familyPendingData },
+      startTransition(() => {
+        setDetails({
+          familyDetails: { loading: false, data: familyData },
+          familyTasks: { loading: false, data: tasksData },
+          familyWaitList: { loading: false, data: familyWaitData },
+          familyPending: { loading: false, data: familyPendingData },
+        });
      });
    } catch (error) {
-      setDetails({
+      setDetails((prevDetails) => ({
+        ...prevDetails,
        familyDetails: { loading: false },
        familyTasks: { loading: false },
        familyWaitList: { loading: false },
        familyPending: { loading: false },
-      });
+      }));
      setErrMsg("An error occurred");
      throw new Error(error);
    }
@@ -119,13 +125,15 @@ export default function FamilyManageTabs({
  const tabs = [
    { id: 1, name: "Tasks" },
    { id: 2, name: "Waiting" },
-    { id: 3, name: "Pending" }
+    { id: 3, name: "Pending" },
  ];

  const [tab, setTab] = useState(tabs[0].name);

  const tabHandler = (value) => {
-    setTab(value);
+    startTransition(() => {
+      setTab(value);
+    });
  };

  const tabComponents = {
@@ -174,7 +182,13 @@ export default function FamilyManageTabs({
  const selectedTabComponent = tabComponents[tab] || defaultTabComponent;

  useEffect(() => {
-    manageFamily();
+    let __manageFamily = true;
+    if (__manageFamily) {
+      manageFamily();
+    }
+    return () => {
+      __manageFamily = false;
+    };
  }, [tab, manageFamily]);

  return (
@@ -200,18 +214,28 @@ export default function FamilyManageTabs({
                browseProfileImg={browseProfileImg}
                accountDetails={accountDetails}
              />
-              <div className="mt-4 flex justify-center items-center gap-2">
+              <div className="mt-4 flex justify-start items-center gap-2">
                <button
-                  onClick={() => tabHandler('Account')} 
-                  className="family-icon p-2 border-2 border-sky-blue rounded-2xl flex flex-col justify-between items-center">
-                  <img src={localImgLoad('images/icons/account.svg')} className="w-[70px] h-[70px]" alt='Settings-Icon' />
-                  <p className="mt-2 text-lg text-sky-blue">Account</p>
+                  onClick={() => tabHandler("Account")}
+                  className="family-icon p-2 border-2 border-sky-blue rounded-2xl flex flex-col justify-between items-center max-w-[65px] w-full"
+                >
+                  <img
+                    src={localImgLoad("images/icons/account.svg")}
+                    className="max-w-[30px] w-full"
+                    alt="Settings-Icon"
+                  />
+                  <p className="text-lg text-sky-blue">Acc.</p>
                </button>
                <button
-                  onClick={() => tabHandler('Profile')} 
-                  className="family-icon p-2 border-2 border-sky-blue rounded-2xl flex flex-col justify-between items-center">
-                  <img src={localImgLoad('images/icons/profile.svg')} className="w-[70px] h-[70px]" alt='Settings-Icon' />
-                  <p className="mt-2 text-lg text-sky-blue">Profile</p>
+                  onClick={() => tabHandler("Profile")}
+                  className="family-icon p-2 border-2 border-sky-blue rounded-2xl flex flex-col justify-between items-center max-w-[65px] w-full"
+                >
+                  <img
+                    src={localImgLoad("images/icons/profile.svg")}
+                    className="max-w-[30px] w-full"
+                    alt="Settings-Icon"
+                  />
+                  <p className="text-lg text-sky-blue">Profile</p>
                </button>
              </div>
            </div>
@@ -243,7 +267,11 @@ export default function FamilyManageTabs({
                </div>
                <div className="flex-[0.9] lg:min-h-[450px] h-full">
                  <div className="h-full p-4 border border-[#dbd9d9] relative overflow-y-auto">
-                    {selectedTabComponent}
+                    <Suspense
+                      fallback={<LoadingSpinner size="16" color="sky-blue" />}
+                    >
+                      {selectedTabComponent}
+                    </Suspense>
                  </div>
                </div>
              </div>
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useTransition } from "react";
 import ModalCom from "../../Helpers/ModalCom";
 import Detail from "../../jobPopout/popoutcomponent/Detail";
 import usersService from "../../../services/UsersService";
@@ -6,7 +6,7 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import { NewTasks } from "./forms";

-function AssignTaskPopout({ action, details, situation, familyDetails }) {
+const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetails }) => {
  const apiCall = new usersService();

  let [requestStatus, setRequestStatus] = useState({
@@ -15,7 +15,7 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
    message: "",
  }); // HOLDS RESPONSE FOR SENDING API REQUEST

-  let [familyTask, setFamilyTask] = useState({ loading: true, data: [] });
+  let [familyTask, setFamilyTask] = useState({ loading: false, data: [] });

  let [taskType, setTaskType] = useState(details ? "new" : "select"); // SWITCHES BTW SELECT TASK AND NEW TASK

@@ -63,7 +63,7 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
        // API PAYLOADS
        job_id: activeTask.data?.job_id,
        job_uid: activeTask.data?.job_uid,
-        family_uid: familyDetails.uid,
+        family_uid: familyDetails?.uid || details?.family_uid,
        job_description: activeTask.data?.description,
        assign_mode: 110011,
      };
@@ -156,27 +156,35 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
  };

  useEffect(() => {
+    let checkFamilyTask = true;
    const reqData = {
      limit: 30,
      offset: 0,
      job_type: "FAMILY",
      action: 13005,
    };
+
    apiCall
      .getMyJobList(reqData)
      .then((res) => {
-        setFamilyTask({ loading: false, data: res?.data?.result_list });
-        if (res?.data?.result_list?.length) {
-          setActiveTask((prev) => ({
-            ...prev,
-            data: res?.data?.result_list[0],
-          }));
+        if (checkFamilyTask) {
+          setFamilyTask({ loading: false, data: res?.data?.result_list });
+          if (res?.data?.result_list?.length) {
+            setActiveTask((prev) => ({
+              ...prev,
+              data: res?.data?.result_list[0],
+            }));
+          }
        }
      })
      .catch((err) => {
        setFamilyTask({ loading: false, data: [] });
        console.log("Error", err);
      });
+
+    return () => {
+      checkFamilyTask = false;
+    };
  }, []);

  return (
@@ -428,6 +436,6 @@ function AssignTaskPopout({ action, details, situation, familyDetails }) {
      </ModalCom>
    </>
  );
-}
+})

-export default AssignTaskPopout;
+export default AssignTaskPopout;
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from "react";
 import usersService from "../../../../services/UsersService";
 import InputCom from "../../../Helpers/Inputs/InputCom";

-// const DEFAULT_IMAGE =
 export default function NewTasks({ formState, setFormState }) {
  let [currency, setCurrency] = useState({
    loading: true,
@@ -1,17 +1,15 @@
 import React, { useState } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
-import { useNavigate, useLocation, Link } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";

 import familyImage from '../../assets/images/no-family-side.png'
+import localImgLoad from "../../lib/localImgLoad";

 export default function FamilyTable({ className, familyList, loader, popUpHandler }) {
-  const filterCategories = ["All Categories", "Explore", "Featured"];
-  const [selectedCategory, setCategory] = useState(filterCategories[0]);
  const navigate = useNavigate();
-  // let location = useLocation();

  const [currentPage, setCurrentPage] = useState(0);
  const indexOfFirstItem = Number(currentPage);
@@ -57,6 +55,7 @@ export default function FamilyTable({ className, familyList, loader, popUpHandle
                        last_login,
                        task_count,
                        family_uid,
+                        banner
                      } = props;
                      let addedDate = added?.split(" ")[0];
                      let LoginDate = last_login?.split(" ")[0];
@@ -67,9 +66,10 @@ export default function FamilyTable({ className, familyList, loader, popUpHandle
                        >
                          <td className=" py-4">
                            <div className="flex space-x-2 items-center w-full">
-                              <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px]">
+                              <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1]">
                                <img
-                                  src={dataImage1}
+                                  // src={dataImage1}
+                                  src={localImgLoad(`images/icons/${banner}`)}
                                  alt="data"
                                  className="w-full h-full"
                                />
@@ -1,56 +1,56 @@
-import { forwardRef } from 'react'
-import QRCode from 'react-qr-code';
+import { forwardRef } from "react";
+import QRCode from "react-qr-code";

 const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
-    return (
-      <div
-        className="w-full lg:min-h-[500px] h-full flex flex-col items-center justify-center"
-        ref={myRef}
-      >
-        <div className="update-table w-full lg:min-h-[450px] h-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow ">
-          <div className="flex items-center justify-around h-[380px]">
-            <div className="flex flex-col">
-              <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-                Username:{" "}
-                <span className="ml-2 normal-case">
-                  {familyData?.username ? familyData?.username : "please wait..."}
-                </span>
-              </h2>
-              <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-                Pin:{" "}
-                <span className="ml-2 normal-case">
-                  {familyData?.pin ? familyData?.pin : "please wait..."}
-                </span>
-              </h2>
-            </div>
-  
-            <span className="text-5xl text-gray-400 opacity-20 font-bold">
-              or
-            </span>
-  
-            <div className="max-w-[200px]">
-              <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
-                Scan the code from mobile app
-              </p>
-              <QRCode
-                size={256}
-                style={{ height: "auto", maxWidth: "100%", width: "100%" }}
-                value={`https://www.google.com`}
-                viewBox={`0 0 256 256`}
-              />
-            </div>
+  return (
+    <div
+      className="w-full lg:min-h-[500px] h-full flex flex-col items-center justify-center"
+      ref={myRef}
+    >
+      <div className="update-table w-full lg:min-h-[450px] h-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow ">
+        <div className="flex items-center justify-around h-[380px]">
+          <div className="flex flex-col">
+            <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              Username:{" "}
+              <span className="ml-2 normal-case">
+                {familyData?.username ? familyData?.username : "please wait..."}
+              </span>
+            </h2>
+            <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              Pin:{" "}
+              <span className="ml-2 normal-case">
+                {familyData?.pin ? familyData?.pin : "please wait..."}
+              </span>
+            </h2>
          </div>
-          <div className="h-[50px] w-full flex justify-center items-center">
-            <button
-              className="btn-shine w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
-              onClick={handlePrint}
-            >
-              Print
-            </button>
+
+          <span className="text-5xl text-gray-400 opacity-20 font-bold">
+            or
+          </span>
+
+          <div className="max-w-[200px]">
+            <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
+              Scan the code from mobile app
+            </p>
+            <QRCode
+              size={256}
+              style={{ height: "auto", maxWidth: "100%", width: "100%" }}
+              value={`https://www.google.com`}
+              viewBox={`0 0 256 256`}
+            />
          </div>
        </div>
+        <div className="h-[50px] w-full flex justify-center items-center">
+          <button
+            className="btn-shine w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
+            onClick={handlePrint}
+          >
+            Print
+          </button>
+        </div>
      </div>
-    );
-  });
+    </div>
+  );
+});

-export default FamilyAccount
+export default FamilyAccount;
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { PaginatedList, handlePagingFunc } from "../../Pagination";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
 import dataImage2 from "../../../assets/images/data-table-user-2.png";
@@ -13,8 +13,12 @@ export default function FamilyPending({
 }) {
  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW

-  let filteredFamilyData = familyData?.result_list?.filter(
-    (data) => data?.family_uid === accountDetails?.family_uid
+  let filteredFamilyData = useMemo(
+    () =>
+      familyData?.result_list?.filter(
+        (data) => data?.family_uid === accountDetails?.family_uid
+      ),
+    [accountDetails?.family_uid, familyData?.result_list]
  );

  const [currentPage, setCurrentPage] = useState(0);
@@ -51,7 +55,7 @@ export default function FamilyPending({
                        value?.currency_code,
                        value?.currency
                      );
-                      let image = value.banner ? value.banner : 'default.jpg'
+                      let image = value.banner ? value.banner : "default.jpg";
                      return (
                        <tr
                          key={index}
@@ -61,7 +65,9 @@ export default function FamilyPending({
                            <div className="flex space-x-2 items-center w-full">
                              <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                <img
-                                  src={localImgLoad(`images/taskbanners/${image}`)}
+                                  src={localImgLoad(
+                                    `images/taskbanners/${image}`
+                                  )}
                                  alt="data"
                                  className="w-full h-full rounded-full"
                                />
@@ -1,141 +1,152 @@
-import { useState } from "react";
-import { handlePagingFunc, PaginatedList } from "../../Pagination";
-import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { memo, useMemo, useState } from "react";
 import SuggestTask from "../../FamilyPopup/SuggestTask";
+import { PaginatedList, handlePagingFunc } from "../../Pagination";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";

-const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
-  const [popUp, setPopUp] = useState({ show: false, data: {} });
-  const [continueTaskPopup, setContinueTaskPopup] = useState({
-    show: false,
-    data: {},
-  });
+const FamilyWaitlist = memo(
+  ({ familyData, className, accountDetails, loader }) => {
+    const [popUp, setPopUp] = useState({ show: false, data: {} });
+    const [continueTaskPopup, setContinueTaskPopup] = useState({
+      show: false,
+      data: {},
+    });
+    const filteredFamilyData = useMemo(
+      () =>
+        familyData?.result_list?.filter(
+          (data) => data?.family_uid === accountDetails?.family_uid
+        ),
+      [familyData, accountDetails]
+    );

-  let filteredFamilyData = familyData?.result_list?.filter(
-    (data) => data?.family_uid === accountDetails?.family_uid
-  );
+    const [currentPage, setCurrentPage] = useState(0);
+    const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const indexOfFirstItem = currentPage;
+    const indexOfLastItem = currentPage + itemsPerPage;
+    const currentTask = useMemo(
+      () => filteredFamilyData?.slice(indexOfFirstItem, indexOfLastItem),
+      [filteredFamilyData, indexOfFirstItem, indexOfLastItem]
+    );

-  const [currentPage, setCurrentPage] = useState(0);
-  const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
-  const indexOfFirstItem = currentPage;
-  const indexOfLastItem = currentPage + itemsPerPage;
-  const currentTask = filteredFamilyData?.slice(
-    indexOfFirstItem,
-    indexOfLastItem
-  );
+    const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);

-  const handlePagination = (e) => handlePagingFunc(e, setCurrentPage);
+    const openPopUp = (value) => {
+      setPopUp({ show: true, data: { ...value } });
+    };

-  return (
-    <div
-      className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[450px] overflow-hidden rounded-2xl section-shadow ${
-        className || ""
-      }`}
-    >
-      {loader ? (
-        <div className="w-full h-full flex justify-center items-center lg:min-h-[470px]">
-          <LoadingSpinner size={16} color="sky-blue" />
-        </div>
-      ) : (
-        <>
-          {filteredFamilyData && (
-            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
-              <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                <tbody>
-                  {currentTask.map((value) => {
-                    const addedDate = value?.added.split(" ")[0];
-                    const selectedImage = require(`../../../assets/images/family/${
-                      value?.banner || "default.jpg"
-                    }`);
-                    return (
-                      <tr
-                        className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
-                        key={value.uid}
-                      >
-                        <td className="py-4">
-                          <div className="w-full flex justify-between items-center">
-                            <div className="account-name flex space-x-4 items-center">
-                              <div className="icon w-14 h-14 flex justify-center items-center">
-                                <img
-                                  src={selectedImage}
-                                  alt="task_img"
-                                  className="w-full object-cover"
-                                />
+    const closePopUp = () => {
+      setPopUp({ show: false, data: {} });
+    };
+
+    const openContinueTaskPopup = (value) => {
+      setContinueTaskPopup({ show: true, data: { ...value } });
+    };
+
+    const closeContinueTaskPopup = () => {
+      setContinueTaskPopup({ show: false, data: {} });
+    };
+
+    return (
+      <div
+        className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[450px] overflow-hidden rounded-2xl section-shadow ${
+          className || ""
+        }`}
+      >
+        {loader ? (
+          <div className="w-full h-full flex justify-center items-center lg:min-h-[470px]">
+            <LoadingSpinner size={16} color="sky-blue" />
+          </div>
+        ) : (
+          <>
+            {filteredFamilyData && (
+              <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                  <tbody>
+                    {currentTask.map((value) => {
+                      const addedDate = value?.added.split(" ")[0];
+                      const selectedImage = require(`../../../assets/images/family/${
+                        value?.banner || "default.jpg"
+                      }`);
+                      return (
+                        <tr
+                          className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
+                          key={value.uid}
+                        >
+                          <td className="py-4">
+                            <div className="w-full flex justify-between items-center">
+                              <div className="account-name flex space-x-4 items-center">
+                                <div className="icon w-14 h-14 flex justify-center items-center">
+                                  <img
+                                    src={selectedImage}
+                                    alt="task_img"
+                                    className="w-full object-cover"
+                                  />
+                                </div>
+                                <div className="">
+                                  <p className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
+                                    {value.title}
+                                  </p>
+                                  <p className="text-sm text-thin-light-gray font-medium">
+                                    {value.description}
+                                  </p>
+                                </div>
                              </div>
-                              <div className="">
-                                <p className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
-                                  {value.title}
+                              <div className="px-2 flex flex-col items-center justify-center">
+                                <p className="text-sm font-bold text-dark-gray dark:text-white">
+                                  {addedDate}
                                </p>
-                                <p className="text-sm text-thin-light-gray font-medium">
-                                  {value.description}
+                                <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
+                                  {value.status_text}
                                </p>
                              </div>
                            </div>
-                            <div className="px-2 flex flex-col items-center justify-center">
-                              <p className="text-sm font-bold text-dark-gray dark:text-white">
-                                {addedDate}
-                              </p>
-                              <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
-                                {value.status_text}
-                              </p>
-                            </div>
-                          </div>
-                        </td>
-                        <td className="text-right py-4 px-2">
-                          <button
-                            onClick={() =>
-                              setPopUp({
-                                show: true,
-                                data: { ...value, selectedImage },
-                              })
-                            }
-                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                          >
-                            View
-                          </button>
-                        </td>
-                      </tr>
-                    );
-                  })}
-                </tbody>
-              </table>
-              <PaginatedList
-                onClick={handlePagination}
-                prev={currentPage === 0}
-                next={currentPage + itemsPerPage >= filteredFamilyData?.length}
-                data={filteredFamilyData}
-                start={indexOfFirstItem}
-                stop={indexOfLastItem}
-              />
-            </div>
-          )}
-        </>
-      )}
-      {popUp.show && (
-        <SuggestTask
-          details={popUp.data}
-          onClose={() => {
-            setPopUp({ show: false, data: {} });
-          }}
-          continuePopupData={(value) =>
-            setContinueTaskPopup({ show: true, data: { ...value } })
-          }
-          situation={popUp.show}
-        />
-      )}
+                          </td>
+                          <td className="text-right py-4 px-2">
+                            <button
+                              onClick={() => openPopUp(value)}
+                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                              View
+                            </button>
+                          </td>
+                        </tr>
+                      );
+                    })}
+                  </tbody>
+                </table>
+                <PaginatedList
+                  onClick={handlePagination}
+                  prev={currentPage === 0}
+                  next={
+                    currentPage + itemsPerPage >= filteredFamilyData?.length
+                  }
+                  data={filteredFamilyData}
+                  start={indexOfFirstItem}
+                  stop={indexOfLastItem}
+                />
+              </div>
+            )}
+          </>
+        )}
+        {popUp.show && (
+          <SuggestTask
+            details={popUp.data}
+            onClose={closePopUp}
+            continuePopupData={openContinueTaskPopup}
+            situation={popUp.show}
+          />
+        )}

-      {/* Continue Task */}
-      {continueTaskPopup.show && (
-        <AssignTaskPopout
-          details={continueTaskPopup.data}
-          action={() => {
-            setContinueTaskPopup({ show: false, data: {} });
-          }}
-          situation={continueTaskPopup.show}
-        />
-      )}
-    </div>
-  );
-};
+        {continueTaskPopup.show && (
+          <AssignTaskPopout
+            details={continueTaskPopup.data}
+            action={closeContinueTaskPopup}
+            situation={continueTaskPopup.show}
+          />
+        )}
+      </div>
+    );
+  }
+);

 export default FamilyWaitlist;
@@ -1,4 +1,6 @@
 import React from "react";
+import localImgLoad from "../../../lib/localImgLoad";
+

 export default function ProfileInfo({
  profileImg,
@@ -8,13 +10,13 @@ export default function ProfileInfo({
  accountDetails,
 }) {
  return (
-    <div className="flex flex-col items-center gap-6">
+    <div className="flex flex-col items-center gap-4">
      <div className="flex justify-center">
        <div className="w-full relative">
          <img
-            src={profileImg}
+            src={localImgLoad(`images/icons/${accountDetails.banner}`)}
            alt=""
-            className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
+            className="sm:w-[180px] sm:h-[180px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
          />
          <input
            ref={profileImgInput}
@@ -1,9 +1,16 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, {
+  Suspense,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
 import InputCom from "../Helpers/Inputs/InputCom";
 import Layout from "../Partials/Layout";
 import FamilyTable from "./FamilyTable";
 import SiteService from "../../services/SiteService";
 import ModalCom from "../Helpers/ModalCom";
+import LoadingSpinner from "../Spinners/LoadingSpinner";

 export default function FamilyAcc() {
  const [selectTab, setValue] = useState("today");
@@ -20,60 +27,50 @@ export default function FamilyAcc() {

  const apiCall = useMemo(() => new SiteService(), []);

-  // This is to make sure it's called once and used everywhere
-  let memberId = localStorage.getItem("member_id");
-  let uid = localStorage.getItem("uid");
-  let sessionId = localStorage.getItem("session_token");
-
  const popUpHandler = () => {
    setPopUp((prev) => !prev);
  };

-  //   tab handler
  const filterHandler = (value) => {
    setValue(value);
  };

-  //   For the age drop down
-  let startAge = 5;
-  let endAge = 16;
-  // creates an array of age values ranging from 16 to 70
-  const ageRange = Array.from(
-    { length: endAge - startAge + 1 },
-    (_, index) => startAge + index
-  );
-  // age handler
+  const ageRange = useMemo(() => {
+    const startAge = 5;
+    const endAge = 16;
+    return Array.from(
+      { length: endAge - startAge + 1 },
+      (_, index) => startAge + index
+    );
+  }, []);
+
  const handleAgeSelect = (event) => {
    setSelectedAge(parseInt(event.target.value));
  };
-  //   Input handler
+
  const handleInputChange = (event) => {
    const { name, value } = event?.target;
-    setFormData({ ...formData, [name]: value });
+    setFormData((prevFormData) => ({ ...prevFormData, [name]: value }));
  };

-  //   Add member
  const addMember = async () => {
    const { first_name, last_name } = formData;
    setLoader(true);
    try {
      if (first_name !== "" && last_name !== "") {
-        let reqData = {
-          member_id: memberId,
-          uid: uid,
-          session_id: sessionId,
+        const reqData = {
          firstname: first_name,
          lastname: last_name,
          age: selectedAge,
        };

-        let res = await apiCall.addFamily(reqData);
+        const res = await apiCall.addFamily(reqData);
        const { data } = res;

-        if (data?.internal_return > 0 && data?.status == "OK") {
+        if (data?.internal_return > 0 && data?.status === "OK") {
          setLoader(false);
          setListReload((prev) => !prev);
-          popUpHandler()
+          popUpHandler();
        } else {
          setLoader(false);
          setMsgErr("Sorry, something went wrong");
@@ -94,38 +91,42 @@ export default function FamilyAcc() {
        first_name: "",
        last_name: "",
      });
-      setSelectedAge("")
+      setSelectedAge("");
    }
  };

-  // member listing
  const memberList = useCallback(async () => {
    setLoader(true);
    try {
-      let reqData = {
-        member_id: memberId,
-        uid: uid,
-        session_id: sessionId,
+      const reqData = {
        limit: 20,
        offset: 0,
        action: 22010,
      };

-      let res = await apiCall.familyListings(reqData);
+      const res = await apiCall.familyListings(reqData);
      const { data } = res;
-      if (data?.internal_return >= 0 && data?.status == "OK") {
-        let { result_list } = data;
+      if (data?.internal_return >= 0 && data?.status === "OK") {
+        const { result_list } = data;
        setFamilyList(result_list);
        setLoader(false);
-      } else return;
+      } else {
+        return;
+      }
    } catch (error) {
      setLoader(false);
      throw new Error(error);
    }
-  }, [apiCall, memberId, sessionId, uid]);
+  }, [apiCall]);

  useEffect(() => {
-    memberList();
+    let checkMemberList = true;
+    if (checkMemberList) {
+      memberList();
+    }
+    return () => {
+      checkMemberList = false;
+    };
  }, [listReload, memberList]);

  return (
@@ -158,7 +159,13 @@ export default function FamilyAcc() {
              ></div>
            </div>
          </div>
-          <FamilyTable familyList={familyList} loader={loader} popUpHandler={popUpHandler} />
+          <Suspense fallback={<LoadingSpinner color="sky-blue" size="16" />}>
+            <FamilyTable
+              familyList={familyList}
+              loader={loader}
+              popUpHandler={popUpHandler}
+            />
+          </Suspense>
        </div>
      </div>
      {popUp && (
@@ -31,6 +31,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {

  const handleSuggestedTask = async (values) => {
    if (!values.title && !values.description) return;
+
    try {
      setSubmitTask({ loading: true });
      const reqData = { ...values };
@@ -195,7 +196,8 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                              role="group"
                              key={idx}
                              htmlFor={`parent-suggested-${idx}`}
-                              className={`transition duration-150 ease-in-out parent-suggest`}
+                              className={`transition duration-150 ease-in-out parent-suggest group cursor-pointer`}
+                              onClick={() => setSuggestedNextStep(title)}
                            >
                              <input
                                type="radio"
@@ -203,7 +205,7 @@ const SuggestTask = ({ details, onClose, situation, continuePopupData }) => {
                                value={title}
                                checked={suggestedNextStep === title}
                                onChange={switchNextStep}
-                                className={`transition duration-150 ease-in-out parent-suggest`}
+                                className={`transition duration-150 ease-in-out parent-suggest pointer-events-none`}
                              />
                              <span
                                onClick={() => setSuggestedNextStep(title)}
@@ -504,11 +504,11 @@ export default function Icons({ name }) {
          ></path>
        </svg>
      ) : name === "atm-card" ? (
-        <img className="w-[20px]" src={ATMCard} alt="card" />
+        <img className="w-[30px]" src={ATMCard} alt="card" />
      ) : name === "visa-card" ? (
-        <img className="w-[20px]" src={VisaCard} alt="card" />
+        <img className="w-[30px]" src={VisaCard} alt="card" />
      ) : name === "master-card" ? (
-        <img className="w-[20px]" src={MasterCard} alt="card" />
+        <img className="w-[30px]" src={MasterCard} alt="card" />
      ) : name === "new-dashboard" ? (
        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/dashboard.svg')} alt="dashboard" />
      ) : name === "new-family" ? (
@@ -21,6 +21,9 @@ export default function InputCom({
  blurHandler,
  spanTag,
  inputBg,
+  onInput,
+  maxLength = 30,
+  minLength = 0,
  direction,
  error,
 }) {
@@ -29,13 +32,13 @@ export default function InputCom({
  // for Min Length:
  const minLengthValidation = () => {
    const inputConfig = inputConfigs[inputRef?.current?.name]?.minLength;
-    return inputConfig || 0;
+    return inputConfig || minLength;
  };

  // for MaxLength
  const maxLengthValidation = () => {
    const inputConfig = inputConfigs[inputRef?.current?.name]?.maxLength;
-    return inputConfig || 30;
+    return inputConfig || maxLength;
  };

  // for Patterns
@@ -63,7 +66,9 @@ export default function InputCom({
              </span>
            )}
            {/* displays error is any */}
-            {error && <span className="text-[12px] text-red-500">{error}</span>} 
+            {error && (
+              <span className="text-[12px] text-red-500 italic">{error}</span>
+            )}
          </label>
        )}
        {forgotPassword && (
@@ -76,18 +81,23 @@ export default function InputCom({
        )}
      </div>
      <div
-        className={`input-wrapper w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-base ${inputClass ? inputClass : "text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] border"}`}
+        className={`input-wrapper w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-base ${
+          inputClass
+            ? inputClass
+            : "text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] border"
+        }`}
      >
        <input
          placeholder={placeholder}
          value={value}
          onChange={inputHandler}
-          className={`input-field placeholder:text-base text-dark-gray w-full h-full tracking-wide ${
-            inputBg ? inputBg : "bg-[#FAFAFA]"
+          className={`input-field placeholder:text-base text-dark-gray w-full h-full ${
+            inputBg ? inputBg : "bg-[#FAFAFA] tracking-wide"
          } dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
          type={type}
          id={name}
          name={name}
+          onInput={onInput}
          minLength={minLengthValidation()}
          maxLength={maxLengthValidation()}
          // pattern={inputPatterns()}
@@ -97,17 +107,14 @@ export default function InputCom({
          dir={direction}
        />
        {iconName && (
-          <div className="absolute right-6 bottom-[10px] z-10 flex gap-2">
+          <div className="absolute right-6 bottom-3 z-10 flex gap-2">
            {iconName.split(" ").map((item, index) => (
              <Icons key={index} name={item} />
            ))}
          </div>
        )}
        {passIcon && (
-          <div
-            className="absolute right-6 bottom-[10px] z-10"
-            onClick={onClick}
-          >
+          <div className="absolute right-6 bottom-3 z-10" onClick={onClick}>
            <Icons name={passIcon} />
          </div>
        )}
@@ -128,7 +135,8 @@ const inputConfigs = {
  amount: { minLength: 1, maxLength: 9, pattern: "[0-9]+" },
  description: { minLength: 5, maxLength: 299 },
  title: { minLength: 5, maxLength: 149 },
-  job_detail: { minLength: 4, maxLength: 1440 }
+  job_detail: { minLength: 4, maxLength: 1440 },
+  cardNum: { minLength: 4, maxLength: 19 },
 };

 /* Numbers Only: <input type="text" pattern="[0-9]*" /> strictly numbers
@@ -20,7 +20,8 @@ import React from "react";
 export const PriceFormatter = (
  price = "00",
  currency = "",
-  currencyName = ""
+  currencyName = "",
+  priceClass
 ) => {
  // Convert the number to a string
  let numStr = String(price);
@@ -44,7 +45,7 @@ export const PriceFormatter = (
  return (
    <span className="text-sm flex items-center">
      <sup>{currency || currencyName || ""}</sup>
-      <span className="px-1 font-bold text-lg">{formattedInteger || ""}</span>
+      <span className={`px-1 font-bold ${priceClass ? priceClass : "text-lg"}`}>{formattedInteger || ""}</span>
      <sup>{formattedDecimal || ""}</sup>
    </span>
  );
@@ -0,0 +1,36 @@
+const TimeDifference = ({ time }) => {
+  const currentTime = new Date();
+  const providedTime = new Date(time);
+
+  const timeDifference = currentTime - providedTime; // Difference in milliseconds
+
+  const minutes = Math.floor(timeDifference / (1000 * 60));
+  const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+  const days = Math.floor(timeDifference / (1000 * 60 * 60 * 24));
+  const months = Math.floor(timeDifference / (1000 * 60 * 60 * 24 * 30));
+
+  if (minutes < 1) {
+    return "Just now";
+  } else if (minutes < 60) {
+    return `${minutes} ${minutes === 1 ? "minute" : "minutes"} ago`;
+  } else if (hours < 12) {
+    return `${hours} ${hours === 1 ? "hour" : "hours"} ago`;
+  } else if (hours < 24) {
+    return "Today";
+  } else if (days < 2) {
+    return "Tomorrow";
+  } else if (days < 7) {
+    return `${days} ${days === 1 ? "day" : "days"} ago`;
+  } else if (months < 1) {
+    const weeks = Math.floor(days / 7);
+    return `${weeks} ${weeks === 1 ? "week" : "weeks"} ago`;
+  } else if (months < 6) {
+    return `${months} ${months === 1 ? "month" : "months"} ago`;
+  }else if (months < 8) {
+    return `"More than 6 months ago"`;
+  } else {
+    return time?.split(" ")[0];
+  }
+};
+
+export default TimeDifference;
@@ -217,22 +217,22 @@ export default function History() {
            {/* <TopHxBox className="mb-11" /> */}
            <div className='w-full p-4 md:p-8 bg-white dark:bg-dark-white rounded-2xl shadow bottomMargin'>
                {/* switch button */}
-                <div className="my-1 flex items-center border-b border-slate-300">
+                <div className="pl-7 my-2 flex items-center border-b border-slate-300 gap-3">
                    <button
                    name="purchases"
                    onClick={(e) => setTab(e.target.name)}
-                    className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                        tab == "purchases" ? "border-sky-blue" : "border-slate-300"
-                    } tracking-wide transition duration-200`}
+                    className={`px-4 py-1 rounded-t-2xl ${
+                        tab == "purchases" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                      }`}
                    >
                    Purchases
                    </button>
                    <button
                    name="recent"
                    onClick={(e) => setTab(e.target.name)}
-                    className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                        tab == "recent" ? "border-sky-blue" : "border-slate-300"
-                    }  tracking-wide transition duration-200`}
+                    className={`px-4 py-1 rounded-t-2xl ${
+                        tab == "recent" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                      }`}
                    >
                    Recent Activity
                    </button>
@@ -11,12 +11,6 @@ import HomeActivities from "./HomeActivities";

 export default function FullAccountDash(props) {
  console.log("PROPS IN HOME->", props);
-
-  const trending = datas.datas;
-  const jobData = datas.datas; // api calls or cache
-
-  const userApi = new usersService();
-
  const { userDetails } = useSelector((state) => state?.userDetails);

  return (
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
-import heroBg from "../../assets/images/hero-bg.svg";
+import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg";
 import heroUser from "../../assets/images/hero-user.png";
 import CountDown from "../Helpers/CountDown";
 import HomeSliders from "./HomeSliders";
@@ -24,7 +24,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {

  return (
    <div
-      className={`w-full lg:h-[444px] h-full lg:flex lg:p-8 p-4 justify-between items-center lg:space-x-28 rounded-2xl overflow-hidden ${
+      className={`w-full min-h-[400px] md:grid grid-cols-2 lg:p-8 p-4 justify-between items-center gap-2 rounded-2xl overflow-hidden ${
        className || ""
      }`}
      style={{
@@ -33,7 +33,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {
        backgroundSize: "cover",
      }}
    >
-      <div className="flex-1 h-[330px] lg:h-full flex flex-col justify-between mb-5 lg:mb-0">
+      <div className="h-full flex flex-col justify-between mb-5 lg:mb-0">
        {/* heading */}
        <div>
          <h1 className="lg:text-2xl text-xl font-medium text-white tracking-wide">
@@ -57,7 +57,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {
        </div>
        {/* countdown */}
        {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && (
-          <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border border-white-opacity">
+          <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border back-dark1 border-white-opacity">
            <div className="flex flex-col justify-between">
              <p className="text-base text-white tracking-wide">Current Task</p>
              <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
@@ -84,7 +84,7 @@ export default function Hero({ className, bannerList, nextDueTask }) {
        )}
        {/* action */}
        <div className="flex lg:space-x-3 space-x-1 items-center">
-          <Link to="/mytask" className="text-white text-base sm:block hidden">
+          <Link to="/mytask" className="text-white text-base">
            <span className=" border-b dark:border-[#5356fb29]  border-white">
              {" "}
              View All Task(s)
@@ -6,7 +6,7 @@ export default function HomeSliders(props) {
  // debugger;
  return (
    <>
-      <div className="hero-slider relative 2xl:w-[600px] xl:w-[400px] lg:w-[420px] w-full mb-2 lg:mb-0 ">
+      <div className="hero-slider relative h-full w-full mb-2 lg:mb-0">
        <div className="w-full">
          <SliderCom settings={props.settings}>
            {props.bannerList?.length <= 0 && (
@@ -1,11 +1,18 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
-import ModalCom from "../../Helpers/ModalCom";
+import { useMemo, useState } from "react";
 import { toast } from "react-toastify";
 import usersService from "../../../services/UsersService";
-import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import ModalCom from "../../Helpers/ModalCom";
 import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";

 const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
+  const [textValue, setTextValue] = useState("");
+  const apiCall = useMemo(() => new usersService(), []);
+
+  const handleInputChange = ({ target: { value } }) => {
+    setTextValue(value);
+  };
+
  const MarketCalls = (details) => {
    const [marketMsg, setMarketMsg] = useState({
      loading: false,
@@ -24,8 +31,8 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {

    const MarketDetail = async () => {
      try {
-        setMarketMsg({ loading: true });
        if (!textValue) return;
+        setMarketMsg({ loading: true });

        reqData.yourmessage = textValue;

@@ -87,22 +94,11 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
      }
    };

-    // useEffect(() => {
-    //   ManageInterest();
-    // }, []);
-
    return { MarketDetail, ManageInterest, manageInt, marketMsg };
  };

-  const [textValue, setTextValue] = useState("");
-
-  const handleInputChange = ({ target: { value } }) => {
-    setTextValue(value);
-  };
-
-  const apiCall = useMemo(() => new usersService(), []);
-
-  let { manageInt, ManageInterest, MarketDetail, marketMsg } = MarketCalls(details);
+  let { manageInt, ManageInterest, MarketDetail, marketMsg } =
+    MarketCalls(details);

  let thePrice = PriceFormatter(
    details?.price * 0.01,
@@ -270,9 +266,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
                  Interest: <b className="ml-1">{details.interest_count}</b>
                </p>
                <hr />
-                <p className="my-1">
-                  Expire: {details.expire}
-                </p>
+                <p className="my-1">Expire: {details.expire}</p>
              </div>
            </div>
            <button
@@ -9,59 +9,61 @@ import PaginatedList from "../Pagination/PaginatedList";
 import { handlePagingFunc } from "../Pagination/HandlePagination";

 export default function ActiveJobMessage({ activeJobMesList }) {
-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentActiveJobMesList = activeJobMesList?.data?.slice(indexOfFirstItem, indexOfLastItem);
+    // const [currentPage, setCurrentPage] = useState(0);
+    // const indexOfFirstItem = Number(currentPage);
+    // const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    // const currentActiveJobMesList = activeJobMesList?.data?.slice(indexOfFirstItem, indexOfLastItem);
  
-    const handlePagination = (e) => {
-      handlePagingFunc(e,setCurrentPage)
-    }
+    // const handlePagination = (e) => {
+    //   handlePagingFunc(e,setCurrentPage)
+    // }

  return (
-    <div className='flex flex-col justify-between h-full'>
-    <table className="wallet-activity w-full table-auto border-collapse text-left">
-        <thead className='border-b-2'>
-            <tr className='text-slate-600'>
-            <th className="p-2"></th>
-            </tr>
-        </thead>
-        {activeJobMesList.data.length ?
-        (
-        <tbody>
-            {currentActiveJobMesList.map((item, index) => (
-            <tr key={index} className='text-slate-500'>
-                <td>
-                    <div className="msg_box">
-                        <div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
-                        <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
-                    </div>
+    <div className='flex flex-col justify-between'>
+    <div className="w-full min-h-[450px] max-h-[450px] overflow-y-scroll">
+        <table className="wallet-activity w-full table-auto border-collapse text-left">
+            <thead className='border-b-2'>
+                <tr className='text-slate-600'>
+                <th className="p-2"></th>
+                </tr>
+            </thead>
+            {activeJobMesList?.data?.length ?
+            (
+            <tbody>
+                {activeJobMesList.data.map((item, index) => (
+                <tr key={index} className='text-slate-500'>
+                    <td>
+                        <div className={`msg_box ${item.who}`}>
+                            <div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
+                            <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                        </div>

-                </td>
-            </tr>
-            ))}
-        </tbody>
-        )
-        :
-        activeJobMesList.error ? 
-        (
-        <tbody>
-            <tr className='text-slate-500'>
-                <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
-            </tr>
-        </tbody>
-        )
-        :
-        <tbody>
-            <tr className='text-slate-500'>
-                <td className="p-2" colSpan={4}>No Message Found!</td>
-            </tr>
-        </tbody>
-        }
-    </table>
+                    </td>
+                </tr>
+                ))}
+            </tbody>
+            )
+            :
+            activeJobMesList.error ? 
+            (
+            <tbody>
+                <tr className='text-slate-500'>
+                    <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+                </tr>
+            </tbody>
+            )
+            :
+            <tbody>
+                <tr className='text-slate-500'>
+                    <td className="p-2" colSpan={4}>No Message Found!</td>
+                </tr>
+            </tbody>
+            }
+        </table>
+    </div>

    {/* PAGINATION BUTTON */}
-    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+    {/* <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> */}
    {/* END OF PAGINATION BUTTON */}
    </div>
  )
@@ -353,7 +353,7 @@ function ActiveJobs(props) {
      </div>

      <div className="my-4 py-[20px] bg-white dark:bg-black px-4 rounded-2xl shadow-md lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0">
-        <div className="w-full lg:w-1/2">
+        <div className="w-full lg:w-1/2 mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
          <div className="">
            <h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
              Actions
@@ -367,23 +367,25 @@ function ActiveJobs(props) {
          {/* TEXTAREA SECTION */}
          <div className="mt-5">
            <div className="">
-              {/* <p className="relative py-2 my-2 text-lg font-bold text-slate-600 dark:text-black border-b-2 border-slate-300 tracking-wide after:absolute after:-bottom-0.5 after:content-[''] after:w-[100px] after:h-[2px] after:bg-sky-blue after:left-0">Message(s)</p> */}
-              <div className="my-2 flex items-center border-b border-slate-300">
+              <div 
+                className="pl-7 my-2 flex items-center border-b border-slate-300 gap-3"
+                // className='ml-7 flex justify-start items-center gap-3'
+                >
                <button
                  name="message"
                  onClick={(e) => setTab(e.target.name)}
-                  className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                    tab == "message" ? "border-sky-blue" : "border-slate-300"
-                  } tracking-wide transition duration-200`}
+                  className={`px-4 py-1 rounded-t-2xl ${
+                    tab == "message" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                  }`}
                >
                  Send Message
                </button>
                <button
                  name="files"
                  onClick={(e) => setTab(e.target.name)}
-                  className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                    tab == "files" ? "border-sky-blue" : "border-slate-300"
-                  }  tracking-wide transition duration-200`}
+                  className={`px-4 py-1 rounded-t-2xl ${
+                    tab == "files" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                  }`}
                >
                  Send Files
                </button>
@@ -402,7 +404,7 @@ function ActiveJobs(props) {
                  <div className="files">
                    <label
                      htmlFor="file"
-                      className="h-20 btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
+                      className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
                    >
                      Select Files to Upload
                    </label>
@@ -457,11 +459,11 @@ function ActiveJobs(props) {

            {/* Buttons Sections */}
            <div className="py-2 sm:flex sm:justify-end sm:items-center">
-              <div className="w-full sm:w-2/4 flex justify-between items-center space-x-2">
+              <div className="w-full sm:w-3/4 flex justify-between items-center space-x-2">
                <button
                  type="button"
                  onClick={handleClearAll}
-                  className="border-gradient text-base tracking-wide px-4 py-3 rounded-full"
+                  className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
                >
                  <span className="text-gradient">Clear</span>
                </button>
@@ -469,7 +471,7 @@ function ActiveJobs(props) {
                  <button
                    onClick={sendFile}
                    type="button"
-                    className="btn-gradient text-base tracking-wide px-4 py-3 rounded-full flex justify-center items-center"
+                    className='btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center'
                  >
                    {requestStatus.loading ? (
                      <LoadingSpinner size="6" color="sky-blue" />
@@ -493,7 +495,7 @@ function ActiveJobs(props) {
                  <button
                    onClick={sendTaskMessage}
                    type="button"
-                    className="btn-gradient text-base text-white tracking-wide px-4 py-3 rounded-full"
+                    className='btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer'
                  >
                    {requestStatus.loading ? (
                      <LoadingSpinner size="6" color="sky-blue" />
@@ -518,9 +520,9 @@ function ActiveJobs(props) {
            <button
              type="button"
              onClick={popUpHandler}
-              className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+              className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center"
            >
-              view all
+              View all
            </button>
          </div>
          {props.activeJobMesList.loading ? (
@@ -4,15 +4,15 @@ function CurrentJobAction() {
  return (
    <div className='job-action  dark:bg-black'>
      <p className="my-3 py-1 text-base active-owner">
-          <table className="w-full text-sm text-left text-gray-500">
+          <table className="w-full text-sm text-left text-gray-500 ">
              <tbody>
              <tr>
                  <td>
-                      <div className="flex space-x-2 items-center w-full">
+                      <div className="flex space-x-2 items-center w-full task_action_panel">

-                              <h1 className="text-xl text-dark-gray dark:text-white">
+                              <div>
                                  Waiting for the completion message from the client before you can approve.
-                              </h1>
+                              </div>
                              {/*<div className="flex flex-col flex-[0.9]">  </div>*/}
                      </div>
                  </td>
@@ -62,14 +62,14 @@ function CurrentTaskAction({jobDetails}) {
  return (
    <div className='job-action  dark:bg-black'>

-          <table className="w-full text-sm text-left text-gray-500 active-worker">
+          <table className="w-full text-sm text-left text-gray-500 active-worker ">
              <tbody>
              <tr>
                  <td>
-                      <div className="flex space-x-2 items-center w-full">
-                          <h1 className="text-xl text-dark-gray dark:text-white">
+                      <div className="flex space-x-2 items-center w-full task_action_panel">
+                          <div>
                              I completed this task and ready for review and acceptance.
-                          </h1>
+                          </div>
                          {/*<div className="flex flex-col flex-[0.9]">*/}

                          {/*</div>*/}
@@ -107,19 +107,18 @@ function PastDueJobAction({jobDetails}) {
            <tbody>
            <tr>
                <td>
-                    <div className="flex space-x-2 items-center w-full">
+                    <div className="flex space-x-2 items-center w-full task_action_panel">

-                            <h1 className="text-xl text-dark-gray dark:text-white">
+                            <div className="dark:text-red-700">
                                Time allocated has passed
-                            </h1>
-                            {/*<div className="flex flex-col flex-[0.9]">  </div>*/}
+                            </div>
                    </div>
                </td>
            </tr>
            <tr>
                <td>
                    <div className="flex justify-center items-center">
-                        <button type="button" onClick={popUpHandler} className="w-[150px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                        <button type="button" onClick={popUpHandler} className="w-[180px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
                            Cancel or Extend Timeline
                        </button>
                    </div>
@@ -8,11 +8,11 @@ function PastDueTaskAction() {
            <tbody>
            <tr>
                <td>
-                    <div className="flex space-x-2 items-center w-full">
+                    <div className="flex space-x-2 items-center w-full task_action_panel">

-                            <h1 className="text-xl text-dark-gray dark:text-white">
+                            <div>
                                You have missed the allocated time
-                            </h1>
+                            </div>
                            {/*<div className="flex flex-col flex-[0.9]"> </div>*/}
                    </div>
                </td>
@@ -96,11 +96,11 @@ function ReviewJobAction({jobDetails}) {
              <tbody>
              <tr>
                  <td>
-                      <div className="flex space-x-2 items-center w-full">
+                      <div className="flex space-x-2 items-center w-full task_action_panel">

-                              <h1 className="text-xl text-dark-gray dark:text-white">
+                              <div>
                                  This Job is Ready for your review
-                              </h1>
+                              </div>
                              {/*<div className="flex flex-col flex-[0.9]"> </div>*/}
                      </div>
                  </td>
@@ -2,7 +2,7 @@ import React from 'react'

 function ReviewTaskAction() {
  return (
-    <div className='job-action  dark:bg-black'>
+    <div className='job-action  dark:bg-black task_action_panel'>
      <p className="my-3 py-1 text-base text-dark-gray dark:text-white">
        Waiting for the completion message from the client before you can approve. Worker True & Review Job
      </p>
@@ -2,7 +2,7 @@ import { useRef, useState } from "react";
 import OfferCard from "../Cards/OfferCard";
 import Icons from "../Helpers/Icons";
 import SliderCom from "../Helpers/SliderCom";
-import OfferJobPopout from "../jobPopout/OfferJobPopout";
+import FamilyOfferJobPopout from "../jobPopout/FamilyOfferJobPopout";

 export default function MyOffersFamilyTable({ className, familyOffers }) {
  let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
@@ -127,7 +127,7 @@ export default function MyOffersFamilyTable({ className, familyOffers }) {

        {/* Offer Job Popout */}
        {offerPopout.show && (
-          <OfferJobPopout
+          <FamilyOfferJobPopout
            details={offerPopout.data}
            onClose={() => {
              setOfferPopout({ show: false, data: {} });
@@ -1,140 +0,0 @@
-import React, {useState} from 'react'
-import RecentActivityTable from './WalletComponent/RecentActivityTable'
-import LoadingSpinner from '../Spinners/LoadingSpinner'
-import { useNavigate, useLocation } from 'react-router-dom'
-import InputCom from '../Helpers/Inputs/InputCom'
-
-import AddFundDollars from './AddFundDollars'
-
-function AddFund({payment}) {
-   
-    const navigate = useNavigate()
-    const {currency} = useLocation()?.state //GETS THE USER CURRENCY FOR ADD FUND
-
-    //STATE FOR CONTROLLED INPUT
-    let [input, setInput] = useState('')
-
-    let [inputError, setInputError] = useState('')
-
-    // FUNCTION TO HANDLE INPUT CHANGE
-    const handleChange = ({target:{name, value}}) => {
-        setInput(value)
-    }
-
-    //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = () => {
-        setInputError('')
-        if(!input || input == '0'){
-            setInputError('Please Enter Amount')
-            return setTimeout(()=>{setInputError('')}, 5000)
-        }
-
-        if(isNaN(input)){
-            setInputError('Amount must be a Number')
-            return setTimeout(()=>{setInputError('')}, 5000)
-        }
-
-        const stateData = {amount: Number(input), currency: 'naira'}
-        navigate('confirm-add-fund', {state: stateData})
-     
-        setInput('')
-    }
-    return (
-        <div>
-            {/* heading */}
-            <div className="sm:flex justify-between items-center mb-6">
-                <div className="w-full flex justify-start space-x-3 items-center">
-                    <button
-                    type="button"
-                    className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
-                    onClick={() =>
-                        navigate('/my-wallet', { replace: true })
-                    }
-                    >
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            width="35"
-                            height="35"
-                            viewBox="0 0 24 24"
-                            fill="skyblue"
-                        >
-                            <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
-                        </svg>
-                    </button>
-                    <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
-                    Add Credit
-                    </h1>
-                </div>
-                <div className="slider-btns flex space-x-4">
-                    <div
-                        onClick={() => filterHandler("today")}
-                        className="relative"
-                    ></div>
-                </div>
-            </div>
-
-            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
-                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
-                    <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
-                        {/*<h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>*/}
-                        {/*<hr />*/}
-                        <form className='md:p-8 p-4 add-fund-info'>
-                            <div className="field w-full mb-6">
-                                <InputCom
-                                    fieldClass="px-6"
-                                    label={currency == 'US Dollars' ? "Amount (USD)" : "Amount (Naira)"}
-                                    type="text"
-                                    name="amount"
-                                    placeholder="0"
-                                    value={input}
-                                    inputHandler={handleChange}
-                                />
-                                {inputError && <p className='text-base text-red-500'>{inputError}</p>}
-                            </div>
-                        </form>
-                        <hr />
-
-                        {/* SHOWS THIS IF USER CURRENCY IS DOLLARS */}
-                        {currency == 'US Dollars' &&
-                        <div className='w-full md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow'>
-                            <AddFundDollars setInputError={setInputError} input={input} setInput={setInput} />
-                        </div>
-                        }
-
-                        {/* HIDES THIS BUTTON IF CURENCY IS NAIRA */}
-                        {currency != 'US Dollars' &&
-                        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
-                            <button
-                                onClick={handleSubmit}
-                                type="button"
-                                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                            >
-                                <span className="text-white">Continue</span>
-                            </button>
-                        </div>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            {/* HIDES THIS SECTION IF CURENCY IS NAIRA */}
-            {currency != 'US Dollars' &&
-            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
-                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full min-h-[590px] bg-white dark:bg-dark-white rounded-2xl shadow">
-                        <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                        {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
-                        {payment.loading ?
-                            <LoadingSpinner size='16' color='sky-blue' />
-                            :
-                            <RecentActivityTable  payment={payment}/>
-                        }
-                    </div>
-                </div>
-            </div>
-            }          
-        </div>
-      )
-}
-
-export default AddFund
@@ -1,480 +0,0 @@
-import React,{useEffect, useState} from 'react'
-import { useNavigate } from 'react-router-dom'
-import InputCom from '../Helpers/Inputs/InputCom';
-import PaginatedList from '../Pagination/PaginatedList';
-import { handlePagingFunc } from '../Pagination/HandlePagination';
-import LoadingSpinner from '../Spinners/LoadingSpinner';
-import usersService from '../../services/UsersService';
-
-import { Form, Formik } from "formik";
-import * as Yup from "yup";
-
-const validationSchema = Yup.object().shape({
-    name: Yup.string()
-        .min(3, "Minimum 3 characters")
-        .max(50, "Maximum 50 characters")
-        .required("Name is required"),
-    cardNum: Yup.string()
-        .min(3, "Minimum 3 characters")
-        .max(25, "Maximum 25 characters")
-        .required("Card Number is required"),
-    code: Yup.string()
-        .min(3, "Minimum 3 characters")
-        .max(25, "Maximum 25 characters")
-        .required("Postal Code is required"),
-    state: Yup.string()
-        .min(3, "Minimum 3 characters")
-        .max(25, "Maximum 25 characters")
-        .required("State is required"),
-    address: Yup.string()
-        .min(3, "Minimum 3 characters")
-        .max(50, "Maximum 50 characters")
-        .required("Address is required"),
-    expirationYear: Yup.string()
-        .min(4, "Minimum 4 characters")
-        .max(4, "Maximum 4 characters")
-        .required("Expiration Year is required"),
-    expirationMonth: Yup.string()
-        .min(1, "Minimum 1 characters")
-        .max(2, "Maximum 2 characters")
-        .required("Expiration Month is required"),
-    cvv: Yup.string()
-        .min(3, "Minimum 3 characters")
-        .max(4, "Maximum 4 characters")
-        .required("CVV Year is required"),
-});
-
-const initialValues = {
-    name: '',
-    cardNum: '',
-    code: '',
-    state: '',
-    address: '',
-    expirationYear: '',
-    expirationMonth: '',
-    cvv: ''
-  };
-
-
-function AddFundDollars(props) {
-    const navigate = useNavigate()
-    let apiCall = new usersService()
-
-    let [tab, setTab] = useState("previous"); //STATE FOR SWITCHING BETWEEN TABS
-
-    let [prevCardDetails, setPrevCardDetails] = useState(null) // STATE TO HOLD PREVIOUS CARD SELECTED
-
-    let [payListCard, setPayListCard] = useState({loading: true, data:[]}) //USER PREVIOUS CARDS
-
-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentPreviousCards = payListCard?.data?.slice(indexOfFirstItem, indexOfLastItem);
-  
-    const handlePagination = (e) => {
-      handlePagingFunc(e,setCurrentPage)
-    }
-
-    // FUNCTION TO SUBMIT
-    const handleSubmit = (values, helpers) => {
-        props.setInputError('')
-        if(!props.input || props.input == '0'){
-            props.setInputError('Please Enter Amount')
-            return setTimeout(()=>{props.setInputError('')}, 5000)
-        }
-
-        if(isNaN(props.input)){
-            props.setInputError('Amount must be a Number')
-            return setTimeout(()=>{props.setInputError('')}, 5000)
-        }
-        if(tab == 'previous'){
-            const stateData = {amount: Number(props.input), currency: 'dollars'}
-            navigate('confirm-add-fund', {state: stateData}) // State will change later dummy for now
-        }
-        if(tab == 'new'){
-            const stateData = {amount: Number(props.input), currency: 'dollars', ...values}
-            navigate('confirm-add-fund', {state: stateData}) // State will change later dummy for now
-        }
-        props.setInput('')
-    }
-
-    useEffect(()=>{
-        apiCall.payListCard().then(res => {
-            setPayListCard({loading: false, data: res.data.result_list})
-        }).catch(err => {
-            console.log('PAYCARDLIST ERROR', err)
-            setPayListCard({loading: false, data: []})
-        })
-    }, [])
-
-  return (
-    <>
-        <h1 className='mb-2 text-xl font-bold text-dark-gray dark:text-white'>Payment Method</h1>
-        <div className="w-full">
-            {/* switch button */}
-            <div className="my-1 flex items-center border-b border-slate-300">
-                <button
-                name="previous"
-                onClick={(e) => setTab(e.target.name)}
-                className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                    tab == "previous" ? "border-sky-blue" : "border-slate-300"
-                } tracking-wide transition duration-200`}
-                >
-                Previous Cards
-                </button>
-                <button
-                name="new"
-                onClick={(e) => setTab(e.target.name)}
-                className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                    tab == "new" ? "border-sky-blue" : "border-slate-300"
-                }  tracking-wide transition duration-200`}
-                >
-                Add New Card
-                </button>
-            </div>
-            {/* END OF switch button */}
-
-            {/* previous tab */}
-            {tab == 'previous' ?
-            <div className="p-4 previous-details w-full border min-h-[300px] flex flex-col justify-between items-center">
-            { payListCard.loading ?
-                <LoadingSpinner size='10' color='sky-blue' />
-                :
-                payListCard?.data?.length ?
-                <table className="my-3 w-full">
-                    <tbody>
-                    {currentPreviousCards.map((item, index)=>(
-                        <tr key={index} className={index != 0 && 'border-t-2'}>
-                            <td>
-                                <div className='my-2 flex items-center gap-5'>
-                                    <input type="radio" className='w-8 h-8' name='card' value='value' />
-                                    <div className='card-details'>
-                                        <h1 className='text-lg font-bold text-dark-gray dark:text-white tracking-wide'>{item.description} Card</h1>
-                                        <p className='text-base font-bold text-dark-gray dark:text-white tracking-wide'>Bank **************{item.digits}</p>
-                                        <div className='w-full sm:flex items-center gap-5'>
-                                            <p className='text-base font-bold text-dark-gray dark:text-white tracking-wide'>{item.added}</p>
-                                            <p className='text-sm font-bold text-green-700 dark:text-white tracking-wide'>Verified</p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td>
-                                <button
-                                    // onClick={handleSubmit}
-                                    type="button"
-                                    className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                >
-                                    <span className="text-white">Manage</span>
-                                </button>
-                            </td>
-                        </tr>
-                    )) 
-                    }
-                    </tbody>
-                </table>
-                :
-                <div className='w-full flex flex-col items-center'>
-                    <p className='my-5 text-base font-bold text-dark-gray dark:text-white tracking-wide'>No Previous Card Found!</p>
-                    <button
-                        onClick={()=> setTab('new')}
-                        type="button"
-                        className="my-5 px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                    >
-                        <span className="text-white">Add Card</span>
-                    </button>
-                </div>
-                }
-                {/* PAGINATION BUTTON */}
-                <div className='w-full'>
-                    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= payListCard?.data?.length ? true : false} data={payListCard?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
-                </div>
-                {/* END OF PAGINATION BUTTON */}
-            </div>
-            :
-            <div className="new-details w-full min-h-[300px] border-t">
-                <div className="w-full flex flex-col justify-between">
-                    <Formik
-                        initialValues={initialValues}
-                        validationSchema={validationSchema}
-                        onSubmit={handleSubmit}
-                    >
-                        {(props) => {
-                        return (
-                            <Form>
-                            <div className="flex flex-col-reverse sm:flex-row">
-                                <div className="flex-1 sm:mr-10">
-                                    <div className="fields w-full">
-                                        {/* inputs starts here */}
-                                        {/* Name */}
-                                        <div className="field w-full my-6">
-                                        <InputCom
-                                            fieldClass="px-6"
-                                            spanTag='*'
-                                            label="Name on Card"
-                                            type="text"
-                                            name="name"
-                                            placeholder="DUMMY NAME"
-                                            value={props.values.name}
-                                            inputHandler={props.handleChange}
-                                            blurHandler={props.handleBlur}
-                                        />
-                                        {props.errors.name && props.touched.name && (
-                                            <p className="text-sm text-red-500">
-                                            {props.errors.name}
-                                            </p>
-                                        )}
-                                        </div>
-
-                                        {/* CARD NUMBER */}
-                                        <div className="field w-full mb-6">
-                                        <InputCom
-                                            fieldClass="px-6"
-                                            spanTag='*'
-                                            iconName='master-card visa-card atm-card'
-                                            label="Card Number"
-                                            type="text"
-                                            name="cardNum"
-                                            placeholder="Enter Card Number"
-                                            value={props.values.cardNum}
-                                            inputHandler={props.handleChange}
-                                            blurHandler={props.handleBlur}
-                                        />
-                                        {props.errors.cardNum && props.touched.cardNum && (
-                                            <p className="text-sm text-red-500">
-                                            {props.errors.cardNum}
-                                            </p>
-                                        )}
-                                        </div>
-                                        {/* EXPIRE YEAR, YEAR AND CVV */}
-                                        <div className="sm:grid gap-5 grid-cols-3 mb-6">
-                                            <div className="field w-full mb-6 xl:mb-0 col-span-1">
-                                                <div className="select-option">
-                                                    <div className={`flex items-center justify-between mb-2.5`}>
-                                                        <label
-                                                            className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
-                                                            htmlFor='expiration'
-                                                        >Expiration Month <span className="text-red-700 text-sm tracking-wide">*</span></label>
-                                                    </div>
-                                                    <div
-                                                        className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base`}
-                                                    >
-                                                        <select 
-                                                        className={`input-field placeholder:text-base text-dark-gray w-full h-full tracking-wide dark:bg-[#11131F] bg-[#f5f8fa] focus:ring-0 focus:outline-none`}
-                                                        value={props.values.expirationMonth}
-                                                        onChange={props.handleChange}
-                                                        onBlur={props.handleBlur}
-                                                        name='expirationMonth'
-                                                        >
-                                                        <option value=''>Select...</option>
-                                                        {expireMonth?.length &&
-                                                            expireMonth.map((item, index) => (
-                                                            <option key={index} value={item.value}>{item.name}</option>
-                                                            ))
-                                                        }
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                {props.errors.expirationMonth && props.touched.expirationMonth && (
-                                                <p className="text-sm text-red-500">
-                                                    {props.errors.expirationMonth}
-                                                </p>
-                                                )}
-                                            </div>
-                                            <div className="field w-full mb-6 xl:mb-0 col-span-1">
-                                                <div className="select-option">
-                                                    <div className={`flex items-center justify-between mb-2.5`}>
-                                                        <label
-                                                            className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
-                                                            htmlFor='expiration'
-                                                        >Expiration Year <span className="text-red-700 text-sm tracking-wide">*</span>
-                                                        </label>
-                                                    </div>
-                                                    <div
-                                                        className={`input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base`}
-                                                    >
-                                                        <select 
-                                                        className={`input-field placeholder:text-base text-dark-gray w-full h-full tracking-wide dark:bg-[#11131F] bg-[#f5f8fa] focus:ring-0 focus:outline-none`}
-                                                        value={props.values.expirationYear}
-                                                        onChange={props.handleChange}
-                                                        onBlur={props.handleBlur}
-                                                        name='expirationYear'
-                                                        >
-                                                        <option value=''>Select...</option>
-                                                        {expireYear?.length &&
-                                                            expireYear.map((item, index) => (
-                                                            <option key={index} value={item}>{item}</option>
-                                                            ))
-                                                        }
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                {props.errors.expirationYear && props.touched.expirationYear && (
-                                                <p className="text-sm text-red-500">
-                                                    {props.errors.expirationYear}
-                                                </p>
-                                                )}
-                                            </div>
-                                            <div className="field w-full col-span-1">
-                                                <InputCom
-                                                fieldClass="px-6"
-                                                spanTag='*'
-                                                iconName='atm-card'
-                                                label="CVV"
-                                                type="text"
-                                                name="cvv"
-                                                placeholder="CVV"
-                                                value={props.values.cvv}
-                                                inputHandler={props.handleChange}
-                                                blurHandler={props.handleBlur}
-                                                />
-                                                {props.errors.cvv && props.touched.cvv && (
-                                                <p className="text-sm text-red-500">
-                                                    {props.errors.cvv}
-                                                </p>
-                                                )}
-                                            </div>
-                                        </div>
-                                        {/* Address */}
-                                        <div className="field w-full my-6">
-                                        <InputCom
-                                            fieldClass="px-6"
-                                            spanTag='*'
-                                            label="Billing Address"
-                                            type="text"
-                                            name="address"
-                                            placeholder="Billing Address"
-                                            value={props.values.Address}
-                                            inputHandler={props.handleChange}
-                                            blurHandler={props.handleBlur}
-                                        />
-                                        {props.errors.address && props.touched.address && (
-                                            <p className="text-sm text-red-500">
-                                            {props.errors.address}
-                                            </p>
-                                        )}
-                                        </div>
-                                        {/* postal code and state */}
-                                        <div className="sm:grid gap-5 grid-cols-3 mb-6">
-                                        <div className="field w-full mb-6 xl:mb-0 col-span-1">
-                                            <InputCom
-                                            fieldClass="px-6"
-                                            spanTag='*'
-                                            label="Postal Code"
-                                            type="text"
-                                            name="code"
-                                            placeholder="Postal Code"
-                                            value={props.values.code}
-                                            inputHandler={props.handleChange}
-                                            blurHandler={props.handleBlur}
-                                            />
-                                            {props.errors.code && props.touched.code && (
-                                            <p className="text-sm text-red-500">
-                                                {props.errors.code}
-                                            </p>
-                                            )}
-                                        </div>
-                                        <div className="field w-full col-span-1">
-                                            <InputCom
-                                            fieldClass="px-6"
-                                            spanTag='*'
-                                            label="State"
-                                            type="text"
-                                            name="state"
-                                            placeholder="State"
-                                            value={props.values.state}
-                                            inputHandler={props.handleChange}
-                                            blurHandler={props.handleBlur}
-                                            />
-                                            {props.errors.state && props.touched.state && (
-                                            <p className="text-sm text-red-500">
-                                                {props.errors.state}
-                                            </p>
-                                            )}
-                                        </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            {/* <div className="w-full">
-                                {requestStatus.message != "" && (
-                                <p
-                                    className={`text-center text-base ${
-                                    requestStatus.status ? "text-green-800" : "text-red-600"
-                                    }`}
-                                >
-                                    {requestStatus.message}
-                                </p>
-                                )}
-                                <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
-                                <div className="flex items-center space-x-4 mr-9">
-                                    <Link
-                                    to="/"
-                                    className="text-18 text-light-red tracking-wide "
-                                    >
-                                    <span className="border-b dark:border-[#5356fb29]  border-light-red">
-                                        {" "}
-                                        Cancel
-                                    </span>
-                                    </Link>
-
-                                    {requestStatus.loading ? (
-                                    <LoadingSpinner size="8" color="sky-blue" />
-                                    ) : (
-                                    <button
-                                        type="submit"
-                                        className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                    >
-                                        Update Profile
-                                    </button>
-                                    )}
-                                </div>
-                                </div>
-                            </div> */}
-                             <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
-                                <button
-                                    type="submit"
-                                    className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                >
-                                    <span className="text-white">Continue</span>
-                                </button>
-                            </div>
-                            </Form>
-                        );
-                        }}
-                    </Formik>
-                </div>
-            </div>
-            }
-        </div>
-        { tab == 'previous' &&
-        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
-            <button
-                onClick={handleSubmit}
-                type="button"
-                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-            >
-                <span className="text-white">Continue</span>
-            </button>
-        </div>
-        }
-    </>
-  )
-}
-
-export default AddFundDollars
-
-
-// FORMS ARRAY OF EXPIRATION YEAR FOR CARD
-const expireYear = []
-let currentYear = new Date().getFullYear()
-for(let i=0; i<=6; i++){
-    expireYear.push(currentYear + i)
-}
-
-// FORMS ARRAY OF EXPIRATION MONTH FOR CARD
-let month = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
-const expireMonth = []
-for(let i=0; i<month.length; i++){
-    expireMonth.push({name:month[i], value:i+1})
-}
@@ -1,115 +1,129 @@
-import React, {useState} from 'react'
-import { Link } from 'react-router-dom'
-import RecentActivityTable from './WalletComponent/RecentActivityTable'
-import PurchasesTable from './WalletComponent/PurchasesTable'
-import CouponTable from './WalletComponent/CouponTable'
-import LoadingSpinner from '../Spinners/LoadingSpinner'
-import { PriceFormatter } from '../Helpers/PriceFormatter'
+import React from "react";
+import { Link } from "react-router-dom";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+import LoadingSpinner from "../Spinners/LoadingSpinner";

-function Balance({wallet, coupon}) {
-    return (
-        <div className="content-wrapper">
-            {/* heading */}
-            <div className="sm:flex justify-between items-center mb-6">
-                <div className="mb-5 sm:mb-0">
-                    <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
-                        Wallet
-                    </h1>
-                </div>
-                <div className="slider-btns flex space-x-4">
-
-                </div>
-            </div>
-            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
-                {/* WALLET SECTION */}
-                <div className="lg:w-4/4 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow min-h-[520px]">
-                        <div className='flex items-baseline justify-between'>
-                            {/*<h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>*/}
-                            {/*<p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>*/}
-                        </div>
-                        {/* wallet balance */}
-                        {wallet.loading ?
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        wallet.data.length ?
-                        wallet.data.map((item, index)=> (
-                        <div key={index} className="p-3 md:flex items-center flex-wrap my-3 border-t-2 border-slate-400 wallet-box">
-                                <div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
-                                    <div className='balance-info bal-col1'>
-                                        <p className='py-2'></p>
-                                        <span className='text-xl text-dark-gray dark:text-white'><b>{item.description}</b></span>
-                                        <p className='text-base text-slate-500'>{item.symbol}</p>
-                                    </div>
-                                    <div className='balance-info'>
-                                        <p className='py-2'>Balance</p>
-                                        <span className='py-1 px-2 bg-green-100 text-green-500 rounded-lg flex flex-start gap-1'>{PriceFormatter(item.amount * 0.01, item.code)}</span>
-                                    </div>
-                                    <div className='balance-info'>
-                                        <p className='py-2'>Escrow</p>
-                                        <span className='py-1 px-2 bg-red-100 text-red-500 rounded-lg flex flex-start gap-1'>{PriceFormatter(item.escrow * 0.01, item.code)}</span>
-                                    </div>
-                                </div>
-
-                                <div className='w-full my-2 md:my-0 md:w-1/2 flex space-x-2 items-center justify-start md:justify-end'>
-                                    {
-                                        item.action_type != 'AC_AD_FD_ONLY' ?
-                                            <Link to='transfer-fund' className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-purple lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
-                                    }
-                                    <Link to='add-fund' state={{currency:item.description}} className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-green lg:text-xl text-lg font-bold text-white'>
-                                        <span className="">
-                                            <svg xmlns="http://www.w3.org/2000/svg" width="38"
-                                                height="38" viewBox="0 0 42 42" fill="none"><path
-                                                d="M21 0C16.8466 0 12.7865 1.23163 9.33303 3.53914C5.8796 5.84665 3.18798 9.1264 1.59854 12.9636C0.00909901 16.8009 -0.406771 21.0233 0.403518 25.0969C1.21381 29.1705 3.21386 32.9123 6.15077 35.8492C9.08767 38.7861 12.8295 40.7862 16.9031 41.5965C20.9767 42.4068 25.1991 41.9909 29.0364 40.4015C32.8736 38.812 36.1534 36.1204 38.4609 32.667C40.7684 29.2135 42 25.1534 42 21C41.994 15.4323 39.7796 10.0944 35.8426 6.15741C31.9056 2.22045 26.5677 0.00602189 21 0ZM28 22.75H22.75V28C22.75 28.4641 22.5656 28.9092 22.2374 29.2374C21.9093 29.5656 21.4641 29.75 21 29.75C20.5359 29.75 20.0908 29.5656 19.7626 29.2374C19.4344 28.9092 19.25 28.4641 19.25 28V22.75H14C13.5359 22.75 13.0908 22.5656 12.7626 22.2374C12.4344 21.9092 12.25 21.4641 12.25 21C12.25 20.5359 12.4344 20.0907 12.7626 19.7626C13.0908 19.4344 13.5359 19.25 14 19.25H19.25V14C19.25 13.5359 19.4344 13.0908 19.7626 12.7626C20.0908 12.4344 20.5359 12.25 21 12.25C21.4641 12.25 21.9093 12.4344 22.2374 12.7626C22.5656 13.0908 22.75 13.5359 22.75 14V19.25H28C28.4641 19.25 28.9093 19.4344 29.2374 19.7626C29.5656 20.0907 29.75 20.5359 29.75 21C29.75 21.4641 29.5656 21.9092 29.2374 22.2374C28.9093 22.5656 28.4641 22.75 28 22.75Z"
-                                                fill="white"></path>
-                                            </svg>
-                                        </span>
-                                        <span className='text-white'>Add Credit</span>
-                                    </Link>
-                                </div>
-                        </div>
-                        ))
-                        :
-                        wallet.error ? 
-                        (
-                        <div className="md:flex items-center flex-wrap mt-3">
-                            <p className='text-base'>Opps! An Error occurred, please try again</p>
-                        </div>
-                        )
-                        :
-                        (
-                        <div className="md:flex items-center flex-wrap mt-3">
-                            <p className='text-base'>No Wallets Found!</p>
-                        </div>
-                        )
-                        }
-                        {/* end of wallet balance */}
-                    </div>
-                </div>
-                {/* END OF WALLET SECTION */}
-
-
-
-            </div>
-
-            {/*<div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>*/}
-
-            {/*    /!* COUPON SECTION *!/*/}
-            {/*    <div className="lg:w-3/4 w-full mb-10 lg:mb-0">*/}
-            {/*        <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">*/}
-            {/*            <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>*/}
-            {/*            {coupon.loading ?*/}
-            {/*                <LoadingSpinner size='16' color='sky-blue' />*/}
-            {/*                :*/}
-            {/*                <CouponTable coupon={coupon} />*/}
-            {/*            }*/}
-            {/*        </div>*/}
-            {/*    </div>*/}
-            {/*    /!* END OF COUPON SECTION *!/*/}
-
-            {/*</div>*/}
+function Balance({ wallet, coupon }) {
+  return (
+    <div className="content-wrapper">
+      {/* heading */}
+      <div className="sm:flex justify-between items-center mb-6">
+        <div className="mb-5 sm:mb-0">
+          <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+            Wallet
+          </h1>
        </div>
-      )
+        <div className="slider-btns flex space-x-4"></div>
+      </div>
+      <div className="w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+        {/* WALLET SECTION */}
+        <div className="lg:w-4/4 w-full mb-10 lg:mb-0">
+          <div className="wallet w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow min-h-[520px]">
+            <div className="flex items-baseline justify-between">
+              {/*<h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>*/}
+              {/*<p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>*/}
+            </div>
+            {/* wallet balance */}
+            {wallet.loading ? (
+              <LoadingSpinner size="16" color="sky-blue" />
+            ) : wallet.data.length ? (
+              wallet.data.map((item, index) => (
+                <div
+                  key={index}
+                  className="p-3 md:flex items-center flex-wrap my-3 border-t-2 border-slate-400 wallet-box"
+                >
+                  <div className="text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start">
+                    <div className="balance-info bal-col1">
+                      <p className="py-2"></p>
+                      <span className="text-xl text-dark-gray dark:text-white">
+                        <b>{item.description}</b>
+                      </span>
+                      <p className="text-base text-slate-500">{item.symbol}</p>
+                    </div>
+                    <div className="balance-info">
+                      <p className="py-2">Balance</p>
+                      <span className="py-1 px-2 bg-green-100 text-green-500 rounded-lg flex flex-start gap-1">
+                        {PriceFormatter(item.amount * 0.01, item.code)}
+                      </span>
+                    </div>
+                    <div className="balance-info">
+                      <p className="py-2">Escrow</p>
+                      <span className="py-1 px-2 bg-red-100 text-red-500 rounded-lg flex flex-start gap-1">
+                        {PriceFormatter(item.escrow * 0.01, item.code)}
+                      </span>
+                    </div>
+                  </div>
+
+                  <div className="w-full my-2 md:my-0 md:w-1/2 flex space-x-2 items-center justify-start md:justify-end">
+                    {item.action_type != "AC_AD_FD_ONLY" ? (
+                      <Link
+                        to="transfer-fund"
+                        className="px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-purple lg:text-xl text-lg font-bold text-white"
+                      >
+                        Transfer
+                      </Link>
+                    ) : (
+                      ""
+                    )}
+                    <Link
+                      to="add-fund"
+                      state={{ currency: item.description }}
+                      className="px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-green lg:text-xl text-lg font-bold text-white"
+                    >
+                      <span className="">
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          width="38"
+                          height="38"
+                          viewBox="0 0 42 42"
+                          fill="none"
+                        >
+                          <path
+                            d="M21 0C16.8466 0 12.7865 1.23163 9.33303 3.53914C5.8796 5.84665 3.18798 9.1264 1.59854 12.9636C0.00909901 16.8009 -0.406771 21.0233 0.403518 25.0969C1.21381 29.1705 3.21386 32.9123 6.15077 35.8492C9.08767 38.7861 12.8295 40.7862 16.9031 41.5965C20.9767 42.4068 25.1991 41.9909 29.0364 40.4015C32.8736 38.812 36.1534 36.1204 38.4609 32.667C40.7684 29.2135 42 25.1534 42 21C41.994 15.4323 39.7796 10.0944 35.8426 6.15741C31.9056 2.22045 26.5677 0.00602189 21 0ZM28 22.75H22.75V28C22.75 28.4641 22.5656 28.9092 22.2374 29.2374C21.9093 29.5656 21.4641 29.75 21 29.75C20.5359 29.75 20.0908 29.5656 19.7626 29.2374C19.4344 28.9092 19.25 28.4641 19.25 28V22.75H14C13.5359 22.75 13.0908 22.5656 12.7626 22.2374C12.4344 21.9092 12.25 21.4641 12.25 21C12.25 20.5359 12.4344 20.0907 12.7626 19.7626C13.0908 19.4344 13.5359 19.25 14 19.25H19.25V14C19.25 13.5359 19.4344 13.0908 19.7626 12.7626C20.0908 12.4344 20.5359 12.25 21 12.25C21.4641 12.25 21.9093 12.4344 22.2374 12.7626C22.5656 13.0908 22.75 13.5359 22.75 14V19.25H28C28.4641 19.25 28.9093 19.4344 29.2374 19.7626C29.5656 20.0907 29.75 20.5359 29.75 21C29.75 21.4641 29.5656 21.9092 29.2374 22.2374C28.9093 22.5656 28.4641 22.75 28 22.75Z"
+                            fill="white"
+                          ></path>
+                        </svg>
+                      </span>
+                      <span className="text-white">Add Credit</span>
+                    </Link>
+                  </div>
+                </div>
+              ))
+            ) : wallet.error ? (
+              <div className="md:flex items-center flex-wrap mt-3">
+                <p className="text-base">
+                  Opps! An Error occurred, please try again
+                </p>
+              </div>
+            ) : (
+              <div className="md:flex items-center flex-wrap mt-3">
+                <p className="text-base">No Wallets Found!</p>
+              </div>
+            )}
+            {/* end of wallet balance */}
+          </div>
+        </div>
+        {/* END OF WALLET SECTION */}
+      </div>
+
+      {/*<div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>*/}
+
+      {/*    /!* COUPON SECTION *!/*/}
+      {/*    <div className="lg:w-3/4 w-full mb-10 lg:mb-0">*/}
+      {/*        <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">*/}
+      {/*            <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>*/}
+      {/*            {coupon.loading ?*/}
+      {/*                <LoadingSpinner size='16' color='sky-blue' />*/}
+      {/*                :*/}
+      {/*                <CouponTable coupon={coupon} />*/}
+      {/*            }*/}
+      {/*        </div>*/}
+      {/*    </div>*/}
+      {/*    /!* END OF COUPON SECTION *!/*/}
+
+      {/*</div>*/}
+    </div>
+  );
 }

-export default Balance
+export default Balance;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
victorAnumudu	6b473b5dc6	wallet refresh	2023-07-24 11:58:09 +01:00
ameye	c1a17949f7	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-23 23:40:59 +00:00
Ebube	24302c7435	Added New Login	2023-07-23 23:59:20 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	27f4fda129	Added images	2023-07-23 07:47:54 -04:00
ameye	7ddef6d52d	Merge branch 'notification-menu-close' of WrenchBoard/Users-Wrench into master	2023-07-23 10:20:40 +00:00
victorAnumudu	187ac61396	logged information removed	2023-07-23 07:18:56 +01:00
victorAnumudu	31297efb5b	closes notification menu when see all notifications is clicked	2023-07-23 07:15:25 +01:00
ameye	f8d6475ff8	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-22 23:21:04 +00:00
Ebube	22a45ac15e	Added some fixes	2023-07-23 00:12:26 +01:00
ameye	0489be5e69	Merge branch 'notifications' of WrenchBoard/Users-Wrench into master	2023-07-22 22:44:03 +00:00
victorAnumudu	0f8ef167bb	Merge master into notifications	2023-07-22 23:15:30 +01:00
victorAnumudu	aa6e3f4b94	notification bug fixed	2023-07-22 23:12:29 +01:00
ameye	68beda891b	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-22 21:20:55 +00:00
Ebube	61bef08a24	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-22 20:53:04 +01:00
Ebube	a6409a037f	ConfirmNairaWithdraw layout, payload adjustment and other style fixes	2023-07-22 20:52:39 +01:00
ameye	f3ab8241a3	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-22 11:27:18 +00:00
Ebube	f3defdca85	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-22 12:23:41 +01:00
Ebube	f3b1a42819	Bug Fixes..Notification load, Withdraw css fix	2023-07-22 12:23:14 +01:00
ameye	e65d538709	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-21 10:48:59 +00:00
Ebube	98aef302de	Updated Layout for Withdraw Pop UP	2023-07-21 11:45:42 +01:00
ameye	b3bbf11f0a	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-20 19:43:23 +00:00
Ebube	973517215f	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-20 20:25:32 +01:00
Ebube	a3782e2dfc	Added Notification and Started Wallet Withdraw	2023-07-20 20:24:54 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	25830d5bf3	Resolve conflict	2023-07-20 06:25:51 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	1615a7ac8a	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench # Conflicts: # src/middleware/AuthRoute.jsx	2023-07-20 06:24:49 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	232211a297	home recent	2023-07-20 06:18:56 -04:00
ameye	eda3d76d4c	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-20 10:17:46 +00:00
Ebube	87f1a1e3e8	Notification for header	2023-07-20 10:22:10 +01:00
ameye	5257f89acb	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-18 20:20:31 +00:00
Ebube	d4cf7419bf	.	2023-07-18 20:28:30 +01:00
Ebube	1ffb732bfa	.	2023-07-18 19:47:23 +01:00
Ebube	9007463f6d	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-18 19:00:21 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	a4b6b9e493	notification icons	2023-07-18 11:00:40 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	ccf820da7c	bank icon	2023-07-18 07:52:58 -04:00
Ebube	7c51896bbf	Wallet update	2023-07-18 10:38:58 +01:00
ameye	aa80bab930	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-17 23:30:44 +00:00
Ebube	1704fc60b4	removed hidden abilities for cvv	2023-07-18 00:20:15 +01:00
ameye	c3e6c90c49	Merge branch 'collapse-icon' of WrenchBoard/Users-Wrench into master	2023-07-17 19:57:36 +00:00
victorAnumudu	1a65b1daa3	collapse-icon fixed, family icon fixed	2023-07-17 19:21:43 +01:00
ameye	ba2c009896	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-17 17:03:29 +00:00
Ebube	bc2b71ecda	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-17 17:47:31 +01:00
Ebube	1d315018a4	Added error msg for card and updated password text display	2023-07-17 17:47:03 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	56f8b75525	wrong end point on production - Ebubes error	2023-07-17 12:12:14 -04:00
Ebube	59531df377	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-17 17:03:39 +01:00
Ebube	06a7386211	another fix	2023-07-17 17:00:59 +01:00
Ebube	4bb3a11261	correction to .env production	2023-07-17 16:22:25 +01:00
Ebube	f308eeca8d	Corrections made on AddFund and text variable for Header	2023-07-17 16:20:57 +01:00
ameye	8e562ed1a5	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-17 15:07:58 +00:00
Ebube	23dd7571a3	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-17 15:52:53 +01:00
Ebube	8530b2d1a0	Digits Fixed and SignOut text variable	2023-07-17 15:52:28 +01:00
ameye	acdbddbc79	Merge branch 'family-icon' of WrenchBoard/Users-Wrench into master	2023-07-17 14:48:17 +00:00
victorAnumudu	15fc5f4f14	family icon added	2023-07-17 15:31:39 +01:00
ameye	2ba3b01646	Merge branch 'resource-question-page' of WrenchBoard/Users-Wrench into master	2023-07-17 12:50:09 +00:00
ameye	4e960a2f53	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-17 12:49:59 +00:00
victorAnumudu	ab700edcf2	resources question page added	2023-07-17 13:42:21 +01:00
Ebube	42e80c7a11	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-17 12:59:32 +01:00
Ebube	d4472a881a	Fixed digits	2023-07-17 12:59:05 +01:00
Ebube	5d12ab4f62	Made a few changes	2023-07-17 11:48:03 +01:00
ameye	8b3c586456	Merge branch 'withdrwal-popup' of WrenchBoard/Users-Wrench into master	2023-07-17 10:38:48 +00:00
ameye	e456b55e16	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-17 10:38:41 +00:00
Ebube	89c5936212	Some fixes	2023-07-17 11:29:50 +01:00
victorAnumudu	7bedf76945	made confirm withdrawal a pop up	2023-07-17 11:07:11 +01:00
Ebube	54bf020c55	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-17 11:04:59 +01:00
Ebube	78145eee77	Paying using new card	2023-07-17 11:04:31 +01:00
victorAnumudu	d75b6ee26c	made withdrawal a pop up	2023-07-17 11:03:27 +01:00
ameye	bf5c9d4671	Merge branch 'profile-bug' of WrenchBoard/Users-Wrench into master	2023-07-17 08:06:43 +00:00
victorAnumudu	d2db38ba21	profile bug fixed	2023-07-17 02:01:37 +01:00
ameye	eecbca6b0e	Merge branch 'withdraw-page' of WrenchBoard/Users-Wrench into master	2023-07-17 00:33:24 +00:00
victorAnumudu	dd1430a350	confirm naira withdrawal added	2023-07-17 01:22:12 +01:00
victorAnumudu	0eca0c52ce	withdraw page added	2023-07-17 01:15:16 +01:00
ameye	c2c7ad7bb4	Merge branch 'family-start-task-layout' of WrenchBoard/Users-Wrench into master	2023-07-16 23:09:30 +00:00
victorAnumudu	98ccbce4c0	family start task layout changed	2023-07-16 23:38:25 +01:00
ameye	6484640e1a	Merge branch 'assign-task-layout' of WrenchBoard/Users-Wrench into master	2023-07-16 22:28:28 +00:00
victorAnumudu	ba3c4e1918	assign task layout btns fixed	2023-07-16 22:41:58 +01:00
ameye	fa4fe35bdf	Merge branch 'assign-task-bug-fixed' of WrenchBoard/Users-Wrench into master	2023-07-16 21:31:23 +00:00
victorAnumudu	c106e66f44	assign task bug fixed	2023-07-16 22:13:47 +01:00
ameye	222c739663	Merge branch 'notification-bug' of WrenchBoard/Users-Wrench into master	2023-07-16 11:04:22 +00:00
victorAnumudu	96972dbe2f	notification bug fixed	2023-07-16 06:51:38 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	7146048aee	style	2023-07-15 22:16:29 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	39f1f5bc73	Resource Question page starter	2023-07-15 21:39:53 -04:00
Ebube	fb7913c563	Another fix	2023-07-16 01:36:27 +01:00
Ebube	feb301c3c0	.	2023-07-16 01:08:37 +01:00
ameye	752fc6a4a8	Merge branch 'history-page-tab' of WrenchBoard/Users-Wrench into master	2023-07-15 21:39:05 +00:00
victorAnumudu	608d5b92f1	history tab style changed	2023-07-15 22:24:38 +01:00
ameye	45563cc59b	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-15 19:32:37 +00:00
ameye	b027e20c20	Merge branch 'job-message-tab' of WrenchBoard/Users-Wrench into master	2023-07-15 19:32:33 +00:00
ameye	bbe0777496	Merge branch 'assign-family-hidden' of WrenchBoard/Users-Wrench into master	2023-07-15 19:32:28 +00:00
Ebube	27efbe362b	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-15 20:02:15 +01:00
Ebube	878539a56a	Confirm Credit Popup Modifications	2023-07-15 19:47:06 +01:00
victorAnumudu	6ae408029d	changed job message tab	2023-07-15 19:21:28 +01:00
victorAnumudu	8016d1bd12	assign to family hidden	2023-07-15 18:59:22 +01:00
ameye	0e9fef218f	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-15 16:19:29 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	8116665045	removed yarn lock	2023-07-15 12:13:47 -04:00
Ebube	e4addc47d9	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-15 17:10:43 +01:00
Ebube	1682f11efd	Confirm Credit Popup	2023-07-15 17:08:52 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	80b2abf9e3	glog page	2023-07-15 12:07:42 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	5edecb6464	jib actions	2023-07-15 11:46:55 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	3a479b3573	action txt	2023-07-15 11:06:04 -04:00
ameye	4034909836	Merge branch 'set-account-settings' of WrenchBoard/Users-Wrench into master	2023-07-15 13:56:30 +00:00
victorAnumudu	8fc61a6289	API for set account settings added	2023-07-15 14:53:34 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	940a12a2e9	actio panel	2023-07-15 09:51:53 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	a9f671eeaa	active task messaghe	2023-07-15 08:55:48 -04:00
ameye	481924fa02	Merge branch 'delete-card' of WrenchBoard/Users-Wrench into master	2023-07-15 10:22:24 +00:00
victorAnumudu	6b712089d1	notification icons added	2023-07-15 10:49:46 +01:00
victorAnumudu	85ca2cb15a	reloads card list on successful card delete	2023-07-15 10:15:14 +01:00
victorAnumudu	d01c4928ff	Merge master into delete-card	2023-07-15 09:52:03 +01:00
victorAnumudu	b81e62988c	delete popout added	2023-07-15 09:48:14 +01:00
ameye	a8b63917fb	Merge branch 'account-settings' of WrenchBoard/Users-Wrench into master	2023-07-15 08:38:13 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	9cf6d13716	images	2023-07-15 04:37:52 -04:00
victorAnumudu	c1af2b7fc9	logged info removed	2023-07-15 08:06:44 +01:00
victorAnumudu	494c1f3271	account settings API added	2023-07-15 08:00:25 +01:00
ameye	9f0c33521f	Merge branch 'reset-profile-password' of WrenchBoard/Users-Wrench into master	2023-07-14 19:56:14 +00:00
victorAnumudu	1d5875d4e2	reset profile password implemented	2023-07-14 20:28:22 +01:00
ameye	6f6b12f4b5	Merge branch 'card-list-image-added' of WrenchBoard/Users-Wrench into master	2023-07-14 17:46:44 +00:00
victorAnumudu	f3ad4d576e	card list image added	2023-07-14 18:42:28 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	e01d0106ad	cards images	2023-07-14 13:19:41 -04:00
ameye	68472f8c66	Merge branch 'card-list-page' of WrenchBoard/Users-Wrench into master	2023-07-14 17:00:38 +00:00
victorAnumudu	8def463d80	card listing added	2023-07-14 17:54:44 +01:00
ameye	0320999f72	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-14 13:42:01 +00:00
Ebube	78a97d8b0b	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-14 13:48:25 +01:00
Ebube	6bf6c5d2d4	Added PaidPrevCard api	2023-07-14 13:48:03 +01:00
ameye	33284600e5	Merge branch 'change-passage-mac' of WrenchBoard/Users-Wrench into master	2023-07-14 12:37:26 +00:00
ameye	68bf995078	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-14 12:37:18 +00:00
Ebube	fa05f47941	.	2023-07-14 13:30:50 +01:00
victorAnumudu	2391857309	flex display changed to suit mac screen	2023-07-14 12:58:49 +01:00
Ebube	ed38cadcee	Start credit Api for Dollar acc	2023-07-14 12:53:05 +01:00
ameye	ea447a9366	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-13 23:09:01 +00:00
Ebube	4e2f120ab5	Few changes	2023-07-13 23:12:29 +01:00
Ebube	20ce9bf749	Consumed Start credit Api	2023-07-13 22:34:09 +01:00
ameye	04e1bcc5f1	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-13 19:38:17 +00:00
Ebube	cbaa8b6f7b	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-13 20:14:54 +01:00
ameye	f6bdb1c299	Merge branch 'wallet-card' of WrenchBoard/Users-Wrench into master	2023-07-13 19:11:32 +00:00
Ebube	d4061d72da	.	2023-07-13 18:20:20 +01:00
Ebube	2d9a8b55b5	.	2023-07-13 18:16:52 +01:00
Ebube	920eafed29	.	2023-07-13 18:10:19 +01:00
Ebube	21d926eb5c	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-13 18:08:23 +01:00
Ebube	ec9d793d6b	.	2023-07-13 18:07:05 +01:00
victorAnumudu	2fd04dc86d	wallet card adjustment	2023-07-13 16:44:05 +01:00
ameye	d7752cb70b	Merge branch 'wallet-layout-fix' of WrenchBoard/Users-Wrench into master	2023-07-13 13:05:32 +00:00
victorAnumudu	dc592f60db	layout fix	2023-07-13 14:02:27 +01:00
victorAnumudu	675ba2989e	layout fix	2023-07-13 14:00:02 +01:00
ameye	b201224fd6	Merge branch 'wallet-size' of WrenchBoard/Users-Wrench into master	2023-07-13 12:45:17 +00:00
ameye	c24013eefd	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-13 12:45:12 +00:00
victorAnumudu	234f04ca8f	wallet size changed	2023-07-13 13:41:39 +01:00
Ebube	5f222a2d88	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-13 12:37:32 +01:00
Ebube	258434a109	Applied corrections and changes to the wallet	2023-07-13 12:34:39 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	ed148612a7	more banners	2023-07-13 07:21:37 -04:00
ameye	2287fb5ebb	Merge branch 'wallet-cleanup' of WrenchBoard/Users-Wrench into master	2023-07-13 10:16:18 +00:00
victorAnumudu	24545baad5	wallet clean up	2023-07-13 10:27:03 +01:00
ameye	ead7589c92	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-13 08:21:23 +00:00
Ebube	51bb8fc421	Corrections on AddFundPop	2023-07-13 03:21:52 +01:00
ameye	d2166d9578	Merge branch 'icons-size' of WrenchBoard/Users-Wrench into master	2023-07-12 21:20:53 +00:00
victorAnumudu	c4872f522b	icon color and size changed	2023-07-12 21:31:09 +01:00
ameye	0aef8c5e1e	Merge branch 'wallet-icons' of WrenchBoard/Users-Wrench into master	2023-07-12 19:27:48 +00:00
ameye	767b5c1b32	Merge branch 'wallet-dropdown-icons' of WrenchBoard/Users-Wrench into master	2023-07-12 19:27:43 +00:00
ameye	6fed51443d	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-12 19:27:33 +00:00
victorAnumudu	017ba7bd2f	wallet icon added and wallet layout changed	2023-07-12 20:00:17 +01:00
victorAnumudu	86d876b013	wallet dropdown icons added	2023-07-12 19:09:04 +01:00
Ebube	fcd8898439	.	2023-07-12 19:05:06 +01:00
Ebube	690f496807	Add New Card Layout	2023-07-12 19:01:27 +01:00
ameye	f804e13b56	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-12 16:19:58 +00:00
Ebube	5e248bc108	Restored layout and tiny modifications	2023-07-12 17:14:13 +01:00
ameye	26647b088f	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-12 15:04:53 +00:00
Ebube	ae8ada33f4	Increased font	2023-07-12 15:54:57 +01:00
Ebube	c31dab92e7	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into my_wallet_layout	2023-07-12 15:51:27 +01:00
Ebube	c16764269e	Added name to Add new fund	2023-07-12 15:48:57 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	afe6a1afcb	currencies	2023-07-12 10:32:57 -04:00
Ebube	e98929627f	Compi!	2023-07-12 15:20:39 +01:00
Ebube	3919a2bc4b	Layout Readjusting	2023-07-12 15:12:50 +01:00
ameye	93e89f996c	Merge branch 'my-facebook-ID' of WrenchBoard/Users-Wrench into master	2023-07-12 13:47:25 +00:00
victorAnumudu	7ede9883ba	facebook redirect page	2023-07-12 14:22:51 +01:00
victorAnumudu	7edc7b08e5	added my default facebook client ID	2023-07-12 14:07:07 +01:00
Ebube	7990959e9f	Passed values to confirm add fund	2023-07-12 10:08:26 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	6ead632c79	facebook	2023-07-11 17:31:52 -04:00
ameye	9c575716cd	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-11 19:13:15 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	cc93d5980d	facebook login added	2023-07-11 14:59:16 -04:00
Ebube	e899e5eb2a	Convert ConfirmAddFund to Popup	2023-07-11 19:47:04 +01:00
ameye	c53ee2833f	Merge branch 'apple-login-init' of WrenchBoard/Users-Wrench into master	2023-07-11 14:23:27 +00:00
victorAnumudu	9475961c2d	apple login initialization	2023-07-11 15:15:58 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	97ae9dd136	env update	2023-07-11 06:43:18 -04:00
ameye	ded088c70f	Merge branch 'facebook-login-init' of WrenchBoard/Users-Wrench into master	2023-07-11 09:01:06 +00:00
ameye	4dacee11e8	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-11 09:00:52 +00:00
victorAnumudu	960579384c	facebook login initiated	2023-07-11 07:56:45 +01:00
Ebube	bcca701a6b	Family Account Items Icons	2023-07-11 03:30:47 +01:00
ameye	6c29f37a60	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-10 23:29:30 +00:00
Ebube	cc22e1a458	Completed conversion to popup	2023-07-10 23:21:59 +01:00
ameye	d274a5c56a	Merge branch 'family-login-bug-fixed' of WrenchBoard/Users-Wrench into master	2023-07-10 20:13:15 +00:00
victorAnumudu	dfe90fbdc2	family login fixed	2023-07-10 20:40:52 +01:00
ameye	a2f3c95671	Merge branch 'my_wallet_layout' of WrenchBoard/Users-Wrench into master	2023-07-10 19:10:14 +00:00
Ebube	6daa4d6d43	Fixed the prop drill	2023-07-10 19:22:03 +01:00
Ebube	2e25b33110	Wallet modifications and Intro to Credit Popup	2023-07-10 17:47:39 +01:00
ameye	a216ab1098	Merge branch 'login-payload' of WrenchBoard/Users-Wrench into master	2023-07-10 15:14:51 +00:00
victorAnumudu	8b01139b93	validated email on user login page	2023-07-10 15:45:38 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	8511db6961	favicon	2023-07-10 10:42:47 -04:00
ameye	99c81fd4ee	Merge branch 'profile-update' of WrenchBoard/Users-Wrench into master	2023-07-10 13:55:41 +00:00
victorAnumudu	ef545c9714	validated email	2023-07-10 13:48:23 +01:00
ameye	029a7327a8	Merge branch 'google-login-fix' of WrenchBoard/Users-Wrench into master	2023-07-10 11:22:19 +00:00
victorAnumudu	5a5d933b24	google login fix	2023-07-10 12:18:43 +01:00
ameye	9f19c930b7	Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master	2023-07-10 08:46:47 +00:00
Ebube	84d7fabae7	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into suggested-task-page	2023-07-10 09:14:54 +01:00
Ebube	b245f87556	Optimizations and underlying fixes done yesterday	2023-07-10 09:14:30 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	bed5303fa4	wallet	2023-07-09 20:42:00 -04:00
ameye	a5af8ed722	Merge branch 'home-hero-min-height' of WrenchBoard/Users-Wrench into master	2023-07-09 23:26:57 +00:00
victorAnumudu	ec97d118b2	AuthLayout added to redirect page	2023-07-09 23:55:35 +01:00
ameye	85213c31a1	Merge branch 'home-hero-min-height' of WrenchBoard/Users-Wrench into master	2023-07-09 22:55:28 +00:00
victorAnumudu	f9b6c68f99	added min height to home page hero section	2023-07-09 23:34:39 +01:00
ameye	2a4b77c9a0	Merge branch 'home-page-hero-adjustment' of WrenchBoard/Users-Wrench into master	2023-07-09 22:28:43 +00:00
victorAnumudu	97aa5dba21	Merge 'master' into home-page-hero-adjustment	2023-07-09 23:19:30 +01:00
victorAnumudu	58a10ca6be	home page hero section adjusted and google login success redirect implemented	2023-07-09 23:14:07 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	f3edf1d90b	home banner	2023-07-09 17:57:05 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	1f7b310b6f	google login	2023-07-09 15:41:49 -04:00
ameye	aecb06ca96	Merge branch 'verify-link' of WrenchBoard/Users-Wrench into master	2023-07-09 10:54:08 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	d89194f18e	sty	2023-07-09 00:39:38 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	03866d666b	banner bg	2023-07-09 00:17:20 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	4224be46bc	banner issues	2023-07-08 23:19:23 -04:00
				`@@ -0,0 +1 @@`
				`{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}`
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" id="naira"><path fill="#fff" d="M24,5A19,19,0,1,0,43,24,19,19,0,0,0,24,5Zm7,20a1,1,0,0,1,0,2H29v3A1.94,1.94,0,0,1,27.45,32a2,2,0,0,1-2.26-1.08L20,17.05l0,14a1,1,0,0,1-2,0V27H16a1,1,0,0,1,0-2h2V22H16a1,1,0,0,1,0-2h2V17a1.94,1.94,0,0,1,1.55-1.92,2,2,0,0,1,2.26,1.08L27,30,27,16a1,1,0,0,1,2,0v4h2a1,1,0,0,1,0,2H29v3Z" class="color3b3c3d svgShape"></path><path fill="#e3e3e3" d="M24,48A24,24,0,1,1,48,24,24,24,0,0,1,24,48ZM24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z" class="color3b3c3d svgShape"></path></svg>