Fixed issue with not showing datepicker in the termination flow

HedvigInsurance · Jan 28, 2025 · bbaafab · bbaafab
1 parent e50e40f
commit bbaafab
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 29 deletions.
diff --git a/Projects/TerminateContracts/Sources/Views/SetTerminationDate.swift b/Projects/TerminateContracts/Sources/Views/SetTerminationDate.swift
@@ -17,38 +17,35 @@ struct SetTerminationDate: View {
     }
 
     var body: some View {
-        hForm {
-            if let termination = terminationNavigationVm.terminationDateStepModel {
-                DatePickerView(
-                    vm: .init(
-                        continueAction: {
-                            terminationNavigationVm.terminationDateStepModel?.date = terminationDate
-                            terminationNavigationVm.isDatePickerPresented = false
+        if let termination = terminationNavigationVm.terminationDateStepModel {
+            DatePickerView(
+                vm: .init(
+                    continueAction: {
+                        terminationNavigationVm.terminationDateStepModel?.date = terminationDate
+                        terminationNavigationVm.isDatePickerPresented = false
 
-                            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                                self.isHidden = true
-                            }
-                        },
-                        cancelAction: {
-                            terminationNavigationVm.isDatePickerPresented = false
-                        },
-                        date: $terminationDate,
-                        config: .init(
-                            minDate: termination.minDate.localDateToDate,
-                            maxDate: termination.maxDate.localDateToDate,
-                            initialySelectedValue: Date(),
-                            placeholder: "",
-                            title: L10n.terminationDateText,
-                            showAsList: false,
-                            dateFormatter: .none,
-                            buttonText: L10n.generalSaveButton
-                        )
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                            self.isHidden = true
+                        }
+                    },
+                    cancelAction: {
+                        terminationNavigationVm.isDatePickerPresented = false
+                    },
+                    date: $terminationDate,
+                    config: .init(
+                        minDate: termination.minDate.localDateToDate,
+                        maxDate: termination.maxDate.localDateToDate,
+                        initialySelectedValue: Date(),
+                        placeholder: "",
+                        title: L10n.terminationDateText,
+                        showAsList: false,
+                        dateFormatter: .none,
+                        buttonText: L10n.generalSaveButton
                     )
                 )
-            }
+            )
+            .hide($isHidden)
         }
-        .hFormContentPosition(.compact)
-        .hide($isHidden)
     }
 }
 

diff --git a/Projects/TerminateContracts/Sources/Views/SetTerminationDateLandingScreen.swift b/Projects/TerminateContracts/Sources/Views/SetTerminationDateLandingScreen.swift
@@ -128,7 +128,7 @@ struct SetTerminationDateLandingScreen: View {
                                 .foregroundColor(hTextColor.Opaque.secondary)
                             }
                         }
-
+                        .fixedSize(horizontal: false, vertical: true)
                         HStack {
                             hRow {
                                 hText(L10n.terminationFlowIUnderstandText)

diff --git a/Projects/hCoreUI/Sources/Views/GeneralDatePicker.swift b/Projects/hCoreUI/Sources/Views/GeneralDatePicker.swift
@@ -60,6 +60,7 @@ public struct DatePickerView: View {
                 }
                 .sectionContainerStyle(.transparent)
             }
+            .padding(.top, .padding8)
         }
         .toolbar {
             ToolbarItem(placement: .principal) {