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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Avatar from '@components/Avatar';
import AvatarFromIcon from '@components/Avatar/AvatarFromIcon';
import AvatarWithDisplayName from '@components/AvatarWithDisplayName';
import type HeaderWithBackButtonProps from '@components/HeaderWithBackButton/types';
import SearchButton from '@components/Search/SearchRouter/SearchButton';
Expand Down Expand Up @@ -156,12 +156,9 @@ function HeaderWithBackButton({
/>
)}
{!!policyAvatar && (
<Avatar
<AvatarFromIcon
icon={policyAvatar}
containerStyles={[StyleUtils.getWidthAndHeightStyle(StyleUtils.getAvatarSize(policyAvatarSize)), styles.mr3]}
source={policyAvatar.source}
name={policyAvatar.name}
avatarID={policyAvatar.id}
type={policyAvatar.type}
size={policyAvatarSize}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/libs/TransactionUtils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2458,7 +2458,7 @@ function hasNoticeTypeViolation(
violation.type === CONST.VIOLATION_TYPES.NOTICE &&
(showInReview === undefined || showInReview === (violation.showInReview ?? false)) &&
!isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy) &&
shouldShowViolation(iouReport, policy, violation.name, currentUserEmail, true, transaction),
shouldShowViolation(iouReport, policy, violation.name, currentUserEmail, currentUserAccountID, true, transaction),
);
}

Expand Down
12 changes: 6 additions & 6 deletions tests/actions/IOUTest/BulkEditTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2382,8 +2382,8 @@ describe('actions/IOU/BulkEdit', () => {
hash: undefined,
currentUserAccountID: RORY_ACCOUNT_ID,
delegateAccountID: undefined,
getCurrencyDecimals,
getCurrencySymbol,
getCurrencyDecimals: getCurrencyDecimalsLocal,
getCurrencySymbol: getCurrencySymbolLocal,
allPolicies: {
[`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy,
},
Expand Down Expand Up @@ -2472,8 +2472,8 @@ describe('actions/IOU/BulkEdit', () => {
hash: undefined,
currentUserAccountID: RORY_ACCOUNT_ID,
delegateAccountID: undefined,
getCurrencyDecimals,
getCurrencySymbol,
getCurrencyDecimals: getCurrencyDecimalsLocal,
getCurrencySymbol: getCurrencySymbolLocal,
allPolicies: {
[`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy,
},
Expand Down Expand Up @@ -2554,8 +2554,8 @@ describe('actions/IOU/BulkEdit', () => {
hash: undefined,
currentUserAccountID: RORY_ACCOUNT_ID,
delegateAccountID: undefined,
getCurrencyDecimals,
getCurrencySymbol,
getCurrencyDecimals: getCurrencyDecimalsLocal,
getCurrencySymbol: getCurrencySymbolLocal,
allPolicies: {
[`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy,
},
Expand Down
1 change: 0 additions & 1 deletion tests/unit/ReportUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16968,7 +16968,6 @@ describe('ReportUtils', () => {
},
},
owner: currentUserEmail,
isPolicyExpenseChatEnabled: true,
};

const chatReport: Report = {
Expand Down
Loading