From f308eeca8d88d0e257073bd329f69680b0b4dfa4 Mon Sep 17 00:00:00 2001 From: Ebube Date: Mon, 17 Jul 2023 16:20:57 +0100 Subject: [PATCH 1/4] Corrections made on AddFund and text variable for Header --- src/components/MyWallet/Popup/AddFundDollars.jsx | 10 +++++----- src/components/Partials/Header.jsx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/MyWallet/Popup/AddFundDollars.jsx b/src/components/MyWallet/Popup/AddFundDollars.jsx index b89d70e..0db090f 100644 --- a/src/components/MyWallet/Popup/AddFundDollars.jsx +++ b/src/components/MyWallet/Popup/AddFundDollars.jsx @@ -32,7 +32,7 @@ const validationSchema = Yup.object().shape({ .max(25, "25 chars max.") .required("required"), state: Yup.string() - .min(3, "3 chars min.") + .min(2, "2 chars min.") .max(25, "25 chars max.") .required("required"), address: Yup.string() @@ -47,7 +47,7 @@ const validationSchema = Yup.object().shape({ .min(1, "1 chars min.") .max(2, "2 chars max.") .required("required"), - cvv: Yup.string() + cvv: Yup.number() .min(3, "3 chars min.") .max(4, "4 chars max.") .required("required"), @@ -451,11 +451,11 @@ function AddFundDollars(props) { spanTag="*" iconName={cardIcons} label="CVV" - type="number" + type="password" name="cvv" placeholder="CVV" maxLength={3} - value={props.values.cvv} + value={props.values.cvv.replace(/./g, "*")} inputHandler={props.handleChange} blurHandler={props.handleBlur} error={props.errors.cvv} @@ -502,7 +502,7 @@ function AddFundDollars(props) { type="text" name="state" placeholder="State" - value={props.values.state} + value={props.values.state.toLocaleUpperCase} inputHandler={props.handleChange} blurHandler={props.handleBlur} error={props.errors.state} diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx index 87db5f7..4df028f 100644 --- a/src/components/Partials/Header.jsx +++ b/src/components/Partials/Header.jsx @@ -686,7 +686,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {

  • - Sign Out + {process.env.REACT_APP_LOGOUT_TEXT}

    • From 4bb3a1126106e2db2a95b3694b3e221a960fbf5d Mon Sep 17 00:00:00 2001 From: Ebube Date: Mon, 17 Jul 2023 16:22:25 +0100 Subject: [PATCH 2/4] correction to .env production --- .env.production | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 7b3c27f..02e59c6 100644 --- a/.env.production +++ b/.env.production @@ -12,8 +12,8 @@ REACT_APP_APPSITE="https://myfitapp.mermsemr.com" #REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user" #REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user" -REACT_APP_AUX_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1" -REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1" +REACT_APP_AUX_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1" +REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/en/wrench/api/v1" #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser" From 06a73862110d500c43f8f3b200e991695a019e90 Mon Sep 17 00:00:00 2001 From: Ebube Date: Mon, 17 Jul 2023 17:00:59 +0100 Subject: [PATCH 3/4] another fix --- src/components/MyWallet/Popup/AddFundDollars.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/MyWallet/Popup/AddFundDollars.jsx b/src/components/MyWallet/Popup/AddFundDollars.jsx index 0db090f..44769ef 100644 --- a/src/components/MyWallet/Popup/AddFundDollars.jsx +++ b/src/components/MyWallet/Popup/AddFundDollars.jsx @@ -47,7 +47,7 @@ const validationSchema = Yup.object().shape({ .min(1, "1 chars min.") .max(2, "2 chars max.") .required("required"), - cvv: Yup.number() + cvv: Yup.string() .min(3, "3 chars min.") .max(4, "4 chars max.") .required("required"), @@ -451,7 +451,7 @@ function AddFundDollars(props) { spanTag="*" iconName={cardIcons} label="CVV" - type="password" + type="text" name="cvv" placeholder="CVV" maxLength={3} @@ -484,7 +484,7 @@ function AddFundDollars(props) { fieldClass="px-6" spanTag="*" label="Postal Code" - type="text" + type="number" name="code" placeholder="Postal Code" value={props.values.code} @@ -502,7 +502,7 @@ function AddFundDollars(props) { type="text" name="state" placeholder="State" - value={props.values.state.toLocaleUpperCase} + value={props.values.state.toUpperCase()} inputHandler={props.handleChange} blurHandler={props.handleBlur} error={props.errors.state} From 1d315018a48e1d7a4706edc4657f30617cc30f37 Mon Sep 17 00:00:00 2001 From: Ebube Date: Mon, 17 Jul 2023 17:47:03 +0100 Subject: [PATCH 4/4] Added error msg for card and updated password text display --- src/components/AuthPages/Login/index.jsx | 4 ++-- src/components/AuthPages/SignUp/index.jsx | 4 ++-- src/components/AuthPages/VerifyPassword/index.jsx | 8 ++++---- src/components/MyWallet/Popup/AddFundDollars.jsx | 8 +++++++- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index e188154..2cb79da 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -275,8 +275,8 @@ export default function Login() {
    diff --git a/src/components/AuthPages/VerifyPassword/index.jsx b/src/components/AuthPages/VerifyPassword/index.jsx index 1e71678..f03509e 100644 --- a/src/components/AuthPages/VerifyPassword/index.jsx +++ b/src/components/AuthPages/VerifyPassword/index.jsx @@ -158,8 +158,8 @@ const SuccessfulComponent = ({ {/* INPUT */}
    setPrevCardError(""), 5000); return; } } @@ -250,7 +253,7 @@ function AddFundDollars(props) { {/* previous tab */} {tab === "previous" && ( -
    +
    {payListCards.loading ? ( ) : payListCards?.data?.length ? ( @@ -295,6 +298,9 @@ function AddFundDollars(props) {
    )} +

    + {prevCardError && prevCardError} +

    )}