diff --git a/web/components/contract/contract-overview.tsx b/web/components/contract/contract-overview.tsx index d2938a2e..797921bf 100644 --- a/web/components/contract/contract-overview.tsx +++ b/web/components/contract/contract-overview.tsx @@ -22,7 +22,6 @@ import { ContractDescription } from './contract-description' import { ContractDetails } from './contract-details' import { NumericGraph } from './numeric-graph' import { ShareRow } from './share-row' -import { FollowMarketButton } from 'web/components/follow-market-button' export const ContractOverview = (props: { contract: Contract @@ -45,18 +44,7 @@ export const ContractOverview = (props: {
- {(outcomeType === 'FREE_RESPONSE' || - outcomeType === 'MULTIPLE_CHOICE') && - !resolution && ( -
- -
- )} -
- -
- {isBinary && ( - - - {tradingAllowed(contract) && ( - - )} - + {tradingAllowed(contract) && ( + + )}
) : isPseudoNumeric ? ( - - - {tradingAllowed(contract) && } - + {tradingAllowed(contract) && } ) : ( (outcomeType === 'FREE_RESPONSE' || diff --git a/web/components/contract/share-row.tsx b/web/components/contract/share-row.tsx index 9011ff1b..0aa0c6b0 100644 --- a/web/components/contract/share-row.tsx +++ b/web/components/contract/share-row.tsx @@ -10,6 +10,7 @@ import { User } from 'common/user' import { CHALLENGES_ENABLED } from 'common/challenge' import { ShareModal } from './share-modal' import { withTracking } from 'web/lib/service/analytics' +import { FollowMarketButton } from 'web/components/follow-market-button' export function ShareRow(props: { contract: Contract @@ -62,6 +63,7 @@ export function ShareRow(props: { /> )} + ) } diff --git a/web/components/follow-market-button.tsx b/web/components/follow-market-button.tsx index 0a8ff4b4..026902f3 100644 --- a/web/components/follow-market-button.tsx +++ b/web/components/follow-market-button.tsx @@ -5,7 +5,7 @@ import { unFollowContract, } from 'web/lib/firebase/contracts' import toast from 'react-hot-toast' -import { CheckIcon, HeartIcon } from '@heroicons/react/outline' +import { CheckIcon, EyeIcon, EyeOffIcon } from '@heroicons/react/outline' import clsx from 'clsx' import { User } from 'common/user' import { useContractFollows } from 'web/hooks/use-follows' @@ -13,6 +13,7 @@ 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 { useState } from 'react' +import { Row } from 'web/components/layout/row' export const FollowMarketButton = (props: { contract: Contract @@ -30,7 +31,7 @@ export const FollowMarketButton = (props: { if (!user) return firebaseLogin() if (followers?.includes(user.id)) { await unFollowContract(contract.id, user.id) - toast('Notifications from this market are now silenced.', { + toast("You'll no longer receive notifications from this market", { icon: , }) track('Unfollow Market', { @@ -38,7 +39,7 @@ export const FollowMarketButton = (props: { }) } else { await followContract(contract.id, user.id) - toast('You are now following this market!', { + toast("You'll now receive notifications from this market!", { icon: , }) track('Follow Market', { @@ -54,15 +55,21 @@ export const FollowMarketButton = (props: { }} > {followers?.includes(user?.id ?? 'nope') ? ( -