Analytics opt in for posthog

res/css/views/toasts/_AnalyticsToast.scss

@@ -15,13 +15,17 @@ limitations under the License.
 */
 
 .mx_AnalyticsToast {
-    .mx_AccessibleButton_kind_danger {
-        background: none;
-        color: $accent;
+    .mx_AccessibleButton_kind_danger_outline {
+        background-color: $accent;
+        color: #ffffff;
+        border: 1px solid $accent;
+        font-weight: 600;
     }
 
     .mx_AccessibleButton_kind_primary {
-        background: $accent;
+        background-color: $accent;
         color: #ffffff;
+        border: 1px solid $accent;
+        font-weight: 600;
     }
 }

src/PosthogAnalytics.ts

@@ -333,11 +333,11 @@ export class PosthogAnalytics {
         // Update this.anonymity based on the user's analytics opt-in settings
         const anonymity = pseudonymousOptIn ? Anonymity.Pseudonymous : Anonymity.Disabled;
         this.setAnonymity(anonymity);
-        if (anonymity == Anonymity.Pseudonymous) {
+        if (anonymity === Anonymity.Pseudonymous) {
             await this.identifyUser(MatrixClientPeg.get(), PosthogAnalytics.getRandomAnalyticsId);
         }
 
-        if (anonymity != Anonymity.Disabled) {
+        if (anonymity !== Anonymity.Disabled) {
             await PosthogAnalytics.instance.updatePlatformSuperProperties();
         }
     }

src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx

@@ -76,7 +76,7 @@ const AnalyticsLearnMoreDialog: React.FC<IProps> = ({
                 ) }
             </div>
             <ul className="mx_AnalyticsLearnMore_bullets">
-                <li>{ _t("We <Bold>don't</Bold> record or profile any personal data",
+                <li>{ _t("We <Bold>don't</Bold> record or profile any account data",
                     {}, { "Bold": (sub) => <b>{ sub }</b> }) }</li>
                 <li>{ _t("We <Bold>don't</Bold> share information with third parties",
                     {}, { "Bold": (sub) => <b>{ sub }</b> }) }</li>

src/dispatcher/actions.ts

@@ -206,22 +206,26 @@ export enum Action {
 
     /**
      * The user accepted pseudonymous analytics (i.e. posthog) from the toast
+     * Payload: none
      */
     PseudonymousAnalyticsAccept = "pseudonymous_analytics_accept",
 
     /**
      * The user rejected pseudonymous analytics (i.e. posthog) from the toast
+     * Payload: none
      */
     PseudonymousAnalyticsReject = "pseudonymous_analytics_reject",
 
     /**
      * The user accepted anonymous analytics (i.e. matomo, pre-posthog) from the toast
      * (this action and its handler can be removed once posthog is rolled out)
+     * Payload: none
      */
     AnonymousAnalyticsAccept = "anonymous_analytics_accept",
 
     /**
      * The user rejected anonymous analytics (i.e. matomo, pre-posthog) from the toast
+     * Payload: none
      */
     AnonymousAnalyticsReject = "anonymous_analytics_reject"
 }

src/i18n/strings/en_EN.json

@@ -752,7 +752,7 @@
     "Enable": "Enable",
     "That's fine": "That's fine",
     "Stop": "Stop",
-    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. ": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. ",
+    "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.": "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. This will use a <PolicyLink>cookie</PolicyLink>.",
     "Help improve %(analyticsOwner)s": "Help improve %(analyticsOwner)s",
     "You previously consented to share anonymous usage data with us. We're updating how that works.": "You previously consented to share anonymous usage data with us. We're updating how that works.",
     "Learn more": "Learn more",
@@ -2292,7 +2292,7 @@
     "Use an identity server to invite by email. Manage in <settings>Settings</settings>.": "Use an identity server to invite by email. Manage in <settings>Settings</settings>.",
     "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>": "You can read all our terms <PrivacyPolicyUrl>here</PrivacyPolicyUrl>",
     "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.": "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we'll generate a random identifier, shared by your devices.",
-    "We <Bold>don't</Bold> record or profile any personal data": "We <Bold>don't</Bold> record or profile any personal data",
+    "We <Bold>don't</Bold> record or profile any account data": "We <Bold>don't</Bold> record or profile any account data",
     "We <Bold>don't</Bold> share information with third parties": "We <Bold>don't</Bold> share information with third parties",
     "You can turn this off anytime in settings": "You can turn this off anytime in settings",
     "The following users may not exist": "The following users may not exist",

src/toasts/AnalyticsToast.tsx

@@ -81,15 +81,20 @@ const TOAST_KEY = "analytics";
 const getAnonymousDescription = (): ReactNode => {
     // get toast description for anonymous tracking (the previous scheme pre-posthog)
     const brand = SdkConfig.get().brand;
+    const cookiePolicyUrl = SdkConfig.get().piwik?.policyUrl;
     return _t(
-        "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. ",
+        "Send <UsageDataLink>anonymous usage data</UsageDataLink> which helps us improve %(brand)s. " +
+        "This will use a <PolicyLink>cookie</PolicyLink>.",
         {
             brand,
         },
         {
             "UsageDataLink": (sub) => (
                 <AccessibleButton kind="link" onClick={onUsageDataClicked}>{ sub }</AccessibleButton>
             ),
+            "PolicyLink": (sub) => cookiePolicyUrl ? (
+                <a target="_blank" href={cookiePolicyUrl}>{ sub }</a>
+            ) : sub,
         },
     );
 };

test/end-to-end-tests/src/scenarios/toast.js

@@ -26,6 +26,7 @@ module.exports = async function toastScenarios(alice, bob) {
 
     alice.log.step(`accepts analytics toast`);
     await acceptToast(alice, "Help improve Element");
+    await rejectToast(alice, "Testing small changes");
     alice.log.done();
 
     alice.log.step(`checks no remaining toasts`);
@@ -40,6 +41,7 @@ module.exports = async function toastScenarios(alice, bob) {
 
     bob.log.step(`reject analytics toast`);
     await rejectToast(bob, "Help improve Element");
+    await rejectToast(bob, "Testing small changes");
     bob.log.done();
 
     bob.log.step(`checks no remaining toasts`);