Skip to content

Commit 0f36281

Browse files
authored
Merge pull request #22269 from Expensify/beaman-removeActionAccountEmailAgain
Remove few instances of `reportAction.actorEmail` for email -> accountID migration
2 parents 6e03e54 + 675fd1c commit 0f36281

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

src/libs/ReportUtils.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ Onyx.connect({
3636
},
3737
});
3838

39-
let loginList;
40-
Onyx.connect({
41-
key: ONYXKEYS.LOGIN_LIST,
42-
callback: (val) => (loginList = _.isEmpty(val) ? [] : _.keys(val)),
43-
});
44-
4539
let preferredLocale = CONST.LOCALES.DEFAULT;
4640
Onyx.connect({
4741
key: ONYXKEYS.NVP_PREFERRED_LOCALE,
@@ -2110,7 +2104,7 @@ function chatIncludesChronos(report) {
21102104
*/
21112105
function canFlagReportAction(reportAction, reportID) {
21122106
return (
2113-
!loginList.includes(reportAction.actorEmail) &&
2107+
reportAction.actorAccountID !== currentUserAccountID &&
21142108
reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT &&
21152109
!ReportActionsUtils.isDeletedAction(reportAction) &&
21162110
!ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&

tests/ui/UnreadIndicatorsTest.js

-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ describe('Unread Indicators', () => {
521521
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {
522522
lastMessageText: lastReportAction.message[0].text,
523523
lastVisibleActionCreated: DateUtils.getDBTime(lastReportAction.timestamp),
524-
lastActorEmail: lastReportAction.actorEmail,
525524
reportID: REPORT_ID,
526525
});
527526
return waitForPromisesToResolve();

0 commit comments

Comments
 (0)