From 6ffd4f486067a45dcdcf11ec14df876a24ff412c Mon Sep 17 00:00:00 2001 From: Suyash More Date: Wed, 7 May 2025 13:10:17 +0530 Subject: [PATCH 1/2] Remove condition to update Mailing country value when state-country picklist enabled --- force-app/main/default/classes/NPSP_Address.cls | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/force-app/main/default/classes/NPSP_Address.cls b/force-app/main/default/classes/NPSP_Address.cls index 1ca140066da..3b0406dc10a 100644 --- a/force-app/main/default/classes/NPSP_Address.cls +++ b/force-app/main/default/classes/NPSP_Address.cls @@ -408,11 +408,7 @@ public inherited sharing class NPSP_Address implements IAddress { if (String.isBlank(countryCode)) { return; } - - if (String.isEmpty(address.MailingCountry__c)) { - address.MailingCountry__c = orgConfig.validCountriesByCode().get(countryCode - .toUpperCase()); - } + address.MailingCountry__c = orgConfig.validCountriesByCode().get(countryCode.toUpperCase()); } /******************************************************************************************************* From 0b0ab1974156b4ef99c8dbb57e9a8e5f285048b4 Mon Sep 17 00:00:00 2001 From: Luke Parrott Date: Fri, 9 May 2025 10:45:45 -0500 Subject: [PATCH 2/2] SLDS2 fixes --- .../geDonationMatchingOpportunityCard.css | 4 ++-- .../geDonationMatchingPaymentCard.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css index a3110c6bd5b..cd297ab66d0 100644 --- a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css +++ b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css @@ -46,8 +46,8 @@ } .bottom-button { - border-bottom-left-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2))); - border-bottom-right-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2))); + border-bottom-left-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2, .25rem))); + border-bottom-right-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2, .25rem))); } .slds-border_extension-bottom { diff --git a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css index bab953d10bf..0cbbe64682e 100644 --- a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css +++ b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css @@ -43,8 +43,8 @@ padding-top: 0.25rem; padding-bottom: 0.25rem; border: none; - border-bottom-left-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2))); - border-bottom-right-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2))); + border-bottom-left-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2, .25rem))); + border-bottom-right-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2, .25rem))); } .slds-card.slds-card_boundary {