diff --git a/force-app/main/default/classes/CON_ContactMerge_TEST.cls b/force-app/main/default/classes/CON_ContactMerge_TEST.cls index 18c81a6d9d3..22764e53f0f 100644 --- a/force-app/main/default/classes/CON_ContactMerge_TEST.cls +++ b/force-app/main/default/classes/CON_ContactMerge_TEST.cls @@ -967,7 +967,8 @@ public class CON_ContactMerge_TEST { } private static User getReadOnlyUser() { - return [SELECT Id FROM User WHERE Profile.Name = :UTIL_UnitTestData_TEST.PROFILE_READONLY_USER LIMIT 1]; + return [SELECT Id FROM User WHERE Profile.Name = :UTIL_UnitTestData_TEST.PROFILE_READONLY_USER + AND IsActive = TRUE LIMIT 1]; } private static void selectSearchResults(List searchResults) { diff --git a/force-app/main/default/lwc/utilCommon/utilCommon.js b/force-app/main/default/lwc/utilCommon/utilCommon.js index efd2291082f..16983ad1df4 100644 --- a/force-app/main/default/lwc/utilCommon/utilCommon.js +++ b/force-app/main/default/lwc/utilCommon/utilCommon.js @@ -638,7 +638,7 @@ const nonePicklistOption = () => { return createPicklistOption(commonLabelNone, commonLabelNone); } -const asyncInterval = async (callback, milliseconds, maxNumberOfIntervals = 5) => { +const asyncInterval = async (callback, milliseconds, maxNumberOfIntervals = 20) => { return new Promise((resolve, reject) => { const intervalId = setInterval(async () => { if (await callback()) {