diff --git a/src/components/UserProfile/QuickSetupModal/QuickSetupModal.module.css b/src/components/UserProfile/QuickSetupModal/QuickSetupModal.module.css index 72c60bc4e1..9f88e5233a 100644 --- a/src/components/UserProfile/QuickSetupModal/QuickSetupModal.module.css +++ b/src/components/UserProfile/QuickSetupModal/QuickSetupModal.module.css @@ -8,12 +8,12 @@ .role-button { border-radius: 10%; - padding: 4px; + padding: 4px 8px; color: white; display: inline-flex; align-items: center; cursor: pointer; - font-size: 14px; + font-size: 12px; white-space: nowrap; position: relative; } diff --git a/src/components/UserProfile/TeamsAndProjects/UserTeamsTable.jsx b/src/components/UserProfile/TeamsAndProjects/UserTeamsTable.jsx index 89054fa742..f7daada47b 100644 --- a/src/components/UserProfile/TeamsAndProjects/UserTeamsTable.jsx +++ b/src/components/UserProfile/TeamsAndProjects/UserTeamsTable.jsx @@ -1,10 +1,11 @@ -import { useEffect, useRef, useState } from 'react'; +import { React, useState, useEffect, useRef } from 'react'; import { Button, Col, Input } from 'reactstrap'; -import hasPermission from '../../../utils/permissions'; import './TeamsAndProjects.module.css'; +import hasPermission from '../../../utils/permissions'; // import styles from './UserTeamsTable.css'; +import { boxStyle, boxStyleDark } from '~/styles'; import { connect } from 'react-redux'; -import { boxStyle } from '~/styles'; +import Switch from './Switch'; import './UserTeamsTable.module.css'; @@ -12,14 +13,14 @@ import { AutoCompleteTeamCode } from './AutoCompleteTeamCode'; import ToggleSwitch from '../UserProfileEdit/ToggleSwitch'; +import './../../Teams/Team.module.css'; +import { TeamMember } from './TeamMember'; import axios from 'axios'; +import { ENDPOINTS } from '~/utils/URL.js'; import { toast } from 'react-toastify'; import { useUpdateFiltersWithIndividualCodesChangeMutation } from '~/actions/weeklySummariesFilterAction'; -import { ENDPOINTS } from '~/utils/URL.js'; -import './../../Teams/Team.module.css'; -import { TeamMember } from './TeamMember'; const UserTeamsTable = props => { const { darkMode } = props; @@ -163,7 +164,7 @@ const UserTeamsTable = props => { />
{props.canEditVisibility && ( -
+
{ backgroundColor: darkMode ? '#1C2541' : '#e9ecef', border: '1px solid #ced4da', marginBottom: '10px', - display: 'flex', - alignItems: 'center', - padding: '10px 15px', - minHeight: '45px', }} > - Visibility + Visibility {
)} -
+
- Teams + Teams - + !showDropdown && setShowDropdown(true)} disabled={!props.canEditTeamCode} diff --git a/src/components/Warnings/Warnings.jsx b/src/components/Warnings/Warnings.jsx index 5007912501..96e53ca235 100644 --- a/src/components/Warnings/Warnings.jsx +++ b/src/components/Warnings/Warnings.jsx @@ -70,14 +70,9 @@ export default function Warning({ if (showTrackers) { setToggle(true); if (usersWarnings.length === 0) { - const index = Array.from(personId ?? '').reduce( - (acc, c) => acc + (c.codePointAt(0) ?? 0), - 0, - ); - const delay = index % 5000; const timer = setTimeout(() => { fetchUsersWarningsById(); - }, delay); + }, 100); return () => clearTimeout(timer); } } else { diff --git a/src/services/httpService.js b/src/services/httpService.js index 6defcfeaca..aa13323464 100644 --- a/src/services/httpService.js +++ b/src/services/httpService.js @@ -1,4 +1,4 @@ -import axios, { isCancel } from 'axios'; +import axios from 'axios'; import { toast } from 'react-toastify'; import logService from './logService'; @@ -9,14 +9,8 @@ if (axios.defaults && axios.defaults.headers && axios.defaults.headers.post) { if (axios.interceptors && axios.interceptors.response && axios.interceptors.response.use) { axios.interceptors.response.use(null, error => { if (!(error.response && error.response.status >= 400 && error.response.status <= 500)) { - if ( - !isCancel(error) && - error.code !== 'ERR_INSUFFICIENT_RESOURCES' && - error.code !== 'ERR_NETWORK' - ) { - logService.logError(error); - toast.error('An unexpected error occurred.'); - } + logService.logError(error); + toast.error('An unexpected error occurred.'); } return Promise.reject(error); });