Disable showing onboarding modal

jevonmao · Sep 27, 2021 · e26b345 · e26b345
1 parent c55f380
commit e26b345
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Sources/Shared/Views/OnboardingView/Components/OnboardingView.swift b/Sources/Shared/Views/OnboardingView/Components/OnboardingView.swift
@@ -48,6 +48,7 @@ struct OnboardingView: View {
                 if AppVersionStatus.currentVersion == "1.2.6" {
                     showAlert = true
                 }
+                stayInPresentation = false
             }, label: {
                 Text("Continue")
                     .font(.body)

diff --git a/Sources/Shared/Views/OnboardingView/OnboardingWrapperView.swift b/Sources/Shared/Views/OnboardingView/OnboardingWrapperView.swift
@@ -14,7 +14,11 @@ struct OnboardingWrapperView<Content: View>: View {
     var contentView: Content
     var body: some View {
         let versionStatus = AppVersionStatus.getVersionStatus()
-        let shouldPresent: Binding<Bool> = Binding(get: {return versionStatus != .stable || userSettings.developerSettings.alwaysShowOnboarding},
+        let shouldPresent: Binding<Bool> = Binding(get: {
+            let shouldShow = versionStatus != .stable || userSettings.developerSettings.alwaysShowOnboarding
+            let remoteOverride = globalRemoteConfig.configValue(forKey: "show_onboarding").boolValue
+            return shouldShow && remoteOverride
+        },
                                                    set: {_ in
                                                         fatalError("Should not be setting this value.")
                                                    })