GEN-2462: Cleanup DK and NO #1439
Draft
+144
−827
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliaendre
requested changes
Aug 1, 2024
| @@ -86,24 +84,16 @@ public struct NotLoggedInView: View { | |||
| } | |||
|
|
|||
| @ViewBuilder | |||
| var marketAndLanguage: some View { | |||
| var language: some View { | |||
There was a problem hiding this comment.
we could actually name this one languageView for readability just to be extra clear that this is a view!
There was a problem hiding this comment.
Makes sense! I'll fix it!
juliaendre
reviewed
Aug 2, 2024
sladan-hedvig
requested changes
Aug 20, 2024
juliaendre
reviewed
Aug 20, 2024
| @@ -17,7 +17,7 @@ extension AppDelegate { | |||
| let optionalDictionary: [String: String?] = [ | |||
| "memberId": memberId, | |||
| "appVersion": Bundle.main.appVersion, | |||
| "market": Localization.Locale.currentLocale.market.rawValue, | |||
| "market": "se", | |||
There was a problem hiding this comment.
@sladan-hedvig not sure how to handle this one
| @@ -207,19 +207,7 @@ struct LoggedInNavigation: View { | |||
| ) | |||
| .environmentObject(vm.profileNavigationVm) | |||
| case .pickLanguage: | |||
| PickLanguage { [weak profileNavigationVm = vm.profileNavigationVm, weak mainNavigationVm, weak vm] _ in | |||
There was a problem hiding this comment.
@sladan-hedvig should be fine right?
| @@ -186,7 +183,7 @@ public class NotLoggedViewModel: ObservableObject { | |||
| webUrl | |||
| .appending("utm_source", value: "ios") | |||
| .appending("utm_medium", value: "hedvig-app") | |||
| .appending("utm_campaign", value: Localization.Locale.currentLocale.market.rawValue.lowercased()) | |||
| .appending("utm_campaign", value: "se") | |||
There was a problem hiding this comment.
@sladan-hedvig same, not sure how to handle
added 9 commits
August 23, 2024 11:27
# Conflicts: # Projects/App/Sources/Journeys/LoggedInNavigation.swift # Projects/App/Sources/Journeys/LoginNavigation.swift # Projects/Market/Sources/LanguageAndMarketPickerView.swift # Projects/Market/Sources/PickLanguage.swift
# Conflicts: # Projects/hCore/Sources/Masking.swift
# Conflicts: # Projects/Claims/Sources/Views/ClaimDetailView.swift
# Conflicts: # Projects/App/Sources/AppDelegate+Unleash.swift # Projects/App/Sources/Journeys/LoginNavigation.swift # Projects/App/Sources/Screens/Impersonation/ImpersonationSettings.swift # Projects/Authentication/Sources/OTP/OTPEntryView.swift # Projects/Authentication/Sources/Service/OctopusImplementation/AuthenticationClientAuthLib.swift # Projects/Home/Sources/HomeState.swift # Projects/Market/Sources/LanguageAndMarketPickerView.swift # Projects/Market/Sources/MarketStore.swift # Projects/Market/Sources/PickLanguage.swift # Projects/MoveFlow/Sources/View/MovingFlowConfirm.swift # Projects/MoveFlow/Sources/View/MovingFlowHouseView.swift # Projects/MoveFlow/Sources/View/MovingFlowHousingType.swift # Projects/hCore/Sources/FeatureFlags/FeatureFlagOctopus.swift
# Conflicts: # Projects/App/Sources/Journeys/LoginNavigation.swift
# Conflicts: # Projects/Contracts/Sources/Models/ContractModels.swift # Projects/MoveFlow/Sources/View/MovingFlowConfirm.swift
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[GEN-2462]
Checklist