From f184f69def97a44fbb249816158c1010ca64e9d6 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 28 Mar 2024 11:15:24 +0100 Subject: [PATCH 1/2] MOBILE-2768 policy: Fix archived policy displayed after login --- src/core/features/policy/services/policy.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/features/policy/services/policy.ts b/src/core/features/policy/services/policy.ts index 82caaafebb1..df7b8a8f961 100644 --- a/src/core/features/policy/services/policy.ts +++ b/src/core/features/policy/services/policy.ts @@ -102,6 +102,10 @@ export class CorePolicyService { for (const i in policies) { const policy = policies[i]; + if (policy.status !== CorePolicyStatus.Active) { + continue; + } + const hasAccepted = policy.acceptance?.status === 1; const hasDeclined = policy.acceptance?.status === 0; From bd0595358653ef2d60b4512fc1d6946b562d7325 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 28 Mar 2024 11:19:44 +0100 Subject: [PATCH 2/2] MOBILE-2768 theme: Apply ion-text-wrap to ion-radio and ion-checkbox --- src/theme/theme.base.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 30367a9f828..6d661464ce1 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -133,8 +133,10 @@ ion-checkbox.ion-text-wrap::part(label) { } .item.ion-text-wrap > ion-label, -.item.ion-text-wrap > ion-checkbox::part(label), -ion-checkbox.ion-text-wrap::part(label) { +.item.ion-text-wrap ion-checkbox::part(label), +ion-checkbox.ion-text-wrap::part(label), +.item.ion-text-wrap ion-radio::part(label), +ion-radio.ion-text-wrap::part(label) { white-space: normal !important; }