Merge branch 'main' into mention-contracts

common/add-liquidity.ts

@@ -1,10 +1,9 @@
 import { addCpmmLiquidity, getCpmmLiquidity } from './calculate-cpmm'
 import { CPMMContract } from './contract'
 import { LiquidityProvision } from './liquidity-provision'
-import { User } from './user'
 
 export const getNewLiquidityProvision = (
-  user: User,
+  userId: string,
   amount: number,
   contract: CPMMContract,
   newLiquidityProvisionId: string
@@ -18,7 +17,7 @@ export const getNewLiquidityProvision = (
 
   const newLiquidityProvision: LiquidityProvision = {
     id: newLiquidityProvisionId,
-    userId: user.id,
+    userId: userId,
     contractId: contract.id,
     amount,
     pool: newPool,

common/antes.ts

@@ -15,6 +15,12 @@ import { Answer } from './answer'
 
 export const HOUSE_LIQUIDITY_PROVIDER_ID = 'IPTOzEqrpkWmEzh6hwvAyY9PqFb2' // @ManifoldMarkets' id
 export const DEV_HOUSE_LIQUIDITY_PROVIDER_ID = '94YYTk1AFWfbWMpfYcvnnwI1veP2' // @ManifoldMarkets' id
+export const UNIQUE_BETTOR_LIQUIDITY_AMOUNT = 20
+
+type NormalizedBet<T extends Bet = Bet> = Omit<
+  T,
+  'userAvatarUrl' | 'userName' | 'userUsername'
+>
 
 export function getCpmmInitialLiquidity(
   providerId: string,
@@ -51,7 +57,7 @@ export function getAnteBets(
 
   const { createdTime } = contract
 
-  const yesBet: Bet = {
+  const yesBet: NormalizedBet = {
     id: yesAnteId,
     userId: creator.id,
     contractId: contract.id,
@@ -65,7 +71,7 @@ export function getAnteBets(
     fees: noFees,
   }
 
-  const noBet: Bet = {
+  const noBet: NormalizedBet = {
     id: noAnteId,
     userId: creator.id,
     contractId: contract.id,
@@ -93,7 +99,7 @@ export function getFreeAnswerAnte(
 
   const { createdTime } = contract
 
-  const anteBet: Bet = {
+  const anteBet: NormalizedBet = {
     id: anteBetId,
     userId: anteBettorId,
     contractId: contract.id,
@@ -123,7 +129,7 @@ export function getMultipleChoiceAntes(
 
   const { createdTime } = contract
 
-  const bets: Bet[] = answers.map((answer, i) => ({
+  const bets: NormalizedBet[] = answers.map((answer, i) => ({
     id: betDocIds[i],
     userId: creator.id,
     contractId: contract.id,
@@ -173,7 +179,7 @@ export function getNumericAnte(
     range(0, bucketCount).map((_, i) => [i, betAnte])
   )
 
-  const anteBet: NumericBet = {
+  const anteBet: NormalizedBet<NumericBet> = {
     id: newBetId,
     userId: anteBettorId,
     contractId: contract.id,

common/bet.ts

@@ -3,6 +3,12 @@ import { Fees } from './fees'
 export type Bet = {
   id: string
   userId: string
+
+  // denormalized for bet lists
+  userAvatarUrl?: string
+  userUsername: string
+  userName: string
+
   contractId: string
   createdTime: number
 

common/economy.ts

@@ -13,5 +13,5 @@ export const UNIQUE_BETTOR_BONUS_AMOUNT = econ?.UNIQUE_BETTOR_BONUS_AMOUNT ?? 10
 export const BETTING_STREAK_BONUS_AMOUNT =
   econ?.BETTING_STREAK_BONUS_AMOUNT ?? 10
 export const BETTING_STREAK_BONUS_MAX = econ?.BETTING_STREAK_BONUS_MAX ?? 50
-export const BETTING_STREAK_RESET_HOUR = econ?.BETTING_STREAK_RESET_HOUR ?? 0
+export const BETTING_STREAK_RESET_HOUR = econ?.BETTING_STREAK_RESET_HOUR ?? 7
 export const FREE_MARKETS_PER_USER_MAX = econ?.FREE_MARKETS_PER_USER_MAX ?? 5

common/envs/constants.ts

@@ -21,7 +21,10 @@ export function isWhitelisted(email?: string) {
 }
 
 // TODO: Before open sourcing, we should turn these into env vars
-export function isAdmin(email: string) {
+export function isAdmin(email?: string) {
+  if (!email) {
+    return false
+  }
   return ENV_CONFIG.adminEmails.includes(email)
 }
 

common/envs/prod.ts

@@ -15,6 +15,9 @@ export type EnvConfig = {
 
   // Branding
   moneyMoniker: string // e.g. 'M$'
+  bettor?: string // e.g. 'bettor' or 'predictor'
+  presentBet?: string // e.g. 'bet' or 'predict'
+  pastBet?: string // e.g. 'bet' or 'prediction'
   faviconPath?: string // Should be a file in /public
   navbarLogoPath?: string
   newQuestionPlaceholders: string[]
@@ -74,10 +77,14 @@ export const PROD_CONFIG: EnvConfig = {
     'iansphilips@gmail.com', // Ian
     'd4vidchee@gmail.com', // D4vid
     'federicoruizcassarino@gmail.com', // Fede
+    'ingawei@gmail.com', //Inga
   ],
   visibility: 'PUBLIC',
 
   moneyMoniker: 'M$',
+  bettor: 'predictor',
+  pastBet: 'prediction',
+  presentBet: 'predict',
   navbarLogoPath: '',
   faviconPath: '/favicon.ico',
   newQuestionPlaceholders: [

common/group.ts

@@ -12,7 +12,18 @@ export type Group = {
   aboutPostId?: string
   chatDisabled?: boolean
   mostRecentContractAddedTime?: number
+  cachedLeaderboard?: {
+    topTraders: {
+      userId: string
+      score: number
+    }[]
+    topCreators: {
+      userId: string
+      score: number
+    }[]
+  }
 }
+
 export const MAX_GROUP_NAME_LENGTH = 75
 export const MAX_ABOUT_LENGTH = 140
 export const MAX_ID_LENGTH = 60

common/new-bet.ts

@@ -31,7 +31,10 @@ import {
   floatingLesserEqual,
 } from './util/math'
 
-export type CandidateBet<T extends Bet = Bet> = Omit<T, 'id' | 'userId'>
+export type CandidateBet<T extends Bet = Bet> = Omit<
+  T,
+  'id' | 'userId' | 'userAvatarUrl' | 'userName' | 'userUsername'
+>
 export type BetInfo = {
   newBet: CandidateBet
   newPool?: { [outcome: string]: number }
@@ -322,7 +325,7 @@ export const getNewBinaryDpmBetInfo = (
 export const getNewMultiBetInfo = (
   outcome: string,
   amount: number,
-  contract: FreeResponseContract | MultipleChoiceContract,
+  contract: FreeResponseContract | MultipleChoiceContract
 ) => {
   const { pool, totalShares, totalBets } = contract
 

common/notification.ts

@@ -1,3 +1,5 @@
+import { notification_preference } from './user-notification-preferences'
+
 export type Notification = {
   id: string
   userId: string
@@ -15,7 +17,7 @@ export type Notification = {
   sourceUserUsername?: string
   sourceUserAvatarUrl?: string
   sourceText?: string
-  data?: string
+  data?: { [key: string]: any }
 
   sourceContractTitle?: string
   sourceContractCreatorUsername?: string
@@ -26,6 +28,7 @@ export type Notification = {
 
   isSeenOnHref?: string
 }
+
 export type notification_source_types =
   | 'contract'
   | 'comment'
@@ -51,28 +54,197 @@ export type notification_source_update_types =
   | 'deleted'
   | 'closed'
 
+/* Optional - if possible use a notification_preference */
 export type notification_reason_types =
   | 'tagged_user'
-  | 'on_users_contract'
-  | 'on_contract_with_users_shares_in'
-  | 'on_contract_with_users_shares_out'
-  | 'on_contract_with_users_answer'
-  | 'on_contract_with_users_comment'
-  | 'reply_to_users_answer'
-  | 'reply_to_users_comment'
   | 'on_new_follow'
-  | 'you_follow_user'
-  | 'added_you_to_group'
+  | 'contract_from_followed_user'
   | 'you_referred_user'
   | 'user_joined_to_bet_on_your_market'
   | 'unique_bettors_on_your_contract'
-  | 'on_group_you_are_member_of'
   | 'tip_received'
   | 'bet_fill'
   | 'user_joined_from_your_group_invite'
   | 'challenge_accepted'
   | 'betting_streak_incremented'
   | 'loan_income'
-  | 'you_follow_contract'
-  | 'liked_your_contract'
   | 'liked_and_tipped_your_contract'
+  | 'comment_on_your_contract'
+  | 'answer_on_your_contract'
+  | 'comment_on_contract_you_follow'
+  | 'answer_on_contract_you_follow'
+  | 'update_on_contract_you_follow'
+  | 'resolution_on_contract_you_follow'
+  | 'comment_on_contract_with_users_shares_in'
+  | 'answer_on_contract_with_users_shares_in'
+  | 'update_on_contract_with_users_shares_in'
+  | 'resolution_on_contract_with_users_shares_in'
+  | 'comment_on_contract_with_users_answer'
+  | 'update_on_contract_with_users_answer'
+  | 'resolution_on_contract_with_users_answer'
+  | 'answer_on_contract_with_users_answer'
+  | 'comment_on_contract_with_users_comment'
+  | 'answer_on_contract_with_users_comment'
+  | 'update_on_contract_with_users_comment'
+  | 'resolution_on_contract_with_users_comment'
+  | 'reply_to_users_answer'
+  | 'reply_to_users_comment'
+  | 'your_contract_closed'
+  | 'subsidized_your_market'
+
+type notification_descriptions = {
+  [key in notification_preference]: {
+    simple: string
+    detailed: string
+  }
+}
+export const NOTIFICATION_DESCRIPTIONS: notification_descriptions = {
+  all_answers_on_my_markets: {
+    simple: 'Answers on your markets',
+    detailed: 'Answers on your own markets',
+  },
+  all_comments_on_my_markets: {
+    simple: 'Comments on your markets',
+    detailed: 'Comments on your own markets',
+  },
+  answers_by_followed_users_on_watched_markets: {
+    simple: 'Only answers by users you follow',
+    detailed: "Only answers by users you follow on markets you're watching",
+  },
+  answers_by_market_creator_on_watched_markets: {
+    simple: 'Only answers by market creator',
+    detailed: "Only answers by market creator on markets you're watching",
+  },
+  betting_streaks: {
+    simple: 'For predictions made over consecutive days',
+    detailed: 'Bonuses for predictions made over consecutive days',
+  },
+  comments_by_followed_users_on_watched_markets: {
+    simple: 'Only comments by users you follow',
+    detailed:
+      'Only comments by users that you follow on markets that you watch',
+  },
+  contract_from_followed_user: {
+    simple: 'New markets from users you follow',
+    detailed: 'New markets from users you follow',
+  },
+  limit_order_fills: {
+    simple: 'Limit order fills',
+    detailed: 'When your limit order is filled by another user',
+  },
+  loan_income: {
+    simple: 'Automatic loans from your predictions in unresolved markets',
+    detailed:
+      'Automatic loans from your predictions that are locked in unresolved markets',
+  },
+  market_updates_on_watched_markets: {
+    simple: 'All creator updates',
+    detailed: 'All market updates made by the creator',
+  },
+  market_updates_on_watched_markets_with_shares_in: {
+    simple: "Only creator updates on markets that you're invested in",
+    detailed:
+      "Only updates made by the creator on markets that you're invested in",
+  },
+  on_new_follow: {
+    simple: 'A user followed you',
+    detailed: 'A user followed you',
+  },
+  onboarding_flow: {
+    simple: 'Emails to help you get started using Manifold',
+    detailed: 'Emails to help you learn how to use Manifold',
+  },
+  probability_updates_on_watched_markets: {
+    simple: 'Large changes in probability on markets that you watch',
+    detailed: 'Large changes in probability on markets that you watch',
+  },
+  profit_loss_updates: {
+    simple: 'Weekly profit and loss updates',
+    detailed: 'Weekly profit and loss updates',
+  },
+  referral_bonuses: {
+    simple: 'For referring new users',
+    detailed: 'Bonuses you receive from referring a new user',
+  },
+  resolutions_on_watched_markets: {
+    simple: 'All market resolutions',
+    detailed: "All resolutions on markets that you're watching",
+  },
+  resolutions_on_watched_markets_with_shares_in: {
+    simple: "Only market resolutions that you're invested in",
+    detailed:
+      "Only resolutions of markets you're watching and that you're invested in",
+  },
+  subsidized_your_market: {
+    simple: 'Your market was subsidized',
+    detailed: 'When someone subsidizes your market',
+  },
+  tagged_user: {
+    simple: 'A user tagged you',
+    detailed: 'When another use tags you',
+  },
+  thank_you_for_purchases: {
+    simple: 'Thank you notes for your purchases',
+    detailed: 'Thank you notes for your purchases',
+  },
+  tipped_comments_on_watched_markets: {
+    simple: 'Only highly tipped comments on markets that you watch',
+    detailed: 'Only highly tipped comments on markets that you watch',
+  },
+  tips_on_your_comments: {
+    simple: 'Tips on your comments',
+    detailed: 'Tips on your comments',
+  },
+  tips_on_your_markets: {
+    simple: 'Tips/Likes on your markets',
+    detailed: 'Tips/Likes on your markets',
+  },
+  trending_markets: {
+    simple: 'Weekly interesting markets',
+    detailed: 'Weekly interesting markets',
+  },
+  unique_bettors_on_your_contract: {
+    simple: 'For unique predictors on your markets',
+    detailed: 'Bonuses for unique predictors on your markets',
+  },
+  your_contract_closed: {
+    simple: 'Your market has closed and you need to resolve it',
+    detailed: 'Your market has closed and you need to resolve it',
+  },
+  all_comments_on_watched_markets: {
+    simple: 'All new comments',
+    detailed: 'All new comments on markets you follow',
+  },
+  all_comments_on_contracts_with_shares_in_on_watched_markets: {
+    simple: `Only on markets you're invested in`,
+    detailed: `Comments on markets that you're watching and you're invested in`,
+  },
+  all_replies_to_my_comments_on_watched_markets: {
+    simple: 'Only replies to your comments',
+    detailed: "Only replies to your comments on markets you're watching",
+  },
+  all_replies_to_my_answers_on_watched_markets: {
+    simple: 'Only replies to your answers',
+    detailed: "Only replies to your answers on markets you're watching",
+  },
+  all_answers_on_watched_markets: {
+    simple: 'All new answers',
+    detailed: "All new answers on markets you're watching",
+  },
+  all_answers_on_contracts_with_shares_in_on_watched_markets: {
+    simple: `Only on markets you're invested in`,
+    detailed: `Answers on markets that you're watching and that you're invested in`,
+  },
+}
+
+export type BettingStreakData = {
+  streak: number
+  bonusAmount: number
+}
+
+export type BetFillData = {
+  betOutcome: string
+  creatorOutcome: string
+  probability: number
+  fillAmount: number
+}

common/sell-bet.ts

@@ -9,7 +9,10 @@ import { CPMMContract, DPMContract } from './contract'
 import { DPM_CREATOR_FEE, DPM_PLATFORM_FEE, Fees } from './fees'
 import { sumBy } from 'lodash'
 
-export type CandidateBet<T extends Bet> = Omit<T, 'id' | 'userId'>
+export type CandidateBet<T extends Bet> = Omit<
+  T,
+  'id' | 'userId' | 'userAvatarUrl' | 'userName' | 'userUsername'
+>
 
 export const getSellBetInfo = (bet: Bet, contract: DPMContract) => {
   const { pool, totalShares, totalBets } = contract

common/txn.ts

@@ -1,6 +1,13 @@
 // A txn (pronounced "texan") respresents a payment between two ids on Manifold
 // Shortened from "transaction" to distinguish from Firebase transactions (and save chars)
-type AnyTxnType = Donation | Tip | Manalink | Referral | Bonus
+type AnyTxnType =
+  | Donation
+  | Tip
+  | Manalink
+  | Referral
+  | UniqueBettorBonus
+  | BettingStreakBonus
+  | CancelUniqueBettorBonus
 type SourceType = 'USER' | 'CONTRACT' | 'CHARITY' | 'BANK'
 
 export type Txn<T extends AnyTxnType = AnyTxnType> = {
@@ -23,6 +30,7 @@ export type Txn<T extends AnyTxnType = AnyTxnType> = {
     | 'REFERRAL'
     | 'UNIQUE_BETTOR_BONUS'
     | 'BETTING_STREAK_BONUS'
+    | 'CANCEL_UNIQUE_BETTOR_BONUS'
 
   // Any extra data
   data?: { [key: string]: any }
@@ -60,13 +68,40 @@ type Referral = {
   category: 'REFERRAL'
 }
 
-type Bonus = {
+type UniqueBettorBonus = {
   fromType: 'BANK'
   toType: 'USER'
-  category: 'UNIQUE_BETTOR_BONUS' | 'BETTING_STREAK_BONUS'
+  category: 'UNIQUE_BETTOR_BONUS'
+  data: {
+    contractId: string
+    uniqueNewBettorId?: string
+    // Old unique bettor bonus txns stored all unique bettor ids
+    uniqueBettorIds?: string[]
+  }
+}
+
+type BettingStreakBonus = {
+  fromType: 'BANK'
+  toType: 'USER'
+  category: 'BETTING_STREAK_BONUS'
+  data: {
+    currentBettingStreak?: number
+  }
+}
+
+type CancelUniqueBettorBonus = {
+  fromType: 'USER'
+  toType: 'BANK'
+  category: 'CANCEL_UNIQUE_BETTOR_BONUS'
+  data: {
+    contractId: string
+  }
 }
 
 export type DonationTxn = Txn & Donation
 export type TipTxn = Txn & Tip
 export type ManalinkTxn = Txn & Manalink
 export type ReferralTxn = Txn & Referral
+export type BettingStreakBonusTxn = Txn & BettingStreakBonus
+export type UniqueBettorBonusTxn = Txn & UniqueBettorBonus
+export type CancelUniqueBettorBonusTxn = Txn & CancelUniqueBettorBonus

common/user-notification-preferences.ts

@@ -0,0 +1,243 @@
+import { filterDefined } from './util/array'
+import { notification_reason_types } from './notification'
+import { getFunctionUrl } from './api'
+import { DOMAIN } from './envs/constants'
+import { PrivateUser } from './user'
+
+export type notification_destination_types = 'email' | 'browser'
+export type notification_preference = keyof notification_preferences
+export type notification_preferences = {
+  // Watched Markets
+  all_comments_on_watched_markets: notification_destination_types[]
+  all_answers_on_watched_markets: notification_destination_types[]
+
+  // Comments
+  tipped_comments_on_watched_markets: notification_destination_types[]
+  comments_by_followed_users_on_watched_markets: notification_destination_types[]
+  all_replies_to_my_comments_on_watched_markets: notification_destination_types[]
+  all_replies_to_my_answers_on_watched_markets: notification_destination_types[]
+  all_comments_on_contracts_with_shares_in_on_watched_markets: notification_destination_types[]
+
+  // Answers
+  answers_by_followed_users_on_watched_markets: notification_destination_types[]
+  answers_by_market_creator_on_watched_markets: notification_destination_types[]
+  all_answers_on_contracts_with_shares_in_on_watched_markets: notification_destination_types[]
+
+  // On users' markets
+  your_contract_closed: notification_destination_types[]
+  all_comments_on_my_markets: notification_destination_types[]
+  all_answers_on_my_markets: notification_destination_types[]
+  subsidized_your_market: notification_destination_types[]
+
+  // Market updates
+  resolutions_on_watched_markets: notification_destination_types[]
+  resolutions_on_watched_markets_with_shares_in: notification_destination_types[]
+  market_updates_on_watched_markets: notification_destination_types[]
+  market_updates_on_watched_markets_with_shares_in: notification_destination_types[]
+  probability_updates_on_watched_markets: notification_destination_types[]
+
+  // Balance Changes
+  loan_income: notification_destination_types[]
+  betting_streaks: notification_destination_types[]
+  referral_bonuses: notification_destination_types[]
+  unique_bettors_on_your_contract: notification_destination_types[]
+  tips_on_your_comments: notification_destination_types[]
+  tips_on_your_markets: notification_destination_types[]
+  limit_order_fills: notification_destination_types[]
+
+  // General
+  tagged_user: notification_destination_types[]
+  on_new_follow: notification_destination_types[]
+  contract_from_followed_user: notification_destination_types[]
+  trending_markets: notification_destination_types[]
+  profit_loss_updates: notification_destination_types[]
+  onboarding_flow: notification_destination_types[]
+  thank_you_for_purchases: notification_destination_types[]
+}
+
+export const getDefaultNotificationPreferences = (
+  userId: string,
+  privateUser?: PrivateUser,
+  noEmails?: boolean
+) => {
+  const {
+    unsubscribedFromCommentEmails,
+    unsubscribedFromAnswerEmails,
+    unsubscribedFromResolutionEmails,
+    unsubscribedFromWeeklyTrendingEmails,
+    unsubscribedFromGenericEmails,
+  } = privateUser || {}
+
+  const constructPref = (browserIf: boolean, emailIf: boolean) => {
+    const browser = browserIf ? 'browser' : undefined
+    const email = noEmails ? undefined : emailIf ? 'email' : undefined
+    return filterDefined([browser, email]) as notification_destination_types[]
+  }
+  return {
+    // Watched Markets
+    all_comments_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromCommentEmails
+    ),
+    all_answers_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromAnswerEmails
+    ),
+
+    // Comments
+    tips_on_your_comments: constructPref(true, !unsubscribedFromCommentEmails),
+    comments_by_followed_users_on_watched_markets: constructPref(true, false),
+    all_replies_to_my_comments_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromCommentEmails
+    ),
+    all_replies_to_my_answers_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromCommentEmails
+    ),
+    all_comments_on_contracts_with_shares_in_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromCommentEmails
+    ),
+
+    // Answers
+    answers_by_followed_users_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromAnswerEmails
+    ),
+    answers_by_market_creator_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromAnswerEmails
+    ),
+    all_answers_on_contracts_with_shares_in_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromAnswerEmails
+    ),
+
+    // On users' markets
+    your_contract_closed: constructPref(
+      true,
+      !unsubscribedFromResolutionEmails
+    ), // High priority
+    all_comments_on_my_markets: constructPref(
+      true,
+      !unsubscribedFromCommentEmails
+    ),
+    all_answers_on_my_markets: constructPref(
+      true,
+      !unsubscribedFromAnswerEmails
+    ),
+    subsidized_your_market: constructPref(true, true),
+
+    // Market updates
+    resolutions_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromResolutionEmails
+    ),
+    market_updates_on_watched_markets: constructPref(true, false),
+    market_updates_on_watched_markets_with_shares_in: constructPref(
+      true,
+      false
+    ),
+    resolutions_on_watched_markets_with_shares_in: constructPref(
+      true,
+      !unsubscribedFromResolutionEmails
+    ),
+
+    //Balance Changes
+    loan_income: constructPref(true, false),
+    betting_streaks: constructPref(true, false),
+    referral_bonuses: constructPref(true, true),
+    unique_bettors_on_your_contract: constructPref(true, false),
+    tipped_comments_on_watched_markets: constructPref(
+      true,
+      !unsubscribedFromCommentEmails
+    ),
+    tips_on_your_markets: constructPref(true, true),
+    limit_order_fills: constructPref(true, false),
+
+    // General
+    tagged_user: constructPref(true, true),
+    on_new_follow: constructPref(true, true),
+    contract_from_followed_user: constructPref(true, true),
+    trending_markets: constructPref(
+      false,
+      !unsubscribedFromWeeklyTrendingEmails
+    ),
+    profit_loss_updates: constructPref(false, true),
+    probability_updates_on_watched_markets: constructPref(true, false),
+    thank_you_for_purchases: constructPref(
+      false,
+      !unsubscribedFromGenericEmails
+    ),
+    onboarding_flow: constructPref(false, !unsubscribedFromGenericEmails),
+  } as notification_preferences
+}
+
+// Adding a new key:value here is optional, you can just use a key of notification_subscription_types
+// You might want to add a key:value here if there will be multiple notification reasons that map to the same
+// subscription type, i.e. 'comment_on_contract_you_follow' and 'comment_on_contract_with_users_answer' both map to
+// 'all_comments_on_watched_markets' subscription type
+// TODO: perhaps better would be to map notification_subscription_types to arrays of notification_reason_types
+const notificationReasonToSubscriptionType: Partial<
+  Record<notification_reason_types, notification_preference>
+> = {
+  you_referred_user: 'referral_bonuses',
+  user_joined_to_bet_on_your_market: 'referral_bonuses',
+  tip_received: 'tips_on_your_comments',
+  bet_fill: 'limit_order_fills',
+  user_joined_from_your_group_invite: 'referral_bonuses',
+  challenge_accepted: 'limit_order_fills',
+  betting_streak_incremented: 'betting_streaks',
+  liked_and_tipped_your_contract: 'tips_on_your_markets',
+  comment_on_your_contract: 'all_comments_on_my_markets',
+  answer_on_your_contract: 'all_answers_on_my_markets',
+  comment_on_contract_you_follow: 'all_comments_on_watched_markets',
+  answer_on_contract_you_follow: 'all_answers_on_watched_markets',
+  update_on_contract_you_follow: 'market_updates_on_watched_markets',
+  resolution_on_contract_you_follow: 'resolutions_on_watched_markets',
+  comment_on_contract_with_users_shares_in:
+    'all_comments_on_contracts_with_shares_in_on_watched_markets',
+  answer_on_contract_with_users_shares_in:
+    'all_answers_on_contracts_with_shares_in_on_watched_markets',
+  update_on_contract_with_users_shares_in:
+    'market_updates_on_watched_markets_with_shares_in',
+  resolution_on_contract_with_users_shares_in:
+    'resolutions_on_watched_markets_with_shares_in',
+  comment_on_contract_with_users_answer: 'all_comments_on_watched_markets',
+  update_on_contract_with_users_answer: 'market_updates_on_watched_markets',
+  resolution_on_contract_with_users_answer: 'resolutions_on_watched_markets',
+  answer_on_contract_with_users_answer: 'all_answers_on_watched_markets',
+  comment_on_contract_with_users_comment: 'all_comments_on_watched_markets',
+  answer_on_contract_with_users_comment: 'all_answers_on_watched_markets',
+  update_on_contract_with_users_comment: 'market_updates_on_watched_markets',
+  resolution_on_contract_with_users_comment: 'resolutions_on_watched_markets',
+  reply_to_users_answer: 'all_replies_to_my_answers_on_watched_markets',
+  reply_to_users_comment: 'all_replies_to_my_comments_on_watched_markets',
+}
+
+export const getNotificationDestinationsForUser = (
+  privateUser: PrivateUser,
+  reason: notification_reason_types | notification_preference
+) => {
+  const notificationSettings = privateUser.notificationPreferences
+  let destinations
+  let subscriptionType: notification_preference | undefined
+  if (Object.keys(notificationSettings).includes(reason)) {
+    subscriptionType = reason as notification_preference
+    destinations = notificationSettings[subscriptionType]
+  } else {
+    const key = reason as notification_reason_types
+    subscriptionType = notificationReasonToSubscriptionType[key]
+    destinations = subscriptionType
+      ? notificationSettings[subscriptionType]
+      : []
+  }
+  const unsubscribeEndpoint = getFunctionUrl('unsubscribe')
+  return {
+    sendToEmail: destinations.includes('email'),
+    sendToBrowser: destinations.includes('browser'),
+    unsubscribeUrl: `${unsubscribeEndpoint}?id=${privateUser.id}&type=${subscriptionType}`,
+    urlToManageThisNotification: `${DOMAIN}/notifications?tab=settings&section=${subscriptionType}`,
+  }
+}

common/user.ts

@@ -1,3 +1,6 @@
+import { notification_preferences } from './user-notification-preferences'
+import { ENV_CONFIG } from 'common/envs/constants'
+
 export type User = {
   id: string
   createdTime: number
@@ -34,7 +37,7 @@ export type User = {
   followerCountCached: number
 
   followedCategories?: string[]
-  homeSections?: { visible: string[]; hidden: string[] }
+  homeSections?: string[]
 
   referredByUserId?: string
   referredByContractId?: string
@@ -63,11 +66,14 @@ export type PrivateUser = {
   initialDeviceToken?: string
   initialIpAddress?: string
   apiKey?: string
-  notificationPreferences?: notification_subscribe_types
+  notificationPreferences: notification_preferences
+  twitchInfo?: {
+    twitchName: string
+    controlToken: string
+    botEnabled?: boolean
+  }
 }
 
-export type notification_subscribe_types = 'all' | 'less' | 'none'
-
 export type PortfolioMetrics = {
   investmentValue: number
   balance: number
@@ -78,3 +84,10 @@ export type PortfolioMetrics = {
 
 export const MANIFOLD_USERNAME = 'ManifoldMarkets'
 export const MANIFOLD_AVATAR_URL = 'https://manifold.markets/logo-bg-white.png'
+
+export const BETTOR = ENV_CONFIG.bettor ?? 'bettor' // aka predictor
+export const BETTORS = ENV_CONFIG.bettor + 's' ?? 'bettors'
+export const PRESENT_BET = ENV_CONFIG.presentBet ?? 'bet' // aka predict
+export const PRESENT_BETS = ENV_CONFIG.presentBet + 's' ?? 'bets'
+export const PAST_BET = ENV_CONFIG.pastBet ?? 'bet' // aka prediction
+export const PAST_BETS = ENV_CONFIG.pastBet + 's' ?? 'bets' // aka predictions

common/util/parse.ts

@@ -23,8 +23,15 @@ import { Link } from '@tiptap/extension-link'
 import { Mention } from '@tiptap/extension-mention'
 import Iframe from './tiptap-iframe'
 import TiptapTweet from './tiptap-tweet-type'
+import { find } from 'linkifyjs'
 import { uniq } from 'lodash'
 
+/** get first url in text. like "notion.so " -> "http://notion.so"; "notion" -> null */
+export function getUrl(text: string) {
+  const results = find(text, 'url')
+  return results.length ? results[0].href : null
+}
+
 export function parseTags(text: string) {
   const regex = /(?:^|\s)(?:[#][a-z0-9_]+)/gi
   const matches = (text.match(regex) || []).map((match) =>

firebase.json

@@ -2,10 +2,30 @@
   "functions": {
     "predeploy": "cd functions && yarn build",
     "runtime": "nodejs16",
-    "source": "functions/dist"
+    "source": "functions/dist",
+    "ignore": [
+      "node_modules",
+      ".git",
+      "firebase-debug.log",
+      "firebase-debug.*.log"
+    ]
   },
   "firestore": {
     "rules": "firestore.rules",
     "indexes": "firestore.indexes.json"
+  },
+  "emulators": {
+    "functions": {
+      "port": 5001
+    },
+    "firestore": {
+      "port": 8080
+    },
+    "pubsub": {
+      "port": 8085
+    },
+    "ui": {
+      "enabled": true
+    }
   }
 }

firestore.rules

@@ -14,7 +14,8 @@ service cloud.firestore {
         'manticmarkets@gmail.com',
         'iansphilips@gmail.com',
         'd4vidchee@gmail.com',
-        'federicoruizcassarino@gmail.com'
+        'federicoruizcassarino@gmail.com',
+        'ingawei@gmail.com'
       ]
     }
 
@@ -77,7 +78,7 @@ service cloud.firestore {
       allow read: if userId == request.auth.uid || isAdmin();
       allow update: if (userId == request.auth.uid || isAdmin())
                        && request.resource.data.diff(resource.data).affectedKeys()
-                       .hasOnly(['apiKey', 'unsubscribedFromResolutionEmails', 'unsubscribedFromCommentEmails', 'unsubscribedFromAnswerEmails', 'notificationPreferences', 'unsubscribedFromWeeklyTrendingEmails' ]);
+                         .hasOnly(['apiKey', 'unsubscribedFromResolutionEmails', 'unsubscribedFromCommentEmails', 'unsubscribedFromAnswerEmails', 'unsubscribedFromWeeklyTrendingEmails', 'notificationPreferences', 'twitchInfo']);
     }
 
     match /private-users/{userId}/views/{viewId} {
@@ -170,7 +171,7 @@ service cloud.firestore {
       allow read;
     }
 
-	   match /groups/{groupId} {
+	    match /groups/{groupId} {
           allow read;
           allow update: if (request.auth.uid == resource.data.creatorId || isAdmin())
                            && request.resource.data.diff(resource.data)
@@ -184,7 +185,7 @@ service cloud.firestore {
 
           match /groupMembers/{memberId}{
              allow create: if request.auth.uid == get(/databases/$(database)/documents/groups/$(groupId)).data.creatorId || (request.auth.uid == request.resource.data.userId && get(/databases/$(database)/documents/groups/$(groupId)).data.anyoneCanJoin);
-             allow delete: if request.auth.uid == resource.data.userId;
+              allow delete: if request.auth.uid == resource.data.userId;
             }
 
           function isGroupMember() {

functions/.gitignore

@@ -17,4 +17,5 @@ package-lock.json
 ui-debug.log
 firebase-debug.log
 firestore-debug.log
+pubsub-debug.log
 firestore_export/

functions/src/add-liquidity.ts

@@ -1,11 +1,16 @@
 import * as admin from 'firebase-admin'
 import { z } from 'zod'
 
-import { Contract } from '../../common/contract'
+import { Contract, CPMMContract } from '../../common/contract'
 import { User } from '../../common/user'
 import { removeUndefinedProps } from '../../common/util/object'
 import { getNewLiquidityProvision } from '../../common/add-liquidity'
 import { APIError, newEndpoint, validate } from './api'
+import {
+  DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+  HOUSE_LIQUIDITY_PROVIDER_ID,
+} from '../../common/antes'
+import { isProd } from './utils'
 
 const bodySchema = z.object({
   contractId: z.string(),
@@ -47,7 +52,7 @@ export const addliquidity = newEndpoint({}, async (req, auth) => {
 
     const { newLiquidityProvision, newPool, newP, newTotalLiquidity } =
       getNewLiquidityProvision(
-        user,
+        user.id,
         amount,
         contract,
         newLiquidityProvisionDoc.id
@@ -88,3 +93,41 @@ export const addliquidity = newEndpoint({}, async (req, auth) => {
 })
 
 const firestore = admin.firestore()
+
+export const addHouseLiquidity = (contract: CPMMContract, amount: number) => {
+  return firestore.runTransaction(async (transaction) => {
+    const newLiquidityProvisionDoc = firestore
+      .collection(`contracts/${contract.id}/liquidity`)
+      .doc()
+
+    const providerId = isProd()
+      ? HOUSE_LIQUIDITY_PROVIDER_ID
+      : DEV_HOUSE_LIQUIDITY_PROVIDER_ID
+
+    const { newLiquidityProvision, newPool, newP, newTotalLiquidity } =
+      getNewLiquidityProvision(
+        providerId,
+        amount,
+        contract,
+        newLiquidityProvisionDoc.id
+      )
+
+    if (newP !== undefined && !isFinite(newP)) {
+      throw new APIError(
+        500,
+        'Liquidity injection rejected due to overflow error.'
+      )
+    }
+
+    transaction.update(
+      firestore.doc(`contracts/${contract.id}`),
+      removeUndefinedProps({
+        pool: newPool,
+        p: newP,
+        totalLiquidity: newTotalLiquidity,
+      })
+    )
+
+    transaction.create(newLiquidityProvisionDoc, newLiquidityProvision)
+  })
+}

functions/src/change-user-info.ts

@@ -2,6 +2,7 @@ import * as admin from 'firebase-admin'
 import { z } from 'zod'
 
 import { getUser } from './utils'
+import { Bet } from '../../common/bet'
 import { Contract } from '../../common/contract'
 import { Comment } from '../../common/comment'
 import { User } from '../../common/user'
@@ -68,10 +69,21 @@ export const changeUser = async (
     .get()
   const answerUpdate: Partial<Answer> = removeUndefinedProps(update)
 
+  const betsSnap = await firestore
+    .collectionGroup('bets')
+    .where('userId', '==', user.id)
+    .get()
+  const betsUpdate: Partial<Bet> = removeUndefinedProps({
+    userName: update.name,
+    userUsername: update.username,
+    userAvatarUrl: update.avatarUrl,
+  })
+
   const bulkWriter = firestore.bulkWriter()
   commentSnap.docs.forEach((d) => bulkWriter.update(d.ref, commentUpdate))
   answerSnap.docs.forEach((d) => bulkWriter.update(d.ref, answerUpdate))
   contracts.docs.forEach((d) => bulkWriter.update(d.ref, contractUpdate))
+  betsSnap.docs.forEach((d) => bulkWriter.update(d.ref, betsUpdate))
   await bulkWriter.flush()
   console.log('Done writing!')
 

functions/src/create-answer.ts

@@ -5,8 +5,7 @@ import { Contract } from '../../common/contract'
 import { User } from '../../common/user'
 import { getNewMultiBetInfo } from '../../common/new-bet'
 import { Answer, MAX_ANSWER_LENGTH } from '../../common/answer'
-import { getContract, getValues } from './utils'
-import { sendNewAnswerEmail } from './emails'
+import { getValues } from './utils'
 import { APIError, newEndpoint, validate } from './api'
 
 const bodySchema = z.object({
@@ -97,10 +96,6 @@ export const createanswer = newEndpoint(opts, async (req, auth) => {
     return answer
   })
 
-  const contract = await getContract(contractId)
-
-  if (answer && contract) await sendNewAnswerEmail(answer, contract)
-
   return answer
 })
 

functions/src/create-group.ts

@@ -10,7 +10,7 @@ import {
   MAX_GROUP_NAME_LENGTH,
   MAX_ID_LENGTH,
 } from '../../common/group'
-import { APIError, newEndpoint, validate } from '../../functions/src/api'
+import { APIError, newEndpoint, validate } from './api'
 import { z } from 'zod'
 
 const bodySchema = z.object({

functions/src/create-user.ts

@@ -18,6 +18,7 @@ import { track } from './analytics'
 import { APIError, newEndpoint, validate } from './api'
 import { Group } from '../../common/group'
 import { SUS_STARTING_BALANCE, STARTING_BALANCE } from '../../common/economy'
+import { getDefaultNotificationPreferences } from '../../common/user-notification-preferences'
 
 const bodySchema = z.object({
   deviceToken: z.string().optional(),
@@ -79,6 +80,7 @@ export const createuser = newEndpoint(opts, async (req, auth) => {
     email,
     initialIpAddress: req.ip,
     initialDeviceToken: deviceToken,
+    notificationPreferences: getDefaultNotificationPreferences(auth.uid),
   }
 
   await firestore.collection('private-users').doc(auth.uid).create(privateUser)

functions/src/email-templates/500-mana.html

@@ -1,318 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title>Manifold Markets 7th Day Anniversary Gift!</title>
-  <!--[if !mso]><!-->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <noscript>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        </noscript>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-    }
-  </style>
-  <style media="screen and (min-width:480px)">
-    .moz-text-html .mj-column-per-100 {
-      width: 100% !important;
-      max-width: 100%;
-    }
-  </style>
-  <style type="text/css">
-    [owa] .mj-column-per-100 {
-      width: 100% !important;
-      max-width: 100%;
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="word-spacing:normal;background-color:#F4F4F4;">
-  <div style="background-color:#F4F4F4;">
-    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-        style="background:#ffffff;background-color:#ffffff;width:100%;">
-        <tbody>
-          <tr>
-            <td
-              style="direction:ltr;font-size:0px;padding:0px 0px 0px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;text-align:center;">
-              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tbody>
-                    <tr>
-                      <td align="center"
-                        style="font-size:0px;padding:0px 25px 0px 25px;padding-top:0px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                          style="border-collapse:collapse;border-spacing:0px;">
-                          <tbody>
-                            <tr>
-                              <td style="width:550px;"><a href="https://manifold.markets/home" target="_blank"><img
-                                    alt="" height="auto" src="https://i.imgur.com/8EP8Y8q.gif"
-                                    style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
-                                    width="550"></a></td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td align="left"
-                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                        <div
-                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                          <p class="text-build-content"
-                            style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
-                            data-testid="4XoHRGw1Y"><span
-                              style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                              Hi {{name}},</span></p>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td align="left"
-                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                        <div
-                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                          <p class="text-build-content"
-                            style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
-                            data-testid="4XoHRGw1Y"><span
-                              style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">Thanks for
-                              using Manifold Markets. Running low
-                              on mana (M$)? Click the link below to receive a one time gift of M$500!</span></p>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td>
-                        <p></p>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td align="center">
-                        <table cellspacing="0" cellpadding="0">
-                          <tr>
-                            <td>
-                              <table cellspacing="0" cellpadding="0">
-                                <tr>
-                                  <td style="border-radius: 2px;" bgcolor="#4337c9">
-                                    <a href="{{manalink}}" target="_blank"
-                                      style="padding: 12px 16px; border: 1px solid #4337c9;border-radius: 16px;font-family: Helvetica, Arial, sans-serif;font-size: 24px; color: #ffffff;text-decoration: none;font-weight:bold;display: inline-block;">
-                                      Claim M$500
-                                    </a>
-                                  </td>
-                                </tr>
-                              </table>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td align="left"
-                        style="font-size:0px;padding:15px 25px 0px 25px;padding-top:15px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
-                        <div
-                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                          <p class="text-build-content" style="line-height: 23px; margin: 10px 0; margin-top: 10px;"
-                            data-testid="3Q8BP69fq"><span style="font-family:Arial, sans-serif;font-size:18px;">Did
-                              you know, besides making correct predictions, there are
-                              plenty of other ways to earn mana?</span></p>
-                          <ul>
-                            <li style="line-height:23px;"><span
-                                style="font-family:Arial, sans-serif;font-size:18px;">Receiving
-                                tips on comments</span></li>
-                            <li style="line-height:23px;"><span
-                                style="font-family:Arial, sans-serif;font-size:18px;">Unique
-                                trader bonus for each user who bets on your
-                                markets</span></li>
-                            <li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;"><a
-                                  class="link-build-content" style="color:inherit;; text-decoration: none;"
-                                  target="_blank" href="https://manifold.markets/referrals"><span
-                                    style="color:#55575d;font-family:Arial;font-size:18px;"><u>Referring
-                                      friends</u></span></a></span></li>
-                            <li style="line-height:23px;"><a class="link-build-content"
-                                style="color:inherit;; text-decoration: none;" target="_blank"
-                                href="https://manifold.markets/group/bugs?s=most-traded"><span
-                                  style="color:#55575d;font-family:Arial;font-size:18px;"><u>Reporting
-                                    bugs</u></span></a><span style="font-family:Arial, sans-serif;font-size:18px;">
-                                and </span><a class="link-build-content" style="color:inherit;; text-decoration: none;"
-                                target="_blank"
-                                href="https://manifold.markets/group/manifold-features-25bad7c7792e/chat?s=most-traded"><span
-                                  style="color:#55575d;font-family:Arial;font-size:18px;"><u>giving
-                                    feedback</u></span></a></li>
-                          </ul>
-                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;">&nbsp;</p>
-                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
-                              style="color:#000000;font-family:Arial;font-size:18px;">Cheers,</span>
-                          </p>
-                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
-                              style="color:#000000;font-family:Arial;font-size:18px;">David
-                              from Manifold</span></p>
-                          <p class="text-build-content" data-testid="3Q8BP69fq"
-                            style="margin: 10px 0; margin-bottom: 10px;">&nbsp;</p>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td align="left"
-                        style="font-size:0px;padding:15px 25px 0px 25px;padding-top:15px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
-                        <div
-                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                          <p class="text-build-content" style="line-height: 23px; margin: 10px 0; margin-top: 10px;"
-                            data-testid="3Q8BP69fq"></a></li>
-                            </ul>
-                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;">&nbsp;</p>
-                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
-                              style="color:#000000;font-family:Arial;font-size:18px;">Cheers,</span></p>
-                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
-                              style="color:#000000;font-family:Arial;font-size:18px;">David from Manifold</span></p>
-                          <p class="text-build-content" data-testid="3Q8BP69fq"
-                            style="margin: 10px 0; margin-bottom: 10px;">&nbsp;</p>
-                        </div>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <!--[if mso | IE]></td></tr></table><![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:0 0 20px 0;text-align:center;">
-              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix"
-                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
-                  width="100%">
-                  <tbody>
-                    <tr>
-                      <td align="center" style="font-size:0px;padding:0px;word-break:break-word;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                          style="border-collapse:collapse;border-spacing:0px;">
-              </div>
-              <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-              <div style="margin:0px auto;max-width:600px;">
-                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                  style="width:100%;">
-                  <tbody>
-                    <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0px 20px 0px;text-align:center;">
-                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                        <div class="mj-column-per-100 mj-outlook-group-fix"
-                          style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
-                            <tbody>
-                              <tr>
-                                <td style="vertical-align:top;padding:0;">
-                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
-                                    <tbody>
-                                      <tr>
-                                        <td align="center"
-                                          style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                                          <div
-                                            style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
-                                            <p style="margin: 10px 0;">This e-mail has been sent to {{name}}, <a
-                                                href="{{unsubscribeLink}}” style=" color:inherit;text-decoration:none;"
-                                                target="_blank">click here to unsubscribe</a>.</p>
-                                          </div>
-                                        </td>
-                                      </tr>
-                                      <tr>
-                                        <td align="center"
-                                          style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                                          <div
-                                            style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
-                                          </div>
-                                        </td>
-                                      </tr>
-                                    </tbody>
-                                  </table>
-                                </td>
-                              </tr>
-                            </tbody>
-                          </table>
-                        </div>
-                        <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <!--[if mso | IE]></td></tr></table><![endif]-->
-    </div>
-</body>
-
-</html>

functions/src/email-templates/creating-market.html

@@ -186,8 +186,9 @@
                                   font-family: Readex Pro, Arial, Helvetica,
                                     sans-serif;
                                   font-size: 17px;
-                                ">Did you know you create your own prediction market on <a class="link-build-content"
-                              style="color: #55575d" target="_blank" href="https://manifold.markets">Manifold</a> for
+                                ">Did you know you can create your own prediction market on <a
+                              class="link-build-content" style="color: #55575d" target="_blank"
+                              href="https://manifold.markets">Manifold</a> on
                             any question you care about?</span>
                         </p>
 
@@ -490,10 +491,10 @@
                                     ">
                                             <p style="margin: 10px 0">
                                               This e-mail has been sent to {{name}},
-                                              <a href="{{unsubscribeLink}}" style="
+                                              <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe</a>.
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
                                             </p>
                                           </div>
                                         </td>

functions/src/email-templates/interesting-markets.html

@@ -440,11 +440,10 @@
                                                                                     <p style="margin: 10px 0">
                                                                                         This e-mail has been sent to
                                                                                         {{name}},
-                                                                                        <a href="{{unsubscribeLink}}"
-                                                                                            style="
+                                                                                        <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe</a> from future recommended markets.
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
                                                                                     </p>
                                                                                 </div>
                                                                             </td>

functions/src/email-templates/market-answer-comment.html

@@ -526,19 +526,10 @@
                       "
                       >our Discord</a
                     >! Or,
-                    <a
-                      href="{{unsubscribeUrl}}"
-                      style="
-                        font-family: 'Helvetica Neue', Helvetica, Arial,
-                          sans-serif;
-                        box-sizing: border-box;
-                        font-size: 12px;
-                        color: #999;
-                        text-decoration: underline;
-                        margin: 0;
-                      "
-                      >unsubscribe</a
-                    >.
+                    <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
                   </td>
                 </tr>
               </table>

functions/src/email-templates/market-answer.html

@@ -367,14 +367,9 @@
                         margin: 0;
                       ">our Discord</a>! Or,
                   <a href="{{unsubscribeUrl}}" style="
-                        font-family: 'Helvetica Neue', Helvetica, Arial,
-                          sans-serif;
-                        box-sizing: border-box;
-                        font-size: 12px;
-                        color: #999;
-                        text-decoration: underline;
-                        margin: 0;
-                      ">unsubscribe</a>.
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/market-close.html

@@ -485,14 +485,9 @@
                         margin: 0;
                       ">our Discord</a>! Or,
                   <a href="{{unsubscribeUrl}}" style="
-                        font-family: 'Helvetica Neue', Helvetica, Arial,
-                          sans-serif;
-                        box-sizing: border-box;
-                        font-size: 12px;
-                        color: #999;
-                        text-decoration: underline;
-                        margin: 0;
-                      ">unsubscribe</a>.
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/market-comment.html

@@ -367,14 +367,9 @@
                         margin: 0;
                       ">our Discord</a>! Or,
                   <a href="{{unsubscribeUrl}}" style="
-                        font-family: 'Helvetica Neue', Helvetica, Arial,
-                          sans-serif;
-                        box-sizing: border-box;
-                        font-size: 12px;
-                        color: #999;
-                        text-decoration: underline;
-                        margin: 0;
-                      ">unsubscribe</a>.
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/market-resolved-no-bets.html

@@ -0,0 +1,491 @@
+<!DOCTYPE html>
+<html style="
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    box-sizing: border-box;
+    font-size: 14px;
+    margin: 0;
+  ">
+
+<head>
+  <meta name="viewport" content="width=device-width" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>Market resolved</title>
+
+  <style type="text/css">
+    img {
+      max-width: 100%;
+    }
+
+    body {
+      -webkit-font-smoothing: antialiased;
+      -webkit-text-size-adjust: none;
+      width: 100% !important;
+      height: 100%;
+      line-height: 1.6em;
+    }
+
+    body {
+      background-color: #f6f6f6;
+    }
+
+    @media only screen and (max-width: 640px) {
+      body {
+        padding: 0 !important;
+      }
+
+      h1 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h2 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h3 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h4 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h1 {
+        font-size: 22px !important;
+      }
+
+      h2 {
+        font-size: 18px !important;
+      }
+
+      h3 {
+        font-size: 16px !important;
+      }
+
+      .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+
+      .content {
+        padding: 0 !important;
+      }
+
+      .content-wrap {
+        padding: 10px !important;
+      }
+
+      .invoice {
+        width: 100% !important;
+      }
+    }
+  </style>
+</head>
+
+<body itemscope itemtype="http://schema.org/EmailMessage" style="
+      font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+      box-sizing: border-box;
+      font-size: 14px;
+      -webkit-font-smoothing: antialiased;
+      -webkit-text-size-adjust: none;
+      width: 100% !important;
+      height: 100%;
+      line-height: 1.6em;
+      background-color: #f6f6f6;
+      margin: 0;
+    " bgcolor="#f6f6f6">
+  <table class="body-wrap" style="
+        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        box-sizing: border-box;
+        font-size: 14px;
+        width: 100%;
+        background-color: #f6f6f6;
+        margin: 0;
+      " bgcolor="#f6f6f6">
+    <tr style="
+          font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+          box-sizing: border-box;
+          font-size: 14px;
+          margin: 0;
+        ">
+      <td style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            margin: 0;
+          " valign="top"></td>
+      <td class="container" width="600" style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            display: block !important;
+            max-width: 600px !important;
+            clear: both !important;
+            margin: 0 auto;
+          " valign="top">
+        <div class="content" style="
+              font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+              box-sizing: border-box;
+              font-size: 14px;
+              max-width: 600px;
+              display: block;
+              margin: 0 auto;
+              padding: 20px;
+            ">
+          <table class="main" width="100%" cellpadding="0" cellspacing="0" style="
+                font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                box-sizing: border-box;
+                font-size: 14px;
+                border-radius: 3px;
+                background-color: #fff;
+                margin: 0;
+                border: 1px solid #e9e9e9;
+              " bgcolor="#fff">
+            <tr style="
+                  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                  box-sizing: border-box;
+                  font-size: 14px;
+                  margin: 0;
+                ">
+              <td class="content-wrap aligncenter" style="
+                    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                    box-sizing: border-box;
+                    font-size: 14px;
+                    vertical-align: top;
+                    text-align: center;
+                    margin: 0;
+                    padding: 20px;
+                  " align="center" valign="top">
+                <table width="100%" cellpadding="0" cellspacing="0" style="
+                      font-family: 'Helvetica Neue', Helvetica, Arial,
+                        sans-serif;
+                      box-sizing: border-box;
+                      font-size: 14px;
+                      margin: 0;
+                      width: 90%;
+                    ">
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 14px;
+                        margin: 0;
+                      ">
+                    <td class="content-block" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 16px;
+                          vertical-align: top;
+                          margin: 0;
+                          padding: 0 0 40px 0;
+                          text-align: left;
+                        " valign="top">
+                      <a href="https://manifold.markets" target="_blank">
+                        <img src="https://manifold.markets/logo-banner.png" width="300" style="height: auto"
+                          alt="Manifold Markets" />
+                      </a>
+                    </td>
+                  </tr>
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 14px;
+                        margin: 0;
+                        padding: 0;
+                      ">
+                    <td class="content-block" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 16px;
+                          vertical-align: top;
+                          margin: 0;
+                          padding: 0 0 6px 0;
+                          text-align: left;
+                        " valign="top">
+                      {{creatorName}} asked
+                    </td>
+                  </tr>
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 14px;
+                        margin: 0;
+                      ">
+                    <td class="content-block" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 14px;
+                          vertical-align: top;
+                          margin: 0;
+                          padding: 0 0 20px;
+                        " valign="top">
+                      <a href="{{url}}" style="
+                            font-family: 'Helvetica Neue', Helvetica, Arial,
+                              'Lucida Grande', sans-serif;
+                            box-sizing: border-box;
+                            font-size: 24px;
+                            color: #000;
+                            line-height: 1.2em;
+                            font-weight: 500;
+                            text-align: left;
+                            margin: 0 0 0 0;
+                            color: #4337c9;
+                            display: block;
+                            text-decoration: none;
+                          ">
+                        {{question}}</a>
+                    </td>
+                  </tr>
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 14px;
+                        margin: 0;
+                      ">
+                    <td class="content-block" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 14px;
+                          vertical-align: top;
+                          margin: 0;
+                          padding: 0 0 0px;
+                        " valign="top">
+                      <h2 class="aligncenter" style="
+                            font-family: 'Helvetica Neue', Helvetica, Arial,
+                              'Lucida Grande', sans-serif;
+                            box-sizing: border-box;
+                            font-size: 24px;
+                            color: #000;
+                            line-height: 1.2em;
+                            font-weight: 500;
+                            text-align: center;
+                            margin: 10px 0 0;
+                          " align="center">
+                        Resolved {{outcome}}
+                      </h2>
+                    </td>
+                  </tr>
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 16px;
+                        margin: 0;
+                      ">
+                    <td class="content-block aligncenter" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 16px;
+                          vertical-align: top;
+                          text-align: center;
+                          margin: 0;
+                          padding: 0;
+                        " align="center" valign="top">
+                      <table class="invoice" style="
+                            font-family: 'Helvetica Neue', Helvetica, Arial,
+                              sans-serif;
+                            box-sizing: border-box;
+                            font-size: 16px;
+                            text-align: left;
+                            width: 80%;
+                            margin: 40px auto;
+                          ">
+                        <tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin: 0;
+                            ">
+                          <td style="
+                                font-family: 'Helvetica Neue', Helvetica, Arial,
+                                  sans-serif;
+                                box-sizing: border-box;
+                                font-size: 16px;
+                                vertical-align: top;
+                                margin: 0;
+                                padding: 5px 0;
+                              " valign="top">
+                            Dear {{name}},
+                            <br style="
+                                  font-family: 'Helvetica Neue', Helvetica,
+                                    Arial, sans-serif;
+                                  box-sizing: border-box;
+                                  font-size: 16px;
+                                  margin: 0;
+                                " />
+                            <br style="
+                                  font-family: 'Helvetica Neue', Helvetica,
+                                    Arial, sans-serif;
+                                  box-sizing: border-box;
+                                  font-size: 16px;
+                                  margin: 0;
+                                " />
+                            A market you were following has been resolved!
+                            <br style="
+                                  font-family: 'Helvetica Neue', Helvetica,
+                                    Arial, sans-serif;
+                                  box-sizing: border-box;
+                                  font-size: 16px;
+                                  margin: 0;
+                                " />
+                            <br style="
+                                  font-family: 'Helvetica Neue', Helvetica,
+                                    Arial, sans-serif;
+                                  box-sizing: border-box;
+                                  font-size: 16px;
+                                  margin: 0;
+                                " />
+                            Thanks,
+                            <br style="
+                                  font-family: 'Helvetica Neue', Helvetica,
+                                    Arial, sans-serif;
+                                  box-sizing: border-box;
+                                  font-size: 16px;
+                                  margin: 0;
+                                " />
+                            Manifold Team
+                            <br style="
+                                  font-family: 'Helvetica Neue', Helvetica,
+                                    Arial, sans-serif;
+                                  box-sizing: border-box;
+                                  font-size: 16px;
+                                  margin: 0;
+                                " />
+                            <br style="
+                                  font-family: 'Helvetica Neue', Helvetica,
+                                    Arial, sans-serif;
+                                  box-sizing: border-box;
+                                  font-size: 16px;
+                                  margin: 0;
+                                " />
+                          </td>
+                        </tr>
+                        <tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin: 0;
+                            ">
+                          <td style="padding: 10px 0 0 0; margin: 0">
+                            <div align="center">
+                              <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;font-family:arial,helvetica,sans-serif;"><tr><td style="font-family:arial,helvetica,sans-serif;" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="" style="height:37px; v-text-anchor:middle; width:110px;" arcsize="11%" stroke="f" fillcolor="#3AAEE0"><w:anchorlock/><center style="color:#FFFFFF;font-family:arial,helvetica,sans-serif;"><![endif]-->
+                              <a href="{{url}}" target="_blank" style="
+                                    box-sizing: border-box;
+                                    display: inline-block;
+                                    font-family: arial, helvetica, sans-serif;
+                                    text-decoration: none;
+                                    -webkit-text-size-adjust: none;
+                                    text-align: center;
+                                    color: #ffffff;
+                                    background-color: #11b981;
+                                    border-radius: 4px;
+                                    -webkit-border-radius: 4px;
+                                    -moz-border-radius: 4px;
+                                    width: auto;
+                                    max-width: 100%;
+                                    overflow-wrap: break-word;
+                                    word-break: break-word;
+                                    word-wrap: break-word;
+                                    mso-border-alt: none;
+                                  ">
+                                <span style="
+                                      display: block;
+                                      padding: 10px 20px;
+                                      line-height: 120%;
+                                    "><span style="
+                                        font-size: 16px;
+                                        font-weight: bold;
+                                        line-height: 18.8px;
+                                      ">View market</span></span>
+                              </a>
+                              <!--[if mso]></center></v:roundrect></td></tr></table><![endif]-->
+                            </div>
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+          <div class="footer" style="
+                font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                box-sizing: border-box;
+                font-size: 14px;
+                width: 100%;
+                clear: both;
+                color: #999;
+                margin: 0;
+                padding: 20px;
+              ">
+            <table width="100%" style="
+                  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                  box-sizing: border-box;
+                  font-size: 14px;
+                  margin: 0;
+                ">
+              <tr style="
+                    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                    box-sizing: border-box;
+                    font-size: 14px;
+                    margin: 0;
+                  ">
+                <td class="aligncenter content-block" style="
+                      font-family: 'Helvetica Neue', Helvetica, Arial,
+                        sans-serif;
+                      box-sizing: border-box;
+                      font-size: 12px;
+                      vertical-align: top;
+                      color: #999;
+                      text-align: center;
+                      margin: 0;
+                      padding: 0 0 20px;
+                    " align="center" valign="top">
+                  Questions? Come ask in
+                  <a href="https://discord.gg/eHQBNBqXuh" style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 12px;
+                        color: #999;
+                        text-decoration: underline;
+                        margin: 0;
+                      ">our Discord</a>! Or,
+                  <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </td>
+      <td style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            margin: 0;
+          " valign="top"></td>
+    </tr>
+  </table>
+</body>
+
+</html>

functions/src/email-templates/market-resolved.html

@@ -500,14 +500,9 @@
                         margin: 0;
                       ">our Discord</a>! Or,
                   <a href="{{unsubscribeUrl}}" style="
-                        font-family: 'Helvetica Neue', Helvetica, Arial,
-                          sans-serif;
-                        box-sizing: border-box;
-                        font-size: 12px;
-                        color: #999;
-                        text-decoration: underline;
-                        margin: 0;
-                      ">unsubscribe</a>.
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/new-market-from-followed-user.html

@@ -0,0 +1,354 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
+    xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+    <title>New market from {{creatorName}}</title>
+    <!--[if !mso]><!-->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <!--<![endif]-->
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <style type="text/css">
+        #outlook a {
+            padding: 0;
+        }
+
+        body {
+            margin: 0;
+            padding: 0;
+            -webkit-text-size-adjust: 100%;
+            -ms-text-size-adjust: 100%;
+        }
+
+        table,
+        td {
+            border-collapse: collapse;
+            mso-table-lspace: 0pt;
+            mso-table-rspace: 0pt;
+        }
+
+        img {
+            border: 0;
+            height: auto;
+            line-height: 100%;
+            outline: none;
+            text-decoration: none;
+            -ms-interpolation-mode: bicubic;
+        }
+
+        p {
+            display: block;
+            margin: 13px 0;
+        }
+    </style>
+    <!--[if mso]>
+      <noscript>
+        <xml>
+          <o:OfficeDocumentSettings>
+            <o:AllowPNG />
+            <o:PixelsPerInch>96</o:PixelsPerInch>
+          </o:OfficeDocumentSettings>
+        </xml>
+      </noscript>
+    <![endif]-->
+    <!--[if lte mso 11]>
+      <style type="text/css">
+        .mj-outlook-group-fix {
+          width: 100% !important;
+        }
+      </style>
+    <![endif]-->
+    <!--[if !mso]><!-->
+    <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css" />
+    <link href="https://fonts.googleapis.com/css?family=Readex+Pro" rel="stylesheet" type="text/css" />
+    <link href="https://fonts.googleapis.com/css?family=Readex+Pro" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
+        @import url(https://fonts.googleapis.com/css?family=Readex+Pro);
+        @import url(https://fonts.googleapis.com/css?family=Readex+Pro);
+    </style>
+    <!--<![endif]-->
+    <style type="text/css">
+        @media only screen and (min-width: 480px) {
+            .mj-column-per-100 {
+                width: 100% !important;
+                max-width: 100%;
+            }
+        }
+    </style>
+    <style media="screen and (min-width:480px)">
+        .moz-text-html .mj-column-per-100 {
+            width: 100% !important;
+            max-width: 100%;
+        }
+    </style>
+    <style type="text/css">
+        [owa] .mj-column-per-100 {
+            width: 100% !important;
+            max-width: 100%;
+        }
+    </style>
+    <style type="text/css">
+        @media only screen and (max-width: 480px) {
+            table.mj-full-width-mobile {
+                width: 100% !important;
+            }
+
+            td.mj-full-width-mobile {
+                width: auto !important;
+            }
+        }
+    </style>
+</head>
+
+<body style="word-spacing: normal; background-color: #f4f4f4">
+    <div style="margin:0px auto;max-width:600px;">
+
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+            <tbody>
+                <tr>
+                    <td
+                        style="direction:ltr;font-size:0px;padding:20px 0px 5px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+
+                        <div class="mj-column-per-100 mj-outlook-group-fix"
+                            style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                                style="vertical-align:top;" width="100%">
+                                <tbody>
+
+                                    <tr>
+                                        <td align="center"
+                                            style="background:#ffffff;font-size:0px;padding:10px 25px 10px 25px;padding-right:25px;padding-left:25px;word-break:break-word;">
+
+                                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                                                style="border-collapse:collapse;border-spacing:0px;">
+                                                <tbody>
+                                                    <tr>
+                                                        <td style="width:550px;">
+
+                                                            <a href="https://manifold.markets" target="_blank">
+
+                                                                <img alt="banner logo" height="auto"
+                                                                    src="https://manifold.markets/logo-banner.png"
+                                                                    style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
+                                                                    title="" width="550">
+
+                                                            </a>
+
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+
+                                        </td>
+                                    </tr>
+
+
+
+                                </tbody>
+                            </table>
+
+                        </div>
+
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="
+          background: #ffffff;
+          background-color: #ffffff;
+          margin: 0px auto;
+          max-width: 600px;
+        ">
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+            style="background: #ffffff; background-color: #ffffff; width: 100%">
+            <tbody>
+
+                <tr>
+                    <td style="
+                  direction: ltr;
+                  font-size: 0px;
+                  padding: 20px 0px 0px 0px;
+                  padding-bottom: 0px;
+                  padding-left: 0px;
+                  padding-right: 0px;
+                  padding-top: 20px;
+                  text-align: center;
+                ">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix" style="
+                    font-size: 0px;
+                    text-align: left;
+                    direction: ltr;
+                    display: inline-block;
+                    vertical-align: top;
+                    width: 100%;
+                  ">
+                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                                style="vertical-align: top" width="100%">
+                                <tbody>
+                                    <tr>
+                                        <td align="left"
+                                            style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                                            <div
+                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                                                <p class="text-build-content"
+                                                    style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                                                    data-testid="4XoHRGw1Y"><span
+                                                        style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                                                    </span>Hi {{name}},</p>
+                                            </div>
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <td align="left"
+                                            style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:20px;word-break:break-word;">
+                                            <div
+                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                                                <p class="text-build-content"
+                                                    style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                                                    data-testid="4XoHRGw1Y"><span
+                                                        style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                                                        {{creatorName}}, (who you're following) just created a new market, check it out!</span></p>
+                                            </div>
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <td align="center"
+                                            style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:20px;word-break:break-word;">
+                                            <div
+                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:center;color:#000000;">
+                                                <a href="{{questionUrl}}">
+                                                    <img alt="{{questionTitle}}" width="375" height="200"
+                                                        style="border: 1px solid #4337c9;" src="{{questionImgSrc}}">
+                                                </a>
+                                            </div>
+
+                                            <table cellspacing="0" cellpadding="0">
+                                                <tr>
+                                                    <td style="border-radius: 4px;" bgcolor="#4337c9">
+                                                        <a href="{{questionUrl}}" target="_blank"
+                                                            style="padding: 6px 10px; border: 1px solid #4337c9;border-radius: 12px;font-family: Helvetica, Arial, sans-serif;font-size: 16px; color: #ffffff;text-decoration: none;font-weight:semibold;display: inline-block;">
+                                                            View market
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                            </table>
+
+                                        </td>
+                                    </tr>
+
+                                </tbody>
+                            </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin: 0px auto; max-width: 600px">
+        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%">
+            <tbody>
+                <tr>
+                    <td style="
+                  direction: ltr;
+                  font-size: 0px;
+                  padding: 0 0 20px 0;
+                  text-align: center;
+                ">
+
+                        <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+                        <div style="margin: 0px auto; max-width: 600px">
+                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+                                style="width: 100%">
+                                <tbody>
+                                    <tr>
+                                        <td style="
+                  direction: ltr;
+                  font-size: 0px;
+                  padding: 20px 0px 20px 0px;
+                  text-align: center;
+                ">
+                                            <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+                                            <div class="mj-column-per-100 mj-outlook-group-fix" style="
+                    font-size: 0px;
+                    text-align: left;
+                    direction: ltr;
+                    display: inline-block;
+                    vertical-align: top;
+                    width: 100%;
+                  ">
+                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                                                    width="100%">
+                                                    <tbody>
+                                                        <tr>
+                                                            <td style="vertical-align: top; padding: 0">
+                                                                <table border="0" cellpadding="0" cellspacing="0"
+                                                                    role="presentation" width="100%">
+                                                                    <tbody>
+                                                                        <tr>
+                                                                            <td align="center" style="
+                                    font-size: 0px;
+                                    padding: 10px 25px;
+                                    word-break: break-word;
+                                  ">
+                                                                                <div style="
+                                      font-family: Ubuntu, Helvetica, Arial,
+                                        sans-serif;
+                                      font-size: 11px;
+                                      line-height: 22px;
+                                      text-align: center;
+                                      color: #000000;
+                                    ">
+                                                                                    <p style="margin: 10px 0">
+                                                                                        This e-mail has been sent to
+                                                                                        {{name}},
+                                                                                        <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                                                                    </p>
+                                                                                </div>
+                                                                            </td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td align="center" style="
+                                    font-size: 0px;
+                                    padding: 10px 25px;
+                                    word-break: break-word;
+                                  "></td>
+                                                                        </tr>
+                                                                    </tbody>
+                                                                </table>
+                                                            </td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                            <!--[if mso | IE]></td></tr></table><![endif]-->
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</body>
+
+</html>

functions/src/email-templates/new-unique-bettor.html

@@ -0,0 +1,397 @@
+<!DOCTYPE html>
+<html style="
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    box-sizing: border-box;
+    font-size: 14px;
+    margin: 0;
+  ">
+
+<head>
+  <meta name="viewport" content="width=device-width" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>New unique predictors on your market</title>
+
+  <style type="text/css">
+    img {
+      max-width: 100%;
+    }
+
+    body {
+      -webkit-font-smoothing: antialiased;
+      -webkit-text-size-adjust: none;
+      width: 100% !important;
+      height: 100%;
+      line-height: 1.6em;
+    }
+
+    body {
+      background-color: #f6f6f6;
+    }
+
+    @media only screen and (max-width: 640px) {
+      body {
+        padding: 0 !important;
+      }
+
+      h1 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h2 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h3 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h4 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h1 {
+        font-size: 22px !important;
+      }
+
+      h2 {
+        font-size: 18px !important;
+      }
+
+      h3 {
+        font-size: 16px !important;
+      }
+
+      .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+
+      .content {
+        padding: 0 !important;
+      }
+
+      .content-wrap {
+        padding: 10px !important;
+      }
+
+      .invoice {
+        width: 100% !important;
+      }
+    }
+  </style>
+</head>
+
+<body itemscope itemtype="http://schema.org/EmailMessage" style="
+      font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+      box-sizing: border-box;
+      font-size: 14px;
+      -webkit-font-smoothing: antialiased;
+      -webkit-text-size-adjust: none;
+      width: 100% !important;
+      height: 100%;
+      line-height: 1.6em;
+      background-color: #f6f6f6;
+      margin: 0;
+    " bgcolor="#f6f6f6">
+  <table class="body-wrap" style="
+        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        box-sizing: border-box;
+        font-size: 14px;
+        width: 100%;
+        background-color: #f6f6f6;
+        margin: 0;
+      " bgcolor="#f6f6f6">
+    <tr style="
+          font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+          box-sizing: border-box;
+          font-size: 14px;
+          margin: 0;
+        ">
+      <td style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            margin: 0;
+          " valign="top"></td>
+      <td class="container" width="600" style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            display: block !important;
+            max-width: 600px !important;
+            clear: both !important;
+            margin: 0 auto;
+          " valign="top">
+        <div class="content" style="
+              font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+              box-sizing: border-box;
+              font-size: 14px;
+              max-width: 600px;
+              display: block;
+              margin: 0 auto;
+              padding: 20px;
+            ">
+          <table class="main" width="100%" cellpadding="0" cellspacing="0" style="
+                font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                box-sizing: border-box;
+                font-size: 14px;
+                border-radius: 3px;
+                background-color: #fff;
+                margin: 0;
+                border: 1px solid #e9e9e9;
+              " bgcolor="#fff">
+            <tr style="
+                  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                  box-sizing: border-box;
+                  font-size: 14px;
+                  margin: 0;
+                ">
+              <td class="content-wrap aligncenter" style="
+                    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                    box-sizing: border-box;
+                    font-size: 14px;
+                    vertical-align: top;
+                    text-align: center;
+                    margin: 0;
+                    padding: 20px;
+                  " align="center" valign="top">
+                <table width="100%" cellpadding="0" cellspacing="0" style="
+                      font-family: 'Helvetica Neue', Helvetica, Arial,
+                        sans-serif;
+                      box-sizing: border-box;
+                      font-size: 14px;
+                      margin: 0;
+                      width: 90%;
+                    ">
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 14px;
+                        margin: 0;
+                      ">
+                    <td class="content-block" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 16px;
+                          vertical-align: top;
+                          margin: 0;
+                          padding: 0 0 0px 0;
+                          text-align: left;
+                        " valign="top">
+                      <a href="https://manifold.markets" target="_blank">
+                        <img src="https://manifold.markets/logo-banner.png" width="300" style="height: auto"
+                          alt="Manifold Markets" />
+                      </a>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left"
+                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                      <div
+                        style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                        <p class="text-build-content"
+                           style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                           data-testid="4XoHRGw1Y"><span
+                          style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                                                    </span>Hi {{name}},</p>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left"
+                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:20px;word-break:break-word;">
+                      <div
+                        style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                        <p class="text-build-content"
+                           style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                           data-testid="4XoHRGw1Y"><span
+                          style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                          Your market <a href='{{marketUrl}}'>{{marketTitle}}</a> just got its first prediction from a user!
+                          <br/>
+                          <br/>
+                          We sent you a <span style='color: #11b981'>{{bonusString}}</span> bonus for
+                          creating a market that appeals to others, and we'll do so for each new predictor.
+                          <br/>
+                          <br/>
+                          Keep up the good work and check out your newest predictor below!
+                        </span></p>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 16px;
+                        margin: 0;
+                      ">
+                    <td class="content-block aligncenter" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 16px;
+                          vertical-align: top;
+                          text-align: center;
+                          margin: 0;
+                          padding: 0;
+                        " align="center" valign="top">
+                      <table class="invoice" style="
+                            font-family: 'Helvetica Neue', Helvetica, Arial,
+                              sans-serif;
+                            box-sizing: border-box;
+                            font-size: 16px;
+                            text-align: left;
+                            width: 80%;
+                            margin: 40px auto;
+                            margin-top: 10px;
+                          ">
+                        <tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin-top: 10px;
+                            ">
+                          <td style="
+                                font-family: 'Helvetica Neue', Helvetica, Arial,
+                                  sans-serif;
+                                box-sizing: border-box;
+                                font-size: 14px;
+                                margin: 0;
+                                padding: 10px 0;
+                              " valign="top">
+                            <div>
+                              <img src="{{bettor1AvatarUrl}}" width="30" height="30" style="
+                                    border-radius: 30px;
+                                    overflow: hidden;
+                                    vertical-align: middle;
+                                    margin-right: 4px;
+                                  " alt="" />
+                              <span style="font-weight: bold">{{bettor1Name}}</span>
+                              {{bet1Description}}
+                            </div>
+                          </td>
+                        </tr>
+                        <tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin: 0;
+                            ">
+                          <td style="padding: 20px 0 0 0; margin: 0">
+                            <div align="center">
+                              <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;font-family:arial,helvetica,sans-serif;"><tr><td style="font-family:arial,helvetica,sans-serif;" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="" style="height:37px; v-text-anchor:middle; width:110px;" arcsize="11%" stroke="f" fillcolor="#3AAEE0"><w:anchorlock/><center style="color:#FFFFFF;font-family:arial,helvetica,sans-serif;"><![endif]-->
+                              <a href="{{marketUrl}}" target="_blank" style="
+                                    box-sizing: border-box;
+                                    display: inline-block;
+                                    font-family: arial, helvetica, sans-serif;
+                                    text-decoration: none;
+                                    -webkit-text-size-adjust: none;
+                                    text-align: center;
+                                    color: #ffffff;
+                                    background-color: #11b981;
+                                    border-radius: 4px;
+                                    -webkit-border-radius: 4px;
+                                    -moz-border-radius: 4px;
+                                    width: auto;
+                                    max-width: 100%;
+                                    overflow-wrap: break-word;
+                                    word-break: break-word;
+                                    word-wrap: break-word;
+                                    mso-border-alt: none;
+                                  ">
+                                <span style="
+                                      display: block;
+                                      padding: 10px 20px;
+                                      line-height: 120%;
+                                    "><span style="
+                                        font-size: 16px;
+                                        font-weight: bold;
+                                        line-height: 18.8px;
+                                      ">View market</span></span>
+                              </a>
+                              <!--[if mso]></center></v:roundrect></td></tr></table><![endif]-->
+                            </div>
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+          <div class="footer" style="
+                font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                box-sizing: border-box;
+                font-size: 14px;
+                width: 100%;
+                clear: both;
+                color: #999;
+                margin: 0;
+                padding: 20px;
+              ">
+            <table width="100%" style="
+                  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                  box-sizing: border-box;
+                  font-size: 14px;
+                  margin: 0;
+                ">
+              <tr style="
+                    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                    box-sizing: border-box;
+                    font-size: 14px;
+                    margin: 0;
+                  ">
+                <td class="aligncenter content-block" style="
+                      font-family: 'Helvetica Neue', Helvetica, Arial,
+                        sans-serif;
+                      box-sizing: border-box;
+                      font-size: 12px;
+                      vertical-align: top;
+                      color: #999;
+                      text-align: center;
+                      margin: 0;
+                      padding: 0 0 20px;
+                    " align="center" valign="top">
+                  Questions? Come ask in
+                  <a href="https://discord.gg/eHQBNBqXuh" style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 12px;
+                        color: #999;
+                        text-decoration: underline;
+                        margin: 0;
+                      ">our Discord</a>! Or,
+                  <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </td>
+      <td style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            margin: 0;
+          " valign="top"></td>
+    </tr>
+  </table>
+</body>
+
+</html>

functions/src/email-templates/new-unique-bettors.html

@@ -0,0 +1,501 @@
+<!DOCTYPE html>
+<html style="
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    box-sizing: border-box;
+    font-size: 14px;
+    margin: 0;
+  ">
+
+<head>
+  <meta name="viewport" content="width=device-width" />
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <title>New unique predictors on your market</title>
+
+  <style type="text/css">
+    img {
+      max-width: 100%;
+    }
+
+    body {
+      -webkit-font-smoothing: antialiased;
+      -webkit-text-size-adjust: none;
+      width: 100% !important;
+      height: 100%;
+      line-height: 1.6em;
+    }
+
+    body {
+      background-color: #f6f6f6;
+    }
+
+    @media only screen and (max-width: 640px) {
+      body {
+        padding: 0 !important;
+      }
+
+      h1 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h2 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h3 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h4 {
+        font-weight: 800 !important;
+        margin: 20px 0 5px !important;
+      }
+
+      h1 {
+        font-size: 22px !important;
+      }
+
+      h2 {
+        font-size: 18px !important;
+      }
+
+      h3 {
+        font-size: 16px !important;
+      }
+
+      .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+
+      .content {
+        padding: 0 !important;
+      }
+
+      .content-wrap {
+        padding: 10px !important;
+      }
+
+      .invoice {
+        width: 100% !important;
+      }
+    }
+  </style>
+</head>
+
+<body itemscope itemtype="http://schema.org/EmailMessage" style="
+      font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+      box-sizing: border-box;
+      font-size: 14px;
+      -webkit-font-smoothing: antialiased;
+      -webkit-text-size-adjust: none;
+      width: 100% !important;
+      height: 100%;
+      line-height: 1.6em;
+      background-color: #f6f6f6;
+      margin: 0;
+    " bgcolor="#f6f6f6">
+  <table class="body-wrap" style="
+        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        box-sizing: border-box;
+        font-size: 14px;
+        width: 100%;
+        background-color: #f6f6f6;
+        margin: 0;
+      " bgcolor="#f6f6f6">
+    <tr style="
+          font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+          box-sizing: border-box;
+          font-size: 14px;
+          margin: 0;
+        ">
+      <td style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            margin: 0;
+          " valign="top"></td>
+      <td class="container" width="600" style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            display: block !important;
+            max-width: 600px !important;
+            clear: both !important;
+            margin: 0 auto;
+          " valign="top">
+        <div class="content" style="
+              font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+              box-sizing: border-box;
+              font-size: 14px;
+              max-width: 600px;
+              display: block;
+              margin: 0 auto;
+              padding: 20px;
+            ">
+          <table class="main" width="100%" cellpadding="0" cellspacing="0" style="
+                font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                box-sizing: border-box;
+                font-size: 14px;
+                border-radius: 3px;
+                background-color: #fff;
+                margin: 0;
+                border: 1px solid #e9e9e9;
+              " bgcolor="#fff">
+            <tr style="
+                  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                  box-sizing: border-box;
+                  font-size: 14px;
+                  margin: 0;
+                ">
+              <td class="content-wrap aligncenter" style="
+                    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                    box-sizing: border-box;
+                    font-size: 14px;
+                    vertical-align: top;
+                    text-align: center;
+                    margin: 0;
+                    padding: 20px;
+                  " align="center" valign="top">
+                <table width="100%" cellpadding="0" cellspacing="0" style="
+                      font-family: 'Helvetica Neue', Helvetica, Arial,
+                        sans-serif;
+                      box-sizing: border-box;
+                      font-size: 14px;
+                      margin: 0;
+                      width: 90%;
+                    ">
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 14px;
+                        margin: 0;
+                      ">
+                    <td class="content-block" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 16px;
+                          vertical-align: top;
+                          margin: 0;
+                          padding: 0 0 0px 0;
+                          text-align: left;
+                        " valign="top">
+                      <a href="https://manifold.markets" target="_blank">
+                        <img src="https://manifold.markets/logo-banner.png" width="300" style="height: auto"
+                          alt="Manifold Markets" />
+                      </a>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left"
+                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                      <div
+                        style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                        <p class="text-build-content"
+                           style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                           data-testid="4XoHRGw1Y"><span
+                          style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                                                    </span>Hi {{name}},</p>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left"
+                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:20px;word-break:break-word;">
+                      <div
+                        style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                        <p class="text-build-content"
+                           style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                           data-testid="4XoHRGw1Y"><span
+                          style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                          Your market <a href='{{marketUrl}}'>{{marketTitle}}</a> got predictions from a total of {{totalPredictors}} users!
+                          <br/>
+                          <br/>
+                          We sent you a <span style='color: #11b981'>{{bonusString}}</span> bonus for getting {{newPredictors}} new predictors,
+                          and we'll continue to do so for each new predictor, (although we won't send you any more emails about it for this market).
+                          <br/>
+                          <br/>
+                          Keep up the good work and check out your newest predictors below!
+                        </span></p>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 16px;
+                        margin: 0;
+                      ">
+                    <td class="content-block aligncenter" style="
+                          font-family: 'Helvetica Neue', Helvetica, Arial,
+                            sans-serif;
+                          box-sizing: border-box;
+                          font-size: 16px;
+                          vertical-align: top;
+                          text-align: center;
+                          margin: 0;
+                          padding: 0;
+                        " align="center" valign="top">
+                      <table class="invoice" style="
+                            font-family: 'Helvetica Neue', Helvetica, Arial,
+                              sans-serif;
+                            box-sizing: border-box;
+                            font-size: 16px;
+                            text-align: left;
+                            width: 80%;
+                            margin: 40px auto;
+                            margin-top: 10px;
+                          ">
+                        <tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin-top: 10px;
+                            ">
+                          <td style="
+                                font-family: 'Helvetica Neue', Helvetica, Arial,
+                                  sans-serif;
+                                box-sizing: border-box;
+                                font-size: 14px;
+                                margin: 0;
+                                padding: 10px 0;
+                              " valign="top">
+                            <div>
+                              <img src="{{bettor1AvatarUrl}}" width="30" height="30" style="
+                                    border-radius: 30px;
+                                    overflow: hidden;
+                                    vertical-align: middle;
+                                    margin-right: 4px;
+                                  " alt="" />
+                              <span style="font-weight: bold">{{bettor1Name}}</span>
+                              {{bet1Description}}
+                            </div>
+                          </td>
+                        </tr><tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin-top: 10px;
+                            ">
+                          <td style="
+                                font-family: 'Helvetica Neue', Helvetica, Arial,
+                                  sans-serif;
+                                box-sizing: border-box;
+                                font-size: 14px;
+                                margin: 0;
+                                padding: 10px 0;
+                              " valign="top">
+                            <div>
+                              <img src="{{bettor2AvatarUrl}}" width="30" height="30" style="
+                                    border-radius: 30px;
+                                    overflow: hidden;
+                                    vertical-align: middle;
+                                    margin-right: 4px;
+                                  " alt="" />
+                              <span style="font-weight: bold">{{bettor2Name}}</span>
+                              {{bet2Description}}
+                            </div>
+                          </td>
+                        </tr><tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin-top: 10px;
+                            ">
+                          <td style="
+                                font-family: 'Helvetica Neue', Helvetica, Arial,
+                                  sans-serif;
+                                box-sizing: border-box;
+                                font-size: 14px;
+                                margin: 0;
+                                padding: 10px 0;
+                              " valign="top">
+                            <div>
+                              <img src="{{bettor3AvatarUrl}}" width="30" height="30" style="
+                                    border-radius: 30px;
+                                    overflow: hidden;
+                                    vertical-align: middle;
+                                    margin-right: 4px;
+                                  " alt="" />
+                              <span style="font-weight: bold">{{bettor3Name}}</span>
+                              {{bet3Description}}
+                            </div>
+                          </td>
+                        </tr><tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin-top: 10px;
+                            ">
+                          <td style="
+                                font-family: 'Helvetica Neue', Helvetica, Arial,
+                                  sans-serif;
+                                box-sizing: border-box;
+                                font-size: 14px;
+                                margin: 0;
+                                padding: 10px 0;
+                              " valign="top">
+                            <div>
+                              <img src="{{bettor4AvatarUrl}}" width="30" height="30" style="
+                                    border-radius: 30px;
+                                    overflow: hidden;
+                                    vertical-align: middle;
+                                    margin-right: 4px;
+                                  " alt="" />
+                              <span style="font-weight: bold">{{bettor4Name}}</span>
+                              {{bet4Description}}
+                            </div>
+                          </td>
+                        </tr><tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin-top: 10px;
+                            ">
+                          <td style="
+                                font-family: 'Helvetica Neue', Helvetica, Arial,
+                                  sans-serif;
+                                box-sizing: border-box;
+                                font-size: 14px;
+                                margin: 0;
+                                padding: 10px 0;
+                              " valign="top">
+                            <div>
+                              <img src="{{bettor5AvatarUrl}}" width="30" height="30" style="
+                                    border-radius: 30px;
+                                    overflow: hidden;
+                                    vertical-align: middle;
+                                    margin-right: 4px;
+                                  " alt="" />
+                              <span style="font-weight: bold">{{bettor5Name}}</span>
+                              {{bet5Description}}
+                            </div>
+                          </td>
+                        </tr>
+                        <tr style="
+                              font-family: 'Helvetica Neue', Helvetica, Arial,
+                                sans-serif;
+                              box-sizing: border-box;
+                              font-size: 16px;
+                              margin: 0;
+                            ">
+                          <td style="padding: 20px 0 0 0; margin: 0">
+                            <div align="center">
+                              <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;font-family:arial,helvetica,sans-serif;"><tr><td style="font-family:arial,helvetica,sans-serif;" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="" style="height:37px; v-text-anchor:middle; width:110px;" arcsize="11%" stroke="f" fillcolor="#3AAEE0"><w:anchorlock/><center style="color:#FFFFFF;font-family:arial,helvetica,sans-serif;"><![endif]-->
+                              <a href="{{marketUrl}}" target="_blank" style="
+                                    box-sizing: border-box;
+                                    display: inline-block;
+                                    font-family: arial, helvetica, sans-serif;
+                                    text-decoration: none;
+                                    -webkit-text-size-adjust: none;
+                                    text-align: center;
+                                    color: #ffffff;
+                                    background-color: #11b981;
+                                    border-radius: 4px;
+                                    -webkit-border-radius: 4px;
+                                    -moz-border-radius: 4px;
+                                    width: auto;
+                                    max-width: 100%;
+                                    overflow-wrap: break-word;
+                                    word-break: break-word;
+                                    word-wrap: break-word;
+                                    mso-border-alt: none;
+                                  ">
+                                <span style="
+                                      display: block;
+                                      padding: 10px 20px;
+                                      line-height: 120%;
+                                    "><span style="
+                                        font-size: 16px;
+                                        font-weight: bold;
+                                        line-height: 18.8px;
+                                      ">View market</span></span>
+                              </a>
+                              <!--[if mso]></center></v:roundrect></td></tr></table><![endif]-->
+                            </div>
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+          <div class="footer" style="
+                font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                box-sizing: border-box;
+                font-size: 14px;
+                width: 100%;
+                clear: both;
+                color: #999;
+                margin: 0;
+                padding: 20px;
+              ">
+            <table width="100%" style="
+                  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                  box-sizing: border-box;
+                  font-size: 14px;
+                  margin: 0;
+                ">
+              <tr style="
+                    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+                    box-sizing: border-box;
+                    font-size: 14px;
+                    margin: 0;
+                  ">
+                <td class="aligncenter content-block" style="
+                      font-family: 'Helvetica Neue', Helvetica, Arial,
+                        sans-serif;
+                      box-sizing: border-box;
+                      font-size: 12px;
+                      vertical-align: top;
+                      color: #999;
+                      text-align: center;
+                      margin: 0;
+                      padding: 0 0 20px;
+                    " align="center" valign="top">
+                  Questions? Come ask in
+                  <a href="https://discord.gg/eHQBNBqXuh" style="
+                        font-family: 'Helvetica Neue', Helvetica, Arial,
+                          sans-serif;
+                        box-sizing: border-box;
+                        font-size: 12px;
+                        color: #999;
+                        text-decoration: underline;
+                        margin: 0;
+                      ">our Discord</a>! Or,
+                  <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </td>
+      <td style="
+            font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            box-sizing: border-box;
+            font-size: 14px;
+            vertical-align: top;
+            margin: 0;
+          " valign="top"></td>
+    </tr>
+  </table>
+</body>
+
+</html>

functions/src/email-templates/one-week.html

@@ -1,519 +1,316 @@
 <!DOCTYPE html>
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
->
-  <head>
-    <title>7th Day Anniversary Gift!</title>
-    <!--[if !mso]><!-->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <!--<![endif]-->
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <style type="text/css">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
+      xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+  <title>Manifold Markets 7th Day Anniversary Gift!</title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style type="text/css">
       #outlook a {
-        padding: 0;
+          padding: 0;
       }
 
       body {
-        margin: 0;
-        padding: 0;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
+          margin: 0;
+          padding: 0;
+          -webkit-text-size-adjust: 100%;
+          -ms-text-size-adjust: 100%;
       }
 
       table,
       td {
-        border-collapse: collapse;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
+          border-collapse: collapse;
+          mso-table-lspace: 0pt;
+          mso-table-rspace: 0pt;
       }
 
       img {
-        border: 0;
-        height: auto;
-        line-height: 100%;
-        outline: none;
-        text-decoration: none;
-        -ms-interpolation-mode: bicubic;
+          border: 0;
+          height: auto;
+          line-height: 100%;
+          outline: none;
+          text-decoration: none;
+          -ms-interpolation-mode: bicubic;
       }
 
       p {
-        display: block;
-        margin: 13px 0;
+          display: block;
+          margin: 13px 0;
       }
-    </style>
-    <!--[if mso]>
-      <noscript>
-        <xml>
-          <o:OfficeDocumentSettings>
-            <o:AllowPNG />
-            <o:PixelsPerInch>96</o:PixelsPerInch>
-          </o:OfficeDocumentSettings>
-        </xml> </noscript
-      >z
-    <![endif]-->
-    <!--[if lte mso 11]>
-      <style type="text/css">
-        .mj-outlook-group-fix {
-          width: 100% !important;
-        }
-      </style>
-    <![endif]-->
-    <style type="text/css">
-      @media only screen and (min-width: 480px) {
-        .mj-column-per-100 {
+  </style>
+  <!--[if mso]>
+  <noscript>
+    <xml>
+      <o:OfficeDocumentSettings>
+        <o:AllowPNG/>
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+    </xml>
+  </noscript>
+  <![endif]-->
+  <!--[if lte mso 11]>
+  <style type="text/css">
+    .mj-outlook-group-fix { width:100% !important; }
+  </style>
+  <![endif]-->
+  <style type="text/css">
+      @media only screen and (min-width:480px) {
+          .mj-column-per-100 {
+              width: 100% !important;
+              max-width: 100%;
+          }
+      }
+  </style>
+  <style media="screen and (min-width:480px)">
+      .moz-text-html .mj-column-per-100 {
           width: 100% !important;
           max-width: 100%;
-        }
       }
-    </style>
-    <style media="screen and (min-width:480px)">
-      .moz-text-html .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-    </style>
-    <style type="text/css">
+  </style>
+  <style type="text/css">
       [owa] .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-    </style>
-    <style type="text/css">
-      @media only screen and (max-width: 480px) {
-        table.mj-full-width-mobile {
           width: 100% !important;
-        }
-
-        td.mj-full-width-mobile {
-          width: auto !important;
-        }
+          max-width: 100%;
       }
-    </style>
-  </head>
+  </style>
+  <style type="text/css">
+      @media only screen and (max-width:480px) {
+          table.mj-full-width-mobile {
+              width: 100% !important;
+          }
 
-  <body style="word-spacing: normal; background-color: #f4f4f4">
-    <div style="background-color: #f4f4f4">
-      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div
-        style="
-          background: #ffffff;
-          background-color: #ffffff;
-          margin: 0px auto;
-          max-width: 600px;
-        "
-      >
-        <table
-          align="center"
-          border="0"
-          cellpadding="0"
-          cellspacing="0"
-          role="presentation"
-          style="background: #ffffff; background-color: #ffffff; width: 100%"
-        >
-          <tbody>
-            <tr>
-              <td
-                style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 0px 0px 0px 0px;
-                  padding-bottom: 0px;
-                  padding-left: 0px;
-                  padding-right: 0px;
-                  padding-top: 0px;
-                  text-align: center;
-                "
-              >
-                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                <div
-                  class="mj-column-per-100 mj-outlook-group-fix"
-                  style="
-                    font-size: 0px;
-                    text-align: left;
-                    direction: ltr;
-                    display: inline-block;
-                    vertical-align: top;
-                    width: 100%;
-                  "
-                >
-                  <table
-                    border="0"
-                    cellpadding="0"
-                    cellspacing="0"
-                    role="presentation"
-                    style="vertical-align: top"
-                    width="100%"
-                  >
+          td.mj-full-width-mobile {
+              width: auto !important;
+          }
+      }
+  </style>
+</head>
+
+<body style="word-spacing:normal;background-color:#F4F4F4;">
+<div style="background-color:#F4F4F4;">
+  <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+  <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;">
+    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+           style="background:#ffffff;background-color:#ffffff;width:100%;">
+      <tbody>
+      <tr>
+        <td
+          style="direction:ltr;font-size:0px;padding:0px 0px 0px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;text-align:center;">
+          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+          <div class="mj-column-per-100 mj-outlook-group-fix"
+               style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
+                   width="100%">
+              <tbody>
+              <tr>
+                <td align="center"
+                    style="font-size:0px;padding:0px 25px 0px 25px;padding-top:0px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
+                  <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                         style="border-collapse:collapse;border-spacing:0px;">
                     <tbody>
-                      <tr>
-                        <td
-                          align="center"
-                          style="
-                            font-size: 0px;
-                            padding: 0px 25px 0px 25px;
-                            padding-top: 0px;
-                            padding-right: 25px;
-                            padding-bottom: 0px;
-                            padding-left: 25px;
-                            word-break: break-word;
-                          "
-                        >
-                          <table
-                            border="0"
-                            cellpadding="0"
-                            cellspacing="0"
-                            role="presentation"
-                            style="
-                              border-collapse: collapse;
-                              border-spacing: 0px;
-                            "
-                          >
-                            <tbody>
-                              <tr>
-                                <td style="width: 550px">
-                                  <a
-                                    href="https://manifold.markets/home"
-                                    target="_blank"
-                                    ><img
-                                      alt=""
-                                      height="auto"
-                                      src="https://03jlj.mjt.lu/img/03jlj/b/u71/sjvu.gif"
-                                      style="
-                                        border: none;
-                                        display: block;
-                                        outline: none;
-                                        text-decoration: none;
-                                        height: auto;
-                                        width: 100%;
-                                        font-size: 13px;
-                                      "
-                                      width="550"
-                                  /></a>
-                                </td>
-                              </tr>
-                            </tbody>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td
-                          align="left"
-                          style="
-                            font-size: 0px;
-                            padding: 10px 25px;
-                            padding-top: 0px;
-                            padding-bottom: 0px;
-                            word-break: break-word;
-                          "
-                        >
-                          <div
-                            style="
-                              font-family: Arial, sans-serif;
-                              font-size: 18px;
-                              letter-spacing: normal;
-                              line-height: 1;
-                              text-align: left;
-                              color: #000000;
-                            "
-                          >
-                            <p
-                              class="text-build-content"
-                              style="
-                                text-align: center;
-                                margin: 10px 0;
-                                margin-top: 10px;
-                                margin-bottom: 10px;
-                              "
-                              data-testid="4XoHRGw1Y"
-                            >
-                              <span
-                                style="
-                                  color: #000000;
-                                  font-family: Arial, Helvetica, sans-serif;
-                                  font-size: 18px;
-                                "
-                                >Hopefully you haven&#39;t gambled all your M$
-                                away already... but if you have I bring good
-                                news! Click the link below to recieve a one time
-                                gift of M$ 500 to your account!</span
-                              >
-                            </p>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td
-                          align="center"
-                          style="
-                            font-size: 0px;
-                            padding: 10px 25px 25px 25px;
-                            padding-top: 10px;
-                            padding-right: 25px;
-                            padding-bottom: 25px;
-                            padding-left: 25px;
-                            word-break: break-word;
-                          "
-                        >
-                          <table
-                            border="0"
-                            cellpadding="0"
-                            cellspacing="0"
-                            role="presentation"
-                            style="
-                              border-collapse: collapse;
-                              border-spacing: 0px;
-                            "
-                          >
-                            <tbody>
-                              <tr>
-                                <td style="width: 550px">
-                                  <a href="{{manalink}}" target="_blank">
-                                    <img
-                                      alt="Get M$500"
-                                      height="auto"
-                                      src="https://03jlj.mjt.lu/img/03jlj/b/u71/sjgt.png"
-                                      style="
-                                        border: none;
-                                        display: block;
-                                        outline: none;
-                                        text-decoration: none;
-                                        height: auto;
-                                        width: 100%;
-                                        font-size: 13px;
-                                      "
-                                      width="550"
-                                  /></a>
-                                  << /td>
-                                </td>
-                              </tr>
-                            </tbody>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td
-                          align="left"
-                          style="
-                            font-size: 0px;
-                            padding: 10px 25px;
-                            padding-top: 0px;
-                            padding-bottom: 0px;
-                            word-break: break-word;
-                          "
-                        >
-                          <div
-                            style="
-                              font-family: Arial, sans-serif;
-                              font-size: 18px;
-                              letter-spacing: normal;
-                              line-height: 1;
-                              text-align: left;
-                              color: #000000;
-                            "
-                          >
-                            <p
-                              class="text-build-content"
-                              style="
-                                line-height: 23px;
-                                text-align: center;
-                                margin: 10px 0;
-                                margin-top: 10px;
-                              "
-                              data-testid="3Q8BP69fq"
-                            >
-                              <span
-                                style="
-                                  color: #000000;
-                                  font-family: Arial, Helvetica, sans-serif;
-                                  font-size: 18px;
-                                "
-                                >If you are still engaging with our markets then
-                                at this point you might as well join our </span
-                              ><a
-                                class="link-build-content"
-                                style="color: inherit; text-decoration: none"
-                                target="_blank"
-                                href="https://discord.gg/VARzUpyCSa"
-                                ><span
-                                  style="
-                                    color: #0c21bf;
-                                    font-family: Arial;
-                                    font-size: 18px;
-                                  "
-                                  ><u>Discord server</u></span
-                                ><span
-                                  style="
-                                    color: #000000;
-                                    font-family: Arial;
-                                    font-size: 18px;
-                                  "
-                                  ><u>.</u>
-                                </span></a
-                              ><span
-                                style="
-                                  color: #000000;
-                                  font-family: Arial;
-                                  font-size: 18px;
-                                "
-                                >You can always leave if you dont like it but
-                                I&#39;d be willing to make a market betting
-                                you&#39;ll stay.</span
-                              >
-                            </p>
-                            <p
-                              class="text-build-content"
-                              data-testid="3Q8BP69fq"
-                              style="margin: 10px 0"
-                            ></p>
-                            <br />
-                            <p
-                              class="text-build-content"
-                              data-testid="3Q8BP69fq"
-                              style="margin: 10px 0"
-                            >
-                              <span
-                                style="
-                                  color: #000000;
-                                  font-family: Arial;
-                                  font-size: 18px;
-                                "
-                                >Cheers,</span
-                              >
-                            </p>
-                            <p
-                              class="text-build-content"
-                              data-testid="3Q8BP69fq"
-                              style="margin: 10px 0"
-                            >
-                              <span
-                                style="
-                                  color: #000000;
-                                  font-family: Arial;
-                                  font-size: 18px;
-                                "
-                                >David from Manifold</span
-                              >
-                            </p>
-                            <p
-                              class="text-build-content"
-                              data-testid="3Q8BP69fq"
-                              style="margin: 10px 0; margin-bottom: 10px"
-                            ></p>
-                          </div>
-                        </td>
-                      </tr>
+                    <tr>
+                      <td style="width:550px;"><a href="https://manifold.markets/home" target="_blank"><img
+                        alt="" height="auto" src="https://i.imgur.com/8EP8Y8q.gif"
+                        style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
+                        width="550"></a></td>
+                    </tr>
                     </tbody>
                   </table>
-                </div>
-                <!--[if mso | IE]></td></tr></table><![endif]-->
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin: 0px auto; max-width: 600px">
-        <table
-          align="center"
-          border="0"
-          cellpadding="0"
-          cellspacing="0"
-          role="presentation"
-          style="width: 100%"
-        >
-          <tbody>
-            <tr>
-              <td
-                style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 20px 0px 20px 0px;
-                  text-align: center;
-                "
-              >
-                <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                <div
-                  class="mj-column-per-100 mj-outlook-group-fix"
-                  style="
-                    font-size: 0px;
-                    text-align: left;
-                    direction: ltr;
-                    display: inline-block;
-                    vertical-align: top;
-                    width: 100%;
-                  "
-                >
-                  <table
-                    border="0"
-                    cellpadding="0"
-                    cellspacing="0"
-                    role="presentation"
-                    width="100%"
-                  >
-                    <tbody>
+                </td>
+              </tr>
+              <tr>
+                <td align="left"
+                    style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                  <div
+                    style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                    <p class="text-build-content"
+                       style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                       data-testid="4XoHRGw1Y"><span
+                      style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                              Hi {{name}},</span></p>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td align="left"
+                    style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                  <div
+                    style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                    <p class="text-build-content"
+                       style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                       data-testid="4XoHRGw1Y"><span
+                      style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">Thanks for
+                              using Manifold Markets. Running low
+                              on mana (M$)? Click the link below to receive a one time gift of M$500!</span></p>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <p></p>
+                </td>
+              </tr>
+              <tr>
+                <td align="center">
+                  <table cellspacing="0" cellpadding="0">
+                    <tr>
+                      <td>
+                        <table cellspacing="0" cellpadding="0">
+                          <tr>
+                            <td style="border-radius: 2px;" bgcolor="#4337c9">
+                              <a href="{{manalink}}" target="_blank"
+                                 style="padding: 12px 16px; border: 1px solid #4337c9;border-radius: 16px;font-family: Helvetica, Arial, sans-serif;font-size: 24px; color: #ffffff;text-decoration: none;font-weight:bold;display: inline-block;">
+                                Claim M$500
+                              </a>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td align="left"
+                    style="font-size:0px;padding:15px 25px 0px 25px;padding-top:15px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
+                  <div
+                    style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                    <p class="text-build-content" style="line-height: 23px; margin: 10px 0; margin-top: 10px;"
+                       data-testid="3Q8BP69fq"><span style="font-family:Arial, sans-serif;font-size:18px;">Did
+                              you know, besides making correct predictions, there are
+                              plenty of other ways to earn mana?</span></p>
+                    <ul>
+                      <li style="line-height:23px;"><span
+                        style="font-family:Arial, sans-serif;font-size:18px;">Predicting
+                        consecutive days to earn streak rewards</span></li>
+                      <li style="line-height:23px;"><span
+                        style="font-family:Arial, sans-serif;font-size:18px;">Receiving
+                                tips on comments and markets</span></li>
+                      <li style="line-height:23px;"><span
+                        style="font-family:Arial, sans-serif;font-size:18px;">Unique
+                                predictor bonus for each user who predicts on your
+                                markets</span></li>
+                      <li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;"><a
+                        class="link-build-content" style="color:inherit;; text-decoration: none;"
+                        target="_blank" href="https://manifold.markets/referrals"><span
+                        style="color:#55575d;font-family:Arial;font-size:18px;"><u>Referring
+                                      friends</u></span></a></span></li>
+                      <li style="line-height:23px;"><a class="link-build-content"
+                                                       style="color:inherit;; text-decoration: none;" target="_blank"
+                                                       href="https://manifold.markets/group/bugs?s=most-traded"><span
+                        style="color:#55575d;font-family:Arial;font-size:18px;"><u>Reporting
+                                    bugs</u></span></a><span style="font-family:Arial, sans-serif;font-size:18px;">
+                                and </span><a class="link-build-content" style="color:inherit;; text-decoration: none;"
+                                              target="_blank"
+                                              href="https://manifold.markets/group/manifold-features-25bad7c7792e/chat?s=most-traded"><span
+                        style="color:#55575d;font-family:Arial;font-size:18px;"><u>giving
+                                    feedback</u></span></a></li>
+                    </ul>
+                    <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;">&nbsp;</p>
+                    <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
+                      style="color:#000000;font-family:Arial;font-size:18px;">Cheers,</span>
+                    </p>
+                    <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
+                      style="color:#000000;font-family:Arial;font-size:18px;">David
+                              from Manifold</span></p>
+                    <p class="text-build-content" data-testid="3Q8BP69fq"
+                       style="margin: 10px 0; margin-bottom: 10px;">&nbsp;</p>
+                  </div>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+  <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+  <div style="margin:0px auto;max-width:600px;">
+    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+      <tbody>
+      <tr>
+        <td style="direction:ltr;font-size:0px;padding:0 0 20px 0;text-align:center;">
+          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+          <div class="mj-column-per-100 mj-outlook-group-fix"
+               style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
+                   width="100%">
+              <tbody>
+              <tr>
+                <td align="center" style="font-size:0px;padding:0px;word-break:break-word;">
+                  <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                         style="border-collapse:collapse;border-spacing:0px;">
+          </div>
+          <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+          <div style="margin:0px auto;max-width:600px;">
+            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+                   style="width:100%;">
+              <tbody>
+              <tr>
+                <td style="direction:ltr;font-size:0px;padding:20px 0px 20px 0px;text-align:center;">
+                  <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+                  <div class="mj-column-per-100 mj-outlook-group-fix"
+                       style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                    <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
+                      <tbody>
                       <tr>
-                        <td style="vertical-align: top; padding: 0">
-                          <table
-                            border="0"
-                            cellpadding="0"
-                            cellspacing="0"
-                            role="presentation"
-                            width="100%"
-                          >
+                        <td style="vertical-align:top;padding:0;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
                             <tbody>
-                              <tr>
-                                <td
-                                  align="center"
-                                  style="
+                            <tr>
+                              <td align="center" style="
                                     font-size: 0px;
                                     padding: 10px 25px;
-                                    padding-top: 0px;
-                                    padding-bottom: 0px;
                                     word-break: break-word;
-                                  "
-                                >
-                                  <div
-                                    style="
-                                      font-family: Arial, sans-serif;
+                                  ">
+                                <div style="
+                                      font-family: Ubuntu, Helvetica, Arial,
+                                        sans-serif;
                                       font-size: 11px;
-                                      letter-spacing: normal;
                                       line-height: 22px;
                                       text-align: center;
                                       color: #000000;
-                                    "
-                                  >
-                                    <p style="margin: 10px 0">
-                                      This e-mail has been sent to {{name}},
-                                      <a
-                                        href="{{unsubscribeLink}}"
-                                        style="
+                                    ">
+                                  <p style="margin: 10px 0">
+                                    This e-mail has been sent to {{name}},
+                                    <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        "
-                                        target="_blank"
-                                        >click here to unsubscribe</a
-                                      >.
-                                    </p>
-                                  </div>
-                                </td>
-                              </tr>
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                  </p>
+                                </div>
+                              </td>
+                            </tr>
+                            <tr>
+                              <td align="center"
+                                  style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                                <div
+                                  style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
+                                </div>
+                              </td>
+                            </tr>
                             </tbody>
                           </table>
                         </td>
                       </tr>
-                    </tbody>
-                  </table>
-                </div>
-                <!--[if mso | IE]></td></tr></table><![endif]-->
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><![endif]-->
-    </div>
-  </body>
-</html>
+                      </tbody>
+                    </table>
+                  </div>
+                  <!--[if mso | IE]></td></tr></table><![endif]-->
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+          <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
+</body>
+
+</html>

functions/src/email-templates/thank-you.html

@@ -214,10 +214,12 @@
                                                                 <div
                                                                     style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
                                                                     <p style="margin: 10px 0;">This e-mail has been sent
-                                                                        to {{name}}, <a href="{{unsubscribeLink}}"
-                                                                            style="color:inherit;text-decoration:none;"
-                                                                            target="_blank">click here to
-                                                                            unsubscribe</a>.</p>
+                                                                        to {{name}},
+                                                                        <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                                                    </p>
                                                                 </div>
                                                             </td>
                                                         </tr>

functions/src/email-templates/welcome.html

@@ -137,7 +137,7 @@
                             style="line-height: 24px;  margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
                             data-testid="4XoHRGw1Y"><span
                               style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                              Welcome! Manifold Markets is a play-money prediction market platform where you can bet on
+                              Welcome! Manifold Markets is a play-money prediction market platform where you can predict
                               anything, from elections to Elon Musk to scientific papers to the NBA. </span></p>
                         </div>
                       </td>
@@ -286,9 +286,12 @@
                                           style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
                                           <div
                                             style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
-                                            <p style="margin: 10px 0;">This e-mail has been sent to {{name}}, <a
-                                                href="{{unsubscribeLink}}” style=" color:inherit;text-decoration:none;"
-                                                target="_blank">click here to unsubscribe</a>.</p>
+                                            <p style="margin: 10px 0;">This e-mail has been sent to {{name}},
+                                              <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                            </p>
                                           </div>
                                         </td>
                                       </tr>

functions/src/emails.ts

@@ -1,8 +1,6 @@
 import { DOMAIN } from '../../common/envs/constants'
-import { Answer } from '../../common/answer'
 import { Bet } from '../../common/bet'
 import { getProbability } from '../../common/calculate'
-import { Comment } from '../../common/comment'
 import { Contract } from '../../common/contract'
 import { PrivateUser, User } from '../../common/user'
 import {
@@ -14,15 +12,18 @@ import { getValueFromBucket } from '../../common/calculate-dpm'
 import { formatNumericProbability } from '../../common/pseudo-numeric'
 
 import { sendTemplateEmail, sendTextEmail } from './send-email'
-import { getPrivateUser, getUser } from './utils'
-import { getFunctionUrl } from '../../common/api'
-import { richTextToString } from '../../common/util/parse'
+import { getUser } from './utils'
 import { buildCardUrl, getOpenGraphProps } from '../../common/contract-details'
-
-const UNSUBSCRIBE_ENDPOINT = getFunctionUrl('unsubscribe')
+import { notification_reason_types } from '../../common/notification'
+import { Dictionary } from 'lodash'
+import {
+  getNotificationDestinationsForUser,
+  notification_preference,
+} from '../../common/user-notification-preferences'
 
 export const sendMarketResolutionEmail = async (
-  userId: string,
+  reason: notification_reason_types,
+  privateUser: PrivateUser,
   investment: number,
   payout: number,
   creator: User,
@@ -32,15 +33,13 @@ export const sendMarketResolutionEmail = async (
   resolutionProbability?: number,
   resolutions?: { [outcome: string]: number }
 ) => {
-  const privateUser = await getPrivateUser(userId)
-  if (
-    !privateUser ||
-    privateUser.unsubscribedFromResolutionEmails ||
-    !privateUser.email
+  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+    privateUser,
+    reason
   )
-    return
+  if (!privateUser || !privateUser.email || !sendToEmail) return
 
-  const user = await getUser(userId)
+  const user = await getUser(privateUser.id)
   if (!user) return
 
   const outcome = toDisplayResolution(
@@ -53,17 +52,13 @@ export const sendMarketResolutionEmail = async (
   const subject = `Resolved ${outcome}: ${contract.question}`
 
   const creatorPayoutText =
-    creatorPayout >= 1 && userId === creator.id
+    creatorPayout >= 1 && privateUser.id === creator.id
       ? ` (plus ${formatMoney(creatorPayout)} in commissions)`
       : ''
 
-  const emailType = 'market-resolved'
-  const unsubscribeUrl = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
-
-  const displayedInvestment =
-    Number.isNaN(investment) || investment < 0
-      ? formatMoney(0)
-      : formatMoney(investment)
+  const correctedInvestment =
+    Number.isNaN(investment) || investment < 0 ? 0 : investment
+  const displayedInvestment = formatMoney(correctedInvestment)
 
   const displayedPayout = formatMoney(payout)
 
@@ -85,7 +80,7 @@ export const sendMarketResolutionEmail = async (
   return await sendTemplateEmail(
     privateUser.email,
     subject,
-    'market-resolved',
+    correctedInvestment === 0 ? 'market-resolved-no-bets' : 'market-resolved',
     templateData
   )
 }
@@ -154,11 +149,12 @@ export const sendWelcomeEmail = async (
 ) => {
   if (!privateUser || !privateUser.email) return
 
-  const { name, id: userId } = user
+  const { name } = user
   const firstName = name.split(' ')[0]
 
-  const emailType = 'generic'
-  const unsubscribeLink = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
+    'onboarding_flow' as notification_preference
+  }`
 
   return await sendTemplateEmail(
     privateUser.email,
@@ -166,7 +162,7 @@ export const sendWelcomeEmail = async (
     'welcome',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
     },
     {
       from: 'David from Manifold <david@manifold.markets>',
@@ -217,23 +213,23 @@ export const sendOneWeekBonusEmail = async (
   if (
     !privateUser ||
     !privateUser.email ||
-    privateUser.unsubscribedFromGenericEmails
+    !privateUser.notificationPreferences.onboarding_flow.includes('email')
   )
     return
 
-  const { name, id: userId } = user
+  const { name } = user
   const firstName = name.split(' ')[0]
 
-  const emailType = 'generic'
-  const unsubscribeLink = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
-
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
+    'onboarding_flow' as notification_preference
+  }`
   return await sendTemplateEmail(
     privateUser.email,
     'Manifold Markets one week anniversary gift',
     'one-week',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
       manalink: 'https://manifold.markets/link/lj4JbBvE',
     },
     {
@@ -250,23 +246,23 @@ export const sendCreatorGuideEmail = async (
   if (
     !privateUser ||
     !privateUser.email ||
-    privateUser.unsubscribedFromGenericEmails
+    !privateUser.notificationPreferences.onboarding_flow.includes('email')
   )
     return
 
-  const { name, id: userId } = user
+  const { name } = user
   const firstName = name.split(' ')[0]
 
-  const emailType = 'generic'
-  const unsubscribeLink = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
-
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
+    'onboarding_flow' as notification_preference
+  }`
   return await sendTemplateEmail(
     privateUser.email,
     'Create your own prediction market',
     'creating-market',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
     },
     {
       from: 'David from Manifold <david@manifold.markets>',
@@ -282,15 +278,18 @@ export const sendThankYouEmail = async (
   if (
     !privateUser ||
     !privateUser.email ||
-    privateUser.unsubscribedFromGenericEmails
+    !privateUser.notificationPreferences.thank_you_for_purchases.includes(
+      'email'
+    )
   )
     return
 
-  const { name, id: userId } = user
+  const { name } = user
   const firstName = name.split(' ')[0]
 
-  const emailType = 'generic'
-  const unsubscribeLink = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
+    'thank_you_for_purchases' as notification_preference
+  }`
 
   return await sendTemplateEmail(
     privateUser.email,
@@ -298,7 +297,7 @@ export const sendThankYouEmail = async (
     'thank-you',
     {
       name: firstName,
-      unsubscribeLink,
+      unsubscribeUrl,
     },
     {
       from: 'David from Manifold <david@manifold.markets>',
@@ -307,16 +306,17 @@ export const sendThankYouEmail = async (
 }
 
 export const sendMarketCloseEmail = async (
+  reason: notification_reason_types,
   user: User,
   privateUser: PrivateUser,
   contract: Contract
 ) => {
-  if (
-    !privateUser ||
-    privateUser.unsubscribedFromResolutionEmails ||
-    !privateUser.email
+  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+    privateUser,
+    reason
   )
-    return
+
+  if (!privateUser.email || !sendToEmail) return
 
   const { username, name, id: userId } = user
   const firstName = name.split(' ')[0]
@@ -324,8 +324,6 @@ export const sendMarketCloseEmail = async (
   const { question, slug, volume } = contract
 
   const url = `https://${DOMAIN}/${username}/${slug}`
-  const emailType = 'market-resolve'
-  const unsubscribeUrl = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
 
   return await sendTemplateEmail(
     privateUser.email,
@@ -343,30 +341,26 @@ export const sendMarketCloseEmail = async (
 }
 
 export const sendNewCommentEmail = async (
-  userId: string,
+  reason: notification_reason_types,
+  privateUser: PrivateUser,
   commentCreator: User,
   contract: Contract,
-  comment: Comment,
+  commentText: string,
+  commentId: string,
   bet?: Bet,
   answerText?: string,
   answerId?: string
 ) => {
-  const privateUser = await getPrivateUser(userId)
-  if (
-    !privateUser ||
-    !privateUser.email ||
-    privateUser.unsubscribedFromCommentEmails
+  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+    privateUser,
+    reason
   )
-    return
+  if (!privateUser || !privateUser.email || !sendToEmail) return
 
-  const { question, creatorUsername, slug } = contract
-  const marketUrl = `https://${DOMAIN}/${creatorUsername}/${slug}#${comment.id}`
-  const emailType = 'market-comment'
-  const unsubscribeUrl = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
+  const { question } = contract
+  const marketUrl = `https://${DOMAIN}/${contract.creatorUsername}/${contract.slug}#${commentId}`
 
   const { name: commentorName, avatarUrl: commentorAvatarUrl } = commentCreator
-  const { content } = comment
-  const text = richTextToString(content)
 
   let betDescription = ''
   if (bet) {
@@ -380,7 +374,7 @@ export const sendNewCommentEmail = async (
   const from = `${commentorName} on Manifold <no-reply@manifold.markets>`
 
   if (contract.outcomeType === 'FREE_RESPONSE' && answerId && answerText) {
-    const answerNumber = `#${answerId}`
+    const answerNumber = answerId ? `#${answerId}` : ''
 
     return await sendTemplateEmail(
       privateUser.email,
@@ -391,7 +385,7 @@ export const sendNewCommentEmail = async (
         answerNumber,
         commentorName,
         commentorAvatarUrl: commentorAvatarUrl ?? '',
-        comment: text,
+        comment: commentText,
         marketUrl,
         unsubscribeUrl,
         betDescription,
@@ -412,7 +406,7 @@ export const sendNewCommentEmail = async (
       {
         commentorName,
         commentorAvatarUrl: commentorAvatarUrl ?? '',
-        comment: text,
+        comment: commentText,
         marketUrl,
         unsubscribeUrl,
         betDescription,
@@ -423,29 +417,26 @@ export const sendNewCommentEmail = async (
 }
 
 export const sendNewAnswerEmail = async (
-  answer: Answer,
-  contract: Contract
+  reason: notification_reason_types,
+  privateUser: PrivateUser,
+  name: string,
+  text: string,
+  contract: Contract,
+  avatarUrl?: string
 ) => {
-  // Send to just the creator for now.
-  const { creatorId: userId } = contract
-
+  const { creatorId } = contract
   // Don't send the creator's own answers.
-  if (answer.userId === userId) return
+  if (privateUser.id === creatorId) return
 
-  const privateUser = await getPrivateUser(userId)
-  if (
-    !privateUser ||
-    !privateUser.email ||
-    privateUser.unsubscribedFromAnswerEmails
+  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+    privateUser,
+    reason
   )
-    return
+  if (!privateUser.email || !sendToEmail) return
 
   const { question, creatorUsername, slug } = contract
-  const { name, avatarUrl, text } = answer
 
   const marketUrl = `https://${DOMAIN}/${creatorUsername}/${slug}`
-  const emailType = 'market-answer'
-  const unsubscribeUrl = `${UNSUBSCRIBE_ENDPOINT}?id=${userId}&type=${emailType}`
 
   const subject = `New answer on ${question}`
   const from = `${name} <info@manifold.markets>`
@@ -474,12 +465,13 @@ export const sendInterestingMarketsEmail = async (
   if (
     !privateUser ||
     !privateUser.email ||
-    privateUser?.unsubscribedFromWeeklyTrendingEmails
+    !privateUser.notificationPreferences.trending_markets.includes('email')
   )
     return
 
-  const emailType = 'weekly-trending'
-  const unsubscribeUrl = `${UNSUBSCRIBE_ENDPOINT}?id=${privateUser.id}&type=${emailType}`
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
+    'trending_markets' as notification_preference
+  }`
 
   const { name } = user
   const firstName = name.split(' ')[0]
@@ -490,7 +482,7 @@ export const sendInterestingMarketsEmail = async (
     'interesting-markets',
     {
       name: firstName,
-      unsubscribeLink: unsubscribeUrl,
+      unsubscribeUrl,
 
       question1Title: contractsToSend[0].question,
       question1Link: contractUrl(contractsToSend[0]),
@@ -522,3 +514,101 @@ function contractUrl(contract: Contract) {
 function imageSourceUrl(contract: Contract) {
   return buildCardUrl(getOpenGraphProps(contract))
 }
+
+export const sendNewFollowedMarketEmail = async (
+  reason: notification_reason_types,
+  userId: string,
+  privateUser: PrivateUser,
+  contract: Contract
+) => {
+  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+    privateUser,
+    reason
+  )
+  if (!privateUser.email || !sendToEmail) return
+  const user = await getUser(privateUser.id)
+  if (!user) return
+
+  const { name } = user
+  const firstName = name.split(' ')[0]
+  const creatorName = contract.creatorName
+
+  return await sendTemplateEmail(
+    privateUser.email,
+    `${creatorName} asked ${contract.question}`,
+    'new-market-from-followed-user',
+    {
+      name: firstName,
+      creatorName,
+      unsubscribeUrl,
+      questionTitle: contract.question,
+      questionUrl: contractUrl(contract),
+      questionImgSrc: imageSourceUrl(contract),
+    },
+    {
+      from: `${creatorName} on Manifold <no-reply@manifold.markets>`,
+    }
+  )
+}
+export const sendNewUniqueBettorsEmail = async (
+  reason: notification_reason_types,
+  userId: string,
+  privateUser: PrivateUser,
+  contract: Contract,
+  totalPredictors: number,
+  newPredictors: User[],
+  userBets: Dictionary<[Bet, ...Bet[]]>,
+  bonusAmount: number
+) => {
+  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+    privateUser,
+    reason
+  )
+  if (!privateUser.email || !sendToEmail) return
+  const user = await getUser(privateUser.id)
+  if (!user) return
+
+  const { name } = user
+  const firstName = name.split(' ')[0]
+  const creatorName = contract.creatorName
+  // make the emails stack for the same contract
+  const subject = `You made a popular market! ${
+    contract.question.length > 50
+      ? contract.question.slice(0, 50) + '...'
+      : contract.question
+  } just got ${
+    newPredictors.length
+  } new predictions. Check out who's predicting on it inside.`
+  const templateData: Record<string, string> = {
+    name: firstName,
+    creatorName,
+    totalPredictors: totalPredictors.toString(),
+    bonusString: formatMoney(bonusAmount),
+    marketTitle: contract.question,
+    marketUrl: contractUrl(contract),
+    unsubscribeUrl,
+    newPredictors: newPredictors.length.toString(),
+  }
+
+  newPredictors.forEach((p, i) => {
+    templateData[`bettor${i + 1}Name`] = p.name
+    if (p.avatarUrl) templateData[`bettor${i + 1}AvatarUrl`] = p.avatarUrl
+    const bet = userBets[p.id][0]
+    if (bet) {
+      const { amount, sale } = bet
+      templateData[`bet${i + 1}Description`] = `${
+        sale || amount < 0 ? 'sold' : 'bought'
+      } ${formatMoney(Math.abs(amount))}`
+    }
+  })
+
+  return await sendTemplateEmail(
+    privateUser.email,
+    subject,
+    newPredictors.length === 1 ? 'new-unique-bettor' : 'new-unique-bettors',
+    templateData,
+    {
+      from: `Manifold Markets <no-reply@manifold.markets>`,
+    }
+  )
+}

functions/src/index.ts

@@ -71,6 +71,7 @@ import { stripewebhook, createcheckoutsession } from './stripe'
 import { getcurrentuser } from './get-current-user'
 import { acceptchallenge } from './accept-challenge'
 import { createpost } from './create-post'
+import { savetwitchcredentials } from './save-twitch-credentials'
 
 const toCloudFunction = ({ opts, handler }: EndpointDefinition) => {
   return onRequest(opts, handler as any)
@@ -96,6 +97,7 @@ const createCheckoutSessionFunction = toCloudFunction(createcheckoutsession)
 const getCurrentUserFunction = toCloudFunction(getcurrentuser)
 const acceptChallenge = toCloudFunction(acceptchallenge)
 const createPostFunction = toCloudFunction(createpost)
+const saveTwitchCredentials = toCloudFunction(savetwitchcredentials)
 
 export {
   healthFunction as health,
@@ -119,4 +121,5 @@ export {
   getCurrentUserFunction as getcurrentuser,
   acceptChallenge as acceptchallenge,
   createPostFunction as createpost,
+  saveTwitchCredentials as savetwitchcredentials
 }

functions/src/market-close-notifications.ts

@@ -3,7 +3,6 @@ import * as admin from 'firebase-admin'
 
 import { Contract } from '../../common/contract'
 import { getPrivateUser, getUserByUsername } from './utils'
-import { sendMarketCloseEmail } from './emails'
 import { createNotification } from './create-notification'
 
 export const marketCloseNotifications = functions
@@ -56,7 +55,6 @@ async function sendMarketCloseEmails() {
     const privateUser = await getPrivateUser(user.id)
     if (!privateUser) continue
 
-    await sendMarketCloseEmail(user, privateUser, contract)
     await createNotification(
       contract.id,
       'contract',

functions/src/on-create-bet.ts

@@ -24,12 +24,17 @@ import {
 } from '../../common/antes'
 import { APIError } from '../../common/api'
 import { User } from '../../common/user'
+import { UNIQUE_BETTOR_LIQUIDITY_AMOUNT } from '../../common/antes'
+import { addHouseLiquidity } from './add-liquidity'
+import { DAY_MS } from '../../common/util/time'
+import { BettingStreakBonusTxn, UniqueBettorBonusTxn } from '../../common/txn'
 
 const firestore = admin.firestore()
 const BONUS_START_DATE = new Date('2022-07-13T15:30:00.000Z').getTime()
 
-export const onCreateBet = functions.firestore
-  .document('contracts/{contractId}/bets/{betId}')
+export const onCreateBet = functions
+  .runWith({ secrets: ['MAILGUN_KEY'] })
+  .firestore.document('contracts/{contractId}/bets/{betId}')
   .onCreate(async (change, context) => {
     const { contractId } = context.params as {
       contractId: string
@@ -58,6 +63,12 @@ export const onCreateBet = functions.firestore
     const bettor = await getUser(bet.userId)
     if (!bettor) return
 
+    await change.ref.update({
+      userAvatarUrl: bettor.avatarUrl,
+      userName: bettor.name,
+      userUsername: bettor.username,
+    })
+
     await updateUniqueBettorsAndGiveCreatorBonus(contract, eventId, bettor)
     await notifyFills(bet, contract, eventId, bettor)
     await updateBettingStreak(bettor, bet, contract, eventId)
@@ -71,12 +82,16 @@ const updateBettingStreak = async (
   contract: Contract,
   eventId: string
 ) => {
-  const betStreakResetTime = getTodaysBettingStreakResetTime()
+  const now = Date.now()
+  const currentDateResetTime = currentDateBettingStreakResetTime()
+  // if now is before reset time, use yesterday's reset time
+  const lastDateResetTime = currentDateResetTime - DAY_MS
+  const betStreakResetTime =
+    now < currentDateResetTime ? lastDateResetTime : currentDateResetTime
   const lastBetTime = user?.lastBetTime ?? 0
 
-  // If they've already bet after the reset time, or if we haven't hit the reset time yet
-  if (lastBetTime > betStreakResetTime || bet.createdTime < betStreakResetTime)
-    return
+  // If they've already bet after the reset time
+  if (lastBetTime > betStreakResetTime) return
 
   const newBettingStreak = (user?.currentBettingStreak ?? 0) + 1
   // Otherwise, add 1 to their betting streak
@@ -95,6 +110,7 @@ const updateBettingStreak = async (
   const bonusTxnDetails = {
     currentBettingStreak: newBettingStreak,
   }
+  // TODO: set the id of the txn to the eventId to prevent duplicates
   const result = await firestore.runTransaction(async (trans) => {
     const bonusTxn: TxnData = {
       fromId: fromUserId,
@@ -105,11 +121,14 @@ const updateBettingStreak = async (
       token: 'M$',
       category: 'BETTING_STREAK_BONUS',
       description: JSON.stringify(bonusTxnDetails),
-    }
+      data: bonusTxnDetails,
+    } as Omit<BettingStreakBonusTxn, 'id' | 'createdTime'>
     return await runTxn(trans, bonusTxn)
   })
   if (!result.txn) {
     log("betting streak bonus txn couldn't be made")
+    log('status:', result.status)
+    log('message:', result.message)
     return
   }
 
@@ -119,6 +138,7 @@ const updateBettingStreak = async (
     bet,
     contract,
     bonusAmount,
+    newBettingStreak,
     eventId
   )
 }
@@ -148,12 +168,13 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
   }
 
   const isNewUniqueBettor = !previousUniqueBettorIds.includes(bettor.id)
-
   const newUniqueBettorIds = uniq([...previousUniqueBettorIds, bettor.id])
+
   // Update contract unique bettors
   if (!contract.uniqueBettorIds || isNewUniqueBettor) {
     log(`Got ${previousUniqueBettorIds} unique bettors`)
     isNewUniqueBettor && log(`And a new unique bettor ${bettor.id}`)
+
     await firestore.collection(`contracts`).doc(contract.id).update({
       uniqueBettorIds: newUniqueBettorIds,
       uniqueBettorCount: newUniqueBettorIds.length,
@@ -163,10 +184,14 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
   // No need to give a bonus for the creator's bet
   if (!isNewUniqueBettor || bettor.id == contract.creatorId) return
 
+  if (contract.mechanism === 'cpmm-1') {
+    await addHouseLiquidity(contract, UNIQUE_BETTOR_LIQUIDITY_AMOUNT)
+  }
+
   // Create combined txn for all new unique bettors
   const bonusTxnDetails = {
     contractId: contract.id,
-    uniqueBettorIds: newUniqueBettorIds,
+    uniqueNewBettorId: bettor.id,
   }
   const fromUserId = isProd()
     ? HOUSE_LIQUIDITY_PROVIDER_ID
@@ -174,6 +199,7 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
   const fromSnap = await firestore.doc(`users/${fromUserId}`).get()
   if (!fromSnap.exists) throw new APIError(400, 'From user not found.')
   const fromUser = fromSnap.data() as User
+  // TODO: set the id of the txn to the eventId to prevent duplicates
   const result = await firestore.runTransaction(async (trans) => {
     const bonusTxn: TxnData = {
       fromId: fromUser.id,
@@ -184,12 +210,14 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
       token: 'M$',
       category: 'UNIQUE_BETTOR_BONUS',
       description: JSON.stringify(bonusTxnDetails),
-    }
+      data: bonusTxnDetails,
+    } as Omit<UniqueBettorBonusTxn, 'id' | 'createdTime'>
     return await runTxn(trans, bonusTxn)
   })
 
   if (result.status != 'success' || !result.txn) {
-    log(`No bonus for user: ${contract.creatorId} - reason:`, result.status)
+    log(`No bonus for user: ${contract.creatorId} - status:`, result.status)
+    log('message:', result.message)
   } else {
     log(`Bonus txn for user: ${contract.creatorId} completed:`, result.txn?.id)
     await createUniqueBettorBonusNotification(
@@ -198,6 +226,7 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
       result.txn.id,
       contract,
       result.txn.amount,
+      newUniqueBettorIds,
       eventId + '-unique-bettor-bonus'
     )
   }
@@ -244,6 +273,6 @@ const notifyFills = async (
   )
 }
 
-const getTodaysBettingStreakResetTime = () => {
+const currentDateBettingStreakResetTime = () => {
   return new Date().setUTCHours(BETTING_STREAK_RESET_HOUR, 0, 0, 0)
 }

functions/src/on-create-comment-on-contract.ts

@@ -1,14 +1,13 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
-import { compact, uniq } from 'lodash'
+import { compact } from 'lodash'
 import { getContract, getUser, getValues } from './utils'
 import { ContractComment } from '../../common/comment'
-import { sendNewCommentEmail } from './emails'
 import { Bet } from '../../common/bet'
 import { Answer } from '../../common/answer'
 import {
   createCommentOrAnswerOrUpdatedContractNotification,
-  filterUserIdsForOnlyFollowerIds,
+  replied_users_info,
 } from './create-notification'
 import { parseMentions, richTextToString } from '../../common/util/parse'
 import { addUserToContractFollowers } from './follow-market'
@@ -77,16 +76,46 @@ export const onCreateCommentOnContract = functions
     const comments = await getValues<ContractComment>(
       firestore.collection('contracts').doc(contractId).collection('comments')
     )
-    const relatedSourceType = comment.replyToCommentId
-      ? 'comment'
-      : comment.answerOutcome
+    const repliedToType = answer
       ? 'answer'
+      : comment.replyToCommentId
+      ? 'comment'
       : undefined
 
     const repliedUserId = comment.replyToCommentId
       ? comments.find((c) => c.id === comment.replyToCommentId)?.userId
       : answer?.userId
 
+    const mentionedUsers = compact(parseMentions(comment.content))
+    const repliedUsers: replied_users_info = {}
+
+    // The parent of the reply chain could be a comment or an answer
+    if (repliedUserId && repliedToType)
+      repliedUsers[repliedUserId] = {
+        repliedToType,
+        repliedToAnswerText: answer ? answer.text : undefined,
+        repliedToId: comment.replyToCommentId || answer?.id,
+        bet: bet,
+      }
+
+    const commentsInSameReplyChain = comments.filter((c) =>
+      repliedToType === 'answer'
+        ? c.answerOutcome === answer?.id
+        : repliedToType === 'comment'
+        ? c.replyToCommentId === comment.replyToCommentId
+        : false
+    )
+    // The rest of the children in the chain are always comments
+    commentsInSameReplyChain.forEach((c) => {
+      if (c.userId !== comment.userId && c.userId !== repliedUserId) {
+        repliedUsers[c.userId] = {
+          repliedToType: 'comment',
+          repliedToAnswerText: undefined,
+          repliedToId: c.id,
+          bet: undefined,
+        }
+      }
+    })
     await createCommentOrAnswerOrUpdatedContractNotification(
       comment.id,
       'comment',
@@ -96,31 +125,8 @@ export const onCreateCommentOnContract = functions
       richTextToString(comment.content),
       contract,
       {
-        relatedSourceType,
-        repliedUserId,
-        taggedUserIds: compact(parseMentions(comment.content)),
+        repliedUsersInfo: repliedUsers,
+        taggedUserIds: mentionedUsers,
       }
     )
-
-    const recipientUserIds = await filterUserIdsForOnlyFollowerIds(
-      uniq([
-        contract.creatorId,
-        ...comments.map((comment) => comment.userId),
-      ]).filter((id) => id !== comment.userId),
-      contractId
-    )
-
-    await Promise.all(
-      recipientUserIds.map((userId) =>
-        sendNewCommentEmail(
-          userId,
-          commentCreator,
-          contract,
-          comment,
-          bet,
-          answer?.text,
-          answer?.id
-        )
-      )
-    )
   })

functions/src/on-create-contract.ts

@@ -1,7 +1,7 @@
 import * as functions from 'firebase-functions'
 
 import { getUser } from './utils'
-import { createNotification } from './create-notification'
+import { createNewContractNotification } from './create-notification'
 import { Contract } from '../../common/contract'
 import { parseMentions, richTextToString } from '../../common/util/parse'
 import { JSONContent } from '@tiptap/core'
@@ -21,13 +21,11 @@ export const onCreateContract = functions
     const mentioned = parseMentions(desc)
     await addUserToContractFollowers(contract.id, contractCreator.id)
 
-    await createNotification(
-      contract.id,
-      'contract',
-      'created',
+    await createNewContractNotification(
       contractCreator,
+      contract,
       eventId,
       richTextToString(desc),
-      { contract, recipients: mentioned }
+      mentioned
     )
   })

functions/src/on-create-liquidity-provision.ts

@@ -7,6 +7,7 @@ import { FIXED_ANTE } from '../../common/economy'
 import {
   DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
   HOUSE_LIQUIDITY_PROVIDER_ID,
+  UNIQUE_BETTOR_LIQUIDITY_AMOUNT,
 } from '../../common/antes'
 
 export const onCreateLiquidityProvision = functions.firestore
@@ -17,9 +18,11 @@ export const onCreateLiquidityProvision = functions.firestore
 
     // Ignore Manifold Markets liquidity for now - users see a notification for free market liquidity provision
     if (
-      (liquidity.userId === HOUSE_LIQUIDITY_PROVIDER_ID ||
+      liquidity.isAnte ||
+      ((liquidity.userId === HOUSE_LIQUIDITY_PROVIDER_ID ||
         liquidity.userId === DEV_HOUSE_LIQUIDITY_PROVIDER_ID) &&
-      liquidity.amount === FIXED_ANTE
+        (liquidity.amount === FIXED_ANTE ||
+          liquidity.amount === UNIQUE_BETTOR_LIQUIDITY_AMOUNT))
     )
       return
 

functions/src/on-update-contract.ts

@@ -13,32 +13,7 @@ export const onUpdateContract = functions.firestore
     if (!contractUpdater) throw new Error('Could not find contract updater')
 
     const previousValue = change.before.data() as Contract
-    if (previousValue.isResolved !== contract.isResolved) {
-      let resolutionText = contract.resolution ?? contract.question
-      if (contract.outcomeType === 'FREE_RESPONSE') {
-        const answerText = contract.answers.find(
-          (answer) => answer.id === contract.resolution
-        )?.text
-        if (answerText) resolutionText = answerText
-      } else if (contract.outcomeType === 'BINARY') {
-        if (resolutionText === 'MKT' && contract.resolutionProbability)
-          resolutionText = `${contract.resolutionProbability}%`
-        else if (resolutionText === 'MKT') resolutionText = 'PROB'
-      } else if (contract.outcomeType === 'PSEUDO_NUMERIC') {
-        if (resolutionText === 'MKT' && contract.resolutionValue)
-          resolutionText = `${contract.resolutionValue}`
-      }
-
-      await createCommentOrAnswerOrUpdatedContractNotification(
-        contract.id,
-        'contract',
-        'resolved',
-        contractUpdater,
-        eventId,
-        resolutionText,
-        contract
-      )
-    } else if (
+    if (
       previousValue.closeTime !== contract.closeTime ||
       previousValue.question !== contract.question
     ) {

functions/src/place-bet.ts

@@ -139,7 +139,14 @@ export const placebet = newEndpoint({}, async (req, auth) => {
     }
 
     const betDoc = contractDoc.collection('bets').doc()
-    trans.create(betDoc, { id: betDoc.id, userId: user.id, ...newBet })
+    trans.create(betDoc, {
+      id: betDoc.id,
+      userId: user.id,
+      userAvatarUrl: user.avatarUrl,
+      userUsername: user.username,
+      userName: user.name,
+      ...newBet,
+    })
     log('Created new bet document.')
 
     if (makers) {

functions/src/resolve-market.ts

@@ -1,6 +1,6 @@
 import * as admin from 'firebase-admin'
 import { z } from 'zod'
-import { difference, mapValues, groupBy, sumBy } from 'lodash'
+import { mapValues, groupBy, sumBy } from 'lodash'
 
 import {
   Contract,
@@ -8,22 +8,26 @@ import {
   MultipleChoiceContract,
   RESOLUTIONS,
 } from '../../common/contract'
-import { User } from '../../common/user'
 import { Bet } from '../../common/bet'
-import { getUser, isProd, payUser } from './utils'
-import { sendMarketResolutionEmail } from './emails'
+import { getUser, getValues, isProd, log, payUser } from './utils'
 import {
   getLoanPayouts,
   getPayouts,
   groupPayoutsByUser,
   Payout,
 } from '../../common/payouts'
-import { isManifoldId } from '../../common/envs/constants'
+import { isAdmin, isManifoldId } from '../../common/envs/constants'
 import { removeUndefinedProps } from '../../common/util/object'
 import { LiquidityProvision } from '../../common/liquidity-provision'
 import { APIError, newEndpoint, validate } from './api'
 import { getContractBetMetrics } from '../../common/calculate'
-import { floatingEqual } from '../../common/util/math'
+import { createCommentOrAnswerOrUpdatedContractNotification } from './create-notification'
+import { CancelUniqueBettorBonusTxn, Txn } from '../../common/txn'
+import { runTxn, TxnData } from './transact'
+import {
+  DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+  HOUSE_LIQUIDITY_PROVIDER_ID,
+} from '../../common/antes'
 
 const bodySchema = z.object({
   contractId: z.string(),
@@ -78,13 +82,18 @@ export const resolvemarket = newEndpoint(opts, async (req, auth) => {
     throw new APIError(404, 'No contract exists with the provided ID')
   const contract = contractSnap.data() as Contract
   const { creatorId, closeTime } = contract
+  const firebaseUser = await admin.auth().getUser(auth.uid)
 
   const { value, resolutions, probabilityInt, outcome } = getResolutionParams(
     contract,
     req.body
   )
 
-  if (creatorId !== auth.uid && !isManifoldId(auth.uid))
+  if (
+    creatorId !== auth.uid &&
+    !isManifoldId(auth.uid) &&
+    !isAdmin(firebaseUser.email)
+  )
     throw new APIError(403, 'User is not creator of contract')
 
   if (contract.resolution) throw new APIError(400, 'Contract already resolved')
@@ -160,18 +169,52 @@ export const resolvemarket = newEndpoint(opts, async (req, auth) => {
   await processPayouts(liquidityPayouts, true)
 
   await processPayouts([...payouts, ...loanPayouts])
+  await undoUniqueBettorRewardsIfCancelResolution(contract, outcome)
 
   const userPayoutsWithoutLoans = groupPayoutsByUser(payouts)
 
-  await sendResolutionEmails(
-    bets,
-    userPayoutsWithoutLoans,
+  const userInvestments = mapValues(
+    groupBy(bets, (bet) => bet.userId),
+    (bets) => getContractBetMetrics(contract, bets).invested
+  )
+  let resolutionText = outcome ?? contract.question
+  if (
+    contract.outcomeType === 'FREE_RESPONSE' ||
+    contract.outcomeType === 'MULTIPLE_CHOICE'
+  ) {
+    const answerText = contract.answers.find(
+      (answer) => answer.id === outcome
+    )?.text
+    if (answerText) resolutionText = answerText
+  } else if (contract.outcomeType === 'BINARY') {
+    if (resolutionText === 'MKT' && probabilityInt)
+      resolutionText = `${probabilityInt}%`
+    else if (resolutionText === 'MKT') resolutionText = 'PROB'
+  } else if (contract.outcomeType === 'PSEUDO_NUMERIC') {
+    if (resolutionText === 'MKT' && value) resolutionText = `${value}`
+  }
+
+  // TODO: this actually may be too slow to complete with a ton of users to notify?
+  await createCommentOrAnswerOrUpdatedContractNotification(
+    contract.id,
+    'contract',
+    'resolved',
     creator,
-    creatorPayout,
+    contract.id + '-resolution',
+    resolutionText,
     contract,
-    outcome,
-    resolutionProbability,
-    resolutions
+    undefined,
+    {
+      bets,
+      userInvestments,
+      userPayouts: userPayoutsWithoutLoans,
+      creator,
+      creatorPayout,
+      contract,
+      outcome,
+      resolutionProbability,
+      resolutions,
+    }
   )
 
   return updatedContract
@@ -189,51 +232,6 @@ const processPayouts = async (payouts: Payout[], isDeposit = false) => {
     .then(() => ({ status: 'success' }))
 }
 
-const sendResolutionEmails = async (
-  bets: Bet[],
-  userPayouts: { [userId: string]: number },
-  creator: User,
-  creatorPayout: number,
-  contract: Contract,
-  outcome: string,
-  resolutionProbability?: number,
-  resolutions?: { [outcome: string]: number }
-) => {
-  const investedByUser = mapValues(
-    groupBy(bets, (bet) => bet.userId),
-    (bets) => getContractBetMetrics(contract, bets).invested
-  )
-  const investedUsers = Object.keys(investedByUser).filter(
-    (userId) => !floatingEqual(investedByUser[userId], 0)
-  )
-
-  const nonWinners = difference(investedUsers, Object.keys(userPayouts))
-  const emailPayouts = [
-    ...Object.entries(userPayouts),
-    ...nonWinners.map((userId) => [userId, 0] as const),
-  ].map(([userId, payout]) => ({
-    userId,
-    investment: investedByUser[userId] ?? 0,
-    payout,
-  }))
-
-  await Promise.all(
-    emailPayouts.map(({ userId, investment, payout }) =>
-      sendMarketResolutionEmail(
-        userId,
-        investment,
-        payout,
-        creator,
-        creatorPayout,
-        contract,
-        outcome,
-        resolutionProbability,
-        resolutions
-      )
-    )
-  )
-}
-
 function getResolutionParams(contract: Contract, body: string) {
   const { outcomeType } = contract
 
@@ -308,4 +306,55 @@ function validateAnswer(
   }
 }
 
+async function undoUniqueBettorRewardsIfCancelResolution(
+  contract: Contract,
+  outcome: string
+) {
+  if (outcome === 'CANCEL') {
+    const creatorsBonusTxns = await getValues<Txn>(
+      firestore
+        .collection('txns')
+        .where('category', '==', 'UNIQUE_BETTOR_BONUS')
+        .where('toId', '==', contract.creatorId)
+    )
+
+    const bonusTxnsOnThisContract = creatorsBonusTxns.filter(
+      (txn) => txn.data && txn.data.contractId === contract.id
+    )
+    log('total bonusTxnsOnThisContract', bonusTxnsOnThisContract.length)
+    const totalBonusAmount = sumBy(bonusTxnsOnThisContract, (txn) => txn.amount)
+    log('totalBonusAmount to be withdrawn', totalBonusAmount)
+    const result = await firestore.runTransaction(async (trans) => {
+      const bonusTxn: TxnData = {
+        fromId: contract.creatorId,
+        fromType: 'USER',
+        toId: isProd()
+          ? HOUSE_LIQUIDITY_PROVIDER_ID
+          : DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+        toType: 'BANK',
+        amount: totalBonusAmount,
+        token: 'M$',
+        category: 'CANCEL_UNIQUE_BETTOR_BONUS',
+        data: {
+          contractId: contract.id,
+        },
+      } as Omit<CancelUniqueBettorBonusTxn, 'id' | 'createdTime'>
+      return await runTxn(trans, bonusTxn)
+    })
+
+    if (result.status != 'success' || !result.txn) {
+      log(
+        `Couldn't cancel bonus for user: ${contract.creatorId} - status:`,
+        result.status
+      )
+      log('message:', result.message)
+    } else {
+      log(
+        `Cancel Bonus txn for user: ${contract.creatorId} completed:`,
+        result.txn?.id
+      )
+    }
+  }
+}
+
 const firestore = admin.firestore()

functions/src/save-twitch-credentials.ts

@@ -0,0 +1,22 @@
+import * as admin from 'firebase-admin'
+import { z } from 'zod'
+
+import { newEndpoint, validate } from './api'
+
+const bodySchema = z.object({
+  twitchInfo: z.object({
+    twitchName: z.string(),
+    controlToken: z.string(),
+  }),
+})
+
+
+export const savetwitchcredentials = newEndpoint({}, async (req, auth) => {
+  const { twitchInfo } = validate(bodySchema, req.body)
+  const userId = auth.uid
+
+  await firestore.doc(`private-users/${userId}`).update({ twitchInfo })
+  return { success: true }
+})
+
+const firestore = admin.firestore()

functions/src/scripts/backfill-contract-followers.ts

@@ -4,14 +4,14 @@ import { initAdmin } from './script-init'
 initAdmin()
 
 import { getValues } from '../utils'
-import { Contract } from 'common/lib/contract'
-import { Comment } from 'common/lib/comment'
+import { Contract } from 'common/contract'
+import { Comment } from 'common/comment'
 import { uniq } from 'lodash'
-import { Bet } from 'common/lib/bet'
+import { Bet } from 'common/bet'
 import {
   DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
   HOUSE_LIQUIDITY_PROVIDER_ID,
-} from 'common/lib/antes'
+} from 'common/antes'
 
 const firestore = admin.firestore()
 

functions/src/scripts/create-new-notification-preferences.ts

@@ -0,0 +1,30 @@
+import * as admin from 'firebase-admin'
+
+import { initAdmin } from './script-init'
+import { getAllPrivateUsers, isProd } from 'functions/src/utils'
+import { getDefaultNotificationPreferences } from 'common/user-notification-preferences'
+initAdmin()
+
+const firestore = admin.firestore()
+
+async function main() {
+  const privateUsers = await getAllPrivateUsers()
+  const disableEmails = !isProd()
+  await Promise.all(
+    privateUsers.map((privateUser) => {
+      if (!privateUser.id) return Promise.resolve()
+      return firestore
+        .collection('private-users')
+        .doc(privateUser.id)
+        .update({
+          notificationPreferences: getDefaultNotificationPreferences(
+            privateUser.id,
+            privateUser,
+            disableEmails
+          ),
+        })
+    })
+  )
+}
+
+if (require.main === module) main().then(() => process.exit())

functions/src/scripts/create-private-users.ts

@@ -5,6 +5,7 @@ initAdmin()
 
 import { PrivateUser, User } from 'common/user'
 import { STARTING_BALANCE } from 'common/economy'
+import { getDefaultNotificationPreferences } from 'common/user-notification-preferences'
 
 const firestore = admin.firestore()
 
@@ -21,6 +22,7 @@ async function main() {
       id: user.id,
       email,
       username,
+      notificationPreferences: getDefaultNotificationPreferences(user.id),
     }
 
     if (user.totalDeposits === undefined) {

functions/src/scripts/denormalize-avatar-urls.ts

@@ -3,12 +3,7 @@
 
 import * as admin from 'firebase-admin'
 import { initAdmin } from './script-init'
-import {
-  DocumentCorrespondence,
-  findDiffs,
-  describeDiff,
-  applyDiff,
-} from './denormalize'
+import { findDiffs, describeDiff, applyDiff } from './denormalize'
 import { DocumentSnapshot, Transaction } from 'firebase-admin/firestore'
 
 initAdmin()
@@ -79,43 +74,36 @@ if (require.main === module) {
         getAnswersByUserId(transaction),
       ])
 
-    const usersContracts = Array.from(
-      usersById.entries(),
-      ([id, doc]): DocumentCorrespondence => {
-        return [doc, contractsByUserId.get(id) || []]
-      }
-    )
-    const contractDiffs = findDiffs(
-      usersContracts,
+    const usersContracts = Array.from(usersById.entries(), ([id, doc]) => {
+      return [doc, contractsByUserId.get(id) || []] as const
+    })
+    const contractDiffs = findDiffs(usersContracts, [
       'avatarUrl',
-      'creatorAvatarUrl'
-    )
+      'creatorAvatarUrl',
+    ])
     console.log(`Found ${contractDiffs.length} contracts with mismatches.`)
     contractDiffs.forEach((d) => {
       console.log(describeDiff(d))
       applyDiff(transaction, d)
     })
 
-    const usersComments = Array.from(
-      usersById.entries(),
-      ([id, doc]): DocumentCorrespondence => {
-        return [doc, commentsByUserId.get(id) || []]
-      }
-    )
-    const commentDiffs = findDiffs(usersComments, 'avatarUrl', 'userAvatarUrl')
+    const usersComments = Array.from(usersById.entries(), ([id, doc]) => {
+      return [doc, commentsByUserId.get(id) || []] as const
+    })
+    const commentDiffs = findDiffs(usersComments, [
+      'avatarUrl',
+      'userAvatarUrl',
+    ])
     console.log(`Found ${commentDiffs.length} comments with mismatches.`)
     commentDiffs.forEach((d) => {
       console.log(describeDiff(d))
       applyDiff(transaction, d)
     })
 
-    const usersAnswers = Array.from(
-      usersById.entries(),
-      ([id, doc]): DocumentCorrespondence => {
-        return [doc, answersByUserId.get(id) || []]
-      }
-    )
-    const answerDiffs = findDiffs(usersAnswers, 'avatarUrl', 'avatarUrl')
+    const usersAnswers = Array.from(usersById.entries(), ([id, doc]) => {
+      return [doc, answersByUserId.get(id) || []] as const
+    })
+    const answerDiffs = findDiffs(usersAnswers, ['avatarUrl', 'avatarUrl'])
     console.log(`Found ${answerDiffs.length} answers with mismatches.`)
     answerDiffs.forEach((d) => {
       console.log(describeDiff(d))

functions/src/scripts/denormalize-bet-user-data.ts

@@ -0,0 +1,38 @@
+// Filling in the user-based fields on bets.
+
+import * as admin from 'firebase-admin'
+import { initAdmin } from './script-init'
+import { findDiffs, describeDiff, getDiffUpdate } from './denormalize'
+import { log, writeAsync } from '../utils'
+
+initAdmin()
+const firestore = admin.firestore()
+
+// not in a transaction for speed -- may need to be run more than once
+async function denormalize() {
+  const users = await firestore.collection('users').get()
+  log(`Found ${users.size} users.`)
+  for (const userDoc of users.docs) {
+    const userBets = await firestore
+      .collectionGroup('bets')
+      .where('userId', '==', userDoc.id)
+      .get()
+    const mapping = [[userDoc, userBets.docs] as const] as const
+    const diffs = findDiffs(
+      mapping,
+      ['avatarUrl', 'userAvatarUrl'],
+      ['name', 'userName'],
+      ['username', 'userUsername']
+    )
+    log(`Found ${diffs.length} bets with mismatched user data.`)
+    const updates = diffs.map((d) => {
+      log(describeDiff(d))
+      return getDiffUpdate(d)
+    })
+    await writeAsync(firestore, updates)
+  }
+}
+
+if (require.main === module) {
+  denormalize().catch((e) => console.error(e))
+}

functions/src/scripts/denormalize-comment-bet-data.ts

@@ -3,12 +3,7 @@
 import * as admin from 'firebase-admin'
 import { zip } from 'lodash'
 import { initAdmin } from './script-init'
-import {
-  DocumentCorrespondence,
-  findDiffs,
-  describeDiff,
-  applyDiff,
-} from './denormalize'
+import { findDiffs, describeDiff, applyDiff } from './denormalize'
 import { log } from '../utils'
 import { Transaction } from 'firebase-admin/firestore'
 
@@ -41,17 +36,20 @@ async function denormalize() {
         )
       )
       log(`Found ${bets.length} bets associated with comments.`)
-      const mapping = zip(bets, betComments)
-        .map(([bet, comment]): DocumentCorrespondence => {
-          return [bet!, [comment!]] // eslint-disable-line
-        })
-        .filter(([bet, _]) => bet.exists) // dev DB has some invalid bet IDs
 
-      const amountDiffs = findDiffs(mapping, 'amount', 'betAmount')
-      const outcomeDiffs = findDiffs(mapping, 'outcome', 'betOutcome')
-      log(`Found ${amountDiffs.length} comments with mismatched amounts.`)
-      log(`Found ${outcomeDiffs.length} comments with mismatched outcomes.`)
-      const diffs = amountDiffs.concat(outcomeDiffs)
+      // dev DB has some invalid bet IDs
+      const mapping = zip(bets, betComments)
+        .filter(([bet, _]) => bet!.exists) // eslint-disable-line
+        .map(([bet, comment]) => {
+          return [bet!, [comment!]] as const // eslint-disable-line
+        })
+
+      const diffs = findDiffs(
+        mapping,
+        ['amount', 'betAmount'],
+        ['outcome', 'betOutcome']
+      )
+      log(`Found ${diffs.length} comments with mismatched data.`)
       diffs.slice(0, 500).forEach((d) => {
         log(describeDiff(d))
         applyDiff(trans, d)

functions/src/scripts/denormalize-comment-contract-data.ts

@@ -2,12 +2,7 @@
 
 import * as admin from 'firebase-admin'
 import { initAdmin } from './script-init'
-import {
-  DocumentCorrespondence,
-  findDiffs,
-  describeDiff,
-  applyDiff,
-} from './denormalize'
+import { findDiffs, describeDiff, applyDiff } from './denormalize'
 import { DocumentSnapshot, Transaction } from 'firebase-admin/firestore'
 
 initAdmin()
@@ -43,16 +38,15 @@ async function denormalize() {
         getContractsById(transaction),
         getCommentsByContractId(transaction),
       ])
-      const mapping = Object.entries(contractsById).map(
-        ([id, doc]): DocumentCorrespondence => {
-          return [doc, commentsByContractId.get(id) || []]
-        }
+      const mapping = Object.entries(contractsById).map(([id, doc]) => {
+        return [doc, commentsByContractId.get(id) || []] as const
+      })
+      const diffs = findDiffs(
+        mapping,
+        ['slug', 'contractSlug'],
+        ['question', 'contractQuestion']
       )
-      const slugDiffs = findDiffs(mapping, 'slug', 'contractSlug')
-      const qDiffs = findDiffs(mapping, 'question', 'contractQuestion')
-      console.log(`Found ${slugDiffs.length} comments with mismatched slugs.`)
-      console.log(`Found ${qDiffs.length} comments with mismatched questions.`)
-      const diffs = slugDiffs.concat(qDiffs)
+      console.log(`Found ${diffs.length} comments with mismatched data.`)
       diffs.slice(0, 500).forEach((d) => {
         console.log(describeDiff(d))
         applyDiff(transaction, d)

functions/src/scripts/denormalize.ts

@@ -2,32 +2,40 @@
 // another set of documents.
 
 import { DocumentSnapshot, Transaction } from 'firebase-admin/firestore'
+import { isEqual, zip } from 'lodash'
+import { UpdateSpec } from '../utils'
 
 export type DocumentValue = {
   doc: DocumentSnapshot
-  field: string
-  val: unknown
+  fields: string[]
+  vals: unknown[]
 }
-export type DocumentCorrespondence = [DocumentSnapshot, DocumentSnapshot[]]
+export type DocumentMapping = readonly [
+  DocumentSnapshot,
+  readonly DocumentSnapshot[]
+]
 export type DocumentDiff = {
   src: DocumentValue
   dest: DocumentValue
 }
 
+type PathPair = readonly [string, string]
+
 export function findDiffs(
-  docs: DocumentCorrespondence[],
-  srcPath: string,
-  destPath: string
+  docs: readonly DocumentMapping[],
+  ...paths: PathPair[]
 ) {
   const diffs: DocumentDiff[] = []
+  const srcPaths = paths.map((p) => p[0])
+  const destPaths = paths.map((p) => p[1])
   for (const [srcDoc, destDocs] of docs) {
-    const srcVal = srcDoc.get(srcPath)
+    const srcVals = srcPaths.map((p) => srcDoc.get(p))
     for (const destDoc of destDocs) {
-      const destVal = destDoc.get(destPath)
-      if (destVal !== srcVal) {
+      const destVals = destPaths.map((p) => destDoc.get(p))
+      if (!isEqual(srcVals, destVals)) {
         diffs.push({
-          src: { doc: srcDoc, field: srcPath, val: srcVal },
-          dest: { doc: destDoc, field: destPath, val: destVal },
+          src: { doc: srcDoc, fields: srcPaths, vals: srcVals },
+          dest: { doc: destDoc, fields: destPaths, vals: destVals },
         })
       }
     }
@@ -37,12 +45,19 @@ export function findDiffs(
 
 export function describeDiff(diff: DocumentDiff) {
   function describeDocVal(x: DocumentValue): string {
-    return `${x.doc.ref.path}.${x.field}: ${x.val}`
+    return `${x.doc.ref.path}.[${x.fields.join('|')}]: [${x.vals.join('|')}]`
   }
   return `${describeDocVal(diff.src)} -> ${describeDocVal(diff.dest)}`
 }
 
-export function applyDiff(transaction: Transaction, diff: DocumentDiff) {
-  const { src, dest } = diff
-  transaction.update(dest.doc.ref, dest.field, src.val)
+export function getDiffUpdate(diff: DocumentDiff) {
+  return {
+    doc: diff.dest.doc.ref,
+    fields: Object.fromEntries(zip(diff.dest.fields, diff.src.vals)),
+  } as UpdateSpec
+}
+
+export function applyDiff(transaction: Transaction, diff: DocumentDiff) {
+  const update = getDiffUpdate(diff)
+  transaction.update(update.doc, update.fields)
 }

functions/src/scripts/update-bonus-txn-data-fields.ts

@@ -0,0 +1,34 @@
+import * as admin from 'firebase-admin'
+
+import { initAdmin } from './script-init'
+import { Txn } from 'common/txn'
+import { getValues } from 'functions/src/utils'
+
+initAdmin()
+
+const firestore = admin.firestore()
+
+async function main() {
+  // get all txns
+  const bonusTxns = await getValues<Txn>(
+    firestore
+      .collection('txns')
+      .where('category', 'in', ['UNIQUE_BETTOR_BONUS', 'BETTING_STREAK_BONUS'])
+  )
+  // JSON parse description field and add to data field
+  const updatedTxns = bonusTxns.map((txn) => {
+    txn.data = txn.description && JSON.parse(txn.description)
+    return txn
+  })
+  console.log('updatedTxns', updatedTxns[0])
+  // update txns
+  await Promise.all(
+    updatedTxns.map((txn) => {
+      return firestore.collection('txns').doc(txn.id).update({
+        data: txn.data,
+      })
+    })
+  )
+}
+
+if (require.main === module) main().then(() => process.exit())

functions/src/scripts/update-notification-preferences.ts

@@ -0,0 +1,25 @@
+import * as admin from 'firebase-admin'
+
+import { initAdmin } from './script-init'
+import { getAllPrivateUsers } from 'functions/src/utils'
+import { FieldValue } from 'firebase-admin/firestore'
+initAdmin()
+
+const firestore = admin.firestore()
+
+async function main() {
+  const privateUsers = await getAllPrivateUsers()
+  await Promise.all(
+    privateUsers.map((privateUser) => {
+      if (!privateUser.id) return Promise.resolve()
+      return firestore.collection('private-users').doc(privateUser.id).update({
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        notificationPreferences: privateUser.notificationSubscriptionTypes,
+        notificationSubscriptionTypes: FieldValue.delete(),
+      })
+    })
+  )
+}
+
+if (require.main === module) main().then(() => process.exit())

functions/src/sell-shares.ts

@@ -112,6 +112,9 @@ export const sellshares = newEndpoint({}, async (req, auth) => {
     transaction.create(newBetDoc, {
       id: newBetDoc.id,
       userId: user.id,
+      userAvatarUrl: user.avatarUrl,
+      userUsername: user.username,
+      userName: user.name,
       ...newBet,
     })
     transaction.update(

functions/src/serve.ts

@@ -27,6 +27,7 @@ import { unsubscribe } from './unsubscribe'
 import { stripewebhook, createcheckoutsession } from './stripe'
 import { getcurrentuser } from './get-current-user'
 import { createpost } from './create-post'
+import { savetwitchcredentials } from './save-twitch-credentials'
 
 type Middleware = (req: Request, res: Response, next: NextFunction) => void
 const app = express()
@@ -65,6 +66,7 @@ addJsonEndpointRoute('/resolvemarket', resolvemarket)
 addJsonEndpointRoute('/unsubscribe', unsubscribe)
 addJsonEndpointRoute('/createcheckoutsession', createcheckoutsession)
 addJsonEndpointRoute('/getcurrentuser', getcurrentuser)
+addJsonEndpointRoute('/savetwitchcredentials', savetwitchcredentials)
 addEndpointRoute('/stripewebhook', stripewebhook, express.raw())
 addEndpointRoute('/createpost', createpost)
 

functions/src/unsubscribe.ts

@@ -1,79 +1,227 @@
 import * as admin from 'firebase-admin'
 import { EndpointDefinition } from './api'
-import { getUser } from './utils'
+import { getPrivateUser } from './utils'
 import { PrivateUser } from '../../common/user'
+import { NOTIFICATION_DESCRIPTIONS } from '../../common/notification'
+import { notification_preference } from '../../common/user-notification-preferences'
 
 export const unsubscribe: EndpointDefinition = {
   opts: { method: 'GET', minInstances: 1 },
   handler: async (req, res) => {
     const id = req.query.id as string
-    let type = req.query.type as string
+    const type = req.query.type as string
     if (!id || !type) {
-      res.status(400).send('Empty id or type parameter.')
+      res.status(400).send('Empty id or subscription type parameter.')
+      return
+    }
+    console.log(`Unsubscribing ${id} from ${type}`)
+    const notificationSubscriptionType = type as notification_preference
+    if (notificationSubscriptionType === undefined) {
+      res.status(400).send('Invalid subscription type parameter.')
       return
     }
 
-    if (type === 'market-resolved') type = 'market-resolve'
-
-    if (
-      ![
-        'market-resolve',
-        'market-comment',
-        'market-answer',
-        'generic',
-        'weekly-trending',
-      ].includes(type)
-    ) {
-      res.status(400).send('Invalid type parameter.')
-      return
-    }
-
-    const user = await getUser(id)
+    const user = await getPrivateUser(id)
 
     if (!user) {
       res.send('This user is not currently subscribed or does not exist.')
       return
     }
 
-    const { name } = user
+    const previousDestinations =
+      user.notificationPreferences[notificationSubscriptionType]
+
+    console.log(previousDestinations)
+    const { email } = user
 
     const update: Partial<PrivateUser> = {
-      ...(type === 'market-resolve' && {
-        unsubscribedFromResolutionEmails: true,
-      }),
-      ...(type === 'market-comment' && {
-        unsubscribedFromCommentEmails: true,
-      }),
-      ...(type === 'market-answer' && {
-        unsubscribedFromAnswerEmails: true,
-      }),
-      ...(type === 'generic' && {
-        unsubscribedFromGenericEmails: true,
-      }),
-      ...(type === 'weekly-trending' && {
-        unsubscribedFromWeeklyTrendingEmails: true,
-      }),
+      notificationPreferences: {
+        ...user.notificationPreferences,
+        [notificationSubscriptionType]: previousDestinations.filter(
+          (destination) => destination !== 'email'
+        ),
+      },
     }
 
     await firestore.collection('private-users').doc(id).update(update)
 
-    if (type === 'market-resolve')
-      res.send(
-        `${name}, you have been unsubscribed from market resolution emails on Manifold Markets.`
-      )
-    else if (type === 'market-comment')
-      res.send(
-        `${name}, you have been unsubscribed from market comment emails on Manifold Markets.`
-      )
-    else if (type === 'market-answer')
-      res.send(
-        `${name}, you have been unsubscribed from market answer emails on Manifold Markets.`
-      )
-    else if (type === 'weekly-trending')
-      res.send(
-        `${name}, you have been unsubscribed from weekly trending emails on Manifold Markets.`
-      )
-    else res.send(`${name}, you have been unsubscribed.`)
+    res.send(
+      `
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
+      xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+  <title>Manifold Markets 7th Day Anniversary Gift!</title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style type="text/css">
+      #outlook a {
+          padding: 0;
+      }
+
+      body {
+          margin: 0;
+          padding: 0;
+          -webkit-text-size-adjust: 100%;
+          -ms-text-size-adjust: 100%;
+      }
+
+      table,
+      td {
+          border-collapse: collapse;
+          mso-table-lspace: 0pt;
+          mso-table-rspace: 0pt;
+      }
+
+      img {
+          border: 0;
+          height: auto;
+          line-height: 100%;
+          outline: none;
+          text-decoration: none;
+          -ms-interpolation-mode: bicubic;
+      }
+
+      p {
+          display: block;
+          margin: 13px 0;
+      }
+  </style>
+  <!--[if mso]>
+  <noscript>
+    <xml>
+      <o:OfficeDocumentSettings>
+        <o:AllowPNG/>
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+    </xml>
+  </noscript>
+  <![endif]-->
+  <!--[if lte mso 11]>
+  <style type="text/css">
+    .mj-outlook-group-fix { width:100% !important; }
+  </style>
+  <![endif]-->
+  <style type="text/css">
+      @media only screen and (min-width:480px) {
+          .mj-column-per-100 {
+              width: 100% !important;
+              max-width: 100%;
+          }
+      }
+  </style>
+  <style media="screen and (min-width:480px)">
+      .moz-text-html .mj-column-per-100 {
+          width: 100% !important;
+          max-width: 100%;
+      }
+  </style>
+  <style type="text/css">
+      [owa] .mj-column-per-100 {
+          width: 100% !important;
+          max-width: 100%;
+      }
+  </style>
+  <style type="text/css">
+      @media only screen and (max-width:480px) {
+          table.mj-full-width-mobile {
+              width: 100% !important;
+          }
+
+          td.mj-full-width-mobile {
+              width: auto !important;
+          }
+      }
+  </style>
+</head>
+<body style="word-spacing:normal;background-color:#F4F4F4;">
+<div style="background-color:#F4F4F4;">
+  <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+  <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;">
+    <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+           style="background:#ffffff;background-color:#ffffff;width:100%;">
+      <tbody>
+      <tr>
+        <td
+          style="direction:ltr;font-size:0px;padding:0px 0px 0px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;text-align:center;">
+          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+          <div class="mj-column-per-100 mj-outlook-group-fix"
+               style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
+                   width="100%">
+              <tbody>
+              <tr>
+                <td style="width:550px;">
+                  <a href="https://manifold.markets" target="_blank">
+                    <img alt="banner logo" height="auto" src="https://manifold.markets/logo-banner.png"
+                         style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
+                         title="" width="550">
+                  </a>
+                </td>
+              </tr>
+              <tr>
+                <td align="left"
+                    style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                  <div
+                    style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                    <p class="text-build-content"
+                       style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                       data-testid="4XoHRGw1Y"><span
+                      style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                              Hello!</span></p>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td align="left"
+                    style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                  <div
+                    style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                    <p class="text-build-content"
+                       style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                       data-testid="4XoHRGw1Y">
+                       <span
+                         style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                      ${email} has been unsubscribed from email notifications related to:
+                    </span>
+                      <br/>
+                      <br/>
+
+                      <span style="font-weight: bold; color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">${NOTIFICATION_DESCRIPTIONS[notificationSubscriptionType].detailed}.</span>
+                    </p>
+                    <br/>
+                    <br/>
+                    <br/>
+                    <span>Click
+                    <a href='https://manifold.markets/notifications?tab=settings'>here</a>
+                       to manage the rest of your notification settings.
+                      </span>
+                  </div>
+
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <p></p>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+</body>
+</html>
+`
+    )
   },
 }
 

functions/src/update-metrics.ts

@@ -4,9 +4,11 @@ import { groupBy, isEmpty, keyBy, last, sortBy } from 'lodash'
 import { getValues, log, logMemory, writeAsync } from './utils'
 import { Bet } from '../../common/bet'
 import { Contract, CPMM } from '../../common/contract'
+
 import { PortfolioMetrics, User } from '../../common/user'
 import { DAY_MS } from '../../common/util/time'
 import { getLoanUpdates } from '../../common/loans'
+import { scoreTraders, scoreCreators } from '../../common/scoring'
 import {
   calculateCreatorVolume,
   calculateNewPortfolioMetrics,
@@ -15,6 +17,7 @@ import {
   computeVolume,
 } from '../../common/calculate-metrics'
 import { getProbability } from '../../common/calculate'
+import { Group } from 'common/group'
 
 const firestore = admin.firestore()
 
@@ -24,16 +27,29 @@ export const updateMetrics = functions
   .onRun(updateMetricsCore)
 
 export async function updateMetricsCore() {
-  const [users, contracts, bets, allPortfolioHistories] = await Promise.all([
-    getValues<User>(firestore.collection('users')),
-    getValues<Contract>(firestore.collection('contracts')),
-    getValues<Bet>(firestore.collectionGroup('bets')),
-    getValues<PortfolioMetrics>(
-      firestore
-        .collectionGroup('portfolioHistory')
-        .where('timestamp', '>', Date.now() - 31 * DAY_MS) // so it includes just over a month ago
-    ),
-  ])
+  const [users, contracts, bets, allPortfolioHistories, groups] =
+    await Promise.all([
+      getValues<User>(firestore.collection('users')),
+      getValues<Contract>(firestore.collection('contracts')),
+      getValues<Bet>(firestore.collectionGroup('bets')),
+      getValues<PortfolioMetrics>(
+        firestore
+          .collectionGroup('portfolioHistory')
+          .where('timestamp', '>', Date.now() - 31 * DAY_MS) // so it includes just over a month ago
+      ),
+      getValues<Group>(firestore.collection('groups')),
+    ])
+
+  const contractsByGroup = await Promise.all(
+    groups.map((group) => {
+      return getValues(
+        firestore
+          .collection('groups')
+          .doc(group.id)
+          .collection('groupContracts')
+      )
+    })
+  )
   log(
     `Loaded ${users.length} users, ${contracts.length} contracts, and ${bets.length} bets.`
   )
@@ -41,6 +57,7 @@ export async function updateMetricsCore() {
 
   const now = Date.now()
   const betsByContract = groupBy(bets, (bet) => bet.contractId)
+
   const contractUpdates = contracts
     .filter((contract) => contract.id)
     .map((contract) => {
@@ -162,4 +179,48 @@ export async function updateMetricsCore() {
     'set'
   )
   log(`Updated metrics for ${users.length} users.`)
+
+  try {
+    const groupUpdates = groups.map((group, index) => {
+      const groupContractIds = contractsByGroup[index] as GroupContractDoc[]
+      const groupContracts = groupContractIds
+        .map((e) => contractsById[e.contractId])
+        .filter((e) => e !== undefined) as Contract[]
+      const bets = groupContracts.map((e) => {
+        if (e != null && e.id in betsByContract) {
+          return betsByContract[e.id] ?? []
+        } else {
+          return []
+        }
+      })
+
+      const creatorScores = scoreCreators(groupContracts)
+      const traderScores = scoreTraders(groupContracts, bets)
+
+      const topTraderScores = topUserScores(traderScores)
+      const topCreatorScores = topUserScores(creatorScores)
+
+      return {
+        doc: firestore.collection('groups').doc(group.id),
+        fields: {
+          cachedLeaderboard: {
+            topTraders: topTraderScores,
+            topCreators: topCreatorScores,
+          },
+        },
+      }
+    })
+    await writeAsync(firestore, groupUpdates)
+  } catch (e) {
+    console.log('Error While Updating Group Leaderboards', e)
+  }
 }
+
+const topUserScores = (scores: { [userId: string]: number }) => {
+  const top50 = Object.entries(scores)
+    .sort(([, scoreA], [, scoreB]) => scoreB - scoreA)
+    .slice(0, 50)
+  return top50.map(([userId, score]) => ({ userId, score }))
+}
+
+type GroupContractDoc = { contractId: string; createdTime: number }

web/components/NotificationSettings.tsx

@@ -1,236 +0,0 @@
-import { useUser } from 'web/hooks/use-user'
-import React, { useEffect, useState } from 'react'
-import { notification_subscribe_types, PrivateUser } from 'common/user'
-import { listenForPrivateUser, updatePrivateUser } from 'web/lib/firebase/users'
-import toast from 'react-hot-toast'
-import { track } from '@amplitude/analytics-browser'
-import { LoadingIndicator } from 'web/components/loading-indicator'
-import { Row } from 'web/components/layout/row'
-import clsx from 'clsx'
-import { CheckIcon, XIcon } from '@heroicons/react/outline'
-import { ChoicesToggleGroup } from 'web/components/choices-toggle-group'
-import { Col } from 'web/components/layout/col'
-import { FollowMarketModal } from 'web/components/contract/follow-market-modal'
-
-export function NotificationSettings() {
-  const user = useUser()
-  const [notificationSettings, setNotificationSettings] =
-    useState<notification_subscribe_types>('all')
-  const [emailNotificationSettings, setEmailNotificationSettings] =
-    useState<notification_subscribe_types>('all')
-  const [privateUser, setPrivateUser] = useState<PrivateUser | null>(null)
-  const [showModal, setShowModal] = useState(false)
-
-  useEffect(() => {
-    if (user) listenForPrivateUser(user.id, setPrivateUser)
-  }, [user])
-
-  useEffect(() => {
-    if (!privateUser) return
-    if (privateUser.notificationPreferences) {
-      setNotificationSettings(privateUser.notificationPreferences)
-    }
-    if (
-      privateUser.unsubscribedFromResolutionEmails &&
-      privateUser.unsubscribedFromCommentEmails &&
-      privateUser.unsubscribedFromAnswerEmails
-    ) {
-      setEmailNotificationSettings('none')
-    } else if (
-      !privateUser.unsubscribedFromResolutionEmails &&
-      !privateUser.unsubscribedFromCommentEmails &&
-      !privateUser.unsubscribedFromAnswerEmails
-    ) {
-      setEmailNotificationSettings('all')
-    } else {
-      setEmailNotificationSettings('less')
-    }
-  }, [privateUser])
-
-  const loading = 'Changing Notifications Settings'
-  const success = 'Notification Settings Changed!'
-  function changeEmailNotifications(newValue: notification_subscribe_types) {
-    if (!privateUser) return
-    if (newValue === 'all') {
-      toast.promise(
-        updatePrivateUser(privateUser.id, {
-          unsubscribedFromResolutionEmails: false,
-          unsubscribedFromCommentEmails: false,
-          unsubscribedFromAnswerEmails: false,
-        }),
-        {
-          loading,
-          success,
-          error: (err) => `${err.message}`,
-        }
-      )
-    } else if (newValue === 'less') {
-      toast.promise(
-        updatePrivateUser(privateUser.id, {
-          unsubscribedFromResolutionEmails: false,
-          unsubscribedFromCommentEmails: true,
-          unsubscribedFromAnswerEmails: true,
-        }),
-        {
-          loading,
-          success,
-          error: (err) => `${err.message}`,
-        }
-      )
-    } else if (newValue === 'none') {
-      toast.promise(
-        updatePrivateUser(privateUser.id, {
-          unsubscribedFromResolutionEmails: true,
-          unsubscribedFromCommentEmails: true,
-          unsubscribedFromAnswerEmails: true,
-        }),
-        {
-          loading,
-          success,
-          error: (err) => `${err.message}`,
-        }
-      )
-    }
-  }
-
-  function changeInAppNotificationSettings(
-    newValue: notification_subscribe_types
-  ) {
-    if (!privateUser) return
-    track('In-App Notification Preferences Changed', {
-      newPreference: newValue,
-      oldPreference: privateUser.notificationPreferences,
-    })
-    toast.promise(
-      updatePrivateUser(privateUser.id, {
-        notificationPreferences: newValue,
-      }),
-      {
-        loading,
-        success,
-        error: (err) => `${err.message}`,
-      }
-    )
-  }
-
-  useEffect(() => {
-    if (privateUser && privateUser.notificationPreferences)
-      setNotificationSettings(privateUser.notificationPreferences)
-    else setNotificationSettings('all')
-  }, [privateUser])
-
-  if (!privateUser) {
-    return <LoadingIndicator spinnerClassName={'border-gray-500 h-4 w-4'} />
-  }
-
-  function NotificationSettingLine(props: {
-    label: string | React.ReactNode
-    highlight: boolean
-    onClick?: () => void
-  }) {
-    const { label, highlight, onClick } = props
-    return (
-      <Row
-        className={clsx(
-          'my-1 gap-1 text-gray-300',
-          highlight && '!text-black',
-          onClick ? 'cursor-pointer' : ''
-        )}
-        onClick={onClick}
-      >
-        {highlight ? <CheckIcon height={20} /> : <XIcon height={20} />}
-        {label}
-      </Row>
-    )
-  }
-
-  return (
-    <div className={'p-2'}>
-      <div>In App Notifications</div>
-      <ChoicesToggleGroup
-        currentChoice={notificationSettings}
-        choicesMap={{ All: 'all', Less: 'less', None: 'none' }}
-        setChoice={(choice) =>
-          changeInAppNotificationSettings(
-            choice as notification_subscribe_types
-          )
-        }
-        className={'col-span-4 p-2'}
-        toggleClassName={'w-24'}
-      />
-      <div className={'mt-4 text-sm'}>
-        <Col className={''}>
-          <Row className={'my-1'}>
-            You will receive notifications for these general events:
-          </Row>
-          <NotificationSettingLine
-            highlight={notificationSettings !== 'none'}
-            label={"Income & referral bonuses you've received"}
-          />
-          <Row className={'my-1'}>
-            You will receive new comment, answer, & resolution notifications on
-            questions:
-          </Row>
-          <NotificationSettingLine
-            highlight={notificationSettings !== 'none'}
-            label={
-              <span>
-                That <span className={'font-bold'}>you watch </span>- you
-                auto-watch questions if:
-              </span>
-            }
-            onClick={() => setShowModal(true)}
-          />
-          <Col
-            className={clsx(
-              'mb-2 ml-8',
-              'gap-1 text-gray-300',
-              notificationSettings !== 'none' && '!text-black'
-            )}
-          >
-            <Row>• You create it</Row>
-            <Row>• You bet, comment on, or answer it</Row>
-            <Row>• You add liquidity to it</Row>
-            <Row>
-              • If you select 'Less' and you've commented on or answered a
-              question, you'll only receive notification on direct replies to
-              your comments or answers
-            </Row>
-          </Col>
-        </Col>
-      </div>
-      <div className={'mt-4'}>Email Notifications</div>
-      <ChoicesToggleGroup
-        currentChoice={emailNotificationSettings}
-        choicesMap={{ All: 'all', Less: 'less', None: 'none' }}
-        setChoice={(choice) =>
-          changeEmailNotifications(choice as notification_subscribe_types)
-        }
-        className={'col-span-4 p-2'}
-        toggleClassName={'w-24'}
-      />
-      <div className={'mt-4 text-sm'}>
-        <div>
-          You will receive emails for:
-          <NotificationSettingLine
-            label={"Resolution of questions you're betting on"}
-            highlight={emailNotificationSettings !== 'none'}
-          />
-          <NotificationSettingLine
-            label={'Closure of your questions'}
-            highlight={emailNotificationSettings !== 'none'}
-          />
-          <NotificationSettingLine
-            label={'Activity on your questions'}
-            highlight={emailNotificationSettings === 'all'}
-          />
-          <NotificationSettingLine
-            label={"Activity on questions you've answered or commented on"}
-            highlight={emailNotificationSettings === 'all'}
-          />
-        </div>
-      </div>
-      <FollowMarketModal setOpen={setShowModal} open={showModal} />
-    </div>
-  )
-}

web/components/answers/answer-resolve-panel.tsx

@@ -11,6 +11,8 @@ import { ResolveConfirmationButton } from '../confirmation-button'
 import { removeUndefinedProps } from 'common/util/object'
 
 export function AnswerResolvePanel(props: {
+  isAdmin: boolean
+  isCreator: boolean
   contract: FreeResponseContract | MultipleChoiceContract
   resolveOption: 'CHOOSE' | 'CHOOSE_MULTIPLE' | 'CANCEL' | undefined
   setResolveOption: (
@@ -18,7 +20,14 @@ export function AnswerResolvePanel(props: {
   ) => void
   chosenAnswers: { [answerId: string]: number }
 }) {
-  const { contract, resolveOption, setResolveOption, chosenAnswers } = props
+  const {
+    contract,
+    resolveOption,
+    setResolveOption,
+    chosenAnswers,
+    isAdmin,
+    isCreator,
+  } = props
   const answers = Object.keys(chosenAnswers)
 
   const [isSubmitting, setIsSubmitting] = useState(false)
@@ -76,7 +85,14 @@ export function AnswerResolvePanel(props: {
 
   return (
     <Col className="gap-4 rounded">
-      <div>Resolve your market</div>
+      <Row className="justify-between">
+        <div>Resolve your market</div>
+        {isAdmin && !isCreator && (
+          <span className="rounded bg-red-200 p-1 text-xs text-red-600">
+            ADMIN
+          </span>
+        )}
+      </Row>
       <Col className="gap-4 sm:flex-row sm:items-center">
         <ChooseCancelSelector
           className="sm:!flex-row sm:items-center"

web/components/answers/answers-panel.tsx

@@ -23,21 +23,26 @@ import { Avatar } from 'web/components/avatar'
 import { Linkify } from 'web/components/linkify'
 import { BuyButton } from 'web/components/yes-no-selector'
 import { UserLink } from 'web/components/user-link'
+import { Button } from 'web/components/button'
+import { useAdmin } from 'web/hooks/use-admin'
+import { needsAdminToResolve } from 'web/pages/[username]/[contractSlug]'
 
 export function AnswersPanel(props: {
   contract: FreeResponseContract | MultipleChoiceContract
 }) {
+  const isAdmin = useAdmin()
   const { contract } = props
   const { creatorId, resolution, resolutions, totalBets, outcomeType } =
     contract
+  const [showAllAnswers, setShowAllAnswers] = useState(false)
+
+  const answers = (useAnswers(contract.id) ?? contract.answers).filter(
+    (a) => a.number != 0 || contract.outcomeType === 'MULTIPLE_CHOICE'
+  )
+  const hasZeroBetAnswers = answers.some((answer) => totalBets[answer.id] < 1)
 
-  const answers = useAnswers(contract.id) ?? contract.answers
   const [winningAnswers, losingAnswers] = partition(
-    answers.filter(
-      (answer) =>
-        (answer.id !== '0' || outcomeType === 'MULTIPLE_CHOICE') &&
-        totalBets[answer.id] > 0.000000001
-    ),
+    answers.filter((a) => (showAllAnswers ? true : totalBets[a.id] > 0)),
     (answer) =>
       answer.id === resolution || (resolutions && resolutions[answer.id])
   )
@@ -127,6 +132,17 @@ export function AnswersPanel(props: {
                 </div>
               </div>
             ))}
+            <Row className={'justify-end'}>
+              {hasZeroBetAnswers && !showAllAnswers && (
+                <Button
+                  color={'gray-white'}
+                  onClick={() => setShowAllAnswers(true)}
+                  size={'md'}
+                >
+                  Show More
+                </Button>
+              )}
+            </Row>
           </div>
         </div>
       )}
@@ -141,17 +157,20 @@ export function AnswersPanel(props: {
           <CreateAnswerPanel contract={contract} />
         )}
 
-      {user?.id === creatorId && !resolution && (
-        <>
-          <Spacer h={2} />
-          <AnswerResolvePanel
-            contract={contract}
-            resolveOption={resolveOption}
-            setResolveOption={setResolveOption}
-            chosenAnswers={chosenAnswers}
-          />
-        </>
-      )}
+      {(user?.id === creatorId || (isAdmin && needsAdminToResolve(contract))) &&
+        !resolution && (
+          <>
+            <Spacer h={2} />
+            <AnswerResolvePanel
+              isAdmin={isAdmin}
+              isCreator={user?.id === creatorId}
+              contract={contract}
+              resolveOption={resolveOption}
+              setResolveOption={setResolveOption}
+              chosenAnswers={chosenAnswers}
+            />
+          </>
+        )}
     </Col>
   )
 }

web/components/answers/create-answer-panel.tsx

@@ -76,7 +76,7 @@ export function CreateAnswerPanel(props: { contract: FreeResponseContract }) {
     if (existingAnswer) {
       setAnswerError(
         existingAnswer
-          ? `"${existingAnswer.text}" already exists as an answer`
+          ? `"${existingAnswer.text}" already exists as an answer. Can't see it? Hit the 'Show More' button right above this box.`
           : ''
       )
       return
@@ -237,7 +237,7 @@ const AnswerError = (props: { text: string; level: answerErrorLevel }) => {
     }[level] ?? ''
   return (
     <div
-      className={`${colorClass} mb-2 mr-auto self-center whitespace-nowrap text-xs font-medium tracking-wide`}
+      className={`${colorClass} mb-2 mr-auto self-center text-xs font-medium tracking-wide`}
     >
       {text}
     </div>

web/components/arrange-home.tsx

@@ -7,25 +7,19 @@ import { Row } from 'web/components/layout/row'
 import { Subtitle } from 'web/components/subtitle'
 import { useMemberGroups } from 'web/hooks/use-group'
 import { filterDefined } from 'common/util/array'
-import { keyBy } from 'lodash'
+import { isArray, keyBy } from 'lodash'
 import { User } from 'common/user'
 import { Group } from 'common/group'
 
 export function ArrangeHome(props: {
   user: User | null | undefined
-  homeSections: { visible: string[]; hidden: string[] }
-  setHomeSections: (homeSections: {
-    visible: string[]
-    hidden: string[]
-  }) => void
+  homeSections: string[]
+  setHomeSections: (sections: string[]) => void
 }) {
   const { user, homeSections, setHomeSections } = props
 
   const groups = useMemberGroups(user?.id) ?? []
-  const { itemsById, visibleItems, hiddenItems } = getHomeItems(
-    groups,
-    homeSections
-  )
+  const { itemsById, sections } = getHomeItems(groups, homeSections)
 
   return (
     <DragDropContext
@@ -35,23 +29,16 @@ export function ArrangeHome(props: {
 
         const item = itemsById[draggableId]
 
-        const newHomeSections = {
-          visible: visibleItems.map((item) => item.id),
-          hidden: hiddenItems.map((item) => item.id),
-        }
+        const newHomeSections = sections.map((section) => section.id)
 
-        const sourceSection = source.droppableId as 'visible' | 'hidden'
-        newHomeSections[sourceSection].splice(source.index, 1)
-
-        const destSection = destination.droppableId as 'visible' | 'hidden'
-        newHomeSections[destSection].splice(destination.index, 0, item.id)
+        newHomeSections.splice(source.index, 1)
+        newHomeSections.splice(destination.index, 0, item.id)
 
         setHomeSections(newHomeSections)
       }}
     >
-      <Row className="relative max-w-lg gap-4">
-        <DraggableList items={visibleItems} title="Visible" />
-        <DraggableList items={hiddenItems} title="Hidden" />
+      <Row className="relative max-w-md gap-4">
+        <DraggableList items={sections} title="Sections" />
       </Row>
     </DragDropContext>
   )
@@ -64,16 +51,13 @@ function DraggableList(props: {
   const { title, items } = props
   return (
     <Droppable droppableId={title.toLowerCase()}>
-      {(provided, snapshot) => (
+      {(provided) => (
         <Col
           {...provided.droppableProps}
           ref={provided.innerRef}
-          className={clsx(
-            'width-[220px] flex-1 items-start rounded bg-gray-50 p-2',
-            snapshot.isDraggingOver && 'bg-gray-100'
-          )}
+          className={clsx('flex-1 items-stretch gap-1 rounded bg-gray-100 p-4')}
         >
-          <Subtitle text={title} className="mx-2 !my-2" />
+          <Subtitle text={title} className="mx-2 !mt-0 !mb-4" />
           {items.map((item, index) => (
             <Draggable key={item.id} draggableId={item.id} index={index}>
               {(provided, snapshot) => (
@@ -82,16 +66,13 @@ function DraggableList(props: {
                   {...provided.draggableProps}
                   {...provided.dragHandleProps}
                   style={provided.draggableProps.style}
-                  className={clsx(
-                    'flex flex-row items-center gap-4 rounded bg-gray-50 p-2',
-                    snapshot.isDragging && 'z-[9000] bg-gray-300'
-                  )}
                 >
-                  <MenuIcon
-                    className="h-5 w-5 flex-shrink-0 text-gray-500"
-                    aria-hidden="true"
-                  />{' '}
-                  {item.label}
+                  <SectionItem
+                    className={clsx(
+                      snapshot.isDragging && 'z-[9000] bg-gray-200'
+                    )}
+                    item={item}
+                  />
                 </div>
               )}
             </Draggable>
@@ -103,15 +84,36 @@ function DraggableList(props: {
   )
 }
 
-export const getHomeItems = (
-  groups: Group[],
-  homeSections: { visible: string[]; hidden: string[] }
-) => {
+const SectionItem = (props: {
+  item: { id: string; label: string }
+  className?: string
+}) => {
+  const { item, className } = props
+
+  return (
+    <div
+      className={clsx(
+        className,
+        'flex flex-row items-center gap-4 rounded bg-gray-50 p-2'
+      )}
+    >
+      <MenuIcon
+        className="h-5 w-5 flex-shrink-0 text-gray-500"
+        aria-hidden="true"
+      />{' '}
+      {item.label}
+    </div>
+  )
+}
+
+export const getHomeItems = (groups: Group[], sections: string[]) => {
+  // Accommodate old home sections.
+  if (!isArray(sections)) sections = []
+
   const items = [
     { label: 'Trending', id: 'score' },
-    { label: 'Newest', id: 'newest' },
-    { label: 'Close date', id: 'close-date' },
-    { label: 'Your trades', id: 'your-bets' },
+    { label: 'New for you', id: 'newest' },
+    { label: 'Daily movers', id: 'daily-movers' },
     ...groups.map((g) => ({
       label: g.name,
       id: g.id,
@@ -119,23 +121,13 @@ export const getHomeItems = (
   ]
   const itemsById = keyBy(items, 'id')
 
-  const { visible, hidden } = homeSections
+  const sectionItems = filterDefined(sections.map((id) => itemsById[id]))
 
-  const [visibleItems, hiddenItems] = [
-    filterDefined(visible.map((id) => itemsById[id])),
-    filterDefined(hidden.map((id) => itemsById[id])),
-  ]
-
-  // Add unmentioned items to the visible list.
-  visibleItems.push(
-    ...items.filter(
-      (item) => !visibleItems.includes(item) && !hiddenItems.includes(item)
-    )
-  )
+  // Add unmentioned items to the end.
+  sectionItems.push(...items.filter((item) => !sectionItems.includes(item)))
 
   return {
-    visibleItems,
-    hiddenItems,
+    sections: sectionItems,
     itemsById,
   }
 }

web/components/bet-button.tsx

@@ -10,6 +10,7 @@ import { useSaveBinaryShares } from './use-save-binary-shares'
 import { Col } from './layout/col'
 import { Button } from 'web/components/button'
 import { BetSignUpPrompt } from './sign-up-prompt'
+import { PRESENT_BET } from 'common/user'
 
 /** Button that opens BetPanel in a new modal */
 export default function BetButton(props: {
@@ -36,12 +37,12 @@ export default function BetButton(props: {
           <Button
             size="lg"
             className={clsx(
-              'my-auto inline-flex min-w-[75px] whitespace-nowrap',
+              'my-auto inline-flex min-w-[75px] whitespace-nowrap capitalize',
               btnClassName
             )}
             onClick={() => setOpen(true)}
           >
-            Predict
+            {PRESENT_BET}
           </Button>
         ) : (
           <BetSignUpPrompt />

web/components/bet-inline.tsx

@@ -79,7 +79,7 @@ export function BetInline(props: {
   return (
     <Col className={clsx('items-center', className)}>
       <Row className="h-12 items-stretch gap-3 rounded bg-indigo-200 py-2 px-3">
-        <div className="text-xl">Bet</div>
+        <div className="text-xl">Predict</div>
         <YesNoSelector
           className="space-x-0"
           btnClassName="rounded-l-none rounded-r-none first:rounded-l-2xl last:rounded-r-2xl"

web/components/bet-panel.tsx

@@ -42,6 +42,7 @@ import { YesNoSelector } from './yes-no-selector'
 import { PlayMoneyDisclaimer } from './play-money-disclaimer'
 import { isAndroid, isIOS } from 'web/lib/util/device'
 import { WarningConfirmationButton } from './warning-confirmation-button'
+import { MarketIntroPanel } from './market-intro-panel'
 
 export function BetPanel(props: {
   contract: CPMMBinaryContract | PseudoNumericContract
@@ -90,10 +91,7 @@ export function BetPanel(props: {
             />
           </>
         ) : (
-          <>
-            <BetSignUpPrompt />
-            <PlayMoneyDisclaimer />
-          </>
+          <MarketIntroPanel />
         )}
       </Col>
 

web/components/bets-list.tsx

@@ -754,7 +754,10 @@ function SellButton(props: {
   )
 }
 
-function ProfitBadge(props: { profitPercent: number; className?: string }) {
+export function ProfitBadge(props: {
+  profitPercent: number
+  className?: string
+}) {
   const { profitPercent, className } = props
   if (!profitPercent) return null
   const colors =

web/components/contract-search.tsx

@@ -3,7 +3,7 @@ import algoliasearch from 'algoliasearch/lite'
 import { SearchOptions } from '@algolia/client-search'
 import { useRouter } from 'next/router'
 import { Contract } from 'common/contract'
-import { User } from 'common/user'
+import { PAST_BETS, User } from 'common/user'
 import {
   ContractHighlightOptions,
   ContractsGrid,
@@ -41,7 +41,7 @@ const searchIndexName = ENV === 'DEV' ? 'dev-contracts' : 'contractsIndex'
 export const SORTS = [
   { label: 'Newest', value: 'newest' },
   { label: 'Trending', value: 'score' },
-  { label: 'Most traded', value: 'most-traded' },
+  { label: `Most ${PAST_BETS}`, value: 'most-traded' },
   { label: '24h volume', value: '24-hour-vol' },
   { label: '24h change', value: 'prob-change-day' },
   { label: 'Last updated', value: 'last-updated' },
@@ -80,9 +80,10 @@ export function ContractSearch(props: {
   highlightOptions?: ContractHighlightOptions
   onContractClick?: (contract: Contract) => void
   hideOrderSelector?: boolean
-  cardHideOptions?: {
+  cardUIOptions?: {
     hideGroupLink?: boolean
     hideQuickBet?: boolean
+    noLinkAvatar?: boolean
   }
   headerClassName?: string
   persistPrefix?: string
@@ -102,7 +103,7 @@ export function ContractSearch(props: {
     additionalFilter,
     onContractClick,
     hideOrderSelector,
-    cardHideOptions,
+    cardUIOptions,
     highlightOptions,
     headerClassName,
     persistPrefix,
@@ -164,6 +165,7 @@ export function ContractSearch(props: {
         numericFilters,
         page: requestedPage,
         hitsPerPage: 20,
+        advancedSyntax: true,
       })
       // if there's a more recent request, forget about this one
       if (id === requestId.current) {
@@ -200,7 +202,7 @@ export function ContractSearch(props: {
   }
 
   return (
-    <Col className="h-full">
+    <Col>
       <ContractSearchControls
         className={headerClassName}
         defaultSort={defaultSort}
@@ -222,7 +224,7 @@ export function ContractSearch(props: {
           showTime={state.showTime ?? undefined}
           onContractClick={onContractClick}
           highlightOptions={highlightOptions}
-          cardHideOptions={cardHideOptions}
+          cardUIOptions={cardUIOptions}
         />
       )}
     </Col>
@@ -449,7 +451,7 @@ function ContractSearchControls(props: {
               selected={state.pillFilter === 'your-bets'}
               onSelect={selectPill('your-bets')}
             >
-              Your trades
+              Your {PAST_BETS}
             </PillButton>
           )}
 

web/components/contract-select-modal.tsx

@@ -0,0 +1,106 @@
+import { Contract } from 'common/contract'
+import { useState } from 'react'
+import { Button } from './button'
+import { ContractSearch } from './contract-search'
+import { Col } from './layout/col'
+import { Modal } from './layout/modal'
+import { Row } from './layout/row'
+import { LoadingIndicator } from './loading-indicator'
+
+export function SelectMarketsModal(props: {
+  title: string
+  description?: React.ReactNode
+  open: boolean
+  setOpen: (open: boolean) => void
+  submitLabel: (length: number) => string
+  onSubmit: (contracts: Contract[]) => void | Promise<void>
+  contractSearchOptions?: Partial<Parameters<typeof ContractSearch>[0]>
+}) {
+  const {
+    title,
+    description,
+    open,
+    setOpen,
+    submitLabel,
+    onSubmit,
+    contractSearchOptions,
+  } = props
+
+  const [contracts, setContracts] = useState<Contract[]>([])
+  const [loading, setLoading] = useState(false)
+
+  async function addContract(contract: Contract) {
+    if (contracts.map((c) => c.id).includes(contract.id)) {
+      setContracts(contracts.filter((c) => c.id !== contract.id))
+    } else setContracts([...contracts, contract])
+  }
+
+  async function onFinish() {
+    setLoading(true)
+    await onSubmit(contracts)
+    setLoading(false)
+    setOpen(false)
+    setContracts([])
+  }
+
+  return (
+    <Modal open={open} setOpen={setOpen} className={'sm:p-0'} size={'lg'}>
+      <Col className="h-[85vh] w-full gap-4 rounded-md bg-white">
+        <div className="p-8 pb-0">
+          <Row>
+            <div className={'text-xl text-indigo-700'}>{title}</div>
+
+            {!loading && (
+              <Row className="grow justify-end gap-4">
+                {contracts.length > 0 && (
+                  <Button onClick={onFinish} color="indigo">
+                    {submitLabel(contracts.length)}
+                  </Button>
+                )}
+                <Button
+                  onClick={() => {
+                    if (contracts.length > 0) {
+                      setContracts([])
+                    } else {
+                      setOpen(false)
+                    }
+                  }}
+                  color="gray"
+                >
+                  {contracts.length > 0 ? 'Reset' : 'Cancel'}
+                </Button>
+              </Row>
+            )}
+          </Row>
+          {description}
+        </div>
+
+        {loading && (
+          <div className="w-full justify-center">
+            <LoadingIndicator />
+          </div>
+        )}
+
+        <div className="overflow-y-auto sm:px-8">
+          <ContractSearch
+            hideOrderSelector
+            onContractClick={addContract}
+            cardUIOptions={{
+              hideGroupLink: true,
+              hideQuickBet: true,
+              noLinkAvatar: true,
+            }}
+            highlightOptions={{
+              contractIds: contracts.map((c) => c.id),
+              highlightClassName:
+                '!bg-indigo-100 outline outline-2 outline-indigo-300',
+            }}
+            additionalFilter={{}} /* hide pills */
+            headerClassName="bg-white"
+            {...contractSearchOptions}
+          />
+        </div>
+      </Col>
+    </Modal>
+  )
+}

web/components/contract/contract-card.tsx

@@ -42,6 +42,7 @@ export function ContractCard(props: {
   hideQuickBet?: boolean
   hideGroupLink?: boolean
   trackingPostfix?: string
+  noLinkAvatar?: boolean
 }) {
   const {
     showTime,
@@ -51,6 +52,7 @@ export function ContractCard(props: {
     hideQuickBet,
     hideGroupLink,
     trackingPostfix,
+    noLinkAvatar,
   } = props
   const contract = useContractWithPreload(props.contract) ?? props.contract
   const { question, outcomeType } = contract
@@ -78,6 +80,7 @@ export function ContractCard(props: {
         <AvatarDetails
           contract={contract}
           className={'hidden md:inline-flex'}
+          noLink={noLinkAvatar}
         />
         <p
           className={clsx(
@@ -142,7 +145,12 @@ export function ContractCard(props: {
           showQuickBet ? 'w-[85%]' : 'w-full'
         )}
       >
-        <AvatarDetails contract={contract} short={true} className="md:hidden" />
+        <AvatarDetails
+          contract={contract}
+          short={true}
+          className="md:hidden"
+          noLink={noLinkAvatar}
+        />
         <MiscDetails
           contract={contract}
           showTime={showTime}

web/components/contract/contract-details.tsx

@@ -86,8 +86,9 @@ export function AvatarDetails(props: {
   contract: Contract
   className?: string
   short?: boolean
+  noLink?: boolean
 }) {
-  const { contract, short, className } = props
+  const { contract, short, className, noLink } = props
   const { creatorName, creatorUsername, creatorAvatarUrl } = contract
 
   return (
@@ -98,8 +99,14 @@ export function AvatarDetails(props: {
         username={creatorUsername}
         avatarUrl={creatorAvatarUrl}
         size={6}
+        noLink={noLink}
+      />
+      <UserLink
+        name={creatorName}
+        username={creatorUsername}
+        short={short}
+        noLink={noLink}
       />
-      <UserLink name={creatorName} username={creatorUsername} short={short} />
     </Row>
   )
 }
@@ -294,7 +301,7 @@ export function ExtraMobileContractDetails(props: {
           <Tooltip
             text={`${formatMoney(
               volume
-            )} bet - ${uniqueBettors} unique traders`}
+            )} bet - ${uniqueBettors} unique predictors`}
           >
             {volumeTranslation}
           </Tooltip>

web/components/contract/contract-info-dialog.tsx

@@ -18,6 +18,7 @@ import { deleteField } from 'firebase/firestore'
 import ShortToggle from '../widgets/short-toggle'
 import { DuplicateContractButton } from '../copy-contract-button'
 import { Row } from '../layout/row'
+import { BETTORS } from 'common/user'
 
 export const contractDetailsButtonClassName =
   'group flex items-center rounded-md px-3 py-2 text-sm font-medium cursor-pointer hover:bg-gray-100 text-gray-400 hover:text-gray-500'
@@ -135,7 +136,7 @@ export function ContractInfoDialog(props: {
               </tr> */}
 
               <tr>
-                <td>Traders</td>
+                <td>{BETTORS}</td>
                 <td>{bettorsCount}</td>
               </tr>
 

web/components/contract/contract-leaderboard.tsx

@@ -6,13 +6,13 @@ import { formatMoney } from 'common/util/format'
 import { groupBy, mapValues, sumBy, sortBy, keyBy } from 'lodash'
 import { useState, useMemo, useEffect } from 'react'
 import { CommentTipMap } from 'web/hooks/use-tip-txns'
-import { useUserById } from 'web/hooks/use-user'
 import { listUsers, User } from 'web/lib/firebase/users'
 import { FeedBet } from '../feed/feed-bets'
 import { FeedComment } from '../feed/feed-comments'
 import { Spacer } from '../layout/spacer'
 import { Leaderboard } from '../leaderboard'
 import { Title } from '../title'
+import { BETTORS } from 'common/user'
 
 export function ContractLeaderboard(props: {
   contract: Contract
@@ -49,7 +49,7 @@ export function ContractLeaderboard(props: {
 
   return users && users.length > 0 ? (
     <Leaderboard
-      title="🏅 Top traders"
+      title={`🏅 Top ${BETTORS}`}
       users={users || []}
       columns={[
         {
@@ -88,7 +88,7 @@ export function ContractTopTrades(props: {
 
   // Now find the betId with the highest profit
   const topBetId = sortBy(bets, (b) => -profitById[b.id])[0]?.id
-  const topBettor = useUserById(betsById[topBetId]?.userId)
+  const topBettor = betsById[topBetId]?.userName
 
   // And also the commentId of the comment with the highest profit
   const topCommentId = sortBy(
@@ -121,7 +121,7 @@ export function ContractTopTrades(props: {
             <FeedBet contract={contract} bet={betsById[topBetId]} />
           </div>
           <div className="mt-2 ml-2 text-sm text-gray-500">
-            {topBettor?.name} made {formatMoney(profitById[topBetId] || 0)}!
+            {topBettor} made {formatMoney(profitById[topBetId] || 0)}!
           </div>
         </>
       )}

web/components/contract/contract-tabs.tsx

@@ -1,7 +1,7 @@
 import { Bet } from 'common/bet'
 import { Contract, CPMMBinaryContract } from 'common/contract'
 import { ContractComment } from 'common/comment'
-import { User } from 'common/user'
+import { PAST_BETS, User } from 'common/user'
 import {
   ContractCommentsActivity,
   ContractBetsActivity,
@@ -18,6 +18,11 @@ import { useLiquidity } from 'web/hooks/use-liquidity'
 import { BetSignUpPrompt } from '../sign-up-prompt'
 import { PlayMoneyDisclaimer } from '../play-money-disclaimer'
 import BetButton from '../bet-button'
+import { capitalize } from 'lodash'
+import {
+  DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+  HOUSE_LIQUIDITY_PROVIDER_ID,
+} from 'common/antes'
 
 export function ContractTabs(props: {
   contract: Contract
@@ -36,13 +41,19 @@ export function ContractTabs(props: {
   const visibleBets = bets.filter(
     (bet) => !bet.isAnte && !bet.isRedemption && bet.amount !== 0
   )
-  const visibleLps = lps?.filter((l) => !l.isAnte && l.amount > 0)
+  const visibleLps = (lps ?? []).filter(
+    (l) =>
+      !l.isAnte &&
+      l.userId !== HOUSE_LIQUIDITY_PROVIDER_ID &&
+      l.userId !== DEV_HOUSE_LIQUIDITY_PROVIDER_ID &&
+      l.amount > 0
+  )
 
   // Load comments here, so the badge count will be correct
   const updatedComments = useComments(contract.id)
   const comments = updatedComments ?? props.comments
 
-  const betActivity = visibleLps && (
+  const betActivity = lps != null && (
     <ContractBetsActivity
       contract={contract}
       bets={visibleBets}
@@ -114,13 +125,13 @@ export function ContractTabs(props: {
             badge: `${comments.length}`,
           },
           {
-            title: 'Trades',
+            title: capitalize(PAST_BETS),
             content: betActivity,
-            badge: `${visibleBets.length}`,
+            badge: `${visibleBets.length + visibleLps.length}`,
           },
           ...(!user || !userBets?.length
             ? []
-            : [{ title: 'Your trades', content: yourTrades }]),
+            : [{ title: `Your ${PAST_BETS}`, content: yourTrades }]),
         ]}
       />
       {!user ? (

web/components/contract/contracts-grid.tsx

@@ -21,9 +21,10 @@ export function ContractsGrid(props: {
   loadMore?: () => void
   showTime?: ShowTime
   onContractClick?: (contract: Contract) => void
-  cardHideOptions?: {
+  cardUIOptions?: {
     hideQuickBet?: boolean
     hideGroupLink?: boolean
+    noLinkAvatar?: boolean
   }
   highlightOptions?: ContractHighlightOptions
   trackingPostfix?: string
@@ -34,11 +35,11 @@ export function ContractsGrid(props: {
     showTime,
     loadMore,
     onContractClick,
-    cardHideOptions,
+    cardUIOptions,
     highlightOptions,
     trackingPostfix,
   } = props
-  const { hideQuickBet, hideGroupLink } = cardHideOptions || {}
+  const { hideQuickBet, hideGroupLink, noLinkAvatar } = cardUIOptions || {}
   const { contractIds, highlightClassName } = highlightOptions || {}
   const onVisibilityUpdated = useCallback(
     (visible) => {
@@ -80,6 +81,7 @@ export function ContractsGrid(props: {
             onClick={
               onContractClick ? () => onContractClick(contract) : undefined
             }
+            noLinkAvatar={noLinkAvatar}
             hideQuickBet={hideQuickBet}
             hideGroupLink={hideGroupLink}
             trackingPostfix={trackingPostfix}

web/components/contract/prob-change-table.tsx

@@ -2,74 +2,69 @@ import clsx from 'clsx'
 import { contractPath } from 'web/lib/firebase/contracts'
 import { CPMMContract } from 'common/contract'
 import { formatPercent } from 'common/util/format'
-import { useProbChanges } from 'web/hooks/use-prob-changes'
-import { linkClass, SiteLink } from '../site-link'
+import { SiteLink } from '../site-link'
 import { Col } from '../layout/col'
 import { Row } from '../layout/row'
-import { useState } from 'react'
+import { LoadingIndicator } from '../loading-indicator'
 
-export function ProbChangeTable(props: { userId: string | undefined }) {
-  const { userId } = props
+export function ProbChangeTable(props: {
+  changes:
+    | { positiveChanges: CPMMContract[]; negativeChanges: CPMMContract[] }
+    | undefined
+}) {
+  const { changes } = props
 
-  const changes = useProbChanges(userId ?? '')
-  const [expanded, setExpanded] = useState(false)
-
-  if (!changes) {
-    return null
-  }
-
-  const count = expanded ? 16 : 4
+  if (!changes) return <LoadingIndicator />
 
   const { positiveChanges, negativeChanges } = changes
-  const filteredPositiveChanges = positiveChanges.slice(0, count / 2)
-  const filteredNegativeChanges = negativeChanges.slice(0, count / 2)
-  const filteredChanges = [
-    ...filteredPositiveChanges,
-    ...filteredNegativeChanges,
-  ]
+
+  const threshold = 0.075
+  const countOverThreshold = Math.max(
+    positiveChanges.findIndex((c) => c.probChanges.day < threshold) + 1,
+    negativeChanges.findIndex((c) => c.probChanges.day > -threshold) + 1
+  )
+  const maxRows = Math.min(positiveChanges.length, negativeChanges.length)
+  const rows = Math.min(3, Math.min(maxRows, countOverThreshold))
+
+  const filteredPositiveChanges = positiveChanges.slice(0, rows)
+  const filteredNegativeChanges = negativeChanges.slice(0, rows)
+
+  if (rows === 0) return <div className="px-4 text-gray-500">None</div>
 
   return (
-    <Col>
-      <Col className="mb-4 w-full divide-x-2 divide-y rounded-lg bg-white shadow-md md:flex-row md:divide-y-0">
-        <Col className="flex-1 divide-y">
-          {filteredChanges.slice(0, count / 2).map((contract) => (
-            <Row className="items-center hover:bg-gray-100">
-              <ProbChange
-                className="p-4 text-right text-xl"
-                contract={contract}
-              />
-              <SiteLink
-                className="p-4 pl-2 font-semibold text-indigo-700"
-                href={contractPath(contract)}
-              >
-                <span className="line-clamp-2">{contract.question}</span>
-              </SiteLink>
-            </Row>
-          ))}
-        </Col>
-        <Col className="flex-1 divide-y">
-          {filteredChanges.slice(count / 2).map((contract) => (
-            <Row className="items-center hover:bg-gray-100">
-              <ProbChange
-                className="p-4 text-right text-xl"
-                contract={contract}
-              />
-              <SiteLink
-                className="p-4 pl-2 font-semibold text-indigo-700"
-                href={contractPath(contract)}
-              >
-                <span className="line-clamp-2">{contract.question}</span>
-              </SiteLink>
-            </Row>
-          ))}
-        </Col>
+    <Col className="mb-4 w-full divide-x-2 divide-y rounded-lg bg-white shadow-md md:flex-row md:divide-y-0">
+      <Col className="flex-1 divide-y">
+        {filteredPositiveChanges.map((contract) => (
+          <Row className="items-center hover:bg-gray-100">
+            <ProbChange
+              className="p-4 text-right text-xl"
+              contract={contract}
+            />
+            <SiteLink
+              className="p-4 pl-2 font-semibold text-indigo-700"
+              href={contractPath(contract)}
+            >
+              <span className="line-clamp-2">{contract.question}</span>
+            </SiteLink>
+          </Row>
+        ))}
+      </Col>
+      <Col className="flex-1 divide-y">
+        {filteredNegativeChanges.map((contract) => (
+          <Row className="items-center hover:bg-gray-100">
+            <ProbChange
+              className="p-4 text-right text-xl"
+              contract={contract}
+            />
+            <SiteLink
+              className="p-4 pl-2 font-semibold text-indigo-700"
+              href={contractPath(contract)}
+            >
+              <span className="line-clamp-2">{contract.question}</span>
+            </SiteLink>
+          </Row>
+        ))}
       </Col>
-      <div
-        className={clsx(linkClass, 'cursor-pointer self-end')}
-        onClick={() => setExpanded(!expanded)}
-      >
-        {expanded ? 'Show less' : 'Show more'}
-      </div>
     </Col>
   )
 }

web/components/contract/watch-market-modal.tsx

@@ -4,7 +4,7 @@ import { EyeIcon } from '@heroicons/react/outline'
 import React from 'react'
 import clsx from 'clsx'
 
-export const FollowMarketModal = (props: {
+export const WatchMarketModal = (props: {
   open: boolean
   setOpen: (b: boolean) => void
   title?: string
@@ -18,20 +18,22 @@ export const FollowMarketModal = (props: {
         <Col className={'gap-2'}>
           <span className={'text-indigo-700'}>• What is watching?</span>
           <span className={'ml-2'}>
-            You can receive notifications on questions you're interested in by
-            clicking the
+            Watching a market means you'll receive notifications from activity
+            on it. You automatically start watching a market if you comment on
+            it, bet on it, or click the
             <EyeIcon
               className={clsx('ml-1 inline h-6 w-6 align-top')}
               aria-hidden="true"
             />
-            ️ button on a question.
+            ️ button.
           </span>
           <span className={'text-indigo-700'}>
             • What types of notifications will I receive?
           </span>
           <span className={'ml-2'}>
-            You'll receive in-app notifications for new comments, answers, and
-            updates to the question.
+            New comments, answers, and updates to the question. See the
+            notifications settings pages to customize which types of
+            notifications you receive on watched markets.
           </span>
         </Col>
       </Col>

web/components/editor.tsx

@@ -2,6 +2,7 @@ import CharacterCount from '@tiptap/extension-character-count'
 import Placeholder from '@tiptap/extension-placeholder'
 import {
   useEditor,
+  BubbleMenu,
   EditorContent,
   JSONContent,
   Content,
@@ -26,13 +27,19 @@ import Iframe from 'common/util/tiptap-iframe'
 import TiptapTweet from './editor/tiptap-tweet'
 import { EmbedModal } from './editor/embed-modal'
 import {
+  CheckIcon,
   CodeIcon,
   PhotographIcon,
   PresentationChartLineIcon,
+  TrashIcon,
 } from '@heroicons/react/solid'
 import { MarketModal } from './editor/market-modal'
 import { insertContent } from './editor/utils'
 import { Tooltip } from './tooltip'
+import BoldIcon from 'web/lib/icons/bold-icon'
+import ItalicIcon from 'web/lib/icons/italic-icon'
+import LinkIcon from 'web/lib/icons/link-icon'
+import { getUrl } from 'common/util/parse'
 
 const DisplayImage = Image.configure({
   HTMLAttributes: {
@@ -148,6 +155,66 @@ function isValidIframe(text: string) {
   return /^<iframe.*<\/iframe>$/.test(text)
 }
 
+function FloatingMenu(props: { editor: Editor | null }) {
+  const { editor } = props
+
+  const [url, setUrl] = useState<string | null>(null)
+
+  if (!editor) return null
+
+  // current selection
+  const isBold = editor.isActive('bold')
+  const isItalic = editor.isActive('italic')
+  const isLink = editor.isActive('link')
+
+  const setLink = () => {
+    const href = url && getUrl(url)
+    if (href) {
+      editor.chain().focus().extendMarkRange('link').setLink({ href }).run()
+    }
+  }
+
+  const unsetLink = () => editor.chain().focus().unsetLink().run()
+
+  return (
+    <BubbleMenu
+      editor={editor}
+      className="flex gap-2 rounded-sm bg-slate-700 p-1 text-white"
+    >
+      {url === null ? (
+        <>
+          <button onClick={() => editor.chain().focus().toggleBold().run()}>
+            <BoldIcon className={clsx('h-5', isBold && 'text-indigo-200')} />
+          </button>
+          <button onClick={() => editor.chain().focus().toggleItalic().run()}>
+            <ItalicIcon
+              className={clsx('h-5', isItalic && 'text-indigo-200')}
+            />
+          </button>
+          <button onClick={() => (isLink ? unsetLink() : setUrl(''))}>
+            <LinkIcon className={clsx('h-5', isLink && 'text-indigo-200')} />
+          </button>
+        </>
+      ) : (
+        <>
+          <input
+            type="text"
+            className="h-5 border-0 bg-inherit text-sm !shadow-none !ring-0"
+            placeholder="Type or paste a link"
+            onChange={(e) => setUrl(e.target.value)}
+          />
+          <button onClick={() => (setLink(), setUrl(null))}>
+            <CheckIcon className="h-5 w-5" />
+          </button>
+          <button onClick={() => (unsetLink(), setUrl(null))}>
+            <TrashIcon className="h-5 w-5" />
+          </button>
+        </>
+      )}
+    </BubbleMenu>
+  )
+}
+
 export function TextEditor(props: {
   editor: Editor | null
   upload: ReturnType<typeof useUploadMutation>
@@ -162,6 +229,7 @@ export function TextEditor(props: {
       {/* hide placeholder when focused */}
       <div className="relative w-full [&:focus-within_p.is-empty]:before:content-none">
         <div className="rounded-lg border border-gray-300 bg-white shadow-sm focus-within:border-indigo-500 focus-within:ring-1 focus-within:ring-indigo-500">
+          <FloatingMenu editor={editor} />
           <EditorContent editor={editor} />
           {/* Toolbar, with buttons for images and embeds */}
           <div className="flex h-9 items-center gap-5 pl-4 pr-1">

web/components/editor/market-modal.tsx

@@ -1,12 +1,6 @@
 import { Editor } from '@tiptap/react'
 import { Contract } from 'common/contract'
-import { useState } from 'react'
-import { Button } from '../button'
-import { ContractSearch } from '../contract-search'
-import { Col } from '../layout/col'
-import { Modal } from '../layout/modal'
-import { Row } from '../layout/row'
-import { LoadingIndicator } from '../loading-indicator'
+import { SelectMarketsModal } from '../contract-select-modal'
 import { embedContractCode, embedContractGridCode } from '../share-embed-button'
 import { insertContent } from './utils'
 
@@ -17,83 +11,23 @@ export function MarketModal(props: {
 }) {
   const { editor, open, setOpen } = props
 
-  const [contracts, setContracts] = useState<Contract[]>([])
-  const [loading, setLoading] = useState(false)
-
-  async function addContract(contract: Contract) {
-    if (contracts.map((c) => c.id).includes(contract.id)) {
-      setContracts(contracts.filter((c) => c.id !== contract.id))
-    } else setContracts([...contracts, contract])
-  }
-
-  async function doneAddingContracts() {
-    setLoading(true)
+  function onSubmit(contracts: Contract[]) {
     if (contracts.length == 1) {
       insertContent(editor, embedContractCode(contracts[0]))
     } else if (contracts.length > 1) {
       insertContent(editor, embedContractGridCode(contracts))
     }
-    setLoading(false)
-    setOpen(false)
-    setContracts([])
   }
 
   return (
-    <Modal open={open} setOpen={setOpen} className={'sm:p-0'} size={'lg'}>
-      <Col className="h-[85vh] w-full gap-4 rounded-md bg-white">
-        <Row className="p-8 pb-0">
-          <div className={'text-xl text-indigo-700'}>Embed a market</div>
-
-          {!loading && (
-            <Row className="grow justify-end gap-4">
-              {contracts.length == 1 && (
-                <Button onClick={doneAddingContracts} color={'indigo'}>
-                  Embed 1 question
-                </Button>
-              )}
-              {contracts.length > 1 && (
-                <Button onClick={doneAddingContracts} color={'indigo'}>
-                  Embed grid of {contracts.length} question
-                  {contracts.length > 1 && 's'}
-                </Button>
-              )}
-              <Button
-                onClick={() => {
-                  if (contracts.length > 0) {
-                    setContracts([])
-                  } else {
-                    setOpen(false)
-                  }
-                }}
-                color="gray"
-              >
-                {contracts.length > 0 ? 'Reset' : 'Cancel'}
-              </Button>
-            </Row>
-          )}
-        </Row>
-
-        {loading && (
-          <div className="w-full justify-center">
-            <LoadingIndicator />
-          </div>
-        )}
-
-        <div className="overflow-y-scroll sm:px-8">
-          <ContractSearch
-            hideOrderSelector
-            onContractClick={addContract}
-            cardHideOptions={{ hideGroupLink: true, hideQuickBet: true }}
-            highlightOptions={{
-              contractIds: contracts.map((c) => c.id),
-              highlightClassName:
-                '!bg-indigo-100 outline outline-2 outline-indigo-300',
-            }}
-            additionalFilter={{}} /* hide pills */
-            headerClassName="bg-white"
-          />
-        </div>
-      </Col>
-    </Modal>
+    <SelectMarketsModal
+      title="Embed markets"
+      open={open}
+      setOpen={setOpen}
+      submitLabel={(len) =>
+        len == 1 ? 'Embed 1 question' : `Embed grid of ${len} questions`
+      }
+      onSubmit={onSubmit}
+    />
   )
 }

web/components/editor/tweet-embed.tsx

@@ -12,7 +12,7 @@ export default function WrappedTwitterTweetEmbed(props: {
   const tweetId = props.node.attrs.tweetId.slice(1)
 
   return (
-    <NodeViewWrapper className="tiptap-tweet">
+    <NodeViewWrapper className="tiptap-tweet [&_.twitter-tweet]:mx-auto">
       <TwitterTweetEmbed tweetId={tweetId} />
     </NodeViewWrapper>
   )

web/components/feed/contract-activity.tsx

@@ -1,8 +1,10 @@
+import { useState } from 'react'
 import { Contract, FreeResponseContract } from 'common/contract'
 import { ContractComment } from 'common/comment'
 import { Answer } from 'common/answer'
 import { Bet } from 'common/bet'
 import { getOutcomeProbability } from 'common/calculate'
+import { Pagination } from 'web/components/pagination'
 import { FeedBet } from './feed-bets'
 import { FeedLiquidity } from './feed-liquidity'
 import { FeedAnswerCommentGroup } from './feed-answer-comment-group'
@@ -19,6 +21,10 @@ export function ContractBetsActivity(props: {
   lps: LiquidityProvision[]
 }) {
   const { contract, bets, lps } = props
+  const [page, setPage] = useState(0)
+  const ITEMS_PER_PAGE = 50
+  const start = page * ITEMS_PER_PAGE
+  const end = start + ITEMS_PER_PAGE
 
   const items = [
     ...bets.map((bet) => ({
@@ -33,24 +39,35 @@ export function ContractBetsActivity(props: {
     })),
   ]
 
-  const sortedItems = sortBy(items, (item) =>
+  const pageItems = sortBy(items, (item) =>
     item.type === 'bet'
       ? -item.bet.createdTime
       : item.type === 'liquidity'
       ? -item.lp.createdTime
       : undefined
-  )
+  ).slice(start, end)
 
   return (
-    <Col className="gap-4">
-      {sortedItems.map((item) =>
-        item.type === 'bet' ? (
-          <FeedBet key={item.id} contract={contract} bet={item.bet} />
-        ) : (
-          <FeedLiquidity key={item.id} liquidity={item.lp} />
-        )
-      )}
-    </Col>
+    <>
+      <Col className="mb-4 gap-4">
+        {pageItems.map((item) =>
+          item.type === 'bet' ? (
+            <FeedBet key={item.id} contract={contract} bet={item.bet} />
+          ) : (
+            <FeedLiquidity key={item.id} liquidity={item.lp} />
+          )
+        )}
+      </Col>
+      <Pagination
+        page={page}
+        itemsPerPage={50}
+        totalItems={items.length}
+        setPage={setPage}
+        scrollToTop
+        nextTitle={'Older'}
+        prevTitle={'Newer'}
+      />
+    </>
   )
 }
 

web/components/feed/feed-bets.tsx

@@ -1,8 +1,7 @@
 import dayjs from 'dayjs'
 import { Contract } from 'common/contract'
 import { Bet } from 'common/bet'
-import { User } from 'common/user'
-import { useUser, useUserById } from 'web/hooks/use-user'
+import { useUser } from 'web/hooks/use-user'
 import { Row } from 'web/components/layout/row'
 import { Avatar, EmptyAvatar } from 'web/components/avatar'
 import clsx from 'clsx'
@@ -15,32 +14,24 @@ import { SiteLink } from 'web/components/site-link'
 import { getChallenge, getChallengeUrl } from 'web/lib/firebase/challenges'
 import { Challenge } from 'common/challenge'
 import { UserLink } from 'web/components/user-link'
+import { BETTOR } from 'common/user'
 
 export function FeedBet(props: { contract: Contract; bet: Bet }) {
   const { contract, bet } = props
-  const { userId, createdTime } = bet
-
-  const isBeforeJune2022 = dayjs(createdTime).isBefore('2022-06-01')
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const bettor = isBeforeJune2022 ? undefined : useUserById(userId)
-
-  const user = useUser()
-  const isSelf = user?.id === userId
+  const { userAvatarUrl, userUsername, createdTime } = bet
+  const showUser = dayjs(createdTime).isAfter('2022-06-01')
 
   return (
     <Row className="items-center gap-2 pt-3">
-      {isSelf ? (
-        <Avatar avatarUrl={user.avatarUrl} username={user.username} />
-      ) : bettor ? (
-        <Avatar avatarUrl={bettor.avatarUrl} username={bettor.username} />
+      {showUser ? (
+        <Avatar avatarUrl={userAvatarUrl} username={userUsername} />
       ) : (
         <EmptyAvatar className="mx-1" />
       )}
       <BetStatusText
         bet={bet}
         contract={contract}
-        isSelf={isSelf}
-        bettor={bettor}
+        hideUser={!showUser}
         className="flex-1"
       />
     </Row>
@@ -50,13 +41,13 @@ export function FeedBet(props: { contract: Contract; bet: Bet }) {
 export function BetStatusText(props: {
   contract: Contract
   bet: Bet
-  isSelf: boolean
-  bettor?: User
+  hideUser?: boolean
   hideOutcome?: boolean
   className?: string
 }) {
-  const { bet, contract, bettor, isSelf, hideOutcome, className } = props
+  const { bet, contract, hideUser, hideOutcome, className } = props
   const { outcomeType } = contract
+  const self = useUser()
   const isPseudoNumeric = outcomeType === 'PSEUDO_NUMERIC'
   const isFreeResponse = outcomeType === 'FREE_RESPONSE'
   const { amount, outcome, createdTime, challengeSlug } = bet
@@ -101,10 +92,10 @@ export function BetStatusText(props: {
 
   return (
     <div className={clsx('text-sm text-gray-500', className)}>
-      {bettor ? (
-        <UserLink name={bettor.name} username={bettor.username} />
+      {!hideUser ? (
+        <UserLink name={bet.userName} username={bet.userUsername} />
       ) : (
-        <span>{isSelf ? 'You' : 'A trader'}</span>
+        <span>{self?.id === bet.userId ? 'You' : `A ${BETTOR}`}</span>
       )}{' '}
       {bought} {money}
       {outOfTotalAmount}

web/components/feed/feed-comments.tsx

@@ -1,6 +1,6 @@
 import { Bet } from 'common/bet'
 import { ContractComment } from 'common/comment'
-import { User } from 'common/user'
+import { PRESENT_BET, User } from 'common/user'
 import { Contract } from 'common/contract'
 import React, { useEffect, useState } from 'react'
 import { minBy, maxBy, partition, sumBy, Dictionary } from 'lodash'
@@ -14,9 +14,7 @@ import { OutcomeLabel } from 'web/components/outcome-label'
 import { CopyLinkDateTimeComponent } from 'web/components/feed/copy-link-date-time'
 import { firebaseLogin } from 'web/lib/firebase/users'
 import { createCommentOnContract } from 'web/lib/firebase/comments'
-import { BetStatusText } from 'web/components/feed/feed-bets'
 import { Col } from 'web/components/layout/col'
-import { getProbability } from 'common/calculate'
 import { track } from 'web/lib/service/analytics'
 import { Tipper } from '../tipper'
 import { CommentTipMap, CommentTips } from 'web/hooks/use-tip-txns'
@@ -257,7 +255,7 @@ function CommentStatus(props: {
   const { contract, outcome, prob } = props
   return (
     <>
-      {' betting '}
+      {` ${PRESENT_BET}ing `}
       <OutcomeLabel outcome={outcome} contract={contract} truncate="short" />
       {prob && ' at ' + Math.round(prob * 100) + '%'}
     </>
@@ -301,74 +299,14 @@ export function ContractCommentInput(props: {
   const { id } = mostRecentCommentableBet || { id: undefined }
 
   return (
-    <Col>
-      <CommentBetArea
-        betsByCurrentUser={props.betsByCurrentUser}
-        contract={props.contract}
-        commentsByCurrentUser={props.commentsByCurrentUser}
-        parentAnswerOutcome={props.parentAnswerOutcome}
-        user={useUser()}
-        className={props.className}
-        mostRecentCommentableBet={mostRecentCommentableBet}
-      />
-      <CommentInput
-        replyToUser={props.replyToUser}
-        parentAnswerOutcome={props.parentAnswerOutcome}
-        parentCommentId={props.parentCommentId}
-        onSubmitComment={onSubmitComment}
-        className={props.className}
-        presetId={id}
-      />
-    </Col>
-  )
-}
-
-function CommentBetArea(props: {
-  betsByCurrentUser: Bet[]
-  contract: Contract
-  commentsByCurrentUser: ContractComment[]
-  parentAnswerOutcome?: string
-  user?: User | null
-  className?: string
-  mostRecentCommentableBet?: Bet
-}) {
-  const { betsByCurrentUser, contract, user, mostRecentCommentableBet } = props
-
-  const { userPosition, outcome } = getBettorsLargestPositionBeforeTime(
-    contract,
-    Date.now(),
-    betsByCurrentUser
-  )
-
-  const isNumeric = contract.outcomeType === 'NUMERIC'
-
-  return (
-    <Row className={clsx(props.className, 'mb-2 gap-1 sm:gap-2')}>
-      <div className="mb-1 text-gray-500">
-        {mostRecentCommentableBet && (
-          <BetStatusText
-            contract={contract}
-            bet={mostRecentCommentableBet}
-            isSelf={true}
-            hideOutcome={isNumeric || contract.outcomeType === 'FREE_RESPONSE'}
-          />
-        )}
-        {!mostRecentCommentableBet && user && userPosition > 0 && !isNumeric && (
-          <>
-            {"You're"}
-            <CommentStatus
-              outcome={outcome}
-              contract={contract}
-              prob={
-                contract.outcomeType === 'BINARY'
-                  ? getProbability(contract)
-                  : undefined
-              }
-            />
-          </>
-        )}
-      </div>
-    </Row>
+    <CommentInput
+      replyToUser={props.replyToUser}
+      parentAnswerOutcome={props.parentAnswerOutcome}
+      parentCommentId={props.parentCommentId}
+      onSubmitComment={onSubmitComment}
+      className={props.className}
+      presetId={id}
+    />
   )
 }
 

web/components/feed/feed-liquidity.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx'
 import dayjs from 'dayjs'
-import { User } from 'common/user'
+import { BETTOR, User } from 'common/user'
 import { useUser, useUserById } from 'web/hooks/use-user'
 import { Row } from 'web/components/layout/row'
 import { Avatar, EmptyAvatar } from 'web/components/avatar'
@@ -25,7 +25,7 @@ export function FeedLiquidity(props: {
   const isSelf = user?.id === userId
 
   return (
-    <Row className="flex w-full gap-2 pt-3">
+    <Row className="items-center gap-2 pt-3">
       {isSelf ? (
         <Avatar avatarUrl={user.avatarUrl} username={user.username} />
       ) : bettor ? (
@@ -63,7 +63,7 @@ export function LiquidityStatusText(props: {
       {bettor ? (
         <UserLink name={bettor.name} username={bettor.username} />
       ) : (
-        <span>{isSelf ? 'You' : 'A trader'}</span>
+        <span>{isSelf ? 'You' : `A ${BETTOR}`}</span>
       )}{' '}
       {bought} a subsidy of {money}
       <RelativeTimestamp time={createdTime} />

web/components/follow-market-button.tsx

@@ -11,7 +11,7 @@ import { User } from 'common/user'
 import { useContractFollows } from 'web/hooks/use-follows'
 import { firebaseLogin, updateUser } from 'web/lib/firebase/users'
 import { track } from 'web/lib/service/analytics'
-import { FollowMarketModal } from 'web/components/contract/follow-market-modal'
+import { WatchMarketModal } from 'web/components/contract/watch-market-modal'
 import { useState } from 'react'
 import { Col } from 'web/components/layout/col'
 
@@ -65,7 +65,7 @@ export const FollowMarketButton = (props: {
           Watch
         </Col>
       )}
-      <FollowMarketModal
+      <WatchMarketModal
         open={open}
         setOpen={setOpen}
         title={`You ${

web/components/landing-page-panel.tsx

@@ -1,3 +1,4 @@
+import Image from 'next/future/image'
 import { SparklesIcon } from '@heroicons/react/solid'
 
 import { Contract } from 'common/contract'
@@ -18,7 +19,7 @@ export function LandingPagePanel(props: { hotContracts: Contract[] }) {
   return (
     <>
       <Col className="mb-6 rounded-xl sm:m-12 sm:mt-0">
-        <img
+        <Image
           height={250}
           width={250}
           className="self-center"

web/components/limit-bets.tsx

@@ -4,7 +4,7 @@ import { getFormattedMappedValue } from 'common/pseudo-numeric'
 import { formatMoney, formatPercent } from 'common/util/format'
 import { sortBy } from 'lodash'
 import { useState } from 'react'
-import { useUser, useUserById } from 'web/hooks/use-user'
+import { useUser } from 'web/hooks/use-user'
 import { cancelBet } from 'web/lib/firebase/api'
 import { Avatar } from './avatar'
 import { Button } from './button'
@@ -109,16 +109,14 @@ function LimitBet(props: {
     setIsCancelling(true)
   }
 
-  const user = useUserById(bet.userId)
-
   return (
     <tr>
       {!isYou && (
         <td>
           <Avatar
             size={'sm'}
-            avatarUrl={user?.avatarUrl}
-            username={user?.username}
+            avatarUrl={bet.userAvatarUrl}
+            username={bet.userUsername}
           />
         </td>
       )}

web/components/liquidity-panel.tsx

@@ -13,6 +13,7 @@ import { NoLabel, YesLabel } from './outcome-label'
 import { Col } from './layout/col'
 import { track } from 'web/lib/service/analytics'
 import { InfoTooltip } from './info-tooltip'
+import { BETTORS, PRESENT_BET } from 'common/user'
 
 export function LiquidityPanel(props: { contract: CPMMContract }) {
   const { contract } = props
@@ -104,7 +105,9 @@ function AddLiquidityPanel(props: { contract: CPMMContract }) {
     <>
       <div className="mb-4 text-gray-500">
         Contribute your M$ to make this market more accurate.{' '}
-        <InfoTooltip text="More liquidity stabilizes the market, encouraging traders to bet. You can withdraw your subsidy at any time." />
+        <InfoTooltip
+          text={`More liquidity stabilizes the market, encouraging ${BETTORS} to ${PRESENT_BET}. You can withdraw your subsidy at any time.`}
+        />
       </div>
 
       <Row>

web/components/market-intro-panel.tsx

@@ -0,0 +1,27 @@
+import Image from 'next/future/image'
+
+import { Col } from './layout/col'
+import { BetSignUpPrompt } from './sign-up-prompt'
+
+export function MarketIntroPanel() {
+  return (
+    <Col>
+      <div className="text-xl">Play-money predictions</div>
+
+      <Image
+        height={125}
+        width={125}
+        className="my-4 self-center"
+        src="/welcome/manipurple.png"
+        alt="Manifold Markets gradient logo"
+      />
+
+      <div className="mb-4 text-sm">
+        Manifold Markets is a play-money prediction market platform where you
+        can forecast anything.
+      </div>
+
+      <BetSignUpPrompt />
+    </Col>
+  )
+}

web/components/nav/nav-bar.tsx

@@ -17,6 +17,7 @@ import { useRouter } from 'next/router'
 import NotificationsIcon from 'web/components/notifications-icon'
 import { useIsIframe } from 'web/hooks/use-is-iframe'
 import { trackCallback } from 'web/lib/service/analytics'
+import { PAST_BETS } from 'common/user'
 
 function getNavigation() {
   return [
@@ -64,7 +65,7 @@ export function BottomNavBar() {
           item={{
             name: formatMoney(user.balance),
             trackingEventName: 'profile',
-            href: `/${user.username}?tab=trades`,
+            href: `/${user.username}?tab=${PAST_BETS}`,
             icon: () => (
               <Avatar
                 className="mx-auto my-1"

web/components/nav/profile-menu.tsx

@@ -4,11 +4,12 @@ import { User } from 'web/lib/firebase/users'
 import { formatMoney } from 'common/util/format'
 import { Avatar } from '../avatar'
 import { trackCallback } from 'web/lib/service/analytics'
+import { PAST_BETS } from 'common/user'
 
 export function ProfileSummary(props: { user: User }) {
   const { user } = props
   return (
-    <Link href={`/${user.username}?tab=trades`}>
+    <Link href={`/${user.username}?tab=${PAST_BETS}`}>
       <a
         onClick={trackCallback('sidebar: profile')}
         className="group mb-3 flex flex-row items-center gap-4 truncate rounded-md py-3 text-gray-500 hover:bg-gray-100 hover:text-gray-700"

web/components/notification-settings.tsx

@@ -0,0 +1,338 @@
+import React, { memo, ReactNode, useEffect, useState } from 'react'
+import { Row } from 'web/components/layout/row'
+import clsx from 'clsx'
+import { PrivateUser } from 'common/user'
+import { updatePrivateUser } from 'web/lib/firebase/users'
+import { Col } from 'web/components/layout/col'
+import {
+  CashIcon,
+  ChatIcon,
+  ChevronDownIcon,
+  ChevronUpIcon,
+  CurrencyDollarIcon,
+  InboxInIcon,
+  InformationCircleIcon,
+  LightBulbIcon,
+  TrendingUpIcon,
+  UserIcon,
+  UsersIcon,
+} from '@heroicons/react/outline'
+import { WatchMarketModal } from 'web/components/contract/watch-market-modal'
+import toast from 'react-hot-toast'
+import { SwitchSetting } from 'web/components/switch-setting'
+import { uniq } from 'lodash'
+import {
+  storageStore,
+  usePersistentState,
+} from 'web/hooks/use-persistent-state'
+import { safeLocalStorage } from 'web/lib/util/local'
+import { NOTIFICATION_DESCRIPTIONS } from 'common/notification'
+import {
+  notification_destination_types,
+  notification_preference,
+} from 'common/user-notification-preferences'
+
+export function NotificationSettings(props: {
+  navigateToSection: string | undefined
+  privateUser: PrivateUser
+}) {
+  const { navigateToSection, privateUser } = props
+  const [showWatchModal, setShowWatchModal] = useState(false)
+
+  const emailsEnabled: Array<notification_preference> = [
+    'all_comments_on_watched_markets',
+    'all_replies_to_my_comments_on_watched_markets',
+    'all_comments_on_contracts_with_shares_in_on_watched_markets',
+
+    'all_answers_on_watched_markets',
+    'all_replies_to_my_answers_on_watched_markets',
+    'all_answers_on_contracts_with_shares_in_on_watched_markets',
+
+    'your_contract_closed',
+    'all_comments_on_my_markets',
+    'all_answers_on_my_markets',
+
+    'resolutions_on_watched_markets_with_shares_in',
+    'resolutions_on_watched_markets',
+
+    'trending_markets',
+    'onboarding_flow',
+    'thank_you_for_purchases',
+
+    'tagged_user', // missing tagged on contract description email
+    'contract_from_followed_user',
+    'unique_bettors_on_your_contract',
+    // TODO: add these
+    // one-click unsubscribe only unsubscribes them from that type only, (well highlighted), then a link to manage the rest of their notifications
+    // 'profit_loss_updates', - changes in markets you have shares in
+    // biggest winner, here are the rest of your markets
+
+    // 'referral_bonuses',
+    // 'on_new_follow',
+    // 'tips_on_your_markets',
+    // 'tips_on_your_comments',
+    // maybe the following?
+    // 'probability_updates_on_watched_markets',
+    // 'limit_order_fills',
+  ]
+  const browserDisabled: Array<notification_preference> = [
+    'trending_markets',
+    'profit_loss_updates',
+    'onboarding_flow',
+    'thank_you_for_purchases',
+  ]
+
+  type SectionData = {
+    label: string
+    subscriptionTypes: Partial<notification_preference>[]
+  }
+
+  const comments: SectionData = {
+    label: 'New Comments',
+    subscriptionTypes: [
+      'all_comments_on_watched_markets',
+      'all_comments_on_contracts_with_shares_in_on_watched_markets',
+      // TODO: combine these two
+      'all_replies_to_my_comments_on_watched_markets',
+      'all_replies_to_my_answers_on_watched_markets',
+    ],
+  }
+
+  const answers: SectionData = {
+    label: 'New Answers',
+    subscriptionTypes: [
+      'all_answers_on_watched_markets',
+      'all_answers_on_contracts_with_shares_in_on_watched_markets',
+    ],
+  }
+  const updates: SectionData = {
+    label: 'Updates & Resolutions',
+    subscriptionTypes: [
+      'market_updates_on_watched_markets',
+      'market_updates_on_watched_markets_with_shares_in',
+      'resolutions_on_watched_markets',
+      'resolutions_on_watched_markets_with_shares_in',
+    ],
+  }
+  const yourMarkets: SectionData = {
+    label: 'Markets You Created',
+    subscriptionTypes: [
+      'your_contract_closed',
+      'all_comments_on_my_markets',
+      'all_answers_on_my_markets',
+      'subsidized_your_market',
+      'tips_on_your_markets',
+    ],
+  }
+  const bonuses: SectionData = {
+    label: 'Bonuses',
+    subscriptionTypes: [
+      'betting_streaks',
+      'referral_bonuses',
+      'unique_bettors_on_your_contract',
+    ],
+  }
+  const otherBalances: SectionData = {
+    label: 'Other',
+    subscriptionTypes: [
+      'loan_income',
+      'limit_order_fills',
+      'tips_on_your_comments',
+    ],
+  }
+  const userInteractions: SectionData = {
+    label: 'Users',
+    subscriptionTypes: [
+      'tagged_user',
+      'on_new_follow',
+      'contract_from_followed_user',
+    ],
+  }
+  const generalOther: SectionData = {
+    label: 'Other',
+    subscriptionTypes: [
+      'trending_markets',
+      'thank_you_for_purchases',
+      'onboarding_flow',
+    ],
+  }
+
+  function NotificationSettingLine(props: {
+    description: string
+    subscriptionTypeKey: notification_preference
+    destinations: notification_destination_types[]
+  }) {
+    const { description, subscriptionTypeKey, destinations } = props
+    const previousInAppValue = destinations.includes('browser')
+    const previousEmailValue = destinations.includes('email')
+    const [inAppEnabled, setInAppEnabled] = useState(previousInAppValue)
+    const [emailEnabled, setEmailEnabled] = useState(previousEmailValue)
+    const loading = 'Changing Notifications Settings'
+    const success = 'Changed Notification Settings!'
+    const highlight = navigateToSection === subscriptionTypeKey
+
+    const changeSetting = (setting: 'browser' | 'email', newValue: boolean) => {
+      toast
+        .promise(
+          updatePrivateUser(privateUser.id, {
+            notificationPreferences: {
+              ...privateUser.notificationPreferences,
+              [subscriptionTypeKey]: destinations.includes(setting)
+                ? destinations.filter((d) => d !== setting)
+                : uniq([...destinations, setting]),
+            },
+          }),
+          {
+            success,
+            loading,
+            error: 'Error changing notification settings. Try again?',
+          }
+        )
+        .then(() => {
+          if (setting === 'browser') {
+            setInAppEnabled(newValue)
+          } else {
+            setEmailEnabled(newValue)
+          }
+        })
+    }
+
+    return (
+      <Row
+        className={clsx(
+          'my-1 gap-1 text-gray-300',
+          highlight ? 'rounded-md bg-indigo-100 p-1' : ''
+        )}
+      >
+        <Col className="ml-3 gap-2 text-sm">
+          <Row className="gap-2 font-medium text-gray-700">
+            <span>{description}</span>
+          </Row>
+          <Row className={'gap-4'}>
+            {!browserDisabled.includes(subscriptionTypeKey) && (
+              <SwitchSetting
+                checked={inAppEnabled}
+                onChange={(newVal) => changeSetting('browser', newVal)}
+                label={'Web'}
+              />
+            )}
+            {emailsEnabled.includes(subscriptionTypeKey) && (
+              <SwitchSetting
+                checked={emailEnabled}
+                onChange={(newVal) => changeSetting('email', newVal)}
+                label={'Email'}
+              />
+            )}
+          </Row>
+        </Col>
+      </Row>
+    )
+  }
+
+  const getUsersSavedPreference = (key: notification_preference) => {
+    return privateUser.notificationPreferences[key] ?? []
+  }
+
+  const Section = memo(function Section(props: {
+    icon: ReactNode
+    data: SectionData
+  }) {
+    const { icon, data } = props
+    const { label, subscriptionTypes } = data
+    const expand =
+      navigateToSection &&
+      subscriptionTypes.includes(navigateToSection as notification_preference)
+
+    // Not sure how to prevent re-render (and collapse of an open section)
+    // due to a private user settings change. Just going to persist expanded state here
+    const [expanded, setExpanded] = usePersistentState(expand ?? false, {
+      key: 'NotificationsSettingsSection-' + subscriptionTypes.join('-'),
+      store: storageStore(safeLocalStorage()),
+    })
+
+    // Not working as the default value for expanded, so using a useEffect
+    useEffect(() => {
+      if (expand) setExpanded(true)
+    }, [expand, setExpanded])
+
+    return (
+      <Col className={clsx('ml-2 gap-2')}>
+        <Row
+          className={'mt-1 cursor-pointer items-center gap-2 text-gray-600'}
+          onClick={() => setExpanded(!expanded)}
+        >
+          {icon}
+          <span>{label}</span>
+
+          {expanded ? (
+            <ChevronUpIcon className="h-5 w-5 text-xs text-gray-500">
+              Hide
+            </ChevronUpIcon>
+          ) : (
+            <ChevronDownIcon className="h-5 w-5 text-xs text-gray-500">
+              Show
+            </ChevronDownIcon>
+          )}
+        </Row>
+        <Col className={clsx(expanded ? 'block' : 'hidden', 'gap-2 p-2')}>
+          {subscriptionTypes.map((subType) => (
+            <NotificationSettingLine
+              subscriptionTypeKey={subType as notification_preference}
+              destinations={getUsersSavedPreference(
+                subType as notification_preference
+              )}
+              description={NOTIFICATION_DESCRIPTIONS[subType].simple}
+            />
+          ))}
+        </Col>
+      </Col>
+    )
+  })
+
+  return (
+    <div className={'p-2'}>
+      <Col className={'gap-6'}>
+        <Row className={'gap-2 text-xl text-gray-700'}>
+          <span>Notifications for Watched Markets</span>
+          <InformationCircleIcon
+            className="-mb-1 h-5 w-5 cursor-pointer text-gray-500"
+            onClick={() => setShowWatchModal(true)}
+          />
+        </Row>
+        <Section icon={<ChatIcon className={'h-6 w-6'} />} data={comments} />
+        <Section
+          icon={<TrendingUpIcon className={'h-6 w-6'} />}
+          data={updates}
+        />
+        <Section
+          icon={<LightBulbIcon className={'h-6 w-6'} />}
+          data={answers}
+        />
+        <Section icon={<UserIcon className={'h-6 w-6'} />} data={yourMarkets} />
+        <Row className={'gap-2 text-xl text-gray-700'}>
+          <span>Balance Changes</span>
+        </Row>
+        <Section
+          icon={<CurrencyDollarIcon className={'h-6 w-6'} />}
+          data={bonuses}
+        />
+        <Section
+          icon={<CashIcon className={'h-6 w-6'} />}
+          data={otherBalances}
+        />
+        <Row className={'gap-2 text-xl text-gray-700'}>
+          <span>General</span>
+        </Row>
+        <Section
+          icon={<UsersIcon className={'h-6 w-6'} />}
+          data={userInteractions}
+        />
+        <Section
+          icon={<InboxInIcon className={'h-6 w-6'} />}
+          data={generalOther}
+        />
+        <WatchMarketModal open={showWatchModal} setOpen={setShowWatchModal} />
+      </Col>
+    </div>
+  )
+}

web/components/numeric-resolution-panel.tsx

@@ -10,13 +10,16 @@ import { NumericContract, PseudoNumericContract } from 'common/contract'
 import { APIError, resolveMarket } from 'web/lib/firebase/api'
 import { BucketInput } from './bucket-input'
 import { getPseudoProbability } from 'common/pseudo-numeric'
+import { BETTOR, BETTORS, PAST_BETS } from 'common/user'
 
 export function NumericResolutionPanel(props: {
+  isAdmin: boolean
+  isCreator: boolean
   creator: User
   contract: NumericContract | PseudoNumericContract
   className?: string
 }) {
-  const { contract, className } = props
+  const { contract, className, isAdmin, isCreator } = props
   const { min, max, outcomeType } = contract
 
   const [outcomeMode, setOutcomeMode] = useState<
@@ -78,10 +81,20 @@ export function NumericResolutionPanel(props: {
       : 'btn-disabled'
 
   return (
-    <Col className={clsx('rounded-md bg-white px-8 py-6', className)}>
-      <div className="mb-6 whitespace-nowrap text-2xl">Resolve market</div>
+    <Col
+      className={clsx(
+        'relative w-full rounded-md bg-white px-8 py-6',
+        className
+      )}
+    >
+      {isAdmin && !isCreator && (
+        <span className="absolute right-4 top-4 rounded bg-red-200 p-1 text-xs text-red-600">
+          ADMIN
+        </span>
+      )}
+      <div className="whitespace-nowrap text-2xl">Resolve market</div>
 
-      <div className="mb-3 text-sm text-gray-500">Outcome</div>
+      <div className="my-3 text-sm text-gray-500">Outcome</div>
 
       <Spacer h={4} />
 
@@ -99,9 +112,12 @@ export function NumericResolutionPanel(props: {
 
       <div>
         {outcome === 'CANCEL' ? (
-          <>All trades will be returned with no fees.</>
+          <>
+            All {PAST_BETS} will be returned. Unique {BETTOR} bonuses will be
+            withdrawn from your account
+          </>
         ) : (
-          <>Resolving this market will immediately pay out traders.</>
+          <>Resolving this market will immediately pay out {BETTORS}.</>
         )}
       </div>
 

web/components/profile/betting-streak-modal.tsx

@@ -3,26 +3,52 @@ import { Col } from 'web/components/layout/col'
 import {
   BETTING_STREAK_BONUS_AMOUNT,
   BETTING_STREAK_BONUS_MAX,
+  BETTING_STREAK_RESET_HOUR,
 } from 'common/economy'
 import { formatMoney } from 'common/util/format'
+import { User } from 'common/user'
+import dayjs from 'dayjs'
+import clsx from 'clsx'
 
 export function BettingStreakModal(props: {
   isOpen: boolean
   setOpen: (open: boolean) => void
+  currentUser?: User | null
 }) {
-  const { isOpen, setOpen } = props
+  const { isOpen, setOpen, currentUser } = props
+  const missingStreak = currentUser && !hasCompletedStreakToday(currentUser)
 
   return (
     <Modal open={isOpen} setOpen={setOpen}>
       <Col className="items-center gap-4 rounded-md bg-white px-8 py-6">
-        <span className={'text-8xl'}>🔥</span>
-        <span className="text-xl">Daily betting streaks</span>
+        <span
+          className={clsx(
+            'text-8xl',
+            missingStreak ? 'grayscale' : 'grayscale-0'
+          )}
+        >
+          🔥
+        </span>
+        {missingStreak && (
+          <Col className={' gap-2 text-center'}>
+            <span className={'font-bold'}>
+              You haven't predicted yet today!
+            </span>
+            <span className={'ml-2'}>
+              If the fire icon is gray, this means you haven't predicted yet
+              today to get your streak bonus. Get out there and make a
+              prediction!
+            </span>
+          </Col>
+        )}
+        <span className="text-xl">Daily prediction streaks</span>
         <Col className={'gap-2'}>
           <span className={'text-indigo-700'}>• What are they?</span>
           <span className={'ml-2'}>
             You get {formatMoney(BETTING_STREAK_BONUS_AMOUNT)} more for each day
-            of consecutive betting up to {formatMoney(BETTING_STREAK_BONUS_MAX)}
-            . The more days you bet in a row, the more you earn!
+            of consecutive predicting up to{' '}
+            {formatMoney(BETTING_STREAK_BONUS_MAX)}. The more days you predict
+            in a row, the more you earn!
           </span>
           <span className={'text-indigo-700'}>
             • Where can I check my streak?
@@ -36,3 +62,17 @@ export function BettingStreakModal(props: {
     </Modal>
   )
 }
+
+export function hasCompletedStreakToday(user: User) {
+  const now = dayjs().utc()
+  const utcTodayAtResetHour = now
+    .hour(BETTING_STREAK_RESET_HOUR)
+    .minute(0)
+    .second(0)
+  const utcYesterdayAtResetHour = utcTodayAtResetHour.subtract(1, 'day')
+  let resetTime = utcTodayAtResetHour.valueOf()
+  if (now.isBefore(utcTodayAtResetHour)) {
+    resetTime = utcYesterdayAtResetHour.valueOf()
+  }
+  return (user?.lastBetTime ?? 0) > resetTime
+}

web/components/profile/loans-modal.tsx

@@ -1,5 +1,6 @@
 import { Modal } from 'web/components/layout/modal'
 import { Col } from 'web/components/layout/col'
+import { PAST_BETS } from 'common/user'
 
 export function LoansModal(props: {
   isOpen: boolean
@@ -11,7 +12,7 @@ export function LoansModal(props: {
     <Modal open={isOpen} setOpen={setOpen}>
       <Col className="items-center gap-4 rounded-md bg-white px-8 py-6">
         <span className={'text-8xl'}>🏦</span>
-        <span className="text-xl">Daily loans on your trades</span>
+        <span className="text-xl">Daily loans on your {PAST_BETS}</span>
         <Col className={'gap-2'}>
           <span className={'text-indigo-700'}>• What are daily loans?</span>
           <span className={'ml-2'}>