Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions jest/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ jest.mock('../src/hooks/useLazyAsset.ts', () => ({
};
}
return mockIllustrations;
}, [names]),

// Use a value-based dependency to avoid returning a new object caused by reference changes on names
}, [names.join(',')]),
),
useMemoizedLazyExpensifyIcons: jest.fn((names: readonly string[]) =>
mockUseMemo(() => {
Expand All @@ -194,7 +196,9 @@ jest.mock('../src/hooks/useLazyAsset.ts', () => ({
};
}
return mockIcons;
}, [names]),

// Use a value-based dependency to avoid returning a new object caused by reference changes on names
}, [names.join(',')]),
),
default: jest.fn((importFn) =>
mockUseMemo(() => {
Expand Down
5 changes: 3 additions & 2 deletions src/pages/workspace/WorkspaceMembersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {DropdownOption, WorkspaceMemberBulkActionType} from '@components/Bu
import ConfirmModal from '@components/ConfirmModal';
import DecisionModal from '@components/DecisionModal';
// eslint-disable-next-line no-restricted-imports
import {FallbackAvatar, Plus} from '@components/Icon/Expensicons';
import {Plus} from '@components/Icon/Expensicons';
import {LockedAccountContext} from '@components/LockedAccountModalProvider';
import MessagesRow from '@components/MessagesRow';
import SearchBar from '@components/SearchBar';
Expand Down Expand Up @@ -426,7 +426,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
),
icons: [
{
source: details.avatar ?? FallbackAvatar,
source: details.avatar ?? icons.FallbackAvatar,
name: formatPhoneNumber(details?.login ?? ''),
type: CONST.ICON_TYPE_AVATAR,
id: accountID,
Expand Down Expand Up @@ -458,6 +458,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
invitedPrimaryToSecondaryLogins,
policyOwner,
currentUserLogin,
icons.FallbackAvatar,
]);

const filterMember = useCallback((memberOption: MemberOption, searchQuery: string) => {
Expand Down
Loading