From ad082b5067e2f0b7a7c3f0228b021c3329e52bfb Mon Sep 17 00:00:00 2001 From: Ian Philips Date: Mon, 12 Sep 2022 09:36:54 -0600 Subject: [PATCH] Change tab in url --- common/notification.ts | 2 +- functions/src/emails.ts | 10 +++++----- web/components/notification-settings.tsx | 2 +- web/pages/notifications.tsx | 15 +++++++++++++-- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/common/notification.ts b/common/notification.ts index e9ccd594..42dbbf35 100644 --- a/common/notification.ts +++ b/common/notification.ts @@ -154,6 +154,6 @@ export const getDestinationsForUser = async ( return { sendToEmail: destinations.includes('email'), sendToBrowser: destinations.includes('browser'), - urlToManageThisNotification: `${DOMAIN}/notifications?section=${subscriptionType}`, + urlToManageThisNotification: `${DOMAIN}/notifications?tab=settings§ion=${subscriptionType}`, } } diff --git a/functions/src/emails.ts b/functions/src/emails.ts index e40a8ab8..47169dbb 100644 --- a/functions/src/emails.ts +++ b/functions/src/emails.ts @@ -153,7 +153,7 @@ export const sendWelcomeEmail = async ( const { name } = user const firstName = name.split(' ')[0] - const unsubscribeLink = `${DOMAIN}/notifications?section=${ + const unsubscribeLink = `${DOMAIN}/notifications?tab=settings§ion=${ 'onboarding_flow' as keyof notification_subscription_types }` @@ -221,7 +221,7 @@ export const sendOneWeekBonusEmail = async ( const { name } = user const firstName = name.split(' ')[0] - const unsubscribeLink = `${DOMAIN}/notifications?section=${ + const unsubscribeLink = `${DOMAIN}/notifications?tab=settings§ion=${ 'onboarding_flow' as keyof notification_subscription_types }` return await sendTemplateEmail( @@ -254,7 +254,7 @@ export const sendCreatorGuideEmail = async ( const { name } = user const firstName = name.split(' ')[0] - const unsubscribeLink = `${DOMAIN}/notifications?section=${ + const unsubscribeLink = `${DOMAIN}/notifications?tab=settings§ion=${ 'onboarding_flow' as keyof notification_subscription_types }` return await sendTemplateEmail( @@ -288,7 +288,7 @@ export const sendThankYouEmail = async ( const { name } = user const firstName = name.split(' ')[0] - const unsubscribeLink = `${DOMAIN}/notifications?section=${ + const unsubscribeLink = `${DOMAIN}/notifications?tab=settings§ion=${ 'thank_you_for_purchases' as keyof notification_subscription_types }` @@ -466,7 +466,7 @@ export const sendInterestingMarketsEmail = async ( ) return - const unsubscribeUrl = `${DOMAIN}/notifications?section=${ + const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings§ion=${ 'trending_markets' as keyof notification_subscription_types }` diff --git a/web/components/notification-settings.tsx b/web/components/notification-settings.tsx index 5dcdf3dd..756adbfd 100644 --- a/web/components/notification-settings.tsx +++ b/web/components/notification-settings.tsx @@ -25,7 +25,7 @@ import { import { WatchMarketModal } from 'web/components/contract/watch-market-modal' import { filterDefined } from 'common/util/array' import toast from 'react-hot-toast' -import { SwitchSetting } from 'web/components/switch' +import { SwitchSetting } from 'web/components/switch-setting' export function NotificationSettings(props: { navigateToSection: string | undefined diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx index 8b89379f..0e25e652 100644 --- a/web/pages/notifications.tsx +++ b/web/pages/notifications.tsx @@ -85,8 +85,19 @@ export default function Notifications() { labelClassName={'pb-2 pt-1 '} className={'mb-0 sm:mb-2'} activeIndex={activeIndex} - onClick={(title, index) => { - setActiveIndex(index) + onClick={(title, i) => { + router.replace( + { + query: { + ...router.query, + tab: title.toLowerCase(), + section: '', + }, + }, + undefined, + { shallow: true } + ) + setActiveIndex(i) }} tabs={[ {