Merge branch 'main' into tweaks_15.10_random

island-is · Oct 15, 2024 · 72f6949 · 72f6949
2 parents c9fb816 + 4a1d731
commit 72f6949
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/libs/portals/shared-modules/delegations/src/components/delegations/DelegationViewModal.tsx b/libs/portals/shared-modules/delegations/src/components/delegations/DelegationViewModal.tsx
@@ -154,7 +154,7 @@ export const DelegationViewModal = ({
               <IdentityCard
                 label={formatMessage(m.validTo)}
                 title={
-                  delegation?.validTo && isValid(delegation.validTo)
+                  delegation?.validTo && isValid(new Date(delegation.validTo))
                     ? format(new Date(delegation?.validTo), 'dd.MM.yyyy')
                     : formatMessage(m.noValidToDate)
                 }

diff --git a/...ls/shared-modules/delegations/src/components/delegations/outgoing/DelegationsOutgoing.tsx b/...ls/shared-modules/delegations/src/components/delegations/outgoing/DelegationsOutgoing.tsx
@@ -121,15 +121,11 @@ export const DelegationsOutgoing = () => {
                     <AccessCard
                       key={delegation.id}
                       delegation={delegation}
-                      onDelete={
-                        !isGeneralMandate
-                          ? (delegation) => {
-                              setDelegation(
-                                delegation as AuthCustomDelegationOutgoing,
-                              )
-                            }
-                          : undefined
-                      }
+                      onDelete={(delegation) => {
+                        setDelegation(
+                          delegation as AuthCustomDelegationOutgoing,
+                        )
+                      }}
                       onEdit={
                         !isGeneralMandate
                           ? (delegation) =>