diff --git a/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx b/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx
index 6d0883593cb..7646692e342 100644
--- a/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx
+++ b/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx
@@ -18,7 +18,7 @@ const DialogFooter = ({ saveText, disabled }: DialogFooterProps) => {
type="submit"
mode="solid"
color="secondary"
- disabled={disabled ?? isSubmitting}
+ disabled={disabled || isSubmitting}
>
{saveText ?? intl.formatMessage(formMessages.saveChanges)}
diff --git a/apps/web/src/components/Table/ResponsiveTable/ResponsiveTable.tsx b/apps/web/src/components/Table/ResponsiveTable/ResponsiveTable.tsx
index b45e922344a..d3241a08843 100644
--- a/apps/web/src/components/Table/ResponsiveTable/ResponsiveTable.tsx
+++ b/apps/web/src/components/Table/ResponsiveTable/ResponsiveTable.tsx
@@ -368,7 +368,7 @@ const ResponsiveTable = ({
- hasSpecialNote: !!(
- initialData.specialNote?.en ?? initialData.specialNote?.fr
- ),
+ hasSpecialNote:
+ !!initialData.specialNote?.en || !!initialData.specialNote?.fr,
specialNoteEn: initialData.specialNote?.en ?? "",
specialNoteFr: initialData.specialNote?.fr ?? "",
});
diff --git a/apps/web/src/pages/Users/UserInformationPage/components/AboutSection.tsx b/apps/web/src/pages/Users/UserInformationPage/components/AboutSection.tsx
index 8b2f9bfaac0..49e85c3e6f9 100644
--- a/apps/web/src/pages/Users/UserInformationPage/components/AboutSection.tsx
+++ b/apps/web/src/pages/Users/UserInformationPage/components/AboutSection.tsx
@@ -93,7 +93,7 @@ const AboutSection = ({ user }: BasicUserInformationProps) => {
)}
{intl.formatMessage({ diff --git a/packages/ui/src/components/Accordion/Accordion.tsx b/packages/ui/src/components/Accordion/Accordion.tsx index 3d85fdd8406..a66b52fb8eb 100644 --- a/packages/ui/src/components/Accordion/Accordion.tsx +++ b/packages/ui/src/components/Accordion/Accordion.tsx @@ -232,7 +232,7 @@ const Trigger = forwardRef< - {(Icon ?? context) && ( + {(!!Icon || !!context) && (