Fixed merge conflicts

2026-05-05 07:27:42 +02:00 · 2023-03-20 07:33:28 +01:00
parent e5d97ed154
commit c61ddcf39a
8 changed files with 12 additions and 17 deletions
@@ -23,7 +23,7 @@ import Foundation
 enum StaticLocationViewingViewAction {
    case close
    case share
-    // case mapCreditsDidTap   // $$$ 1.10.5 does not have this enum case
+    case mapCreditsDidTap
    case showUserLocation
 }

@@ -49,7 +49,7 @@ struct StaticLocationView: View {
                                       annotations: [viewModel.viewState.sharedAnnotation],
                                       highlightedAnnotation: viewModel.viewState.sharedAnnotation,
                                       userAvatarData: viewModel.viewState.userAvatarData,
-                                       showsUserLocation: false,
+                                       showsUserLocationMode: ShowUserLocationMode.hide,
                                       userLocation: Binding.constant(nil),
                                       mapCenterCoordinate: Binding.constant(nil),
                                       errorSubject: viewModel.viewState.errorSubject)