diff --git a/src/applications/_mock-form/containers/IntroductionPage.jsx b/src/applications/_mock-form/containers/IntroductionPage.jsx index 62551abbf0d4..8888d0deb7a0 100644 --- a/src/applications/_mock-form/containers/IntroductionPage.jsx +++ b/src/applications/_mock-form/containers/IntroductionPage.jsx @@ -49,7 +49,7 @@ class IntroductionPage extends React.Component {

Follow the steps below to apply for Mock form.

- +

  • Prepare

    To fill out this application, you’ll need your:

    diff --git a/src/applications/ask-va/components/BreadCrumbs.jsx b/src/applications/ask-va/components/BreadCrumbs.jsx index 4a9b7c6910f1..db0f8920f101 100644 --- a/src/applications/ask-va/components/BreadCrumbs.jsx +++ b/src/applications/ask-va/components/BreadCrumbs.jsx @@ -17,7 +17,7 @@ const BreadCrumbs = ({ currentLocation }) => { const breadcrumbLinks = breadcrumbsDictionary[adjustedLocation]; return ( - + {breadcrumbLinks.map(link => ( {link.title} diff --git a/src/applications/burial-poc-v6/pages/BurialIntroduction.jsx b/src/applications/burial-poc-v6/pages/BurialIntroduction.jsx index 5b78ee0b9e54..ebfe78979f84 100644 --- a/src/applications/burial-poc-v6/pages/BurialIntroduction.jsx +++ b/src/applications/burial-poc-v6/pages/BurialIntroduction.jsx @@ -14,7 +14,7 @@ export default function BurialIntroduction(props) {

    Follow the steps below to apply for burial benefits.

    - +

  • Prepare

    diff --git a/src/applications/burials-v2/components/IntroductionPage.jsx b/src/applications/burials-v2/components/IntroductionPage.jsx index 97043492527c..236bb2ccc859 100644 --- a/src/applications/burials-v2/components/IntroductionPage.jsx +++ b/src/applications/burials-v2/components/IntroductionPage.jsx @@ -26,7 +26,7 @@ class IntroductionPage extends React.Component {

    Follow the steps below to apply for burial benefits.

    - +

  • Prepare

     { return (
    - + Home Manage your VA debt Your VA debt diff --git a/src/applications/debt-letters/components/DebtLettersDownload.jsx b/src/applications/debt-letters/components/DebtLettersDownload.jsx index 3b3281780117..147e196fa290 100644 --- a/src/applications/debt-letters/components/DebtLettersDownload.jsx +++ b/src/applications/debt-letters/components/DebtLettersDownload.jsx @@ -24,7 +24,7 @@ const DebtLettersDownload = ({ return (
    - + Home Manage your VA debt Your debt diff --git a/src/applications/debt-letters/components/DebtLettersSummary.jsx b/src/applications/debt-letters/components/DebtLettersSummary.jsx index 49d5659c9749..97bca7769815 100644 --- a/src/applications/debt-letters/components/DebtLettersSummary.jsx +++ b/src/applications/debt-letters/components/DebtLettersSummary.jsx @@ -112,7 +112,7 @@ const DebtLettersSummary = ({ isError, isVBMSError, debts, debtLinks }) => { return ( <> - + Home Manage your VA debt Your VA debt diff --git a/src/applications/disability-benefits/2346/containers/App.jsx b/src/applications/disability-benefits/2346/containers/App.jsx index b6442749e828..794bcc686d90 100644 --- a/src/applications/disability-benefits/2346/containers/App.jsx +++ b/src/applications/disability-benefits/2346/containers/App.jsx @@ -65,7 +65,7 @@ class App extends Component { <> {!featureToggles.loading && (
    - + Home {/* this will get updated when this route is added */} Health care @@ -80,13 +80,11 @@ class App extends Component { Loading your information... )} - {isError && - !pending && - isLoggedIn && ( -
    - -
    - )} + {isError && !pending && isLoggedIn && ( +
    + +
    + )} {showMainContent && ( {children} @@ -108,7 +106,4 @@ const mapDispatchToProps = dispatch => ({ ...bindActionCreators({ fetchFormStatus }, dispatch), }); -export default connect( - mapStateToProps, - mapDispatchToProps, -)(App); +export default connect(mapStateToProps, mapDispatchToProps)(App); diff --git a/src/applications/education-letters/components/Layout.jsx b/src/applications/education-letters/components/Layout.jsx index 292dbc3b0d1f..156e2073253b 100644 --- a/src/applications/education-letters/components/Layout.jsx +++ b/src/applications/education-letters/components/Layout.jsx @@ -10,7 +10,7 @@ const Layout = ({ children, clsName = '', breadCrumbs = {} }) => { return ( <> - + Home Education and training {renderBreadCrumbs()} @@ -29,9 +29,9 @@ const Layout = ({ children, clsName = '', breadCrumbs = {} }) => { }; Layout.propTypes = { - clsName: PropTypes.string, - children: PropTypes.object, breadCrumbs: PropTypes.object, + children: PropTypes.object, + clsName: PropTypes.string, }; export default Layout; diff --git a/src/applications/enrollment-verification/components/EnrollmentVerificationBreadcrumbs.jsx b/src/applications/enrollment-verification/components/EnrollmentVerificationBreadcrumbs.jsx index d060dc38d4a6..cf3a23606702 100644 --- a/src/applications/enrollment-verification/components/EnrollmentVerificationBreadcrumbs.jsx +++ b/src/applications/enrollment-verification/components/EnrollmentVerificationBreadcrumbs.jsx @@ -52,5 +52,5 @@ export default function EnrollmentVerificationBreadcrumbs() { ); } - return {breadcrumbs}; + return {breadcrumbs}; } diff --git a/src/applications/fry-dea/containers/FryDeaApp.jsx b/src/applications/fry-dea/containers/FryDeaApp.jsx index 25cae75a403d..b9a90aeea3af 100644 --- a/src/applications/fry-dea/containers/FryDeaApp.jsx +++ b/src/applications/fry-dea/containers/FryDeaApp.jsx @@ -24,43 +24,40 @@ function FryDeaApp({ }) { const [fetchedVeterans, setFetchedVeterans] = useState(false); - useEffect( - () => { - if (!user.login.currentlyLoggedIn) { - return; - } + useEffect(() => { + if (!user.login.currentlyLoggedIn) { + return; + } - if (!fetchedVeterans) { - setFetchedVeterans(true); - getVeterans(); - } + if (!fetchedVeterans) { + setFetchedVeterans(true); + getVeterans(); + } - if ( - formData.showUpdatedFryDeaApp !== showUpdatedFryDeaApp || - formData.veterans !== veterans - ) { - setFormData({ - ...formData, - showUpdatedFryDeaApp, - veterans, - }); - } - }, - [ - fetchedVeterans, - formData, - getVeterans, - location.pathname, - setFormData, - showUpdatedFryDeaApp, - user.login.currentlyLoggedIn, - veterans, - ], - ); + if ( + formData.showUpdatedFryDeaApp !== showUpdatedFryDeaApp || + formData.veterans !== veterans + ) { + setFormData({ + ...formData, + showUpdatedFryDeaApp, + veterans, + }); + } + }, [ + fetchedVeterans, + formData, + getVeterans, + location.pathname, + setFormData, + showUpdatedFryDeaApp, + user.login.currentlyLoggedIn, + veterans, + ]); return ( <> - + Home Education and training @@ -98,7 +95,4 @@ const mapDispatchToProps = { getVeterans: fetchVeterans, }; -export default connect( - mapStateToProps, - mapDispatchToProps, -)(FryDeaApp); +export default connect(mapStateToProps, mapDispatchToProps)(FryDeaApp); diff --git a/src/applications/fry-dea/containers/IntroductionPage.jsx b/src/applications/fry-dea/containers/IntroductionPage.jsx index e41163c66cf7..bd1b05924c57 100644 --- a/src/applications/fry-dea/containers/IntroductionPage.jsx +++ b/src/applications/fry-dea/containers/IntroductionPage.jsx @@ -52,7 +52,7 @@ class IntroductionPage extends React.Component { Follow these steps to get started - +

  • Check your eligibility

    diff --git a/src/applications/gi/components/GiBillBreadcrumbs.jsx b/src/applications/gi/components/GiBillBreadcrumbs.jsx index d59f37341608..6b2750733f14 100644 --- a/src/applications/gi/components/GiBillBreadcrumbs.jsx +++ b/src/applications/gi/components/GiBillBreadcrumbs.jsx @@ -47,7 +47,7 @@ const GiBillBreadcrumbs = () => { ); } - return {crumbs}; + return {crumbs}; }; export default GiBillBreadcrumbs; diff --git a/src/applications/health-care-supply-reordering/containers/App.jsx b/src/applications/health-care-supply-reordering/containers/App.jsx index 3594c38e7780..e6a2516c0520 100644 --- a/src/applications/health-care-supply-reordering/containers/App.jsx +++ b/src/applications/health-care-supply-reordering/containers/App.jsx @@ -63,7 +63,7 @@ class App extends Component { return ( <> {!featureToggles.loading && ( - + Home {/* this will get updated when this route is added */} Health care @@ -77,13 +77,11 @@ class App extends Component { Loading your information... )} - {isError && - !pending && - isLoggedIn && ( -

    - -
    - )} + {isError && !pending && isLoggedIn && ( +
    + +
    + )} {showMainContent && ( {children} @@ -105,7 +103,4 @@ const mapDispatchToProps = dispatch => ({ ...bindActionCreators({ fetchFormStatus }, dispatch), }); -export default connect( - mapStateToProps, - mapDispatchToProps, -)(App); +export default connect(mapStateToProps, mapDispatchToProps)(App); diff --git a/src/applications/ivc-champva/10-7959f-1/containers/IntroductionPage.jsx b/src/applications/ivc-champva/10-7959f-1/containers/IntroductionPage.jsx index 16cf77710903..8c1b8876052f 100644 --- a/src/applications/ivc-champva/10-7959f-1/containers/IntroductionPage.jsx +++ b/src/applications/ivc-champva/10-7959f-1/containers/IntroductionPage.jsx @@ -32,7 +32,7 @@ class IntroductionPage extends React.Component {

    Follow the steps below to apply for CHAMPVA benefits.

    - +

  • Prepare

    To fill out this application, you’ll need your:

    diff --git a/src/applications/medical-copays/components/AlertView.jsx b/src/applications/medical-copays/components/AlertView.jsx index ceecfe6eef26..ac85fc70b21f 100644 --- a/src/applications/medical-copays/components/AlertView.jsx +++ b/src/applications/medical-copays/components/AlertView.jsx @@ -37,7 +37,7 @@ const AlertView = ({ pathname, alertType, error, cdpToggle, hasDebts }) => { return ( <> - + Home Health care Pay your VA copay bill diff --git a/src/applications/medical-copays/containers/DetailPage.jsx b/src/applications/medical-copays/containers/DetailPage.jsx index 2285f4c1429c..71def8c0f2ee 100644 --- a/src/applications/medical-copays/containers/DetailPage.jsx +++ b/src/applications/medical-copays/containers/DetailPage.jsx @@ -33,19 +33,19 @@ const DetailPage = ({ match }) => { mcpHTMLStatementToggle(state), ); - useEffect( - () => { - if (!isCurrentBalance) { - setAlert('past-due-balance'); - } - scrollToTop(); - }, - [isCurrentBalance], - ); + useEffect(() => { + if (!isCurrentBalance) { + setAlert('past-due-balance'); + } + scrollToTop(); + }, [isCurrentBalance]); return ( <> - + Home Health care Pay your VA copay bill diff --git a/src/applications/medical-copays/containers/HTMLStatementPage.jsx b/src/applications/medical-copays/containers/HTMLStatementPage.jsx index a821fca77afa..dca33c3ad66a 100644 --- a/src/applications/medical-copays/containers/HTMLStatementPage.jsx +++ b/src/applications/medical-copays/containers/HTMLStatementPage.jsx @@ -32,7 +32,10 @@ const HTMLStatementPage = ({ match }) => { return ( <>
    - + Home Health care Pay your VA copay bill diff --git a/src/applications/medical-copays/containers/OverviewPage.jsx b/src/applications/medical-copays/containers/OverviewPage.jsx index 9499994f4091..29406f89519e 100644 --- a/src/applications/medical-copays/containers/OverviewPage.jsx +++ b/src/applications/medical-copays/containers/OverviewPage.jsx @@ -59,7 +59,7 @@ const OverviewPage = () => { return ( <>
    - + Home Health care Pay your VA copay bill diff --git a/src/applications/mhv/secure-messaging/components/shared/SmBreadcrumbs.jsx b/src/applications/mhv/secure-messaging/components/shared/SmBreadcrumbs.jsx index ad8c570ceccf..316731aa59d1 100644 --- a/src/applications/mhv/secure-messaging/components/shared/SmBreadcrumbs.jsx +++ b/src/applications/mhv/secure-messaging/components/shared/SmBreadcrumbs.jsx @@ -26,99 +26,84 @@ const SmBreadcrumbs = () => { } } - const [locationBasePath, locationChildPath] = useMemo( - () => { - const pathElements = location.pathname.split('/'); - if (pathElements[0] === '') pathElements.shift(); - return pathElements; - }, - [location], - ); + const [locationBasePath, locationChildPath] = useMemo(() => { + const pathElements = location.pathname.split('/'); + if (pathElements[0] === '') pathElements.shift(); + return pathElements; + }, [location]); - useEffect( - () => { - checkScreenSize(); - }, - [isMobile], - ); + useEffect(() => { + checkScreenSize(); + }, [isMobile]); - useEffect( - () => { - if ( - `/${locationBasePath}/` === Constants.Paths.FOLDERS && - parseInt(locationChildPath, 10) < 1 - ) { - navigateToFolderByFolderId(locationChildPath, history); - } - }, - [locationBasePath, locationChildPath, history], - ); + useEffect(() => { + if ( + `/${locationBasePath}/` === Constants.Paths.FOLDERS && + parseInt(locationChildPath, 10) < 1 + ) { + navigateToFolderByFolderId(locationChildPath, history); + } + }, [locationBasePath, locationChildPath, history]); window.addEventListener('resize', checkScreenSize); - useEffect( - () => { - if (!locationBasePath) { - dispatch(setBreadcrumbs({}, location)); - return; - } + useEffect(() => { + if (!locationBasePath) { + dispatch(setBreadcrumbs({}, location)); + return; + } - const path = `/${locationBasePath}/`; + const path = `/${locationBasePath}/`; - if ( - [ - Constants.Paths.INBOX, - Constants.Paths.SENT, - Constants.Paths.DELETED, - Constants.Paths.DRAFTS, - ].includes(path) || - (path === Constants.Paths.FOLDERS && !locationChildPath) - ) { - dispatch(setBreadcrumbs(Constants.Breadcrumbs.MESSAGES, location)); - } else if (path === Constants.Paths.FOLDERS && locationChildPath) { - dispatch(setBreadcrumbs(Constants.Breadcrumbs.FOLDERS, location)); - } else if (path === Constants.Paths.COMPOSE) { - dispatch(setBreadcrumbs(Constants.Breadcrumbs.INBOX, location)); - } else if ( - path === - (Constants.Paths.MESSAGE_THREAD || - Constants.Paths.REPLY || - Constants.Paths.COMPOSE) && - activeFolder - ) { - dispatch( - setBreadcrumbs( - { - path: `${Constants.Paths.FOLDERS}${activeFolder.folderId}`, - label: `Back to ${ - activeFolder.folderId < 1 - ? activeFolder.name.toLowerCase() - : activeFolder.name - }`, - }, - location, - ), - ); - } - }, - [ - activeFolder, - dispatch, - location, - locationBasePath, - locationChildPath, - messageDetails?.subject, - ], - ); + if ( + [ + Constants.Paths.INBOX, + Constants.Paths.SENT, + Constants.Paths.DELETED, + Constants.Paths.DRAFTS, + ].includes(path) || + (path === Constants.Paths.FOLDERS && !locationChildPath) + ) { + dispatch(setBreadcrumbs(Constants.Breadcrumbs.MESSAGES, location)); + } else if (path === Constants.Paths.FOLDERS && locationChildPath) { + dispatch(setBreadcrumbs(Constants.Breadcrumbs.FOLDERS, location)); + } else if (path === Constants.Paths.COMPOSE) { + dispatch(setBreadcrumbs(Constants.Breadcrumbs.INBOX, location)); + } else if ( + path === + (Constants.Paths.MESSAGE_THREAD || + Constants.Paths.REPLY || + Constants.Paths.COMPOSE) && + activeFolder + ) { + dispatch( + setBreadcrumbs( + { + path: `${Constants.Paths.FOLDERS}${activeFolder.folderId}`, + label: `Back to ${ + activeFolder.folderId < 1 + ? activeFolder.name.toLowerCase() + : activeFolder.name + }`, + }, + location, + ), + ); + } + }, [ + activeFolder, + dispatch, + location, + locationBasePath, + locationChildPath, + messageDetails?.subject, + ]); - useEffect( - () => { - if (messageDetails && !activeFolder) { - dispatch(retrieveFolder(messageDetails?.threadFolderId)); - } - }, - [messageDetails, activeFolder, dispatch], - ); + useEffect(() => { + if (messageDetails && !activeFolder) { + dispatch(retrieveFolder(messageDetails?.threadFolderId)); + } + }, [messageDetails, activeFolder, dispatch]); const breadcrumbSize = () => { if (isMobile) { @@ -133,7 +118,11 @@ const SmBreadcrumbs = () => { !crumbs?.label ? 'breadcrumbs--hidden' : '' }`} > - + {crumbs && (