Skip to content

Commit d67957a

Browse files
authored
Merge pull request #5368 from mozilla/mntor-3851
Add link to marketing email preferences
2 parents 861953d + df42a97 commit d67957a

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/panels/Panel.module.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
p {
4040
color: $color-grey-40;
4141
font-weight: 400;
42-
padding-right: $layout-xl;
42+
43+
@media screen and (min-width: $content-md) {
44+
padding-right: $layout-xl;
45+
}
4346
}
4447
}
4548
}

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/panels/SettingsPanelNotifications.module.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
label {
1616
align-items: center;
1717
display: flex;
18-
gap: $layout-md;
18+
gap: $layout-xs;
1919
justify-content: space-between;
2020

21+
@media screen and (min-width: $content-md) {
22+
gap: $layout-md;
23+
}
24+
2125
div {
2226
display: flex;
2327
flex-direction: column;

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/panels/SettingsPanelNotifications.tsx

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ import { EmailUpdateCommOptionRequest } from "../../../../../../../api/v1/user/u
1515
import { useTelemetry } from "../../../../../../../hooks/useTelemetry";
1616
import { useRadioGroup } from "react-aria";
1717
import { VisuallyHidden } from "../../../../../../../components/server/VisuallyHidden";
18-
import { Button } from "../../../../../../../components/client/Button";
18+
import { TelemetryButton } from "../../../../../../../components/client/TelemetryButton";
1919
import styles from "./SettingsPanelNotifications.module.scss";
2020
import { SwitchInput } from "../../../../../../../components/client/SwitchInput";
2121
import { RadioInput } from "../../../../../../../components/client/RadioInput";
22+
import { CONST_URL_MOZILLA_BASKET } from "../../../../../../../../constants";
2223

2324
export type SettingsPanelNotificationsProps = {
2425
data: SubscriberEmailPreferencesOutput;
@@ -215,9 +216,21 @@ function SettingsPanelNotifications(props: SettingsPanelNotificationsProps) {
215216
<section>
216217
<h4>{l10n.getString("settings-tab-notifications-marketing-title")}</h4>
217218
<p>{l10n.getString("settings-tab-notifications-marketing-text")}</p>
218-
<Button className={styles.link} variant="link" href="/">
219+
<TelemetryButton
220+
className={styles.link}
221+
variant="link"
222+
href={`${CONST_URL_MOZILLA_BASKET}/fxa/?email=${props.subscriber.primary_email}`}
223+
target="_blank"
224+
event={{
225+
module: "link",
226+
name: "click",
227+
data: {
228+
link_id: "clicked_marketing_email_settings",
229+
},
230+
}}
231+
>
219232
{l10n.getString("settings-tab-notifications-marketing-link-label")}
220-
</Button>
233+
</TelemetryButton>
221234
</section>
222235
</>
223236
);

src/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export const CONST_URL_TERMS =
2828
"https://www.mozilla.org/about/legal/terms/subscription-services/";
2929
export const CONST_URL_PRIVACY_POLICY =
3030
"https://www.mozilla.org/privacy/subscription-services/";
31+
export const CONST_URL_MOZILLA_BASKET = "https://basket.mozilla.org";
3132
export const CONST_URL_DATA_PRIVACY_PETITION_BANNER =
3233
"https://foundation.mozilla.org/campaigns/demand-privacy-for-all-support-a-us-data-privacy-law-v1/?utm_source=monitor&utm_medium=in-product&utm_campaign=24-pfa";
3334
export const CONST_URL_MONITOR_GITHUB =

0 commit comments

Comments
 (0)