Merge pull request #1613 from Automattic/lantean/adjusting-copy

Magic Links: Adjusting Copy
Automattic · Jul 15, 2024 · 747c3ef · 747c3ef
2 parents 94f66ad + 6d779c0
commit 747c3ef
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/Simplenote/Classes/MagicLinkAuthenticator.swift b/Simplenote/Classes/MagicLinkAuthenticator.swift
@@ -70,12 +70,13 @@ private extension MagicLinkAuthenticator {
                     authenticator.authenticate(withUsername: confirmation.username, token: confirmation.syncToken)
 
                     NotificationCenter.default.post(name: .magicLinkAuthDidSucceed, object: nil)
-                    SPTracker.trackUserConfirmedLoginLink()
+                    SPTracker.trackLoginLinkConfirmationSuccess()
                 }
 
             } catch {
                 NSLog("[MagicLinkAuthenticator] Magic Link TokenExchange Error: \(error)")
                 NotificationCenter.default.post(name: .magicLinkAuthDidFail, object: error)
+                SPTracker.trackLoginLinkConfirmationFailure()
             }
         }
 

diff --git a/Simplenote/Classes/SPAuthViewController.swift b/Simplenote/Classes/SPAuthViewController.swift
@@ -315,7 +315,7 @@ private extension SPAuthViewController {
                 self.handleError(error: error)
             } else {
                 self.presentMagicLinkRequestedView(email: email)
-                SPTracker.trackUserRequestedLoginLink()
+                SPTracker.trackLoginLinkRequested()
             }
 
             self.unlockInterface()

diff --git a/Simplenote/Classes/SPTracker.h b/Simplenote/Classes/SPTracker.h
@@ -81,10 +81,13 @@
 #pragma mark - User
 + (void)trackUserAccountCreated;
 + (void)trackUserSignedIn;
-+ (void)trackUserRequestedLoginLink;
-+ (void)trackUserConfirmedLoginLink;
 + (void)trackUserSignedOut;
 
+#pragma mark - Login Links
++ (void)trackLoginLinkRequested;
++ (void)trackLoginLinkConfirmationSuccess;
++ (void)trackLoginLinkConfirmationFailure;
+
 #pragma mark - WP.com Sign In
 + (void)trackWPCCButtonPressed;
 + (void)trackWPCCLoginSucceeded;

diff --git a/Simplenote/Classes/SPTracker.m b/Simplenote/Classes/SPTracker.m
@@ -317,21 +317,30 @@ + (void)trackUserSignedIn
     [self trackAutomatticEventWithName:@"user_signed_in" properties:nil];
 }
 
-+ (void)trackUserRequestedLoginLink
++ (void)trackUserSignedOut
 {
-    [self trackAutomatticEventWithName:@"user_requested_login_link" properties:nil];
+    [self trackAutomatticEventWithName:@"user_signed_out" properties:nil];
 }
 
-+ (void)trackUserConfirmedLoginLink
+
+#pragma mark - Login Links
+
++ (void)trackLoginLinkRequested
 {
-    [self trackAutomatticEventWithName:@"user_confirmed_login_link" properties:nil];
+    [self trackAutomatticEventWithName:@"login_link_requested" properties:nil];
 }
 
-+ (void)trackUserSignedOut
++ (void)trackLoginLinkConfirmationSuccess
 {
-    [self trackAutomatticEventWithName:@"user_signed_out" properties:nil];
+    [self trackAutomatticEventWithName:@"login_link_confirmation_success" properties:nil];
 }
 
++ (void)trackLoginLinkConfirmationFailure
+{
+    [self trackAutomatticEventWithName:@"login_link_confirmation_failure" properties:nil];
+}
+
+
 #pragma mark - WP.com Sign In
 
 + (void)trackWPCCButtonPressed

diff --git a/Simplenote/MagicLinkInvalidView.swift b/Simplenote/MagicLinkInvalidView.swift
@@ -18,15 +18,11 @@ struct MagicLinkInvalidView: View {
                     .renderingMode(.template)
                     .foregroundColor(Color(.simplenoteLightBlueColor))
 
-                Text("Invalid Link")
+                Text("Link no longer valid")
                     .bold()
                     .font(.system(size: Metrics.titleFontSize))
-                    .padding()
-
-                Text("Your authentication link is no longer valid")
-                    .font(.system(size: Metrics.detailsFontSize))
                     .multilineTextAlignment(.center)
-                    .padding(.bottom, Metrics.detailsPaddingBottom)
+                    .padding(.bottom, Metrics.titlePaddingBottom)
 
                 Button(action: pressedRequestNewLink) {
                     Text("Request a new Link")
@@ -71,9 +67,8 @@ struct MagicLinkInvalidView: View {
 private enum Metrics {
     static let crossIconSize = CGSize(width: 100, height: 100)
     static let dismissSize = CGSize(width: 30, height: 30)
-    static let titleFontSize: CGFloat = 22
-    static let detailsFontSize: CGFloat = 17
-    static let detailsPaddingBottom: CGFloat = 30
+    static let titleFontSize: CGFloat = 20
+    static let titlePaddingBottom: CGFloat = 30
     static let actionCornerRadius: CGFloat = 10
 }