Merge branch 'master' into mod/tor/US-650250

Author: tumms2021389

packages/react-sdk-components/src/components/infra/Containers/FlowContainer/FlowContainer.tsx

@@ -266,7 +266,9 @@ export const FlowContainer = (props: FlowContainerProps) => {
     // if have caseMessage show message and end
     const theCaseMessages = localizedVal(thePConn.getValue('caseMessages', ''), localeCategory); // 2nd arg empty string until typedefs properly allow optional
 
-    if (theCaseMessages || !hasAssignments()) {
+    // caseMessages's behavior has changed in 24.2, and hence it doesn't let Optional Action work.
+    // Changing the below condition for now. Was: (theCaseMessages || !hasAssignments())
+    if (!hasAssignments()) {
       // Temp fix for 8.7 change: confirmationNote no longer coming through in caseMessages$.
       // So, if we get here and caseMessages$ is empty, use default value in DX API response
       setCaseMessages(theCaseMessages || localizedVal('Thank you! The next step in this case has been routed appropriately.', localeCategory));

packages/react-sdk-components/src/components/infra/NavBar/NavBar.css

@@ -165,4 +165,5 @@
 
 .scrollable {
   overflow-y: scroll !important;
+  min-height: 200px !important;
 }

packages/react-sdk-components/src/components/template/SimpleTable/SimpleTableManual/SimpleTableManual.tsx

@@ -258,11 +258,16 @@ export default function SimpleTableManual(props: PropsWithChildren<SimpleTableMa
   function generateRowsData() {
     // if referenceList is empty and dataPageName property value exists then make a datapage fetch call and get the list of data.
     if (!referenceList.length && dataPageName) {
-      getDataPage(dataPageName, parameters, context).then(listData => {
-        const data = formatRowsData(listData);
-        myRows = data;
-        setRowData(data);
-      });
+      getDataPage(dataPageName, parameters, context)
+        .then(listData => {
+          const data = formatRowsData(listData);
+          myRows = data;
+          setRowData(data);
+        })
+        .catch(e => {
+          // eslint-disable-next-line no-console
+          console.log(e);
+        });
     } else {
       // The referenceList prop has the JSON data for each row to be displayed
       //  in the table. So, iterate over referenceList to create the dataRows that

packages/react-sdk-components/tests/e2e/Digv2/FormFields/Attachment.spec.js

@@ -106,7 +106,7 @@ test.describe('E2E test', () => {
     /** Testing error case by uploading empty file */
     await page.setInputFiles(`#AttachmentList`, [zeroBytesFile]);
     await expect(page.locator('div >> text="Error with one or more files"')).toBeVisible();
-    await expect(page.locator(`div >> text="Empty file can't be uploaded."`)).toBeVisible();
+    await expect(page.locator(`div >> text="Empty file can't be uploaded." >> nth=0`)).toBeVisible();
 
     const errorFile = await page.locator('div[class="psdk-utility-card"]:has-text("Unable to upload file")');
     await errorFile.locator('button[aria-label="Delete Attachment"]').click();

packages/react-sdk-components/tests/e2e/Digv2/FormFields/Email.spec.js

@@ -44,6 +44,7 @@ test.describe('E2E test', () => {
     /** Required tests */
     const requiredEmail = page.locator('input[data-test-id="96fa7548c363cdd5adb29c2c2749e436"]');
     requiredEmail.fill('[email protected]');
+    requiredEmail.blur();
     await expect(page.locator('p.Mui-error.Mui-required')).toBeHidden();
 
     /** Checking 'field label', 'placeholder', and 'helper text' */