[PM-16776][PM-16693] Visual tweaks to the 2FA notice screen (#1253)

bitwarden · Jan 10, 2025 · 3d00a96 · 3d00a96
1 parent 34cbcf6
commit 3d00a96
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 6 deletions.
diff --git a/BitwardenShared/UI/Auth/TwoFactorNotice/EmailAccess/EmailAccessView.swift b/BitwardenShared/UI/Auth/TwoFactorNotice/EmailAccess/EmailAccessView.swift
@@ -28,7 +28,7 @@ struct EmailAccessView: View {
                     store.send(.learnMoreTapped)
                 } label: {
                     Text(Localizations.learnMore)
-                        .styleGuide(.subheadline)
+                        .styleGuide(.callout, weight: .semibold)
                         .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor)
                 }
             )
@@ -51,6 +51,7 @@ struct EmailAccessView: View {
             openURL(url)
             store.send(.clearURL)
         }
+        .navigationBarHidden(true)
     }
 
     private var toggleCard: some View {

diff --git a/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.1.png b/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.1.png
diff --git a/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.2.png b/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.2.png
diff --git a/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.3.png b/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.3.png
diff --git a/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.4.png b/...ilAccess/__Snapshots__/EmailAccessViewTests/test_snapshot_emailAccessView.4.png
diff --git a/...ots__/EmailAccessViewTests/test_snapshot_emailAccessView_longEmailAddress.1.png b/...ots__/EmailAccessViewTests/test_snapshot_emailAccessView_longEmailAddress.1.png
diff --git a/BitwardenShared/UI/Auth/TwoFactorNotice/SetUpTwoFactor/SetUpTwoFactorView.swift b/BitwardenShared/UI/Auth/TwoFactorNotice/SetUpTwoFactor/SetUpTwoFactorView.swift
@@ -66,6 +66,9 @@ struct SetUpTwoFactorView: View {
             openURL(url)
             store.send(.clearURL)
         }
+        .navigationBarHidden(false)
+        .navigationBarTitle(Localizations.twoStepLogin)
+        .navigationBarTitleDisplayMode(.inline)
     }
 }
 

diff --git a/BitwardenShared/UI/Auth/TwoFactorNotice/SetUpTwoFactor/SetUpTwoFactorViewTests.swift b/BitwardenShared/UI/Auth/TwoFactorNotice/SetUpTwoFactor/SetUpTwoFactorViewTests.swift
@@ -65,7 +65,7 @@ class SetUpTwoFactorViewTests: BitwardenTestCase {
     func test_snapshot_setUpTwoFactorView_allowDelay_true() {
         processor.state.allowDelay = true
         assertSnapshots(
-            of: subject,
+            of: subject.navStackWrapped,
             as: [.defaultPortrait, .defaultPortraitDark, .defaultPortraitAX5, .defaultLandscape]
         )
     }
@@ -75,7 +75,7 @@ class SetUpTwoFactorViewTests: BitwardenTestCase {
     func test_snapshot_setUpTwoFactorView_allowDelay_false() {
         processor.state.allowDelay = false
         assertSnapshots(
-            of: subject,
+            of: subject.navStackWrapped,
             as: [.defaultPortrait, .defaultPortraitDark, .defaultPortraitAX5, .defaultLandscape]
         )
     }

diff --git a/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.1.png b/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.1.png
diff --git a/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.2.png b/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.2.png
diff --git a/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.3.png b/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.3.png
diff --git a/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.4.png b/...SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_false.4.png
diff --git a/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.1.png b/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.1.png
diff --git a/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.2.png b/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.2.png
diff --git a/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.3.png b/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.3.png
diff --git a/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.4.png b/.../SetUpTwoFactorViewTests/test_snapshot_setUpTwoFactorView_allowDelay_true.4.png
diff --git a/BitwardenShared/UI/Vault/Vault/VaultCoordinator.swift b/BitwardenShared/UI/Vault/Vault/VaultCoordinator.swift
@@ -369,9 +369,6 @@ final class VaultCoordinator: Coordinator, HasStackNavigator { // swiftlint:disa
     ///   - emailAddress: The email address of the user.
     private func showTwoFactorNotice(allowDelay: Bool, emailAddress: String) {
         let navigationController = UINavigationController()
-        let appearance = UINavigationBarAppearance()
-        appearance.configureWithTransparentBackground()
-        navigationController.navigationBar.scrollEdgeAppearance = appearance
 
         let coordinator = module.makeTwoFactorNoticeCoordinator(stackNavigator: navigationController)
         coordinator.start()