bcgov · JamesPasta · Jan 29, 2026 · Jan 22, 2026 · Jan 23, 2026 · Jan 23, 2026
diff --git a/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts b/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
@@ -1,10 +1,22 @@
+// cypress/e2e/basicEmail.cy.ts
+
 describe('Send an email', () => {
     const TEST_EMAIL_TO = 'grantmanagementsupport@gov.bc.ca'
     const TEST_EMAIL_CC = 'UnitySupport@gov.bc.ca'
     const TEST_EMAIL_BCC = 'UNITYSUP@Victoria1.gov.bc.ca'
     const TEMPLATE_NAME = 'Test Case 1'
     const STANDARD_TIMEOUT = 20000
 
+    // Only suppress the noisy ResizeObserver error that Unity throws in TEST.
+    // Everything else should still fail the test.
+    Cypress.on('uncaught:exception', (err) => {
+        const msg = err && err.message ? err.message : ''
+        if (msg.indexOf('ResizeObserver loop limit exceeded') >= 0) {
+            return false
+        }
+        return true
+    })
+
     const now = new Date()
     const timestamp =
         now.getFullYear() +
@@ -23,8 +35,6 @@ describe('Send an email', () => {
 
     function switchToDefaultGrantsProgramIfAvailable() {
         cy.get('body').then(($body) => {
-            // If we are already on GrantPrograms (or can navigate there), try. Otherwise skip quietly.
-            // Key point: never .should() an optional element.
             const hasUserInitials = $body.find('.unity-user-initials').length > 0
 
             if (!hasUserInitials) {
@@ -41,7 +51,6 @@ describe('Send an email', () => {
 
                 if (switchLink.length === 0) {
                     cy.log('Skipping tenant switch: "Switch Grant Programs" not present for this user/session')
-                    // Close dropdown so it does not block clicks later
                     cy.get('body').click(0, 0)
                     return
                 }
@@ -74,6 +83,81 @@ describe('Send an email', () => {
         })
     }
 
+    function openSavedEmailFromHistoryBySubject(subject: string) {
+        cy.get('body', { timeout: STANDARD_TIMEOUT }).then(($body) => {
+            const historyTableById = $body.find('#EmailHistoryTable')
+            if (historyTableById.length > 0) {
+                cy.get('#EmailHistoryTable', { timeout: STANDARD_TIMEOUT })
+                    .should('be.visible')
+                    .within(() => {
+                        cy.contains('td', subject, { timeout: STANDARD_TIMEOUT })
+                            .should('exist')
+                            .click()
+                    })
+                return
+            }
+
+            // Fallback: find the subject anywhere in a TD (scoped to avoid brittle class names)
+            cy.contains('td', subject, { timeout: STANDARD_TIMEOUT })
+                .should('exist')
+                .click()
+        })
+    }
+
+    function confirmSendDialogIfPresent() {
+        // Wait until either a bootstrap modal is shown, or SweetAlert container appears, or confirm button exists.
+        cy.get('body', { timeout: STANDARD_TIMEOUT }).should(($b) => {
+            const hasBootstrapShownModal = $b.find('.modal.show').length > 0
+            const hasSwal = $b.find('.swal2-container').length > 0
+            const hasConfirmBtn = $b.find('#btn-confirm-send').length > 0
+            expect(hasBootstrapShownModal || hasSwal || hasConfirmBtn).to.eq(true)
+        })
+
+        cy.get('body', { timeout: STANDARD_TIMEOUT }).then(($b) => {
+            const hasSwal = $b.find('.swal2-container').length > 0
+            if (hasSwal) {
+                // SweetAlert2 style
+                cy.get('.swal2-container', { timeout: STANDARD_TIMEOUT }).should('be.visible')
+                cy.contains('.swal2-container', 'Are you sure', { timeout: STANDARD_TIMEOUT }).should('exist')
+
+                // Typical confirm button class, with fallback to text match
+                if ($b.find('.swal2-confirm').length > 0) {
+                    cy.get('.swal2-confirm', { timeout: STANDARD_TIMEOUT }).should('be.visible').click()
+                } else {
+                    cy.contains('.swal2-container button', 'Yes', { timeout: STANDARD_TIMEOUT }).click()
+                }
+                return
+            }
+
+            const hasBootstrapShownModal = $b.find('.modal.show').length > 0
+            if (hasBootstrapShownModal) {
+                // Bootstrap modal: assert the shown modal, not the inner content div
+                cy.get('.modal.show', { timeout: STANDARD_TIMEOUT })
+                    .should('be.visible')
+                    .within(() => {
+                        cy.contains('Are you sure you want to send this email?', { timeout: STANDARD_TIMEOUT })
+                            .should('exist')
+
+                        // Prefer the known id if present, otherwise click a button with expected intent text
+                        if (Cypress.$('#btn-confirm-send').length > 0) {
+                            cy.get('#btn-confirm-send', { timeout: STANDARD_TIMEOUT })
+                                .should('exist')
+                                .should('be.visible')
+                                .click()
+                        } else {
+                            cy.contains('button', 'Confirm', { timeout: STANDARD_TIMEOUT }).click()
+                        }
+                    })
+                return
+            }
+
+            // Last resort: confirm button exists but modal might not be "visible" by Cypress standards
+            cy.get('#btn-confirm-send', { timeout: STANDARD_TIMEOUT })
+                .should('exist')
+                .click({ force: true })
+        })
+    }
+
     it('Login', () => {
         cy.login()
     })
@@ -189,38 +273,27 @@ describe('Send an email', () => {
     })
 
     it('Select saved email from Email History', () => {
-        cy.contains('td.data-table-header', TEST_EMAIL_SUBJECT, { timeout: STANDARD_TIMEOUT })
-            .should('exist')
-            .click()
+        openSavedEmailFromHistoryBySubject(TEST_EMAIL_SUBJECT)
 
         cy.get('#EmailTo', { timeout: STANDARD_TIMEOUT }).should('be.visible')
         cy.get('#EmailCC').should('be.visible')
         cy.get('#EmailBCC').should('be.visible')
         cy.get('#EmailSubject').should('be.visible')
 
-        cy.get('#btn-send').should('be.visible')
-        cy.get('#btn-save').should('be.visible')
+        cy.get('#btn-send', { timeout: STANDARD_TIMEOUT }).should('exist')
+        cy.get('#btn-save', { timeout: STANDARD_TIMEOUT }).should('exist')
     })
 
     it('Send the email', () => {
         cy.get('#btn-send', { timeout: STANDARD_TIMEOUT })
             .should('exist')
             .should('be.visible')
+            .should('not.be.disabled')
             .click()
     })
 
-    it('Confirm send email in modal', () => {
-        cy.get('#modal-content', { timeout: STANDARD_TIMEOUT })
-            .should('exist')
-            .should('be.visible')
-
-        cy.contains('Are you sure you want to send this email?', { timeout: STANDARD_TIMEOUT })
-            .should('exist')
-
-        cy.get('#btn-confirm-send', { timeout: STANDARD_TIMEOUT })
-            .should('exist')
-            .should('be.visible')
-            .click()
+    it('Confirm send email in dialog', () => {
+        confirmSendDialogIfPresent()
     })
 
     it('Verify Logout', () => {

diff --git a/applications/Unity.GrantManager/.gitignore b/applications/Unity.GrantManager/.gitignore
@@ -261,6 +261,9 @@ src/Unity.GrantManager.DbMigrator/Logs/*
 src/Unity.GrantManager.Blazor.Server/Logs/*
 src/Unity.GrantManager.Blazor.Server.Tiered/Logs/*
 
+# Development settings with sensitive information
+**/appsettings.Development.json
+
 # Use abp install-libs to restore.
 **/wwwroot/libs/*
 

diff --git a/....GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Unity.Flex.Application.csproj b/....GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Unity.Flex.Application.csproj
@@ -9,6 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
 		<PackageReference Include="System.Text.Json" Version="9.0.5" />

diff --git a/.../modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj b/.../modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Unity.Flex.Application\Unity.Flex.Application.csproj" />
     <ProjectReference Include="..\Unity.Flex.TestBase\Unity.Flex.TestBase.csproj" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />

diff --git a/...ager/modules/Unity.Flex/test/Unity.Flex.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/...ager/modules/Unity.Flex/test/Unity.Flex.TestBase/Security/FakeCurrentPrincipalAccessor.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Security.Claims;
+using System.Security.Claims;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Security.Claims;
 
@@ -13,14 +12,14 @@ protected override ClaimsPrincipal GetClaimsPrincipal()
         return GetPrincipal();
     }
 
-    private ClaimsPrincipal GetPrincipal()
+    private static ClaimsPrincipal GetPrincipal()
     {
-        return new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>
-                {
+        return new ClaimsPrincipal(new ClaimsIdentity(
+                [
                     new Claim(AbpClaimTypes.UserId, "2e701e62-0953-4dd3-910b-dc6cc93ccb0d"),
                     new Claim(AbpClaimTypes.UserName, "admin"),
                     new Claim(AbpClaimTypes.Email, "admin@abp.io")
-                }
+                ]
             )
         );
     }

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Unity.Identity.Web.csproj b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Unity.Identity.Web.csproj
@@ -31,6 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="System.Text.Json" Version="9.0.5" />

diff --git a/...rc/Unity.Notifications.EntityFrameworkCore/Unity.Notifications.EntityFrameworkCore.csproj b/...rc/Unity.Notifications.EntityFrameworkCore/Unity.Notifications.EntityFrameworkCore.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="System.Text.Json" Version="9.0.5" />

diff --git a/...s/test/Unity.Notifications.Application.Tests/Unity.Notifications.Application.Tests.csproj b/...s/test/Unity.Notifications.Application.Tests/Unity.Notifications.Application.Tests.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Unity.Notifications.Application\Unity.Notifications.Application.csproj" />
     <ProjectReference Include="..\Unity.Notifications.Domain.Tests\Unity.Notifications.Domain.Tests.csproj" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="System.Text.Json" Version="9.0.5" />

diff --git a/...tifications/test/Unity.Notifications.Domain.Tests/Unity.Notifications.Domain.Tests.csproj b/...tifications/test/Unity.Notifications.Domain.Tests/Unity.Notifications.Domain.Tests.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />

diff --git a/...ifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj b/...ifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />

diff --git a/...r/modules/Unity.Payments/src/Unity.Payments.Application/Unity.Payments.Application.csproj b/...r/modules/Unity.Payments/src/Unity.Payments.Application/Unity.Payments.Application.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="ClosedXML" Version="0.104.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/...anager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.js b/...anager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.js
@@ -131,7 +131,10 @@ $(function () {
             defaultVisibleColumns,
             listColumns,
             maxRowsPerPage: 25,
-            defaultSortColumn: 0,
+            defaultSortColumn: {
+                name: 'userName',
+                dir: 'asc'
+            },
             dataEndpoint: unity.grantManager.payments.paymentSettings.getL2ApproversThresholds,
             data: {},
             responseCallback,
@@ -251,7 +254,10 @@ $(function () {
             defaultVisibleColumns,
             listColumns,
             maxRowsPerPage: 25,
-            defaultSortColumn: 0,
+            defaultSortColumn: {
+                name: 'ministryClient',
+                dir: 'asc'
+            },
             dataEndpoint: unity.grantManager.payments.accountCoding.getList,
             data: {},
             responseCallback,

diff --git a/...GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js b/...GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
@@ -151,7 +151,10 @@ $(function () {
         defaultVisibleColumns,
         listColumns,
         maxRowsPerPage: 10,
-        defaultSortColumn: 13,
+        defaultSortColumn: {
+            name: 'requestedOn',
+            dir: 'desc'
+        },
         dataEndpoint: unity.payments.paymentRequests.paymentRequest.getList,
         data: {},
         responseCallback,

diff --git a/...nity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Unity.Payments.Web.csproj b/...nity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Unity.Payments.Web.csproj
@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="System.Text.Json" Version="9.0.5" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="9.1.3" />

diff --git a/...ules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js b/...ules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js
@@ -198,7 +198,10 @@
         defaultVisibleColumns,
         listColumns,
         maxRowsPerPage: 10,
-        defaultSortColumn: 3,
+        defaultSortColumn: {
+            name: 'requestedOn',
+            dir: 'desc'
+        },
         dataEndpoint:
             unity.payments.paymentRequests.paymentRequest
                 .getListByApplicationId,

diff --git a/...ty.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj b/...ty.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj
@@ -13,6 +13,7 @@
     <ProjectReference Include="..\..\src\Unity.Payments.Shared\Unity.Payments.Shared.csproj" />
     <ProjectReference Include="..\..\src\Unity.Payments.Web\Unity.Payments.Web.csproj" />
     <ProjectReference Include="..\Unity.Payments.TestBase\Unity.Payments.TestBase.csproj" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="System.Text.Json" Version="9.0.5" />

diff --git a/...anager/modules/Unity.Payments/test/Unity.Payments.TestBase/Unity.Payments.TestBase.csproj b/...anager/modules/Unity.Payments/test/Unity.Payments.TestBase/Unity.Payments.TestBase.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />

diff --git a/...odules/Unity.Reporting/src/Unity.Reporting.Application/Unity.Reporting.Application.csproj b/...odules/Unity.Reporting/src/Unity.Reporting.Application/Unity.Reporting.Application.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.1.3" />
     <PackageReference Include="Volo.Abp.AutoMapper" Version="9.1.3" />
     <PackageReference Include="Volo.Abp.Ddd.Application" Version="9.1.3" />

diff --git a/...Reporting/test/Unity.Reporting.Application.Tests/Unity.Reporting.Application.Tests.csproj b/...Reporting/test/Unity.Reporting.Application.Tests/Unity.Reporting.Application.Tests.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Unity.Reporting.Application\Unity.Reporting.Application.csproj" />
     <ProjectReference Include="..\Unity.Reporting.TestBase\Unity.Reporting.TestBase.csproj" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
   </ItemGroup>
 

diff --git a/.../Unity.TenantManagement.Application.Tests/Unity.TenantManagement.Application.Tests.csproj b/.../Unity.TenantManagement.Application.Tests/Unity.TenantManagement.Application.Tests.csproj
@@ -18,6 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />

diff --git a/...agement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj b/...agement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Unity.TenantManagement.TestBase\Unity.TenantManagement.TestBase.csproj" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="System.Text.Json" Version="9.0.5" />

diff --git a/...antManagement/test/Unity.TenantManagement.TestBase/Unity.TenantManagement.TestBase.csproj b/...antManagement/test/Unity.TenantManagement.TestBase/Unity.TenantManagement.TestBase.csproj
@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />