From 06452061a120c0052cdfa0ec040891f2070b83f3 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 01:06:11 +0400 Subject: [PATCH 01/38] refactor: replace ExpensifyWordmark --- src/components/Breadcrumbs.tsx | 5 +++-- .../DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.tsx | 5 +++-- src/components/DistanceEReceipt.tsx | 5 +++-- src/components/EReceipt.tsx | 7 ++++--- src/components/Icon/Expensicons.ts | 2 -- src/components/PerDiemEReceipt.tsx | 6 +++--- src/components/QRShare/index.tsx | 5 +++-- src/components/SAMLLoadingIndicator.tsx | 5 +++-- src/components/ValidateCode/ExpiredValidateCodeModal.tsx | 5 +++-- src/components/ValidateCode/JustSignedInModal.tsx | 5 +++-- src/pages/ConnectionCompletePage.tsx | 4 +++- src/pages/ErrorPage/GenericErrorPage.tsx | 5 +++-- src/pages/ErrorPage/SessionExpiredPage.tsx | 5 +++-- 13 files changed, 37 insertions(+), 27 deletions(-) diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx index 874184ddabed..6c88e2adaca7 100644 --- a/src/components/Breadcrumbs.tsx +++ b/src/components/Breadcrumbs.tsx @@ -1,7 +1,7 @@ import React from 'react'; import type {StyleProp, ViewStyle} from 'react-native'; import {PixelRatio, View} from 'react-native'; -import LogoComponent from '@assets/images/expensify-wordmark.svg'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import variables from '@styles/variables'; @@ -35,6 +35,7 @@ type BreadcrumbsProps = { function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) { const theme = useTheme(); const styles = useThemeStyles(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const [primaryBreadcrumb, secondaryBreadcrumb] = breadcrumbs; const isRootBreadcrumb = primaryBreadcrumb.type === CONST.BREADCRUMB_TYPE.ROOT; const fontScale = PixelRatio.getFontScale() > CONST.LOGO_MAX_SCALE ? CONST.LOGO_MAX_SCALE : PixelRatio.getFontScale(); @@ -46,7 +47,7 @@ function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) { title={ @@ -47,7 +48,7 @@ function DeeplinkRedirectLoadingIndicator({openLinkInBrowser}: DeeplinkRedirectL width={154} height={34} fill={theme.success} - src={Expensicons.ExpensifyWordmark} + src={icons.ExpensifyWordmark} /> diff --git a/src/components/DistanceEReceipt.tsx b/src/components/DistanceEReceipt.tsx index 9a1463c2506f..296619da9247 100644 --- a/src/components/DistanceEReceipt.tsx +++ b/src/components/DistanceEReceipt.tsx @@ -1,6 +1,7 @@ import React, {useMemo} from 'react'; import {View} from 'react-native'; import EReceiptBackground from '@assets/images/eReceipt_background.svg'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import {convertToDisplayString} from '@libs/CurrencyUtils'; @@ -12,7 +13,6 @@ import type {TranslationPaths} from '@src/languages/types'; import type {Transaction} from '@src/types/onyx'; import type {WaypointCollection} from '@src/types/onyx/Transaction'; import Icon from './Icon'; -import * as Expensicons from './Icon/Expensicons'; import ImageSVG from './ImageSVG'; import PendingMapView from './MapView/PendingMapView'; import ReceiptImage from './ReceiptImage'; @@ -30,6 +30,7 @@ type DistanceEReceiptProps = { function DistanceEReceipt({transaction, hoverPreview = false}: DistanceEReceiptProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const thumbnail = hasReceipt(transaction) ? getThumbnailAndImageURIs(transaction).thumbnail : null; const {amount: transactionAmount, currency: transactionCurrency, merchant: transactionMerchant, created: transactionDate} = getTransactionDetails(transaction) ?? {}; const formattedTransactionAmount = convertToDisplayString(transactionAmount, transactionCurrency); @@ -101,7 +102,7 @@ function DistanceEReceipt({transaction, hoverPreview = false}: DistanceEReceiptP {translate('eReceipt.guaranteed')} diff --git a/src/components/EReceipt.tsx b/src/components/EReceipt.tsx index 75a156e25a24..2ad7ad89467d 100644 --- a/src/components/EReceipt.tsx +++ b/src/components/EReceipt.tsx @@ -1,6 +1,7 @@ import React, {useEffect, useRef} from 'react'; import {View} from 'react-native'; import useEReceipt from '@hooks/useEReceipt'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -15,7 +16,6 @@ import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type Transaction from '@src/types/onyx/Transaction'; import Icon from './Icon'; -import * as Expensicons from './Icon/Expensicons'; import ImageSVG from './ImageSVG'; import type {TransactionListItemType} from './SelectionListWithSections/types'; import Text from './Text'; @@ -41,6 +41,7 @@ function EReceipt({transactionID, transactionItem, onLoad, isThumbnail = false}: const StyleUtils = useStyleUtils(); const {translate} = useLocalize(); const theme = useTheme(); + const icons = useMemoizedLazyExpensifyIcons(['ReceiptBody', 'ExpensifyWordmark'] as const); const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true}); const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true}); @@ -87,7 +88,7 @@ function EReceipt({transactionID, transactionItem, onLoad, isThumbnail = false}: @@ -157,7 +158,7 @@ function EReceipt({transactionID, transactionItem, onLoad, isThumbnail = false}: width={variables.eReceiptWordmarkWidth} height={variables.eReceiptWordmarkHeight} fill={secondaryColor} - src={Expensicons.ExpensifyWordmark} + src={icons.ExpensifyWordmark} /> diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 1a885a21901c..83597ce9553c 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -82,7 +82,6 @@ import ExpensifyCard from '@assets/images/expensify-card-icon.svg'; import ExpensifyFooterLogoVertical from '@assets/images/expensify-footer-logo-vertical.svg'; import ExpensifyFooterLogo from '@assets/images/expensify-footer-logo.svg'; import ExpensifyLogoNew from '@assets/images/expensify-logo-new.svg'; -import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; import Eye from '@assets/images/eye.svg'; @@ -290,7 +289,6 @@ export { Exit, ExpensifyAppIcon, ExpensifyCard, - ExpensifyWordmark, ExpensifyFooterLogo, ExpensifyFooterLogoVertical, Expand, diff --git a/src/components/PerDiemEReceipt.tsx b/src/components/PerDiemEReceipt.tsx index 4d924a394912..4b0271fd9ee1 100644 --- a/src/components/PerDiemEReceipt.tsx +++ b/src/components/PerDiemEReceipt.tsx @@ -1,5 +1,6 @@ import React from 'react'; import {View} from 'react-native'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -13,7 +14,6 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type {TransactionCustomUnit} from '@src/types/onyx/Transaction'; import EReceiptThumbnail from './EReceiptThumbnail'; import Icon from './Icon'; -import * as Expensicons from './Icon/Expensicons'; import Text from './Text'; type PerDiemEReceiptProps = { @@ -52,6 +52,7 @@ function PerDiemEReceipt({transactionID}: PerDiemEReceiptProps) { const styles = useThemeStyles(); const StyleUtils = useStyleUtils(); const {translate} = useLocalize(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, { canBeMissing: true, }); @@ -108,8 +109,7 @@ function PerDiemEReceipt({transactionID}: PerDiemEReceiptProps) { {translate('eReceipt.guaranteed')} diff --git a/src/components/QRShare/index.tsx b/src/components/QRShare/index.tsx index d7d60e0ccd3a..001541ae5cff 100644 --- a/src/components/QRShare/index.tsx +++ b/src/components/QRShare/index.tsx @@ -2,10 +2,10 @@ import React, {useImperativeHandle, useRef, useState} from 'react'; import type {LayoutChangeEvent} from 'react-native'; import {View} from 'react-native'; import type {Svg} from 'react-native-svg'; -import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg'; import ImageSVG from '@components/ImageSVG'; import QRCode from '@components/QRCode'; import Text from '@components/Text'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -33,6 +33,7 @@ function QRShare({ const {shouldUseNarrowLayout} = useResponsiveLayout(); const {windowWidth} = useWindowDimensions(); const qrCodeContainerWidth = shouldUseNarrowLayout ? windowWidth : variables.sideBarWidth; + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const [qrCodeSize, setQrCodeSize] = useState(qrCodeContainerWidth - styles.ph5.paddingHorizontal * 2 - variables.qrShareHorizontalPadding * 2); const svgRef = useRef(undefined); @@ -59,7 +60,7 @@ function QRShare({ diff --git a/src/components/SAMLLoadingIndicator.tsx b/src/components/SAMLLoadingIndicator.tsx index 2be7b76e6cae..9506d86c330a 100644 --- a/src/components/SAMLLoadingIndicator.tsx +++ b/src/components/SAMLLoadingIndicator.tsx @@ -1,11 +1,11 @@ import React from 'react'; import {StyleSheet, View} from 'react-native'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import variables from '@styles/variables'; import Icon from './Icon'; -import * as Expensicons from './Icon/Expensicons'; import * as Illustrations from './Icon/Illustrations'; import Text from './Text'; @@ -13,6 +13,7 @@ function SAMLLoadingIndicator() { const theme = useTheme(); const styles = useThemeStyles(); const {translate} = useLocalize(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); return ( @@ -38,7 +39,7 @@ function SAMLLoadingIndicator() { width={154} height={34} fill={theme.success} - src={Expensicons.ExpensifyWordmark} + src={icons.ExpensifyWordmark} /> diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx index 18172544d9d1..b29322de46e7 100644 --- a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx +++ b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx @@ -1,10 +1,10 @@ import React from 'react'; import {View} from 'react-native'; import Icon from '@components/Icon'; -import * as Expensicons from '@components/Icon/Expensicons'; import * as Illustrations from '@components/Icon/Illustrations'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useTheme from '@hooks/useTheme'; @@ -19,6 +19,7 @@ function ExpiredValidateCodeModal() { const styles = useThemeStyles(); const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS); const {translate} = useLocalize(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); return ( @@ -54,7 +55,7 @@ function ExpiredValidateCodeModal() { width={variables.modalWordmarkWidth} height={variables.modalWordmarkHeight} fill={theme.success} - src={Expensicons.ExpensifyWordmark} + src={icons.ExpensifyWordmark} /> diff --git a/src/components/ValidateCode/JustSignedInModal.tsx b/src/components/ValidateCode/JustSignedInModal.tsx index 527493c778cb..a57c6f750572 100644 --- a/src/components/ValidateCode/JustSignedInModal.tsx +++ b/src/components/ValidateCode/JustSignedInModal.tsx @@ -1,10 +1,10 @@ import React from 'react'; import {View} from 'react-native'; import Icon from '@components/Icon'; -import * as Expensicons from '@components/Icon/Expensicons'; import Lottie from '@components/Lottie'; import LottieAnimations from '@components/LottieAnimations'; import Text from '@components/Text'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -19,6 +19,7 @@ function JustSignedInModal({is2FARequired}: JustSignedInModalProps) { const theme = useTheme(); const styles = useThemeStyles(); const {translate} = useLocalize(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); return ( @@ -43,7 +44,7 @@ function JustSignedInModal({is2FARequired}: JustSignedInModalProps) { width={variables.modalWordmarkWidth} height={variables.modalWordmarkHeight} fill={theme.success} - src={Expensicons.ExpensifyWordmark} + src={icons.ExpensifyWordmark} /> diff --git a/src/pages/ConnectionCompletePage.tsx b/src/pages/ConnectionCompletePage.tsx index f41fa1dc3686..fb8cde56052c 100644 --- a/src/pages/ConnectionCompletePage.tsx +++ b/src/pages/ConnectionCompletePage.tsx @@ -3,6 +3,7 @@ import {View} from 'react-native'; import Icon from '@components/Icon'; import * as Expensicons from '@components/Icon/Expensicons'; import Text from '@components/Text'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -12,6 +13,7 @@ function ConnectionCompletePage() { const theme = useTheme(); const styles = useThemeStyles(); const {translate} = useLocalize(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); return ( @@ -32,7 +34,7 @@ function ConnectionCompletePage() { width={variables.modalWordmarkWidth} height={variables.modalWordmarkHeight} fill={theme.success} - src={Expensicons.ExpensifyWordmark} + src={icons.ExpensifyWordmark} /> diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx index b9366174d652..311b0d6c5d93 100644 --- a/src/pages/ErrorPage/GenericErrorPage.tsx +++ b/src/pages/ErrorPage/GenericErrorPage.tsx @@ -1,6 +1,5 @@ import React from 'react'; import {View} from 'react-native'; -import LogoWordmark from '@assets/images/expensify-wordmark.svg'; import Button from '@components/Button'; import Icon from '@components/Icon'; import * as Expensicons from '@components/Icon/Expensicons'; @@ -9,6 +8,7 @@ import SafeAreaConsumer from '@components/SafeAreaConsumer'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; import useIsAuthenticated from '@hooks/useIsAuthenticated'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import usePageRefresh from '@hooks/usePageRefresh'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -25,6 +25,7 @@ function GenericErrorPage({error}: {error?: Error}) { const StyleUtils = useStyleUtils(); const isAuthenticated = useIsAuthenticated(); const {translate} = useLocalize(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const isChunkLoadError = error?.name === CONST.CHUNK_LOAD_ERROR || /Loading chunk [\d]+ failed/.test(error?.message ?? ''); const refreshPage = usePageRefresh(); @@ -82,7 +83,7 @@ function GenericErrorPage({error}: {error?: Error}) { @@ -46,7 +47,7 @@ function SessionExpiredPage() { width={154} height={34} fill={theme.success} - src={Expensicons.ExpensifyWordmark} + src={icons.ExpensifyWordmark} /> From 980d651b05b65ccc063461185973a10b311c3f64 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 01:44:14 +0400 Subject: [PATCH 02/38] refactor: migrate 'ExpensifyLogoNew' --- src/components/Icon/Expensicons.ts | 2 -- src/pages/settings/Troubleshoot/TroubleshootPage.tsx | 10 ++++++---- src/stories/PromotedActionBar.stories.tsx | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 83597ce9553c..0fb07b2f309b 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -81,7 +81,6 @@ import ExpensifyAppIcon from '@assets/images/expensify-app-icon.svg'; import ExpensifyCard from '@assets/images/expensify-card-icon.svg'; import ExpensifyFooterLogoVertical from '@assets/images/expensify-footer-logo-vertical.svg'; import ExpensifyFooterLogo from '@assets/images/expensify-footer-logo.svg'; -import ExpensifyLogoNew from '@assets/images/expensify-logo-new.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; import Eye from '@assets/images/eye.svg'; @@ -344,7 +343,6 @@ export { MoneyHourglass, Monitor, Mute, - ExpensifyLogoNew, NewWindow, NewWorkspace, NotificationsAvatar, diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx index b0ae441d15ad..7fba082fcb1d 100644 --- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx +++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx @@ -1,7 +1,6 @@ import {differenceInDays} from 'date-fns'; import React, {useCallback, useMemo, useState} from 'react'; import {View} from 'react-native'; -import type {SvgProps} from 'react-native-svg'; import ConfirmModal from '@components/ConfirmModal'; import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -21,6 +20,7 @@ import Switch from '@components/Switch'; import TestToolMenu from '@components/TestToolMenu'; import TestToolRow from '@components/TestToolRow'; import useEnvironment from '@hooks/useEnvironment'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; @@ -38,10 +38,11 @@ import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import type IconAsset from '@src/types/utils/IconAsset'; type BaseMenuItem = { translationKey: TranslationPaths; - icon: React.FC; + icon: IconAsset; action: () => void | Promise; }; @@ -49,6 +50,7 @@ function TroubleshootPage() { const {translate} = useLocalize(); const styles = useThemeStyles(); const {isProduction} = useEnvironment(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyLogoNew'] as const); const [isConfirmationModalVisible, setIsConfirmationModalVisible] = useState(false); const waitForNavigate = useWaitForNavigation(); const {shouldUseNarrowLayout} = useResponsiveLayout(); @@ -82,7 +84,7 @@ function TroubleshootPage() { return { translationKey: 'exitSurvey.goToExpensifyClassic', - icon: Expensicons.ExpensifyLogoNew, + icon: icons.ExpensifyLogoNew, ...(CONFIG.IS_HYBRID_APP ? { action: () => closeReactNativeApp({shouldSetNVP: true}), @@ -104,7 +106,7 @@ function TroubleshootPage() { }, }), }; - }, [tryNewDot?.classicRedirect?.isLockedToNewDot, surveyCompletedWithinLastMonth, shouldOpenSurveyReasonPage]); + }, [tryNewDot?.classicRedirect?.isLockedToNewDot, icons.ExpensifyLogoNew, surveyCompletedWithinLastMonth, shouldOpenSurveyReasonPage]); const menuItems = useMemo(() => { const debugConsoleItem: BaseMenuItem = { diff --git a/src/stories/PromotedActionBar.stories.tsx b/src/stories/PromotedActionBar.stories.tsx index 2dd81d8b5945..f505c68a5a54 100644 --- a/src/stories/PromotedActionBar.stories.tsx +++ b/src/stories/PromotedActionBar.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {View} from 'react-native'; -import * as Expensicons from '@components/Icon/Expensicons'; +import {getExpensifyIcon} from '@components/Icon/chunks/expensify-icons.chunk'; import PromotedActionsBar from '@components/PromotedActionsBar'; import type {PromotedAction, PromotedActionsBarProps} from '@components/PromotedActionsBar'; import variables from '@src/styles/variables'; @@ -33,19 +33,19 @@ function Template(args: PromotedActionsBarProps) { const promotedActions = [ { key: 'join', - icon: Expensicons.CommentBubbles, + icon: getExpensifyIcon('CommentBubbles'), text: 'Join', onSelected: () => {}, }, { key: 'pin', - icon: Expensicons.Pin, + icon: getExpensifyIcon('Pin'), text: 'Pin', onSelected: () => {}, }, { key: 'share', - icon: Expensicons.QrCode, + icon: getExpensifyIcon('QrCode'), text: 'Share', onSelected: () => {}, }, @@ -53,7 +53,7 @@ const promotedActions = [ const defaultPromotedAction = { key: '', - icon: Expensicons.ExpensifyLogoNew, + icon: getExpensifyIcon('ExpensifyLogoNew'), text: '', onSelected: () => {}, }; From 9b897b4abb8caddd5214a7d6d1a433f050aa5b11 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 01:46:41 +0400 Subject: [PATCH 03/38] refactor: migrate ExpensifyFooterLogo --- src/components/Icon/Expensicons.ts | 4 ---- src/pages/signin/SignInPageLayout/Footer.tsx | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 0fb07b2f309b..55fa38910403 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -79,8 +79,6 @@ import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; import ExpensifyAppIcon from '@assets/images/expensify-app-icon.svg'; import ExpensifyCard from '@assets/images/expensify-card-icon.svg'; -import ExpensifyFooterLogoVertical from '@assets/images/expensify-footer-logo-vertical.svg'; -import ExpensifyFooterLogo from '@assets/images/expensify-footer-logo.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; import Eye from '@assets/images/eye.svg'; @@ -288,8 +286,6 @@ export { Exit, ExpensifyAppIcon, ExpensifyCard, - ExpensifyFooterLogo, - ExpensifyFooterLogoVertical, Expand, Export, Eye, diff --git a/src/pages/signin/SignInPageLayout/Footer.tsx b/src/pages/signin/SignInPageLayout/Footer.tsx index c0ced49a3d23..c919a18641a3 100644 --- a/src/pages/signin/SignInPageLayout/Footer.tsx +++ b/src/pages/signin/SignInPageLayout/Footer.tsx @@ -3,11 +3,11 @@ import type {StyleProp, TextStyle} from 'react-native'; import {View} from 'react-native'; import SignInGradient from '@assets/images/home-fade-gradient--mobile.svg'; import Hoverable from '@components/Hoverable'; -import * as Expensicons from '@components/Icon/Expensicons'; import ImageSVG from '@components/ImageSVG'; import Text from '@components/Text'; import type {LinkProps, PressProps} from '@components/TextLink'; import TextLink from '@components/TextLink'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -148,6 +148,7 @@ function Footer({navigateFocus}: FooterProps) { const StyleUtils = useStyleUtils(); const {translate} = useLocalize(); const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyFooterLogo', 'ExpensifyFooterLogoVertical'] as const); const isVertical = shouldUseNarrowLayout; const imageDirection = isVertical ? styles.flexRow : styles.flexColumn; const imageStyle = isVertical ? styles.pr0 : styles.alignSelfCenter; @@ -216,10 +217,10 @@ function Footer({navigateFocus}: FooterProps) { {!isVertical ? ( - + ) : ( From 2c5ddb7b4860ba4b6e43565af3afc2ac04e2d4bd Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 01:49:38 +0400 Subject: [PATCH 04/38] refactor: remove unused ExpensifyAppIcon --- src/components/Icon/Expensicons.ts | 2 -- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 1 - 2 files changed, 3 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 55fa38910403..3018257096c1 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -77,7 +77,6 @@ import EReceiptIcon from '@assets/images/eReceiptIcon.svg'; import Exclamation from '@assets/images/exclamation.svg'; import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; -import ExpensifyAppIcon from '@assets/images/expensify-app-icon.svg'; import ExpensifyCard from '@assets/images/expensify-card-icon.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; @@ -284,7 +283,6 @@ export { EmptyStateRoutePending, Exclamation, Exit, - ExpensifyAppIcon, ExpensifyCard, Expand, Export, diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index 727ab1b372a7..da4159369d4a 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -8,7 +8,6 @@ import ConfirmModal from '@components/ConfirmModal'; import FormHelpMessage from '@components/FormHelpMessage'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import Icon from '@components/Icon'; -import * as Expensicons from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import MenuItemList from '@components/MenuItemList'; import type {MenuItemWithLink} from '@components/MenuItemList'; From 0f096a84f095a70415bd35d150cbe610cf6ef2d4 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 01:53:11 +0400 Subject: [PATCH 05/38] refactor: migrate ExpensifyCard --- src/components/Icon/Expensicons.ts | 2 -- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 3018257096c1..40e056d9a3dc 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -77,7 +77,6 @@ import EReceiptIcon from '@assets/images/eReceiptIcon.svg'; import Exclamation from '@assets/images/exclamation.svg'; import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; -import ExpensifyCard from '@assets/images/expensify-card-icon.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; import Eye from '@assets/images/eye.svg'; @@ -283,7 +282,6 @@ export { EmptyStateRoutePending, Exclamation, Exit, - ExpensifyCard, Expand, Export, Eye, diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index da4159369d4a..3071d9b82879 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -8,6 +8,7 @@ import ConfirmModal from '@components/ConfirmModal'; import FormHelpMessage from '@components/FormHelpMessage'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import Icon from '@components/Icon'; +import * as Expensicons from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import MenuItemList from '@components/MenuItemList'; import type {MenuItemWithLink} from '@components/MenuItemList'; @@ -21,7 +22,7 @@ import ThreeDotsMenu from '@components/ThreeDotsMenu'; import type ThreeDotsMenuProps from '@components/ThreeDotsMenu/types'; import useEnvironment from '@hooks/useEnvironment'; import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds'; -import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; +import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -91,6 +92,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { const allCardSettings = useExpensifyCardFeeds(policyID); const isSyncInProgress = isConnectionInProgress(connectionSyncProgress, policy); const illustrations = useMemoizedLazyIllustrations(['Accounting'] as const); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyCard'] as const); const connectionNames = CONST.POLICY.CONNECTIONS.NAME; const accountingIntegrations = Object.values(connectionNames); @@ -348,7 +350,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { ...(shouldShowCardReconciliationOption ? [ { - icon: Expensicons.ExpensifyCard, + icon: icons.ExpensifyCard, iconRight: Expensicons.ArrowRight, shouldShowRightIcon: true, title: translate('workspace.accounting.cardReconciliation'), @@ -419,6 +421,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { startIntegrationFlow, popoverAnchorRefs, datetimeToRelative, + icons.ExpensifyCard, ]); const otherIntegrationsItems = useMemo(() => { From 8b10c0ffeb52d6d095da4a51c5f2e46126015976 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 01:56:13 +0400 Subject: [PATCH 06/38] refactor: migrate Apple and Google logos --- src/components/Icon/Expensicons.ts | 4 --- src/components/SignInButtons/IconButton.tsx | 38 +++++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 40e056d9a3dc..e9dc5367bebd 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -175,8 +175,6 @@ import RotateLeft from '@assets/images/rotate-left.svg'; import Scan from '@assets/images/scan.svg'; import Send from '@assets/images/send.svg'; import Shield from '@assets/images/shield.svg'; -import AppleLogo from '@assets/images/signIn/apple-logo.svg'; -import GoogleLogo from '@assets/images/signIn/google-logo.svg'; import AdvancedApprovalsSquare from '@assets/images/simple-illustrations/advanced-approvals-icon-square.svg'; import MessageInABottle from '@assets/images/simple-illustrations/simple-illustration__messageinabottle.svg'; import ReplaceReceipt from '@assets/images/simple-illustrations/simple-illustration__replace-receipt.svg'; @@ -227,7 +225,6 @@ export { All, Android, Apple, - AppleLogo, ArrowSplit, ArrowCollapse, ArrowRight, @@ -301,7 +298,6 @@ export { Gallery, Gear, Globe, - GoogleLogo, Hashtag, Heart, History, diff --git a/src/components/SignInButtons/IconButton.tsx b/src/components/SignInButtons/IconButton.tsx index 7ef476cff18a..cf686c390d57 100644 --- a/src/components/SignInButtons/IconButton.tsx +++ b/src/components/SignInButtons/IconButton.tsx @@ -1,31 +1,14 @@ import React from 'react'; import type {ValueOf} from 'type-fest'; import Icon from '@components/Icon'; -import * as Expensicons from '@components/Icon/Expensicons'; import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import type IconAsset from '@src/types/utils/IconAsset'; -const providerData = { - [CONST.SIGN_IN_METHOD.APPLE]: { - icon: Expensicons.AppleLogo, - accessibilityLabel: 'common.signInWithApple', - }, - [CONST.SIGN_IN_METHOD.GOOGLE]: { - icon: Expensicons.GoogleLogo, - accessibilityLabel: 'common.signInWithGoogle', - }, -} satisfies Record< - ValueOf, - { - icon: IconAsset; - accessibilityLabel: TranslationPaths; - } ->; - type IconButtonProps = { onPress?: () => void; provider: ValueOf; @@ -34,6 +17,25 @@ type IconButtonProps = { function IconButton({onPress = () => {}, provider}: IconButtonProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); + const icons = useMemoizedLazyExpensifyIcons(['AppleLogo', 'GoogleLogo'] as const); + + const providerData = { + [CONST.SIGN_IN_METHOD.APPLE]: { + icon: icons.AppleLogo, + accessibilityLabel: 'common.signInWithApple', + }, + [CONST.SIGN_IN_METHOD.GOOGLE]: { + icon: icons.GoogleLogo, + accessibilityLabel: 'common.signInWithGoogle', + }, + } satisfies Record< + ValueOf, + { + icon: IconAsset; + accessibilityLabel: TranslationPaths; + } + >; + return ( Date: Wed, 19 Nov 2025 02:03:25 +0400 Subject: [PATCH 07/38] refactor: migrate EmptyStateRoutePending --- src/components/DistanceMapView/index.android.tsx | 5 +++-- src/components/Icon/Expensicons.ts | 2 -- src/components/MapView/PendingMapView.tsx | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/DistanceMapView/index.android.tsx b/src/components/DistanceMapView/index.android.tsx index 92fe87a762fa..0c97a643daf5 100644 --- a/src/components/DistanceMapView/index.android.tsx +++ b/src/components/DistanceMapView/index.android.tsx @@ -1,9 +1,9 @@ import React, {useState} from 'react'; import {View} from 'react-native'; import BlockingView from '@components/BlockingViews/BlockingView'; -import * as Expensicons from '@components/Icon/Expensicons'; import MapView from '@components/MapView'; import PendingMapView from '@components/MapView/PendingMapView'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -18,6 +18,7 @@ function DistanceMapView({overlayStyle, requireRouteToDisplayMap, ...rest}: Dist const {translate} = useLocalize(); const theme = useTheme(); const StyleUtils = useStyleUtils(); + const icons = useMemoizedLazyExpensifyIcons(['EmptyStateRoutePending'] as const); return ( <> @@ -36,7 +37,7 @@ function DistanceMapView({overlayStyle, requireRouteToDisplayMap, ...rest}: Dist {/* The "map pending" text should only be shown in the IOU create flow. In the created IOU preview, only the icon should be shown. */} {!requireRouteToDisplayMap ? ( {hasTextContent ? ( Date: Wed, 19 Nov 2025 02:10:55 +0400 Subject: [PATCH 08/38] refactor: migrate EmptyStateSpyPigeon --- src/components/Icon/Expensicons.ts | 2 -- .../settings/Security/LockAccount/UnlockAccountPage.tsx | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index fbf21bcc85fa..d251cfcf0c66 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -71,7 +71,6 @@ import DragAndDrop from '@assets/images/drag-and-drop.svg'; import DragHandles from '@assets/images/drag-handles.svg'; import Emoji from '@assets/images/emoji.svg'; import Lightbulb from '@assets/images/emojiCategoryIcons/light-bulb.svg'; -import EmptyStateSpyPigeon from '@assets/images/emptystate__spy-pigeon.svg'; import EReceiptIcon from '@assets/images/eReceiptIcon.svg'; import Exclamation from '@assets/images/exclamation.svg'; import Exit from '@assets/images/exit.svg'; @@ -429,7 +428,6 @@ export { Minus, ThumbsDown, UserLock, - EmptyStateSpyPigeon, NetSuiteExport, QBOExport, SageIntacctExport, diff --git a/src/pages/settings/Security/LockAccount/UnlockAccountPage.tsx b/src/pages/settings/Security/LockAccount/UnlockAccountPage.tsx index bfc0b9ad6dc0..d871a9b514ce 100644 --- a/src/pages/settings/Security/LockAccount/UnlockAccountPage.tsx +++ b/src/pages/settings/Security/LockAccount/UnlockAccountPage.tsx @@ -1,9 +1,9 @@ import React from 'react'; import ConfirmationPage from '@components/ConfirmationPage'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; -import * as Expensicons from '@components/Icon/Expensicons'; import ScreenWrapper from '@components/ScreenWrapper'; import ScrollView from '@components/ScrollView'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; @@ -13,6 +13,7 @@ import ROUTES from '@src/ROUTES'; function UnlockAccountPage() { const {translate} = useLocalize(); const styles = useThemeStyles(); + const icons = useMemoizedLazyExpensifyIcons(['EmptyStateSpyPigeon'] as const); return ( Date: Wed, 19 Nov 2025 02:15:20 +0400 Subject: [PATCH 09/38] refactor: migrate MessageInABottle and SmartScan --- src/components/DropZone/DualDropZone.tsx | 6 ++++-- src/components/Icon/Expensicons.ts | 4 ---- src/pages/Search/SearchPage.tsx | 6 ++++-- .../report/ReportActionCompose/ReportActionCompose.tsx | 7 ++++--- src/pages/iou/request/step/IOURequestStepScan/index.tsx | 4 +++- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/components/DropZone/DualDropZone.tsx b/src/components/DropZone/DualDropZone.tsx index 35ed9b289d4b..eac362437b44 100644 --- a/src/components/DropZone/DualDropZone.tsx +++ b/src/components/DropZone/DualDropZone.tsx @@ -2,6 +2,7 @@ import React from 'react'; import {View} from 'react-native'; import DragAndDropConsumer from '@components/DragAndDrop/Consumer'; import * as Expensicons from '@components/Icon/Expensicons'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; @@ -28,6 +29,7 @@ function DualDropZone({isEditing, onAttachmentDrop, onReceiptDrop, shouldAcceptS const {translate} = useLocalize(); const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout(); const theme = useTheme(); + const icons = useMemoizedLazyExpensifyIcons(['MessageInABottle', 'SmartScan'] as const); const shouldStackVertically = shouldUseNarrowLayout || isMediumScreenWidth; const scanReceiptsText = shouldAcceptSingleReceipt ? 'dropzone.addReceipt' : 'dropzone.scanReceipts'; @@ -38,7 +40,7 @@ function DualDropZone({isEditing, onAttachmentDrop, onReceiptDrop, shouldAcceptS {({isDraggingOver}) => ( {({isDraggingOver}) => ( (null); + const icons = useMemoizedLazyExpensifyIcons(['MessageInABottle'] as const); + const suggestionsRef = useRef(null); const composerRef = useRef(undefined); const reportParticipantIDs = useMemo( @@ -568,7 +569,7 @@ function ReportActionCompose({ {!shouldDisplayDualDropZone && ( validateAttachments({dragEvent})}> ('prompt'); const [isFlashLightOn, toggleFlashlight] = useReducer((state) => !state, false); const [isTorchAvailable, setIsTorchAvailable] = useState(false); @@ -1087,7 +1089,7 @@ function IOURequestStepScan({ Date: Wed, 19 Nov 2025 02:16:57 +0400 Subject: [PATCH 10/38] refactor: migrate Exit and TreasureChest --- src/components/Icon/Expensicons.ts | 4 ---- src/pages/settings/InitialSettingsPage.tsx | 9 ++++++--- src/pages/workspace/WorkspaceOverviewPage.tsx | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 6dcd9a8c6896..d9a1da8d5eb2 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -73,7 +73,6 @@ import Emoji from '@assets/images/emoji.svg'; import Lightbulb from '@assets/images/emojiCategoryIcons/light-bulb.svg'; import EReceiptIcon from '@assets/images/eReceiptIcon.svg'; import Exclamation from '@assets/images/exclamation.svg'; -import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; @@ -195,7 +194,6 @@ import ThumbsUp from '@assets/images/thumbs-up.svg'; import Train from '@assets/images/train.svg'; import Transfer from '@assets/images/transfer.svg'; import Trashcan from '@assets/images/trashcan.svg'; -import TreasureChest from '@assets/images/treasure-chest.svg'; import Unlock from '@assets/images/unlock.svg'; import UploadAlt from '@assets/images/upload-alt.svg'; import Upload from '@assets/images/upload.svg'; @@ -273,7 +271,6 @@ export { EReceiptIcon, Emoji, Exclamation, - Exit, Expand, Export, Eye, @@ -342,7 +339,6 @@ export { QBOSquare, QrCode, QuestionMark, - TreasureChest, Receipt, ReceiptPlaceholderPlus, ReceiptPlus, diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index 9c5226c772d9..1ce0fc7b166e 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -20,6 +20,7 @@ import Text from '@components/Text'; import Tooltip from '@components/Tooltip'; import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails'; import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -113,6 +114,8 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr const subscriptionPlan = useSubscriptionPlan(); const previousUserPersonalDetails = usePrevious(currentUserPersonalDetails); + const icons = useMemoizedLazyExpensifyIcons(['TreasureChest', 'Exit'] as const); + const shouldLogout = useRef(false); const freeTrialText = getFreeTrialText(translate, policies, introSelected, firstDayFreeTrial, lastDayFreeTrial); @@ -260,7 +263,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr }, { translationKey: 'initialSettingsPage.whatIsNew', - icon: Expensicons.TreasureChest, + icon: icons.TreasureChest, iconRight: Expensicons.NewWindow, shouldShowRightIcon: true, link: CONST.WHATS_NEW_URL, @@ -288,12 +291,12 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr }, { translationKey: signOutTranslationKey, - icon: Expensicons.Exit, + icon: icons.Exit, action: () => signOut(false), }, ], }; - }, [styles.pt4, signOut]); + }, [styles.pt4, signOut, icons]); /** * Return JSX.Element with menu items diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx index 55fc36fa9e36..6b3a785c35e3 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -74,7 +74,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const illustrations = useThemeIllustrations(); const illustrationIcons = useMemoizedLazyIllustrations(['Building'] as const); - const expensifyIcons = useMemoizedLazyExpensifyIcons(['FallbackWorkspaceAvatar', 'ImageCropSquareMask', 'QrCode', 'Transfer', 'Trashcan', 'UserPlus'] as const); + const expensifyIcons = useMemoizedLazyExpensifyIcons(['Exit', 'FallbackWorkspaceAvatar', 'ImageCropSquareMask', 'QrCode', 'Transfer', 'Trashcan', 'UserPlus'] as const); const backTo = route.params.backTo; const [currencyList = getEmptyObject()] = useOnyx(ONYXKEYS.CURRENCY_LIST, {canBeMissing: true}); @@ -404,7 +404,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa secondaryActions.push({ value: 'leave', text: translate('common.leave'), - icon: Expensicons.Exit, + icon: expensifyIcons.Exit, onSelected: () => close(handleLeave), }); return renderDropdownMenu(secondaryActions); From df254d38f1510b908855c0b4002bbb1d64a39779 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 02:29:29 +0400 Subject: [PATCH 11/38] refactor: remove unused icon imports --- src/components/Icon/Expensicons.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index d9a1da8d5eb2..f293d36252a4 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -159,7 +159,6 @@ import Printer from '@assets/images/printer.svg'; import Profile from '@assets/images/profile.svg'; import QrCode from '@assets/images/qrcode.svg'; import QuestionMark from '@assets/images/question-mark-circle.svg'; -import ReceiptBody from '@assets/images/receipt-body.svg'; import ReceiptMultiple from '@assets/images/receipt-multiple.svg'; import ReceiptPlaceholderPlus from '@assets/images/receipt-placeholder-plus.svg'; import ReceiptPlus from '@assets/images/receipt-plus.svg'; @@ -213,7 +212,6 @@ import Clear from '@assets/images/x-circle.svg'; import Zoom from '@assets/images/zoom.svg'; export { - ReceiptBody, ActiveRoomAvatar, AddReaction, All, From 1bc7d204b2d31e037590b67c0a84c94d64c6a0f7 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 03:18:51 +0400 Subject: [PATCH 12/38] fix: add no-restricted-imports --- .../DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.tsx | 1 + src/components/DropZone/DualDropZone.tsx | 5 ++--- src/components/SAMLLoadingIndicator.tsx | 1 + src/components/ValidateCode/ExpiredValidateCodeModal.tsx | 1 + src/pages/ConnectionCompletePage.tsx | 1 + src/pages/ErrorPage/GenericErrorPage.tsx | 1 + src/pages/ErrorPage/SessionExpiredPage.tsx | 1 + src/pages/Search/SearchPage.tsx | 1 + src/pages/iou/request/step/IOURequestStepScan/index.tsx | 1 + src/pages/settings/InitialSettingsPage.tsx | 1 + src/pages/settings/Troubleshoot/TroubleshootPage.tsx | 2 ++ src/pages/workspace/WorkspaceOverviewPage.tsx | 3 ++- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 1 + 13 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.tsx b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.tsx index 84ef334374de..36ff547c3679 100644 --- a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.tsx +++ b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.tsx @@ -2,6 +2,7 @@ import {emailSelector} from '@selectors/Session'; import React from 'react'; import {View} from 'react-native'; import Icon from '@components/Icon'; +// eslint-disable-next-line no-restricted-imports import * as Illustrations from '@components/Icon/Illustrations'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; diff --git a/src/components/DropZone/DualDropZone.tsx b/src/components/DropZone/DualDropZone.tsx index eac362437b44..b93d5f856f83 100644 --- a/src/components/DropZone/DualDropZone.tsx +++ b/src/components/DropZone/DualDropZone.tsx @@ -1,7 +1,6 @@ import React from 'react'; import {View} from 'react-native'; import DragAndDropConsumer from '@components/DragAndDrop/Consumer'; -import * as Expensicons from '@components/Icon/Expensicons'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; @@ -29,7 +28,7 @@ function DualDropZone({isEditing, onAttachmentDrop, onReceiptDrop, shouldAcceptS const {translate} = useLocalize(); const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout(); const theme = useTheme(); - const icons = useMemoizedLazyExpensifyIcons(['MessageInABottle', 'SmartScan'] as const); + const icons = useMemoizedLazyExpensifyIcons(['MessageInABottle', 'SmartScan', 'ReplaceReceipt'] as const); const shouldStackVertically = shouldUseNarrowLayout || isMediumScreenWidth; const scanReceiptsText = shouldAcceptSingleReceipt ? 'dropzone.addReceipt' : 'dropzone.scanReceipts'; @@ -56,7 +55,7 @@ function DualDropZone({isEditing, onAttachmentDrop, onReceiptDrop, shouldAcceptS {({isDraggingOver}) => ( close(handleLeave), }); } diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index 3071d9b82879..01e2985153e9 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -8,6 +8,7 @@ import ConfirmModal from '@components/ConfirmModal'; import FormHelpMessage from '@components/FormHelpMessage'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import Icon from '@components/Icon'; +// eslint-disable-next-line no-restricted-imports import * as Expensicons from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import MenuItemList from '@components/MenuItemList'; From c55c531827d10f1f7768b9131d8b11547c217ee2 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 03:24:12 +0400 Subject: [PATCH 13/38] fix lint --- src/components/ValidateCode/ExpiredValidateCodeModal.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx index 6326530ecf7d..dad8c08cf01f 100644 --- a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx +++ b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx @@ -12,13 +12,13 @@ import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; import variables from '@styles/variables'; -import * as Session from '@userActions/Session'; +import {beginSignIn} from '@userActions/Session'; import ONYXKEYS from '@src/ONYXKEYS'; function ExpiredValidateCodeModal() { const theme = useTheme(); const styles = useThemeStyles(); - const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS); + const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: true}); const {translate} = useLocalize(); const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); return ( @@ -39,7 +39,7 @@ function ExpiredValidateCodeModal() { {translate('validateCodeModal.or')}{' '} { - Session.beginSignIn(credentials?.login ?? ''); + beginSignIn(credentials?.login ?? ''); Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack); }} > From a496d83d589c757e13c492ce68ac78c6c1e99437 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 03:24:51 +0400 Subject: [PATCH 14/38] refactor: remove unused import of Expensicons --- src/pages/workspace/WorkspaceOverviewPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx index b9a8d073bcc8..f942ca4009ab 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -9,8 +9,6 @@ import AvatarWithImagePicker from '@components/AvatarWithImagePicker'; import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu'; import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types'; import ConfirmModal from '@components/ConfirmModal'; -// eslint-disable-next-line no-restricted-imports -import * as Expensicons from '@components/Icon/Expensicons'; import {LockedAccountContext} from '@components/LockedAccountModalProvider'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; From 2e0fecad97239be15b4a50280e843f2313e64210 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Wed, 19 Nov 2025 03:46:59 +0400 Subject: [PATCH 15/38] feat: migrate Expensicons.Exit --- src/pages/workspace/WorkspacesListPage.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx index a7eebb71d8d2..b0991e9cd681 100755 --- a/src/pages/workspace/WorkspacesListPage.tsx +++ b/src/pages/workspace/WorkspacesListPage.tsx @@ -27,6 +27,7 @@ import Text from '@components/Text'; import WorkspacesEmptyStateComponent from '@components/WorkspacesEmptyStateComponent'; import useCardFeeds from '@hooks/useCardFeeds'; import useHandleBackButton from '@hooks/useHandleBackButton'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -326,6 +327,7 @@ function WorkspacesListPage() { /** * Gets the menu item for each workspace */ + const icons = useMemoizedLazyExpensifyIcons(['Exit'] as const); const getWorkspaceMenuItem = useCallback( ({item, index}: GetWorkspaceMenuItem) => { const isAdmin = isPolicyAdmin(item as unknown as PolicyType, session?.email); @@ -343,7 +345,7 @@ function WorkspacesListPage() { if (!isOwner && (item.policyID !== preferredPolicyID || !isRestrictedToPreferredPolicy)) { threeDotsMenuItems.push({ - icon: Expensicons.Exit, + icon: icons.Exit, text: translate('common.leave'), onSelected: callFunctionIfActionIsAllowed(() => { close(() => { @@ -480,6 +482,7 @@ function WorkspacesListPage() { isRestrictedToPreferredPolicy, policyIDToDelete, preferredPolicyID, + icons.Exit, ], ); From b8ab36416fa500fe7aae1711fb22fb607d041790 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 13:26:43 +0400 Subject: [PATCH 16/38] refactor: optimize providerData with useMemo --- src/components/SignInButtons/IconButton.tsx | 38 ++++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/components/SignInButtons/IconButton.tsx b/src/components/SignInButtons/IconButton.tsx index cf686c390d57..796d86905a63 100644 --- a/src/components/SignInButtons/IconButton.tsx +++ b/src/components/SignInButtons/IconButton.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {useMemo} from 'react'; import type {ValueOf} from 'type-fest'; import Icon from '@components/Icon'; import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback'; @@ -19,22 +19,26 @@ function IconButton({onPress = () => {}, provider}: IconButtonProps) { const styles = useThemeStyles(); const icons = useMemoizedLazyExpensifyIcons(['AppleLogo', 'GoogleLogo'] as const); - const providerData = { - [CONST.SIGN_IN_METHOD.APPLE]: { - icon: icons.AppleLogo, - accessibilityLabel: 'common.signInWithApple', - }, - [CONST.SIGN_IN_METHOD.GOOGLE]: { - icon: icons.GoogleLogo, - accessibilityLabel: 'common.signInWithGoogle', - }, - } satisfies Record< - ValueOf, - { - icon: IconAsset; - accessibilityLabel: TranslationPaths; - } - >; + const providerData = useMemo( + () => + ({ + [CONST.SIGN_IN_METHOD.APPLE]: { + icon: icons.AppleLogo, + accessibilityLabel: 'common.signInWithApple' as const, + }, + [CONST.SIGN_IN_METHOD.GOOGLE]: { + icon: icons.GoogleLogo, + accessibilityLabel: 'common.signInWithGoogle' as const, + }, + }) satisfies Record< + ValueOf, + { + icon: IconAsset; + accessibilityLabel: TranslationPaths; + } + >, + [icons.AppleLogo, icons.GoogleLogo], + ); return ( Date: Thu, 20 Nov 2025 13:28:23 +0400 Subject: [PATCH 17/38] fix: restore accidentally removed secondaryColor fill --- src/components/PerDiemEReceipt.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/PerDiemEReceipt.tsx b/src/components/PerDiemEReceipt.tsx index 4b0271fd9ee1..24019563db45 100644 --- a/src/components/PerDiemEReceipt.tsx +++ b/src/components/PerDiemEReceipt.tsx @@ -109,6 +109,7 @@ function PerDiemEReceipt({transactionID}: PerDiemEReceiptProps) { {translate('eReceipt.guaranteed')} From df7c20f180086ad06b7831956ca5a9e27d8861d9 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 15:46:15 +0400 Subject: [PATCH 18/38] fix: remove unnecessary import of Expensicons in SearchPage --- src/pages/Search/SearchPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index 7e65ebc68094..a49e9d7df8b7 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -8,8 +8,6 @@ import DecisionModal from '@components/DecisionModal'; import DragAndDropConsumer from '@components/DragAndDrop/Consumer'; import DragAndDropProvider from '@components/DragAndDrop/Provider'; import DropZoneUI from '@components/DropZone/DropZoneUI'; -// eslint-disable-next-line no-restricted-imports -import * as Expensicons from '@components/Icon/Expensicons'; import type {PaymentMethodType} from '@components/KYCWall/types'; import type {PopoverMenuItem} from '@components/PopoverMenu'; import ScreenWrapper from '@components/ScreenWrapper'; From ae6138eef769dfc34e34028603808c54a06db834 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 16:56:32 +0400 Subject: [PATCH 19/38] fix: update credentials to not allow missing values in ExpiredValidateCodeModal --- src/components/ValidateCode/ExpiredValidateCodeModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx index dad8c08cf01f..0bb0087c94f9 100644 --- a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx +++ b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx @@ -18,7 +18,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; function ExpiredValidateCodeModal() { const theme = useTheme(); const styles = useThemeStyles(); - const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: true}); + const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: false}); const {translate} = useLocalize(); const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); return ( From e13ddb8c832115b2b6726c832d600eb70ebbac70 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 17:09:09 +0400 Subject: [PATCH 20/38] fix: remove unused import of Expensicons --- src/pages/iou/request/step/IOURequestStepScan/index.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx index 2529bf885813..67d14be8dd4e 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/index.tsx +++ b/src/pages/iou/request/step/IOURequestStepScan/index.tsx @@ -17,8 +17,6 @@ import {DragAndDropContext} from '@components/DragAndDrop/Provider'; import DropZoneUI from '@components/DropZone/DropZoneUI'; import FeatureTrainingModal from '@components/FeatureTrainingModal'; import Icon from '@components/Icon'; -// eslint-disable-next-line no-restricted-imports -import * as Expensicons from '@components/Icon/Expensicons'; import LocationPermissionModal from '@components/LocationPermissionModal'; import PressableWithFeedback from '@components/Pressable/PressableWithFeedback'; import ReceiptAlternativeMethods from '@components/ReceiptAlternativeMethods'; @@ -110,7 +108,6 @@ function IOURequestStepScan({ const {translate} = useLocalize(); const {isBetaEnabled} = usePermissions(); const {isDraggingOver} = useContext(DragAndDropContext); - const icons = useMemoizedLazyExpensifyIcons(['SmartScan'] as const); const [cameraPermissionState, setCameraPermissionState] = useState('prompt'); const [isFlashLightOn, toggleFlashlight] = useReducer((state) => !state, false); const [isTorchAvailable, setIsTorchAvailable] = useState(false); From 5509c28e73d406c9bde5dca3646484241e22b0f1 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 17:12:25 +0400 Subject: [PATCH 21/38] fix: replace useMemoizedLazyExpensifyIcons with expensifyIcons in SearchPage --- src/pages/Search/SearchPage.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index a49e9d7df8b7..396a8909f8f4 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -109,7 +109,6 @@ function SearchPage({route}: SearchPageProps) { const [integrationsExportTemplates] = useOnyx(ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES, {canBeMissing: true}); const [csvExportLayouts] = useOnyx(ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS, {canBeMissing: true}); const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false); - const icons = useMemoizedLazyExpensifyIcons(['SmartScan'] as const); const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false); const [isDeleteExpensesConfirmModalVisible, setIsDeleteExpensesConfirmModalVisible] = useState(false); const [isDownloadExportModalVisible, setIsDownloadExportModalVisible] = useState(false); @@ -831,7 +830,7 @@ function SearchPage({route}: SearchPageProps) { /> Date: Thu, 20 Nov 2025 18:16:01 +0400 Subject: [PATCH 22/38] fix: import useMemoizedLazyExpensifyIcons and update icon usage in ReportDetailsPage --- src/pages/ReportDetailsPage.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index fdb34dbb7386..cc35377e7dd2 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -28,6 +28,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails' import useDeleteTransactions from '@hooks/useDeleteTransactions'; import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations'; import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -161,6 +162,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, {canBeMissing: true}); const parentReportAction = useParentReportAction(report); + const lazyIcons = useMemoizedLazyExpensifyIcons(['Exit'] as const); const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`, {canBeMissing: false}); @@ -519,7 +521,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM, translationKey: 'common.leave', - icon: Expensicons.Exit, + icon: lazyIcons.Exit, isAnonymousAction: true, action: () => { if (getParticipantsAccountIDsForDisplay(report, false, true).length === 1 && isRootGroupChat) { @@ -572,14 +574,15 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail parentReportAction, iouTransactionID, moneyRequestReport?.reportID, + introSelected, + isRestrictedToPreferredPolicy, + preferredPolicyID, currentUserPersonalDetails.accountID, isTaskActionable, + isSmallScreenWidth, + lazyIcons.Exit, isRootGroupChat, leaveChat, - isSmallScreenWidth, - isRestrictedToPreferredPolicy, - preferredPolicyID, - introSelected, ]); const displayNamesWithTooltips = useMemo(() => { From f16d18c5cb8cfcd46a446c2ac6a0a54427392598 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 19:12:39 +0400 Subject: [PATCH 23/38] fix: add TreasureChest illustration import to illustrations.chunk.ts --- src/components/Icon/Illustrations.ts | 2 -- src/components/Icon/chunks/illustrations.chunk.ts | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts index 0222be26dc4f..742388c0ae5c 100644 --- a/src/components/Icon/Illustrations.ts +++ b/src/components/Icon/Illustrations.ts @@ -79,7 +79,6 @@ import ThumbsDown from '@assets/images/simple-illustrations/simple-illustration_ import ThumbsUpStars from '@assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg'; import Tire from '@assets/images/simple-illustrations/simple-illustration__tire.svg'; import TrashCan from '@assets/images/simple-illustrations/simple-illustration__trashcan.svg'; -import TreasureChest from '@assets/images/simple-illustrations/simple-illustration__treasurechest.svg'; import VirtualCard from '@assets/images/simple-illustrations/simple-illustration__virtualcard.svg'; export { @@ -102,7 +101,6 @@ export { LaptopWithSecondScreenSync, LaptopWithSecondScreenX, MoneyIntoWallet, - TreasureChest, ThumbsUpStars, Hands, SmartScan, diff --git a/src/components/Icon/chunks/illustrations.chunk.ts b/src/components/Icon/chunks/illustrations.chunk.ts index b1f566acf446..1a5d1527b117 100644 --- a/src/components/Icon/chunks/illustrations.chunk.ts +++ b/src/components/Icon/chunks/illustrations.chunk.ts @@ -78,6 +78,7 @@ import ShieldYellow from '@assets/images/simple-illustrations/simple-illustratio import Stopwatch from '@assets/images/simple-illustrations/simple-illustration__stopwatch.svg'; import Tag from '@assets/images/simple-illustrations/simple-illustration__tag.svg'; import ThumbsDown from '@assets/images/simple-illustrations/simple-illustration__thumbsdown.svg'; +import TreasureChest from '@assets/images/simple-illustrations/simple-illustration__treasurechest.svg'; import CompanyCard from '@assets/images/simple-illustrations/simple-illustration__twocards-horizontal.svg'; import Workflows from '@assets/images/simple-illustrations/simple-illustration__workflows.svg'; import ExpensifyApprovedLogo from '@assets/images/subscription-details__approvedlogo.svg'; @@ -138,6 +139,7 @@ const Illustrations = { Tag, CompanyCard, ThumbsDown, + TreasureChest, Workflows, CarIce, BlueShield, From b5990c37bc9b43de8e094f0720edcff3d6ed0046 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 19:14:26 +0400 Subject: [PATCH 24/38] fix: replace direct illustration imports with useMemoizedLazyIllustrations in billing banners --- .../CardSection/BillingBanner/EarlyDiscountBanner.tsx | 5 +++-- .../CardSection/BillingBanner/PreTrialBillingBanner.tsx | 5 +++-- .../CardSection/BillingBanner/TrialStartedBillingBanner.tsx | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx index 342f28d114c5..f16bfc11496b 100644 --- a/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx +++ b/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyDiscountBanner.tsx @@ -3,10 +3,10 @@ import {View} from 'react-native'; import Button from '@components/Button'; import Icon from '@components/Icon'; import * as Expensicons from '@components/Icon/Expensicons'; -import * as Illustrations from '@components/Icon/Illustrations'; import {PressableWithFeedback} from '@components/Pressable'; import RenderHTML from '@components/RenderHTML'; import Tooltip from '@components/Tooltip'; +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; @@ -39,6 +39,7 @@ function EarlyDiscountBanner({isSubscriptionPage, onboardingHelpDropdownButton, const styles = useThemeStyles(); const StyleUtils = useStyleUtils(); const {translate} = useLocalize(); + const illustrations = useMemoizedLazyIllustrations(['TreasureChest'] as const); const [firstDayFreeTrial] = useOnyx(ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL, {canBeMissing: true}); const [lastDayFreeTrial] = useOnyx(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, {canBeMissing: true}); @@ -145,7 +146,7 @@ function EarlyDiscountBanner({isSubscriptionPage, onboardingHelpDropdownButton, seconds: discountInfo?.seconds, })} subtitleStyle={[styles.mt1, styles.mutedNormalTextLabel, isSubscriptionPage && StyleUtils.getTextColorStyle(theme.trialTimer)]} - icon={Illustrations.TreasureChest} + icon={illustrations.TreasureChest} rightComponent={!isSubscriptionPage && rightComponent} /> ); diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx index bb3b5bcbdfd6..0c497eaafc67 100644 --- a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx +++ b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import * as Illustrations from '@components/Icon/Illustrations'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import * as Report from '@libs/actions/Report'; @@ -13,6 +13,7 @@ import BillingBanner from './BillingBanner'; function PreTrialBillingBanner() { const {translate} = useLocalize(); const styles = useThemeStyles(); + const illustrations = useMemoizedLazyIllustrations(['TreasureChest'] as const); const navigateToChat = () => { const reportUsedForOnboarding = ReportUtils.getChatUsedForOnboarding(); @@ -40,7 +41,7 @@ function PreTrialBillingBanner() { {translate('subscription.billingBanner.preTrial.subtitleEnd')} } - icon={Illustrations.TreasureChest} + icon={illustrations.TreasureChest} /> ); } diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/TrialStartedBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/TrialStartedBillingBanner.tsx index 6de323091743..5a98a60bbdfd 100644 --- a/src/pages/settings/Subscription/CardSection/BillingBanner/TrialStartedBillingBanner.tsx +++ b/src/pages/settings/Subscription/CardSection/BillingBanner/TrialStartedBillingBanner.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import * as Illustrations from '@components/Icon/Illustrations'; +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import {calculateRemainingFreeTrialDays, doesUserHavePaymentCardAdded} from '@libs/SubscriptionUtils'; @@ -10,13 +10,14 @@ function TrialStartedBillingBanner() { const {translate} = useLocalize(); const [userBillingFundID] = useOnyx(ONYXKEYS.NVP_BILLING_FUND_ID, {canBeMissing: true}); const [lastDayFreeTrial] = useOnyx(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, {canBeMissing: true}); + const illustrations = useMemoizedLazyIllustrations(['TreasureChest'] as const); const subtitle = !doesUserHavePaymentCardAdded(userBillingFundID) ? translate('subscription.billingBanner.trialStarted.subtitle') : ''; return ( ); } From a8176e66850d9f849227ddfee907638fc0f65f39 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 19:35:17 +0400 Subject: [PATCH 25/38] fix: eslint error in PreTrialBillingBanner --- .../CardSection/BillingBanner/PreTrialBillingBanner.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx index 0c497eaafc67..c13652712a48 100644 --- a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx +++ b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx @@ -4,9 +4,9 @@ import TextLink from '@components/TextLink'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; -import * as Report from '@libs/actions/Report'; +import {navigateToConciergeChat} from '@libs/actions/Report'; import Navigation from '@libs/Navigation/Navigation'; -import * as ReportUtils from '@libs/ReportUtils'; +import {getChatUsedForOnboarding} from '@libs/ReportUtils'; import ROUTES from '@src/ROUTES'; import BillingBanner from './BillingBanner'; @@ -16,10 +16,10 @@ function PreTrialBillingBanner() { const illustrations = useMemoizedLazyIllustrations(['TreasureChest'] as const); const navigateToChat = () => { - const reportUsedForOnboarding = ReportUtils.getChatUsedForOnboarding(); + const reportUsedForOnboarding = getChatUsedForOnboarding(); if (!reportUsedForOnboarding) { - Report.navigateToConciergeChat(); + navigateToConciergeChat(); return; } From ead281664ea13694e53cc4d4dc870ac2de09489d Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 19:35:30 +0400 Subject: [PATCH 26/38] fix: update icon usage in InitialSettingsPage to include ExpensifyLogoNew --- src/pages/settings/InitialSettingsPage.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index 72dfceb69b79..4f3e8d3802f5 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -120,7 +120,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr const previousUserPersonalDetails = usePrevious(currentUserPersonalDetails); const [tryNewDot] = useOnyx(ONYXKEYS.NVP_TRY_NEW_DOT, {canBeMissing: true}); - const icons = useMemoizedLazyExpensifyIcons(['TreasureChest', 'Exit'] as const); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyLogoNew', 'TreasureChest', 'Exit'] as const); const shouldLogout = useRef(false); @@ -263,7 +263,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr return { translationKey: 'exitSurvey.goToExpensifyClassic', - icon: Expensicons.ExpensifyLogoNew, + icon: icons.ExpensifyLogoNew, ...(CONFIG.IS_HYBRID_APP ? { action: () => closeReactNativeApp({shouldSetNVP: true}), @@ -285,7 +285,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr }, }), }; - }, [tryNewDot?.classicRedirect?.isLockedToNewDot, tryNewDot?.classicRedirect?.dismissed, surveyCompletedWithinLastMonth]); + }, [tryNewDot?.classicRedirect?.isLockedToNewDot, tryNewDot?.classicRedirect?.dismissed, icons.ExpensifyLogoNew, surveyCompletedWithinLastMonth]); /** * Return a list of menu items data for general section @@ -347,7 +347,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr }, ], }; - }, [styles.pt4, classicRedirectMenuItem, tryNewDot?.nudgeMigration, signOut, icons.Exit]); + }, [styles.pt4, classicRedirectMenuItem, tryNewDot?.nudgeMigration, icons.TreasureChest, icons.Exit, signOut]); /** * Return JSX.Element with menu items From cb2ebf068bf48cf46f1a83a560e9831e14e737f4 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Thu, 20 Nov 2025 23:50:45 +0400 Subject: [PATCH 27/38] Remove unused lazyIcons from ReportDetailsPage --- src/pages/ReportDetailsPage.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 832ea090c8ac..d081802f5895 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -162,7 +162,6 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const [allSnapshots] = useOnyx(ONYXKEYS.COLLECTION.SNAPSHOT, {canBeMissing: true}); const parentReportAction = useParentReportAction(report); - const lazyIcons = useMemoizedLazyExpensifyIcons(['Exit'] as const); const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`, {canBeMissing: false}); @@ -582,13 +581,8 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail currentUserPersonalDetails.accountID, isTaskActionable, isSmallScreenWidth, - lazyIcons.Exit, isRootGroupChat, leaveChat, - isSmallScreenWidth, - isRestrictedToPreferredPolicy, - preferredPolicyID, - introSelected, expensifyIcons, ]); From 856bf6acdb2e5bdc434df6d0cc6c135d1ba85ca8 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:25:15 +0400 Subject: [PATCH 28/38] revert lazyload of Breadcrumps.tsx --- src/components/Breadcrumbs.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx index 6c88e2adaca7..874184ddabed 100644 --- a/src/components/Breadcrumbs.tsx +++ b/src/components/Breadcrumbs.tsx @@ -1,7 +1,7 @@ import React from 'react'; import type {StyleProp, ViewStyle} from 'react-native'; import {PixelRatio, View} from 'react-native'; -import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; +import LogoComponent from '@assets/images/expensify-wordmark.svg'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import variables from '@styles/variables'; @@ -35,7 +35,6 @@ type BreadcrumbsProps = { function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) { const theme = useTheme(); const styles = useThemeStyles(); - const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const [primaryBreadcrumb, secondaryBreadcrumb] = breadcrumbs; const isRootBreadcrumb = primaryBreadcrumb.type === CONST.BREADCRUMB_TYPE.ROOT; const fontScale = PixelRatio.getFontScale() > CONST.LOGO_MAX_SCALE ? CONST.LOGO_MAX_SCALE : PixelRatio.getFontScale(); @@ -47,7 +46,7 @@ function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) { title={ Date: Fri, 21 Nov 2025 14:26:55 +0400 Subject: [PATCH 29/38] revert lazyload of GenericErrorPage.tsx --- src/pages/ErrorPage/GenericErrorPage.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx index a8a4821e056c..b9366174d652 100644 --- a/src/pages/ErrorPage/GenericErrorPage.tsx +++ b/src/pages/ErrorPage/GenericErrorPage.tsx @@ -1,15 +1,14 @@ import React from 'react'; import {View} from 'react-native'; +import LogoWordmark from '@assets/images/expensify-wordmark.svg'; import Button from '@components/Button'; import Icon from '@components/Icon'; -// eslint-disable-next-line no-restricted-imports import * as Expensicons from '@components/Icon/Expensicons'; import ImageSVG from '@components/ImageSVG'; import SafeAreaConsumer from '@components/SafeAreaConsumer'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; import useIsAuthenticated from '@hooks/useIsAuthenticated'; -import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import usePageRefresh from '@hooks/usePageRefresh'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -26,7 +25,6 @@ function GenericErrorPage({error}: {error?: Error}) { const StyleUtils = useStyleUtils(); const isAuthenticated = useIsAuthenticated(); const {translate} = useLocalize(); - const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const isChunkLoadError = error?.name === CONST.CHUNK_LOAD_ERROR || /Loading chunk [\d]+ failed/.test(error?.message ?? ''); const refreshPage = usePageRefresh(); @@ -84,7 +82,7 @@ function GenericErrorPage({error}: {error?: Error}) { Date: Fri, 21 Nov 2025 14:27:35 +0400 Subject: [PATCH 30/38] Revert the unnecessary changes in reportDetailsPage.tsx --- src/pages/ReportDetailsPage.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index d081802f5895..ec72b77a8273 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -575,14 +575,14 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail parentReportAction, iouTransactionID, moneyRequestReport?.reportID, - introSelected, - isRestrictedToPreferredPolicy, - preferredPolicyID, currentUserPersonalDetails.accountID, isTaskActionable, - isSmallScreenWidth, isRootGroupChat, leaveChat, + isSmallScreenWidth, + isRestrictedToPreferredPolicy, + preferredPolicyID, + introSelected, expensifyIcons, ]); From 9144aa066014b51e79014684b0c3161e00bfb750 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:40:18 +0400 Subject: [PATCH 31/38] Remove TreasureChest icon from exports in Illustrations.ts --- src/components/Icon/Illustrations.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts index 555d9bc431ea..8f4d8d1cbfc5 100644 --- a/src/components/Icon/Illustrations.ts +++ b/src/components/Icon/Illustrations.ts @@ -109,7 +109,6 @@ export { Luggage, MoneyIntoWallet, ConciergeBubble, - TreasureChest, ThumbsUpStars, HeadSet, Hourglass, From 1f087d1919c1ed7dae540832a737d701f379993a Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:41:44 +0400 Subject: [PATCH 32/38] revert lazyload of QRShare --- src/components/QRShare/index.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/QRShare/index.tsx b/src/components/QRShare/index.tsx index 66557d9d9047..40f71bc804ea 100644 --- a/src/components/QRShare/index.tsx +++ b/src/components/QRShare/index.tsx @@ -2,10 +2,10 @@ import React, {useImperativeHandle, useRef, useState} from 'react'; import type {LayoutChangeEvent} from 'react-native'; import {View} from 'react-native'; import type {Svg} from 'react-native-svg'; +import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg'; import ImageSVG from '@components/ImageSVG'; import QRCode from '@components/QRCode'; import Text from '@components/Text'; -import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; @@ -34,7 +34,6 @@ function QRShare({ const {shouldUseNarrowLayout} = useResponsiveLayout(); const {windowWidth} = useWindowDimensions(); const qrCodeContainerWidth = shouldUseNarrowLayout ? windowWidth : variables.sideBarWidth; - const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const {formatPhoneNumber} = useLocalize(); @@ -63,7 +62,7 @@ function QRShare({ From a074699b88440d00a900bdc84a6f995b749200d1 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 15:38:38 +0400 Subject: [PATCH 33/38] fix: Set canBeMissing to false --- src/components/ValidateCode/ExpiredValidateCodeModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx index 442bdd59d76a..d0b4fb36e1fb 100644 --- a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx +++ b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx @@ -16,7 +16,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; function ExpiredValidateCodeModal() { const theme = useTheme(); const styles = useThemeStyles(); - const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: true}); + const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: false}); const {translate} = useLocalize(); const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); const illustrations = useMemoizedLazyIllustrations(['ToddBehindCloud'] as const); From b8197f4c433cde3e3778c85b51f5080fe88d4658 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 16:32:24 +0400 Subject: [PATCH 34/38] Revert unnecessary removed icons --- src/components/Icon/Expensicons.ts | 30 ++++++++++++++++++++++++++++ src/components/Icon/Illustrations.ts | 2 ++ 2 files changed, 32 insertions(+) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index f293d36252a4..1a885a21901c 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -71,9 +71,18 @@ import DragAndDrop from '@assets/images/drag-and-drop.svg'; import DragHandles from '@assets/images/drag-handles.svg'; import Emoji from '@assets/images/emoji.svg'; import Lightbulb from '@assets/images/emojiCategoryIcons/light-bulb.svg'; +import EmptyStateRoutePending from '@assets/images/emptystate__routepending.svg'; +import EmptyStateSpyPigeon from '@assets/images/emptystate__spy-pigeon.svg'; import EReceiptIcon from '@assets/images/eReceiptIcon.svg'; import Exclamation from '@assets/images/exclamation.svg'; +import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; +import ExpensifyAppIcon from '@assets/images/expensify-app-icon.svg'; +import ExpensifyCard from '@assets/images/expensify-card-icon.svg'; +import ExpensifyFooterLogoVertical from '@assets/images/expensify-footer-logo-vertical.svg'; +import ExpensifyFooterLogo from '@assets/images/expensify-footer-logo.svg'; +import ExpensifyLogoNew from '@assets/images/expensify-logo-new.svg'; +import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; import Eye from '@assets/images/eye.svg'; @@ -159,6 +168,7 @@ import Printer from '@assets/images/printer.svg'; import Profile from '@assets/images/profile.svg'; import QrCode from '@assets/images/qrcode.svg'; import QuestionMark from '@assets/images/question-mark-circle.svg'; +import ReceiptBody from '@assets/images/receipt-body.svg'; import ReceiptMultiple from '@assets/images/receipt-multiple.svg'; import ReceiptPlaceholderPlus from '@assets/images/receipt-placeholder-plus.svg'; import ReceiptPlus from '@assets/images/receipt-plus.svg'; @@ -171,8 +181,12 @@ import RotateLeft from '@assets/images/rotate-left.svg'; import Scan from '@assets/images/scan.svg'; import Send from '@assets/images/send.svg'; import Shield from '@assets/images/shield.svg'; +import AppleLogo from '@assets/images/signIn/apple-logo.svg'; +import GoogleLogo from '@assets/images/signIn/google-logo.svg'; import AdvancedApprovalsSquare from '@assets/images/simple-illustrations/advanced-approvals-icon-square.svg'; +import MessageInABottle from '@assets/images/simple-illustrations/simple-illustration__messageinabottle.svg'; import ReplaceReceipt from '@assets/images/simple-illustrations/simple-illustration__replace-receipt.svg'; +import SmartScan from '@assets/images/simple-illustrations/simple-illustration__smartscan.svg'; import Facebook from '@assets/images/social-facebook.svg'; import Instagram from '@assets/images/social-instagram.svg'; import Linkedin from '@assets/images/social-linkedin.svg'; @@ -193,6 +207,7 @@ import ThumbsUp from '@assets/images/thumbs-up.svg'; import Train from '@assets/images/train.svg'; import Transfer from '@assets/images/transfer.svg'; import Trashcan from '@assets/images/trashcan.svg'; +import TreasureChest from '@assets/images/treasure-chest.svg'; import Unlock from '@assets/images/unlock.svg'; import UploadAlt from '@assets/images/upload-alt.svg'; import Upload from '@assets/images/upload.svg'; @@ -212,11 +227,13 @@ import Clear from '@assets/images/x-circle.svg'; import Zoom from '@assets/images/zoom.svg'; export { + ReceiptBody, ActiveRoomAvatar, AddReaction, All, Android, Apple, + AppleLogo, ArrowSplit, ArrowCollapse, ArrowRight, @@ -268,7 +285,14 @@ export { DragHandles, EReceiptIcon, Emoji, + EmptyStateRoutePending, Exclamation, + Exit, + ExpensifyAppIcon, + ExpensifyCard, + ExpensifyWordmark, + ExpensifyFooterLogo, + ExpensifyFooterLogoVertical, Expand, Export, Eye, @@ -288,6 +312,7 @@ export { Gallery, Gear, Globe, + GoogleLogo, Hashtag, Heart, History, @@ -313,6 +338,7 @@ export { Menu, Meter, Megaphone, + MessageInABottle, MoneyBag, MoneyCircle, MoneySearch, @@ -320,6 +346,7 @@ export { MoneyHourglass, Monitor, Mute, + ExpensifyLogoNew, NewWindow, NewWorkspace, NotificationsAvatar, @@ -337,6 +364,7 @@ export { QBOSquare, QrCode, QuestionMark, + TreasureChest, Receipt, ReceiptPlaceholderPlus, ReceiptPlus, @@ -350,6 +378,7 @@ export { Scan, Send, Shield, + SmartScan, Stopwatch, Suitcase, Sync, @@ -418,6 +447,7 @@ export { Minus, ThumbsDown, UserLock, + EmptyStateSpyPigeon, NetSuiteExport, QBOExport, SageIntacctExport, diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts index 8f4d8d1cbfc5..05ebee1667ba 100644 --- a/src/components/Icon/Illustrations.ts +++ b/src/components/Icon/Illustrations.ts @@ -86,6 +86,7 @@ import ThumbsDown from '@assets/images/simple-illustrations/simple-illustration_ import ThumbsUpStars from '@assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg'; import Tire from '@assets/images/simple-illustrations/simple-illustration__tire.svg'; import TrashCan from '@assets/images/simple-illustrations/simple-illustration__trashcan.svg'; +import TreasureChest from '@assets/images/simple-illustrations/simple-illustration__treasurechest.svg'; import VirtualCard from '@assets/images/simple-illustrations/simple-illustration__virtualcard.svg'; import ExpensifyApprovedLogo from '@assets/images/subscription-details__approvedlogo.svg'; import TurtleInShell from '@assets/images/turtle-in-shell.svg'; @@ -109,6 +110,7 @@ export { Luggage, MoneyIntoWallet, ConciergeBubble, + TreasureChest, ThumbsUpStars, HeadSet, Hourglass, From 21b8efd13a4c801e4067cd8f68cbc6a698ed5497 Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 17:48:52 +0400 Subject: [PATCH 35/38] Revert "Revert unnecessary removed icons" This reverts commit b8197f4c433cde3e3778c85b51f5080fe88d4658. --- src/components/Icon/Expensicons.ts | 30 ---------------------------- src/components/Icon/Illustrations.ts | 2 -- 2 files changed, 32 deletions(-) diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 1a885a21901c..f293d36252a4 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -71,18 +71,9 @@ import DragAndDrop from '@assets/images/drag-and-drop.svg'; import DragHandles from '@assets/images/drag-handles.svg'; import Emoji from '@assets/images/emoji.svg'; import Lightbulb from '@assets/images/emojiCategoryIcons/light-bulb.svg'; -import EmptyStateRoutePending from '@assets/images/emptystate__routepending.svg'; -import EmptyStateSpyPigeon from '@assets/images/emptystate__spy-pigeon.svg'; import EReceiptIcon from '@assets/images/eReceiptIcon.svg'; import Exclamation from '@assets/images/exclamation.svg'; -import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; -import ExpensifyAppIcon from '@assets/images/expensify-app-icon.svg'; -import ExpensifyCard from '@assets/images/expensify-card-icon.svg'; -import ExpensifyFooterLogoVertical from '@assets/images/expensify-footer-logo-vertical.svg'; -import ExpensifyFooterLogo from '@assets/images/expensify-footer-logo.svg'; -import ExpensifyLogoNew from '@assets/images/expensify-logo-new.svg'; -import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg'; import Export from '@assets/images/export.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; import Eye from '@assets/images/eye.svg'; @@ -168,7 +159,6 @@ import Printer from '@assets/images/printer.svg'; import Profile from '@assets/images/profile.svg'; import QrCode from '@assets/images/qrcode.svg'; import QuestionMark from '@assets/images/question-mark-circle.svg'; -import ReceiptBody from '@assets/images/receipt-body.svg'; import ReceiptMultiple from '@assets/images/receipt-multiple.svg'; import ReceiptPlaceholderPlus from '@assets/images/receipt-placeholder-plus.svg'; import ReceiptPlus from '@assets/images/receipt-plus.svg'; @@ -181,12 +171,8 @@ import RotateLeft from '@assets/images/rotate-left.svg'; import Scan from '@assets/images/scan.svg'; import Send from '@assets/images/send.svg'; import Shield from '@assets/images/shield.svg'; -import AppleLogo from '@assets/images/signIn/apple-logo.svg'; -import GoogleLogo from '@assets/images/signIn/google-logo.svg'; import AdvancedApprovalsSquare from '@assets/images/simple-illustrations/advanced-approvals-icon-square.svg'; -import MessageInABottle from '@assets/images/simple-illustrations/simple-illustration__messageinabottle.svg'; import ReplaceReceipt from '@assets/images/simple-illustrations/simple-illustration__replace-receipt.svg'; -import SmartScan from '@assets/images/simple-illustrations/simple-illustration__smartscan.svg'; import Facebook from '@assets/images/social-facebook.svg'; import Instagram from '@assets/images/social-instagram.svg'; import Linkedin from '@assets/images/social-linkedin.svg'; @@ -207,7 +193,6 @@ import ThumbsUp from '@assets/images/thumbs-up.svg'; import Train from '@assets/images/train.svg'; import Transfer from '@assets/images/transfer.svg'; import Trashcan from '@assets/images/trashcan.svg'; -import TreasureChest from '@assets/images/treasure-chest.svg'; import Unlock from '@assets/images/unlock.svg'; import UploadAlt from '@assets/images/upload-alt.svg'; import Upload from '@assets/images/upload.svg'; @@ -227,13 +212,11 @@ import Clear from '@assets/images/x-circle.svg'; import Zoom from '@assets/images/zoom.svg'; export { - ReceiptBody, ActiveRoomAvatar, AddReaction, All, Android, Apple, - AppleLogo, ArrowSplit, ArrowCollapse, ArrowRight, @@ -285,14 +268,7 @@ export { DragHandles, EReceiptIcon, Emoji, - EmptyStateRoutePending, Exclamation, - Exit, - ExpensifyAppIcon, - ExpensifyCard, - ExpensifyWordmark, - ExpensifyFooterLogo, - ExpensifyFooterLogoVertical, Expand, Export, Eye, @@ -312,7 +288,6 @@ export { Gallery, Gear, Globe, - GoogleLogo, Hashtag, Heart, History, @@ -338,7 +313,6 @@ export { Menu, Meter, Megaphone, - MessageInABottle, MoneyBag, MoneyCircle, MoneySearch, @@ -346,7 +320,6 @@ export { MoneyHourglass, Monitor, Mute, - ExpensifyLogoNew, NewWindow, NewWorkspace, NotificationsAvatar, @@ -364,7 +337,6 @@ export { QBOSquare, QrCode, QuestionMark, - TreasureChest, Receipt, ReceiptPlaceholderPlus, ReceiptPlus, @@ -378,7 +350,6 @@ export { Scan, Send, Shield, - SmartScan, Stopwatch, Suitcase, Sync, @@ -447,7 +418,6 @@ export { Minus, ThumbsDown, UserLock, - EmptyStateSpyPigeon, NetSuiteExport, QBOExport, SageIntacctExport, diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts index 05ebee1667ba..8f4d8d1cbfc5 100644 --- a/src/components/Icon/Illustrations.ts +++ b/src/components/Icon/Illustrations.ts @@ -86,7 +86,6 @@ import ThumbsDown from '@assets/images/simple-illustrations/simple-illustration_ import ThumbsUpStars from '@assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg'; import Tire from '@assets/images/simple-illustrations/simple-illustration__tire.svg'; import TrashCan from '@assets/images/simple-illustrations/simple-illustration__trashcan.svg'; -import TreasureChest from '@assets/images/simple-illustrations/simple-illustration__treasurechest.svg'; import VirtualCard from '@assets/images/simple-illustrations/simple-illustration__virtualcard.svg'; import ExpensifyApprovedLogo from '@assets/images/subscription-details__approvedlogo.svg'; import TurtleInShell from '@assets/images/turtle-in-shell.svg'; @@ -110,7 +109,6 @@ export { Luggage, MoneyIntoWallet, ConciergeBubble, - TreasureChest, ThumbsUpStars, HeadSet, Hourglass, From a675988bc11e2a27ce537e0deef890ddaa7b852f Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 17:57:16 +0400 Subject: [PATCH 36/38] refactor: Replace direct SVG imports with lazy-loaded icons in Breadcrumbs, QRShare, and GenericErrorPage --- src/components/Breadcrumbs.tsx | 6 ++++-- src/components/QRShare/index.tsx | 5 +++-- src/pages/ErrorPage/GenericErrorPage.tsx | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx index 874184ddabed..d7f12f3f7ab6 100644 --- a/src/components/Breadcrumbs.tsx +++ b/src/components/Breadcrumbs.tsx @@ -1,7 +1,7 @@ import React from 'react'; import type {StyleProp, ViewStyle} from 'react-native'; import {PixelRatio, View} from 'react-native'; -import LogoComponent from '@assets/images/expensify-wordmark.svg'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import variables from '@styles/variables'; @@ -38,6 +38,8 @@ function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) { const [primaryBreadcrumb, secondaryBreadcrumb] = breadcrumbs; const isRootBreadcrumb = primaryBreadcrumb.type === CONST.BREADCRUMB_TYPE.ROOT; const fontScale = PixelRatio.getFontScale() > CONST.LOGO_MAX_SCALE ? CONST.LOGO_MAX_SCALE : PixelRatio.getFontScale(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark'] as const); + return ( {isRootBreadcrumb ? ( @@ -46,7 +48,7 @@ function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) { title={ diff --git a/src/pages/ErrorPage/GenericErrorPage.tsx b/src/pages/ErrorPage/GenericErrorPage.tsx index b9366174d652..cc246babe4ab 100644 --- a/src/pages/ErrorPage/GenericErrorPage.tsx +++ b/src/pages/ErrorPage/GenericErrorPage.tsx @@ -1,14 +1,13 @@ import React from 'react'; import {View} from 'react-native'; -import LogoWordmark from '@assets/images/expensify-wordmark.svg'; import Button from '@components/Button'; import Icon from '@components/Icon'; -import * as Expensicons from '@components/Icon/Expensicons'; import ImageSVG from '@components/ImageSVG'; import SafeAreaConsumer from '@components/SafeAreaConsumer'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; import useIsAuthenticated from '@hooks/useIsAuthenticated'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import usePageRefresh from '@hooks/usePageRefresh'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -27,6 +26,7 @@ function GenericErrorPage({error}: {error?: Error}) { const {translate} = useLocalize(); const isChunkLoadError = error?.name === CONST.CHUNK_LOAD_ERROR || /Loading chunk [\d]+ failed/.test(error?.message ?? ''); const refreshPage = usePageRefresh(); + const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark', 'Bug'] as const); return ( @@ -36,7 +36,7 @@ function GenericErrorPage({error}: {error?: Error}) { Date: Fri, 21 Nov 2025 18:02:44 +0400 Subject: [PATCH 37/38] feat: Add additional lazy-loaded icons to InitialSettingsPage --- src/pages/settings/InitialSettingsPage.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index a58cedf1bee0..9ccead7649d8 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -87,7 +87,7 @@ type MenuData = { type Menu = {sectionStyle: StyleProp; sectionTranslationKey: TranslationPaths; items: MenuData[]}; function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPageProps) { - const icons = useMemoizedLazyExpensifyIcons(['Gear', 'Profile', 'NewWindow'] as const); + const icons = useMemoizedLazyExpensifyIcons(['Gear', 'Profile', 'NewWindow', 'ExpensifyLogoNew', 'TreasureChest', 'Exit'] as const); const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET, {canBeMissing: true}); const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {canBeMissing: true}); const [fundList] = useOnyx(ONYXKEYS.FUND_LIST, {canBeMissing: true}); @@ -121,8 +121,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr const previousUserPersonalDetails = usePrevious(currentUserPersonalDetails); const [tryNewDot] = useOnyx(ONYXKEYS.NVP_TRY_NEW_DOT, {canBeMissing: true}); - const icons = useMemoizedLazyExpensifyIcons(['ExpensifyLogoNew', 'TreasureChest', 'Exit'] as const); - const shouldLogout = useRef(false); const freeTrialText = getFreeTrialText(translate, policies, introSelected, firstDayFreeTrial, lastDayFreeTrial); From e592165971b0b8736a2eb66768ca19a05af41cee Mon Sep 17 00:00:00 2001 From: Mohammad Jafarinejad <71210799+mohammadjafarinejad@users.noreply.github.com> Date: Fri, 21 Nov 2025 18:05:43 +0400 Subject: [PATCH 38/38] feat: Update lazy-loaded icons in TroubleshootPage and WorkspacesListPage --- src/pages/settings/Troubleshoot/TroubleshootPage.tsx | 3 +-- src/pages/workspace/WorkspacesListPage.tsx | 3 +-- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx index 48e98ad711fd..15372095a16b 100644 --- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx +++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx @@ -47,12 +47,11 @@ type BaseMenuItem = { }; function TroubleshootPage() { - const icons = useMemoizedLazyExpensifyIcons(['Download'] as const); + const icons = useMemoizedLazyExpensifyIcons(['Download', 'ExpensifyLogoNew'] as const); const illustrations = useMemoizedLazyIllustrations(['Lightbulb'] as const); const {translate} = useLocalize(); const styles = useThemeStyles(); const {isProduction} = useEnvironment(); - const icons = useMemoizedLazyExpensifyIcons(['ExpensifyLogoNew'] as const); const [isConfirmationModalVisible, setIsConfirmationModalVisible] = useState(false); const waitForNavigate = useWaitForNavigation(); const {shouldUseNarrowLayout} = useResponsiveLayout(); diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx index aea55e066c0c..a911725c11ab 100755 --- a/src/pages/workspace/WorkspacesListPage.tsx +++ b/src/pages/workspace/WorkspacesListPage.tsx @@ -124,7 +124,7 @@ function isUserReimburserForPolicy(policies: Record { const isAdmin = isPolicyAdmin(item as unknown as PolicyType, session?.email); diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index c5ae71edc058..f9f73bb26cec 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -92,9 +92,8 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { const policyID = policy?.id; const allCardSettings = useExpensifyCardFeeds(policyID); const isSyncInProgress = isConnectionInProgress(connectionSyncProgress, policy); - const icons = useMemoizedLazyExpensifyIcons(['Gear', 'NewWindow'] as const); + const icons = useMemoizedLazyExpensifyIcons(['Gear', 'NewWindow', 'ExpensifyCard'] as const); const illustrations = useMemoizedLazyIllustrations(['Accounting'] as const); - const icons = useMemoizedLazyExpensifyIcons(['ExpensifyCard'] as const); const connectionNames = CONST.POLICY.CONNECTIONS.NAME; const accountingIntegrations = Object.values(connectionNames);