Merge 234d8f9 into feature/238

SalesforceFoundation · Apr 17, 2024 · 34ace95 · 34ace95
2 parents 302619d + 234d8f9
commit 34ace95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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<CON_ContactMerge_CTRL.ContactWrapper> searchResults) {

diff --git 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()) {