diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 40787401f1ed..a0d1f611bb9b 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -50,6 +50,8 @@ function HeaderWithBackButton({
onThreeDotsButtonPress = () => {},
report,
policyAvatar,
+ policyAvatarSize = CONST.AVATAR_SIZE.DEFAULT,
+ titleStyles,
shouldShowReportAvatarWithDisplay = false,
shouldDisplayStatus,
shouldShowBackButton = true,
@@ -68,6 +70,7 @@ function HeaderWithBackButton({
subtitle = '',
title = '',
titleColor,
+ numberOfTitleLines = 1,
threeDotsAnchorAlignment = {
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
@@ -143,9 +146,9 @@ function HeaderWithBackButton({
@@ -167,6 +170,8 @@ function HeaderWithBackButton({
subtitle,
title,
titleColor,
+ titleStyles,
+ numberOfTitleLines,
translate,
openParentReportInCurrentTab,
shouldDisplayStatus,
@@ -276,14 +281,16 @@ function HeaderWithBackButton({
{!!policyAvatar &&
(policyAvatar.type === CONST.ICON_TYPE_WORKSPACE ? (
) : (
diff --git a/src/components/HeaderWithBackButton/types.ts b/src/components/HeaderWithBackButton/types.ts
index 8d3cfc6a9917..dcb38ed51984 100644
--- a/src/components/HeaderWithBackButton/types.ts
+++ b/src/components/HeaderWithBackButton/types.ts
@@ -3,6 +3,7 @@ import type {PopoverMenuItem} from '@components/PopoverMenu';
import type {Action} from '@hooks/useSingleExecution';
+import type CONST from '@src/CONST';
import type {StepCounterParams} from '@src/languages/params';
import type {TranslationPaths} from '@src/languages/types';
import type {Report} from '@src/types/onyx';
@@ -12,8 +13,9 @@ import type ChildrenProps from '@src/types/utils/ChildrenProps';
import type IconAsset from '@src/types/utils/IconAsset';
import type {ReactNode} from 'react';
-import type {StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
type ThreeDotsMenuItem = {
/** An icon element displayed on the left side */
@@ -163,6 +165,12 @@ type HeaderWithBackButtonProps = Partial & {
/** Policy avatar to display in the header */
policyAvatar?: Icon;
+ /** Size of the policy avatar. Defaults to CONST.AVATAR_SIZE.DEFAULT */
+ policyAvatarSize?: ValueOf;
+
+ /** Additional styles to apply to the title text */
+ titleStyles?: StyleProp;
+
/** Additional styles to add to the component */
style?: StyleProp;
diff --git a/src/pages/TeachersUnite/SaveTheWorldPage.tsx b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
index efc8af2bbc65..7409f8c1232d 100644
--- a/src/pages/TeachersUnite/SaveTheWorldPage.tsx
+++ b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
@@ -10,7 +10,6 @@ import SectionSubtitleHTML from '@components/SectionSubtitleHTML';
import useConfirmModal from '@hooks/useConfirmModal';
import useDocumentTitle from '@hooks/useDocumentTitle';
-import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -47,7 +46,6 @@ function SaveTheWorldPage() {
const theme = useTheme();
const {isActingAsDelegate} = useDelegateNoAccessState();
const {showDelegateNoAccessModal} = useDelegateNoAccessActions();
- const illustrations = useMemoizedLazyIllustrations(['TeachersUnite']);
const [personalOffsetsEnabled = false] = useOnyx(ONYXKEYS.NVP_PERSONAL_OFFSETS);
const [userBillingFundID] = useOnyx(ONYXKEYS.NVP_BILLING_FUND_ID);
const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
@@ -151,7 +149,6 @@ function SaveTheWorldPage() {
shouldDisplaySearchRouter
shouldDisplayHelpButton
onBackButtonPress={Navigation.goBack}
- icon={illustrations.TeachersUnite}
shouldUseHeadlineHeader
/>
diff --git a/src/pages/domain/Admins/DomainAdminsPage.tsx b/src/pages/domain/Admins/DomainAdminsPage.tsx
index 4ec454d9c775..885922570e4b 100644
--- a/src/pages/domain/Admins/DomainAdminsPage.tsx
+++ b/src/pages/domain/Admins/DomainAdminsPage.tsx
@@ -6,7 +6,7 @@ import DomainAdminsTable from '@components/Tables/DomainAdminsTable';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDomainDocumentTitle from '@hooks/useDomainDocumentTitle';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
@@ -47,7 +47,6 @@ function DomainAdminsPage({route}: DomainAdminsPageProps) {
const styles = useThemeStyles();
const theme = useTheme();
const {shouldUseNarrowLayout} = useResponsiveLayout();
- const illustrations = useMemoizedLazyIllustrations(['UserShield']);
const icons = useMemoizedLazyExpensifyIcons(['Gear', 'Plus', 'DotIndicator']);
const [adminAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
@@ -145,7 +144,6 @@ function DomainAdminsPage({route}: DomainAdminsPageProps) {
Navigation.goBack(ROUTES.DOMAINS_LIST.route)}
shouldDisplayHelpButton={shouldUseNarrowLayout}
/>
diff --git a/src/pages/domain/DomainSamlPage.tsx b/src/pages/domain/DomainSamlPage.tsx
index 70e16c9e018b..ff8b142e0757 100644
--- a/src/pages/domain/DomainSamlPage.tsx
+++ b/src/pages/domain/DomainSamlPage.tsx
@@ -94,8 +94,8 @@ function DomainSamlPage({route}: DomainSamlPageProps) {
>
diff --git a/src/pages/domain/Groups/DomainGroupsPage.tsx b/src/pages/domain/Groups/DomainGroupsPage.tsx
index e32539beb954..9c420936d8ee 100644
--- a/src/pages/domain/Groups/DomainGroupsPage.tsx
+++ b/src/pages/domain/Groups/DomainGroupsPage.tsx
@@ -5,7 +5,7 @@ import type {DomainGroupRowData} from '@components/Tables/DomainGroupsTable';
import DomainGroupsTable from '@components/Tables/DomainGroupsTable';
import useDomainDocumentTitle from '@hooks/useDomainDocumentTitle';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
@@ -46,7 +46,6 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
const icons = useMemoizedLazyExpensifyIcons(['Plus']);
const styles = useThemeStyles();
const {translate} = useLocalize();
- const illustrations = useMemoizedLazyIllustrations(['Members']);
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {isOffline} = useNetwork();
const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
@@ -114,7 +113,6 @@ function DomainGroupsPage({route}: DomainGroupsPageProps) {
diff --git a/src/pages/domain/Members/DomainMembersPage.tsx b/src/pages/domain/Members/DomainMembersPage.tsx
index 37c129232ce1..f5e5d9eaa1ec 100644
--- a/src/pages/domain/Members/DomainMembersPage.tsx
+++ b/src/pages/domain/Members/DomainMembersPage.tsx
@@ -56,7 +56,7 @@ function DomainMembersPage({route}: DomainMembersPageProps) {
const {domainAccountID} = route.params;
const {translate, formatPhoneNumber} = useLocalize();
const styles = useThemeStyles();
- const illustrations = useMemoizedLazyIllustrations(['Profile', 'LaptopWithMembers', 'LockClosed', 'BuildingCross', 'Encryption']);
+ const illustrations = useMemoizedLazyIllustrations(['LaptopWithMembers', 'LockClosed', 'BuildingCross', 'Encryption']);
const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Gear', 'DotIndicator', 'RemoveMembers', 'Download', 'Transfer']);
const {shouldUseNarrowLayout} = useResponsiveLayout();
const [selectedMembers, setSelectedMembers] = useState([]);
@@ -303,7 +303,6 @@ function DomainMembersPage({route}: DomainMembersPageProps) {
@@ -346,7 +345,6 @@ function DomainMembersPage({route}: DomainMembersPageProps) {
domainAccountID={domainAccountID}
members={members}
headerTitle={translate('domain.members.title')}
- headerIcon={illustrations.Profile}
headerContent={getHeaderButtons()}
selectedMembers={selectedMembers}
setSelectedMembers={setSelectedMembers}
diff --git a/src/pages/settings/AboutPage/AboutPage.tsx b/src/pages/settings/AboutPage/AboutPage.tsx
index ecd75048aaee..f360778bd116 100644
--- a/src/pages/settings/AboutPage/AboutPage.tsx
+++ b/src/pages/settings/AboutPage/AboutPage.tsx
@@ -8,7 +8,7 @@ import Text from '@components/Text';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDocumentTitle from '@hooks/useDocumentTitle';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -65,7 +65,6 @@ type MenuItem = WithSentryLabel & {
function AboutPage() {
const icons = useMemoizedLazyExpensifyIcons(['NewWindow', 'Link', 'Keyboard', 'Eye', 'MoneyBag', 'Bug']);
- const illustrations = useMemoizedLazyIllustrations(['PalmTree']);
const {translate} = useLocalize();
const styles = useThemeStyles();
const popoverAnchor = useRef(null);
@@ -175,7 +174,6 @@ function AboutPage() {
shouldDisplaySearchRouter
shouldDisplayHelpButton
onBackButtonPress={Navigation.goBack}
- icon={illustrations.PalmTree}
shouldUseHeadlineHeader
/>
diff --git a/src/pages/settings/Agents/AgentsPage.tsx b/src/pages/settings/Agents/AgentsPage.tsx
index 5b61973c8016..618688ffc52e 100644
--- a/src/pages/settings/Agents/AgentsPage.tsx
+++ b/src/pages/settings/Agents/AgentsPage.tsx
@@ -14,7 +14,7 @@ import useChatWithAgent from '@hooks/useChatWithAgent';
import useCleanupSelectedOptions from '@hooks/useCleanupSelectedOptions';
import useConfirmModal from '@hooks/useConfirmModal';
import useDocumentTitle from '@hooks/useDocumentTitle';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
@@ -52,7 +52,6 @@ function AgentsPage() {
const {isOffline} = useNetwork();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine();
- const illustrations = useMemoizedLazyIllustrations(['AiBot']);
const icons = useMemoizedLazyExpensifyIcons(['Plus', 'Trashcan']);
const chatWithAgent = useChatWithAgent();
const switchToDelegator = useSwitchToDelegator();
@@ -247,7 +246,6 @@ function AgentsPage() {
offlineIndicatorStyle={styles.mtAuto}
>
{
if (isMobileSelectionModeEnabled) {
clearSelectedAgents();
diff --git a/src/pages/settings/Copilot/CopilotPage.tsx b/src/pages/settings/Copilot/CopilotPage.tsx
index e9426477ac39..f4c1290b7926 100644
--- a/src/pages/settings/Copilot/CopilotPage.tsx
+++ b/src/pages/settings/Copilot/CopilotPage.tsx
@@ -58,7 +58,7 @@ const accountDelegationSelector = (accountValue: Account | undefined) => ({
function CopilotPage() {
const icons = useMemoizedLazyExpensifyIcons(['ArrowCircleClockwise', 'CircleSlash', 'Pencil', 'ThreeDots', 'UserPlus']);
- const illustrations = useMemoizedLazyIllustrations(['Copilots', 'Members']);
+ const illustrations = useMemoizedLazyIllustrations(['Copilots']);
const styles = useThemeStyles();
const {localeCompare, translate, formatPhoneNumber} = useLocalize();
const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -413,7 +413,6 @@ function CopilotPage() {
title={translate('delegate.copilot')}
shouldShowBackButton={shouldUseNarrowLayout}
onBackButtonPress={Navigation.goBack}
- icon={illustrations.Members}
shouldUseHeadlineHeader
shouldDisplaySearchRouter
shouldDisplayHelpButton
diff --git a/src/pages/settings/HelpPage/HelpPage.tsx b/src/pages/settings/HelpPage/HelpPage.tsx
index d75f1388bcfe..ae8eea8b00b2 100644
--- a/src/pages/settings/HelpPage/HelpPage.tsx
+++ b/src/pages/settings/HelpPage/HelpPage.tsx
@@ -33,7 +33,7 @@ import {View} from 'react-native';
function HelpPage() {
const icons = useMemoizedLazyExpensifyIcons(['ConciergeAvatar', 'NewWindow', 'Monitor']);
- const illustrations = useMemoizedLazyIllustrations(['Chalkboard', 'LifeRing', 'TopiaryDollarSign']);
+ const illustrations = useMemoizedLazyIllustrations(['Chalkboard', 'TopiaryDollarSign']);
const themeIllustrations = useThemeIllustrations();
const {translate} = useLocalize();
const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -194,7 +194,6 @@ function HelpPage() {
>
loadIllustration('Profile' as IllustrationName));
const icons = useMemoizedLazyExpensifyIcons(['QrCode']);
const contactMethodBrickRoadIndicator = getLoginListBrickRoadIndicator(loginList, currentUserPersonalDetails?.email);
@@ -205,7 +202,6 @@ function ProfilePage() {
shouldShowBackButton={shouldUseNarrowLayout}
shouldDisplaySearchRouter
shouldDisplayHelpButton
- icon={Profile}
shouldUseHeadlineHeader
/>
(), expenseRulesResult] = useOnyx(ONYXKEYS.NVP_EXPENSE_RULES);
@@ -169,7 +168,6 @@ function ExpenseRulesPage() {
offlineIndicatorStyle={styles.mtAuto}
>
{
if (isMobileSelectionModeEnabled) {
setSelectedRules([]);
diff --git a/src/pages/settings/Security/SecuritySettingsPage.tsx b/src/pages/settings/Security/SecuritySettingsPage.tsx
index 77c4675bcbc4..263d19b6619d 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.tsx
+++ b/src/pages/settings/Security/SecuritySettingsPage.tsx
@@ -12,7 +12,7 @@ import useConfirmModal from '@hooks/useConfirmModal';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDocumentTitle from '@hooks/useDocumentTitle';
import useIsAgentAccount from '@hooks/useIsAgentAccount';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
@@ -57,7 +57,6 @@ type BaseMenuItemType = WithSentryLabel & {
function SecuritySettingsPage() {
const icons = useMemoizedLazyExpensifyIcons(['ArrowCollapse', 'ClosedSign', 'Fingerprint', 'Monitor', 'Shield', 'UserLock']);
- const illustrations = useMemoizedLazyIllustrations(['LockClosed']);
const securitySettingsIllustration = useSecuritySettingsSectionIllustration();
const styles = useThemeStyles();
const {translate} = useLocalize();
@@ -290,7 +289,6 @@ function SecuritySettingsPage() {
title={translate('initialSettingsPage.security')}
shouldShowBackButton={shouldUseNarrowLayout}
onBackButtonPress={Navigation.goBack}
- icon={illustrations.LockClosed}
shouldUseHeadlineHeader
shouldDisplaySearchRouter
shouldDisplayHelpButton
diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
index 18de841b647b..5ddfdfd02d4e 100644
--- a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
@@ -4,7 +4,6 @@ import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import useDocumentTitle from '@hooks/useDocumentTitle';
-import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -33,7 +32,6 @@ function SubscriptionSettingsPage({route}: SubscriptionSettingsPageProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const subscriptionPlan = useSubscriptionPlan();
- const illustrations = useMemoizedLazyIllustrations(['CreditCardsNew']);
useDocumentTitle(translate('workspace.common.subscription'));
useEffect(() => {
openSubscriptionPage();
@@ -74,7 +72,6 @@ function SubscriptionSettingsPage({route}: SubscriptionSettingsPageProps) {
shouldShowBackButton={shouldUseNarrowLayout}
shouldDisplaySearchRouter
shouldDisplayHelpButton
- icon={illustrations.CreditCardsNew}
shouldUseHeadlineHeader
/>
diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index dc34228b0c04..35204b8d59e0 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -16,7 +16,7 @@ import TestToolRow from '@components/TestToolRow';
import useConfirmModal from '@hooks/useConfirmModal';
import useDocumentTitle from '@hooks/useDocumentTitle';
import useEnvironment from '@hooks/useEnvironment';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -60,7 +60,6 @@ type BaseMenuItem = WithSentryLabel & {
function TroubleshootPage() {
const icons = useMemoizedLazyExpensifyIcons(['Download', 'ExpensifyLogoNew', 'RotateLeft']);
- const illustrations = useMemoizedLazyIllustrations(['Lightbulb']);
const troubleshootIllustration = useTroubleshootSectionIllustration();
const {translate} = useLocalize();
const styles = useThemeStyles();
@@ -203,7 +202,6 @@ function TroubleshootPage() {
shouldDisplaySearchRouter
shouldDisplayHelpButton
onBackButtonPress={Navigation.goBack}
- icon={illustrations.Lightbulb}
shouldUseHeadlineHeader
/>
diff --git a/src/pages/settings/Wallet/WalletPage/index.tsx b/src/pages/settings/Wallet/WalletPage/index.tsx
index 122caf8a0f72..550186c485ed 100644
--- a/src/pages/settings/Wallet/WalletPage/index.tsx
+++ b/src/pages/settings/Wallet/WalletPage/index.tsx
@@ -114,7 +114,7 @@ function WalletPage() {
const hasSinglePolicy = activeAdminPolicies.length === 1;
const icons = useMemoizedLazyExpensifyIcons(['MoneySearch', 'Wallet', 'Transfer', 'Hourglass', 'Exclamation', 'Star', 'Trashcan', 'Globe', 'UserPlus', 'UserMinus', 'Table', 'Plus']);
- const illustrations = useMemoizedLazyIllustrations(['MoneyIntoWallet', 'VerticalCreditCards']);
+ const illustrations = useMemoizedLazyIllustrations(['VerticalCreditCards']);
const walletIllustration = useWalletSectionIllustration();
const theme = useTheme();
@@ -439,7 +439,6 @@ function WalletPage() {
const headerWithBackButton = (
Navigation.goBack(route.params?.backTo ?? ROUTES.WORKSPACES_LIST.route)}
policyAvatar={policyAvatar}
+ policyAvatarSize={CONST.AVATAR_SIZE.SMALL}
shouldDisplayHelpButton={shouldUseNarrowLayout}
/>
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 5a22fe6b70b1..4349da8316b0 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -16,7 +16,7 @@ import TextLink from '@components/TextLink';
import useConfirmModal from '@hooks/useConfirmModal';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useHRSyncResultsModal from '@hooks/useHRSyncResultsModal';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
@@ -143,7 +143,6 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
const policyID = route.params.policyID;
const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`);
const [invitedEmailsToAccountIDsDraft] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`);
- const illustrations = useMemoizedLazyIllustrations(['ReceiptWrangler', 'EmptyShelves']);
const accountIDs = useMemo(() => Object.values(policyMemberEmailsToAccountIDs ?? {}).map((accountID) => Number(accountID)), [policyMemberEmailsToAccountIDs]);
const prevAccountIDs = usePrevious(accountIDs);
@@ -764,7 +763,6 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
{
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
index 6cf87d5324f8..34bd49e1f68f 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
@@ -5,7 +5,6 @@ import type {WorkspaceCompanyCardsTableHandle} from '@components/Tables/Workspac
import useAssignCard from '@hooks/useAssignCard';
import useCompanyCards from '@hooks/useCompanyCards';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
@@ -37,7 +36,6 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
const policyID = route.params.policyID;
const {translate} = useLocalize();
const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
- const memoizedIllustrations = useMemoizedLazyIllustrations(['CompanyCard']);
const {shouldUseNarrowLayout} = useResponsiveLayout();
const isMobileSelectionModeEnabled = useMobileSelectionMode();
const companyCardsTableRef = useRef(null);
@@ -121,7 +119,6 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
policyFeature={CONST.POLICY.POLICY_FEATURE.COMPANY_CARDS}
>
loadIllustration('CarIce' as IllustrationName));
const customUnit = useMemo(() => getDistanceRateCustomUnit(policy), [policy]);
const customUnitRates: Record = useMemo(() => customUnit?.rates ?? {}, [customUnit?.rates]);
@@ -456,7 +453,6 @@ function PolicyDistanceRatesPage({
shouldShowOfflineIndicatorInWideScreen
>
();
const {showConfirmModal} = useConfirmModal();
@@ -140,7 +139,6 @@ function WorkspaceHRPage({
/>
)}
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
index f637812627b4..65ad37b331e7 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
@@ -14,7 +14,7 @@ import useCleanupSelectedOptions from '@hooks/useCleanupSelectedOptions';
import useConfirmModal from '@hooks/useConfirmModal';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useFilteredSelection from '@hooks/useFilteredSelection';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
@@ -104,7 +104,6 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
useWorkspaceDocumentTitle(policy?.name, 'workspace.common.perDiem');
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
const isMobileSelectionModeEnabled = useMobileSelectionMode();
- const illustrations = useMemoizedLazyIllustrations(['PerDiem']);
const expensifyIcons = useMemoizedLazyExpensifyIcons(['Gear', 'Table', 'Download', 'Trashcan']);
const [customUnit, allSubRates] = useMemo(() => {
@@ -385,7 +384,6 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
{
diff --git a/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx b/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
index 2b423191e565..2d073abdc913 100644
--- a/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
+++ b/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
@@ -1,8 +1,6 @@
import Button from '@components/ButtonComposed';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import {loadIllustration} from '@components/Icon/IllustrationLoader';
-import type {IllustrationName} from '@components/Icon/IllustrationLoader';
import MenuItem from '@components/MenuItem';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import {ModalActions} from '@components/Modal/Global/ModalContext';
@@ -14,7 +12,7 @@ import ThreeDotsMenu from '@components/ThreeDotsMenu';
import useConfirmModal from '@hooks/useConfirmModal';
import useGetReceiptPartnersIntegrationData from '@hooks/useGetReceiptPartnersIntegrationData';
-import {useMemoizedLazyAsset, useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import usePolicy from '@hooks/usePolicy';
@@ -67,7 +65,6 @@ function WorkspaceReceiptPartnersPage({route}: WorkspaceReceiptPartnersPageProps
const isAutoRemove = !!integrations?.uber?.autoRemove;
const isAutoInvite = !!integrations?.uber?.autoInvite;
const centralBillingAccountEmail = !!integrations?.uber?.centralBillingAccountEmail;
- const {asset: ReceiptPartners} = useMemoizedLazyAsset(() => loadIllustration('ReceiptPartners' as IllustrationName));
// Track focus and connection change to route to the invite flow once after successful connection
const prevIsUberConnected = usePrevious(isUberConnected);
const {canWrite: canWriteMoreFeatures, showReadOnlyModal, withReadOnlyFallback} = usePolicyFeatureWriteAccess(policy, CONST.POLICY.POLICY_FEATURE.MORE_FEATURES);
@@ -309,7 +306,6 @@ function WorkspaceReceiptPartnersPage({route}: WorkspaceReceiptPartnersPageProps
{
@@ -222,7 +221,6 @@ function WorkspaceReportFieldsPage({
offlineIndicatorStyle={styles.mtAuto}
>
{
if (isMultiLevelTags) {
@@ -842,7 +841,6 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
offlineIndicatorStyle={styles.mtAuto}
>
!policy?.taxRates?.taxes[taxID]?.isDisabled).length;
const disabledRatesCount = selectedTaxesIDs.length - enabledRatesCount;
const icons = useMemoizedLazyExpensifyIcons(['Checkmark', 'Close', 'Gear', 'Plus', 'Trashcan']);
- const illustrations = useMemoizedLazyIllustrations(['Coins']);
const fetchTaxes = useCallback(() => {
openPolicyTaxesPage(policyID);
@@ -385,7 +384,6 @@ function WorkspaceTaxesPage({
offlineIndicatorStyle={styles.mtAuto}
>
topBarLabel: {
color: theme.text,
- fontSize: variables.fontSizeXLarge,
+ fontSize: variables.fontSizeH2,
+ lineHeight: variables.lineHeightSizeH2,
...headlineFont,
},
diff --git a/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx b/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx
index 06566c269722..e26a32475b30 100644
--- a/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx
+++ b/tests/ui/WorkspaceCompanyCardsPageSelectionModeTest.tsx
@@ -205,7 +205,7 @@ describe('WorkspaceCompanyCardsPage selection mode', () => {
render(getWorkspaceCompanyCardsPage());
expect(screen.getByText('workspace.common.companyCards')).toBeTruthy();
- expect(screen.getByTestId('WorkspaceCompanyCardsPageIcon')).toBeTruthy();
+ expect(screen.queryByTestId('WorkspaceCompanyCardsPageIcon')).toBeNull();
expect(screen.getByText('true')).toBeTruthy();
expect(mockTableProps.current?.isSelectionModeEnabled).toBe(false);
});