diff --git a/frontend/src/app/AdminNavBar/AdminNavBar.tsx b/frontend/src/app/AdminNavBar/AdminNavBar.tsx index 6ebdfc5358..47dd2cdf77 100644 --- a/frontend/src/app/AdminNavBar/AdminNavBar.tsx +++ b/frontend/src/app/AdminNavBar/AdminNavBar.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useMemo } from 'react' +import React, { useCallback, useEffect, useMemo } from 'react' import { BiCommentDetail } from 'react-icons/bi' import { Link as ReactLink } from 'react-router-dom' import { @@ -17,6 +17,7 @@ import { EMERGENCY_CONTACT_KEY_PREFIX, ROLLOUT_ANNOUNCEMENT_KEY_PREFIX, } from '~constants/localStorage' +import { ROOT_ROUTE } from '~constants/routes' import { useIsMobile } from '~hooks/useIsMobile' import { useLocalStorage } from '~hooks/useLocalStorage' import { logout } from '~services/AuthService' @@ -92,6 +93,7 @@ export const AdminNavBar = ({ isMenuOpen }: AdminNavBarProps): JSX.Element => { ) const [hasSeenAnnouncement] = useLocalStorage( ROLLOUT_ANNOUNCEMENT_KEY, + false, ) // Only want to show the emergency contact modal if user id exists but user has no emergency contact @@ -104,7 +106,7 @@ export const AdminNavBar = ({ isMenuOpen }: AdminNavBarProps): JSX.Element => { ) const [hasSeenContactModal, setHasSeenContactModal] = - useLocalStorage(emergencyContactKey) + useLocalStorage(emergencyContactKey, false) const { isOpen: isContactModalOpen, @@ -118,25 +120,30 @@ export const AdminNavBar = ({ isMenuOpen }: AdminNavBarProps): JSX.Element => { // Emergency contact modal appears after the rollout announcement modal useEffect(() => { - if (!hasSeenContactModal && user && !user?.contact && hasSeenAnnouncement) { + if ( + hasSeenContactModal === false && + user && + !user.contact && + hasSeenAnnouncement === true + ) { onContactModalOpen() } }, [hasSeenContactModal, onContactModalOpen, user, hasSeenAnnouncement]) - const handleLogout = () => { + const handleLogout = useCallback(() => { logout() removeQuery() if (emergencyContactKey) { localStorage.removeItem(emergencyContactKey) } - } + }, [emergencyContactKey, removeQuery]) return ( <> - + {} - + ) => ( ) => ( ) => ( d="M171.027 24.21L166.54 23.5308L154.418 21.6927L136.507 18.9762L114.856 15.6892L91.3253 12.1079L67.7448 8.53116L46.2028 5.26229L28.456 2.54578L16.5929 0.73477C14.8961 0.401639 13.1827 0.15832 11.46 0.00583842C8.89196 -0.0852386 6.40196 0.89261 4.58876 2.70424C2.40908 4.87293 1.97679 7.77054 1.47168 10.6682C0.230532 18.0142 -0.227055 25.4702 0.106542 32.9119C0.65236 44.9293 2.68975 56.8335 6.17232 68.3533C6.8731 70.7076 7.62847 72.8809 9.58518 74.5334C11.5724 76.1855 14.1694 76.924 16.734 76.5663C19.305 76.195 21.876 75.4389 24.4106 74.873L44.8195 70.3228C53.3562 68.4212 61.8929 66.5167 70.4295 64.6091C79.7186 62.5355 89.0031 60.4528 98.283 58.3611C107.229 56.3478 116.178 54.318 125.131 52.2716C132.782 50.5179 140.425 48.7416 148.061 46.9427C153.339 45.6931 158.613 44.4389 163.86 43.0671C165.302 42.6868 166.745 42.311 168.165 41.8673C168.97 41.6138 169.775 41.3874 170.595 41.1656L171.732 40.8577C172.124 40.7535 172.283 40.586 171.755 40.749C171.3 40.8848 171.468 40.7988 171.582 40.3687C171.696 39.9386 171.737 39.6036 171.8 39.2278C171.928 38.4581 172.023 37.6884 172.087 36.9142C172.434 32.6622 172.095 28.3823 171.081 24.2371C171.067 24.2149 171.04 24.2046 171.015 24.212C170.989 24.2194 170.972 24.2426 170.972 24.2688C172.292 29.5841 172.606 35.5605 171.345 40.903C171.339 40.9222 171.345 40.9431 171.359 40.9574C171.373 40.9716 171.394 40.9768 171.414 40.9709L172.16 40.7445C172.182 40.7305 172.193 40.7034 172.185 40.6782C172.178 40.653 172.154 40.6357 172.128 40.6358C168.943 41.4961 165.785 42.4468 162.572 43.2799C157.312 44.6382 152.029 45.8878 146.746 47.1328C139.356 48.8804 131.958 50.5979 124.553 52.2851C115.952 54.2561 107.349 56.209 98.7426 58.1438C89.8419 60.1479 80.9381 62.1461 72.0313 64.1382L47.1357 69.7116L26.7632 74.2391L19.1002 75.955C17.1481 76.4078 15.2642 76.7836 13.2665 76.2901C10.3976 75.5646 8.06731 73.4879 7.02781 70.7303C6.27243 68.6884 5.74003 66.5287 5.17577 64.428C4.4932 61.8805 3.87433 59.3149 3.31918 56.7312C1.9783 50.5613 1.04648 44.3104 0.529736 38.0189C-0.0679764 30.9456 -0.000945508 23.8322 0.729957 16.7713C0.936245 14.8486 1.20169 12.9319 1.52629 11.0213C1.80842 9.36876 2.02684 7.61208 2.6002 6.04103C3.60782 3.29444 5.89354 1.20597 8.72969 0.440481C11.055 -0.175263 13.4485 0.395205 15.7693 0.748352L26.3764 2.35562L42.5852 4.8186L62.6937 7.87015L84.9911 11.2567L107.798 14.7158L129.404 17.9982L148.102 20.8324L162.208 22.974L169.998 24.1556L170.995 24.3096C171.068 24.3277 171.1 24.219 171.027 24.21Z" fill="black" stroke="black" - stroke-width="0.1" + strokeWidth="0.1" /> @@ -360,37 +360,37 @@ export const EmptyResponsesSvgr = chakra((props: SVGProps) => ( d="M245.69 77.5896C247.901 81.1853 248.843 85.4126 248.365 89.6011C248.365 89.6736 248.47 89.6736 248.479 89.6011C248.962 85.3932 248.016 81.1455 245.79 77.5353C245.749 77.4719 245.653 77.5353 245.69 77.5896Z" fill="black" stroke="black" - stroke-width="0.2" + strokeWidth="0.2" /> ( {Array(11) .fill(null) - .map(() => ( - + .map((_, i) => ( + ))} ) diff --git a/frontend/src/features/user/billing/BillCharges/components/NoChargesSvg.tsx b/frontend/src/features/user/billing/BillCharges/components/NoChargesSvg.tsx index 295dec3656..5c00073bca 100644 --- a/frontend/src/features/user/billing/BillCharges/components/NoChargesSvg.tsx +++ b/frontend/src/features/user/billing/BillCharges/components/NoChargesSvg.tsx @@ -14,7 +14,7 @@ export const NoChargesSvg = chakra( { setEsrvcId(esrvcId?.trim()) return ( - - {esrvcId ? ( - - ) : ( - - )} - + + + + {esrvcId ? ( + + ) : ( + + )} + + ) } diff --git a/frontend/src/features/workspace/WorkspacePage.tsx b/frontend/src/features/workspace/WorkspacePage.tsx index 5a72b782a0..2712c9cdb3 100644 --- a/frontend/src/features/workspace/WorkspacePage.tsx +++ b/frontend/src/features/workspace/WorkspacePage.tsx @@ -44,10 +44,10 @@ export const WorkspacePage = (): JSX.Element => { [user], ) const [hasSeenAnnouncement, setHasSeenAnnouncement] = - useLocalStorage(ROLLOUT_ANNOUNCEMENT_KEY) + useLocalStorage(ROLLOUT_ANNOUNCEMENT_KEY, false) const isAnnouncementModalOpen = useMemo( - () => !isUserLoading && !hasSeenAnnouncement, + () => !isUserLoading && hasSeenAnnouncement === false, [isUserLoading, hasSeenAnnouncement], ) diff --git a/frontend/src/theme/index.ts b/frontend/src/theme/index.ts index e443ab9d18..297026fd6a 100644 --- a/frontend/src/theme/index.ts +++ b/frontend/src/theme/index.ts @@ -21,7 +21,7 @@ export const theme = extendTheme({ body: { height: '100%', fontFeatureSettings: "'tnum' on, 'cv05' on", - '-webkit-font-smoothing': 'antialiased', + WebkitFontSmoothing: 'antialiased', }, '#root, #__next': { isolation: 'isolate',