From 28af2063c3f735af9311559cc9895f743c88ab93 Mon Sep 17 00:00:00 2001 From: mantikoros <sgrugett@gmail.com> Date: Wed, 7 Sep 2022 14:45:04 -0500 Subject: [PATCH] "bet" => "trade" --- functions/src/place-bet.ts | 2 +- web/components/answers/answer-bet-panel.tsx | 2 +- web/components/arrange-home.tsx | 2 +- web/components/bet-button.tsx | 2 +- web/components/bet-panel.tsx | 12 ++++++------ web/components/contract-search.tsx | 2 +- web/components/contract/contract-details.tsx | 2 +- web/components/contract/contract-info-dialog.tsx | 2 +- web/components/contract/contract-leaderboard.tsx | 2 +- web/components/contract/contract-tabs.tsx | 4 ++-- web/components/play-money-disclaimer.tsx | 2 +- web/components/profile/loans-modal.tsx | 2 +- web/components/resolution-panel.tsx | 4 ++-- web/components/user-page.tsx | 2 +- web/components/yes-no-selector.tsx | 2 +- web/pages/experimental/home/index.tsx | 2 +- web/pages/notifications.tsx | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/functions/src/place-bet.ts b/functions/src/place-bet.ts index 404fda50..d98430c1 100644 --- a/functions/src/place-bet.ts +++ b/functions/src/place-bet.ts @@ -135,7 +135,7 @@ export const placebet = newEndpoint({}, async (req, auth) => { !isFinite(newP) || Math.min(...Object.values(newPool ?? {})) < CPMM_MIN_POOL_QTY) ) { - throw new APIError(400, 'Bet too large for current liquidity pool.') + throw new APIError(400, 'Trade too large for current liquidity pool.') } const betDoc = contractDoc.collection('bets').doc() diff --git a/web/components/answers/answer-bet-panel.tsx b/web/components/answers/answer-bet-panel.tsx index ace06b6c..dbf7ff11 100644 --- a/web/components/answers/answer-bet-panel.tsx +++ b/web/components/answers/answer-bet-panel.tsx @@ -120,7 +120,7 @@ export function AnswerBetPanel(props: { <Col className={clsx('px-2 pb-2 pt-4 sm:pt-0', className)}> <Row className="items-center justify-between self-stretch"> <div className="text-xl"> - Bet on {isModal ? `"${answer.text}"` : 'this answer'} + Buy answer: {isModal ? `"${answer.text}"` : 'this answer'} </div> {!isModal && ( diff --git a/web/components/arrange-home.tsx b/web/components/arrange-home.tsx index 2c43788c..2f49d144 100644 --- a/web/components/arrange-home.tsx +++ b/web/components/arrange-home.tsx @@ -112,7 +112,7 @@ export const getHomeItems = ( { label: 'Trending', id: 'score' }, { label: 'Newest', id: 'newest' }, { label: 'Close date', id: 'close-date' }, - { label: 'Your bets', id: 'your-bets' }, + { label: 'Your trades', id: 'your-bets' }, ...groups.map((g) => ({ label: g.name, id: g.id, diff --git a/web/components/bet-button.tsx b/web/components/bet-button.tsx index 7d84bbc0..77b17678 100644 --- a/web/components/bet-button.tsx +++ b/web/components/bet-button.tsx @@ -38,7 +38,7 @@ export default function BetButton(props: { className={clsx('my-auto inline-flex min-w-[75px] ', btnClassName)} onClick={() => setOpen(true)} > - Bet + Trade </Button> ) : ( <BetSignUpPrompt /> diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx index c48e92a9..1f2b9bd3 100644 --- a/web/components/bet-panel.tsx +++ b/web/components/bet-panel.tsx @@ -281,7 +281,7 @@ function BuyPanel(props: { title="Whoa, there!" text={`You might not want to spend ${formatPercent( bankrollFraction - )} of your balance on a single bet. \n\nCurrent balance: ${formatMoney( + )} of your balance on a single trade. \n\nCurrent balance: ${formatMoney( user?.balance ?? 0 )}`} /> @@ -379,11 +379,11 @@ function BuyPanel(props: { )} onClick={betDisabled ? undefined : submitBet} > - {isSubmitting ? 'Submitting...' : 'Submit bet'} + {isSubmitting ? 'Submitting...' : 'Submit trade'} </button> )} - {wasSubmitted && <div className="mt-4">Bet submitted!</div>} + {wasSubmitted && <div className="mt-4">Trade submitted!</div>} </Col> ) } @@ -569,7 +569,7 @@ function LimitOrderPanel(props: { <Row className="mt-1 items-center gap-4"> <Col className="gap-2"> <div className="relative ml-1 text-sm text-gray-500"> - Bet {isPseudoNumeric ? <HigherLabel /> : <YesLabel />} up to + Buy {isPseudoNumeric ? <HigherLabel /> : <YesLabel />} up to </div> <ProbabilityOrNumericInput contract={contract} @@ -580,7 +580,7 @@ function LimitOrderPanel(props: { </Col> <Col className="gap-2"> <div className="ml-1 text-sm text-gray-500"> - Bet {isPseudoNumeric ? <LowerLabel /> : <NoLabel />} down to + Buy {isPseudoNumeric ? <LowerLabel /> : <NoLabel />} down to </div> <ProbabilityOrNumericInput contract={contract} @@ -750,7 +750,7 @@ function QuickOrLimitBet(props: { return ( <Row className="align-center mb-4 justify-between"> - <div className="text-4xl">Bet</div> + <div className="text-4xl">Trade</div> {!hideToggle && ( <Row className="mt-1 items-center gap-2"> <PillButton diff --git a/web/components/contract-search.tsx b/web/components/contract-search.tsx index 0beedc1b..8e3b18e0 100644 --- a/web/components/contract-search.tsx +++ b/web/components/contract-search.tsx @@ -441,7 +441,7 @@ function ContractSearchControls(props: { selected={state.pillFilter === 'your-bets'} onSelect={selectPill('your-bets')} > - Your bets + Your trades </PillButton> )} diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx index 48528029..c383d349 100644 --- a/web/components/contract/contract-details.tsx +++ b/web/components/contract/contract-details.tsx @@ -294,7 +294,7 @@ export function ExtraMobileContractDetails(props: { <Tooltip text={`${formatMoney( volume - )} bet - ${uniqueBettors} unique bettors`} + )} bet - ${uniqueBettors} unique traders`} > {volumeTranslation} </Tooltip> diff --git a/web/components/contract/contract-info-dialog.tsx b/web/components/contract/contract-info-dialog.tsx index f376a04a..ae586725 100644 --- a/web/components/contract/contract-info-dialog.tsx +++ b/web/components/contract/contract-info-dialog.tsx @@ -135,7 +135,7 @@ export function ContractInfoDialog(props: { </tr> */} <tr> - <td>Bettors</td> + <td>Traders</td> <td>{bettorsCount}</td> </tr> diff --git a/web/components/contract/contract-leaderboard.tsx b/web/components/contract/contract-leaderboard.tsx index ce5c7da6..1eaf7043 100644 --- a/web/components/contract/contract-leaderboard.tsx +++ b/web/components/contract/contract-leaderboard.tsx @@ -49,7 +49,7 @@ export function ContractLeaderboard(props: { return users && users.length > 0 ? ( <Leaderboard - title="🏅 Top bettors" + title="🏅 Top traders" users={users || []} columns={[ { diff --git a/web/components/contract/contract-tabs.tsx b/web/components/contract/contract-tabs.tsx index 417de12b..40fa9da0 100644 --- a/web/components/contract/contract-tabs.tsx +++ b/web/components/contract/contract-tabs.tsx @@ -116,13 +116,13 @@ export function ContractTabs(props: { badge: `${comments.length}`, }, { - title: 'Bets', + title: 'Trades', content: betActivity, badge: `${visibleBets.length}`, }, ...(!user || !userBets?.length ? [] - : [{ title: 'Your bets', content: yourTrades }]), + : [{ title: 'Your trades', content: yourTrades }]), ]} /> {!user ? ( diff --git a/web/components/play-money-disclaimer.tsx b/web/components/play-money-disclaimer.tsx index 6ee16c1e..a3bda242 100644 --- a/web/components/play-money-disclaimer.tsx +++ b/web/components/play-money-disclaimer.tsx @@ -4,6 +4,6 @@ export const PlayMoneyDisclaimer = () => ( <InfoBox title="Play-money betting" className="mt-4 max-w-md" - text="Mana (M$) is the play-money used by our platform to keep track of your bets. It's completely free for you and your friends to get started!" + text="Mana (M$) is the play-money used by our platform to keep track of your trades. It's completely free for you and your friends to get started!" /> ) diff --git a/web/components/profile/loans-modal.tsx b/web/components/profile/loans-modal.tsx index 46be649a..24b23e5b 100644 --- a/web/components/profile/loans-modal.tsx +++ b/web/components/profile/loans-modal.tsx @@ -11,7 +11,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 bets</span> + <span className="text-xl">Daily loans on your trades</span> <Col className={'gap-2'}> <span className={'text-indigo-700'}>• What are daily loans?</span> <span className={'ml-2'}> diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx index fe062d06..5a7b993e 100644 --- a/web/components/resolution-panel.tsx +++ b/web/components/resolution-panel.tsx @@ -83,14 +83,14 @@ export function ResolutionPanel(props: { <div> {outcome === 'YES' ? ( <> - Winnings will be paid out to YES bettors. + Winnings will be paid out to traders who bought YES. {/* <br /> <br /> You will earn {earnedFees}. */} </> ) : outcome === 'NO' ? ( <> - Winnings will be paid out to NO bettors. + Winnings will be paid out to traders who bought NO. {/* <br /> <br /> You will earn {earnedFees}. */} diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx index 2d4db1eb..81aed562 100644 --- a/web/components/user-page.tsx +++ b/web/components/user-page.tsx @@ -260,7 +260,7 @@ export function UserPage(props: { user: User }) { ), }, { - title: 'Bets', + title: 'Trades', content: ( <> <BetsList user={user} /> diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx index aaf1764e..719308bf 100644 --- a/web/components/yes-no-selector.tsx +++ b/web/components/yes-no-selector.tsx @@ -193,7 +193,7 @@ export function BuyButton(props: { className?: string; onClick?: () => void }) { )} onClick={onClick} > - Bet + Buy </button> ) } diff --git a/web/pages/experimental/home/index.tsx b/web/pages/experimental/home/index.tsx index 0f02b002..fb0b488d 100644 --- a/web/pages/experimental/home/index.tsx +++ b/web/pages/experimental/home/index.tsx @@ -86,7 +86,7 @@ const Home = (props: { auth: { user: User } | null }) => { return ( <SearchSection key={id} - label={'Your bets'} + label={'Your trades'} sort={'prob-change-day'} user={user} yourBets diff --git a/web/pages/notifications.tsx b/web/pages/notifications.tsx index ccfbf371..d10812bf 100644 --- a/web/pages/notifications.tsx +++ b/web/pages/notifications.tsx @@ -390,7 +390,7 @@ function IncomeNotificationItem(props: { reasonText = !simple ? `Bonus for ${ parseInt(sourceText) / UNIQUE_BETTOR_BONUS_AMOUNT - } new bettors on` + } new traders on` : 'bonus on' } else if (sourceType === 'tip') { reasonText = !simple ? `tipped you on` : `in tips on` @@ -508,7 +508,7 @@ function IncomeNotificationItem(props: { {(isTip || isUniqueBettorBonus) && ( <MultiUserTransactionLink userInfos={userLinks} - modalLabel={isTip ? 'Who tipped you' : 'Unique bettors'} + modalLabel={isTip ? 'Who tipped you' : 'Unique traders'} /> )} <Row className={'line-clamp-2 flex max-w-xl'}>