Skip to content

Commit

Permalink
consistent names
Browse files Browse the repository at this point in the history
  • Loading branch information
mantikoros committed Jan 25, 2025
1 parent 4bc772c commit 9e333cb
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions backend/api/src/gidx/complete-cashout-request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const completeCashoutRequest: APIHandler<
const { redeemable } = await calculateRedeemablePrizeCash(pg, userId)

if (redeemable < manaCashAmount) {
throw new APIError(400, 'Insufficient redeemable prize cash')
throw new APIError(400, 'Insufficient redeemable sweepcash')
}
const dollarsToWithdraw = PaymentAmount.dollars
const CalculatedPaymentAmount = (1 - SWEEPIES_CASHOUT_FEE) * manaCashAmount
Expand Down Expand Up @@ -107,7 +107,7 @@ const debitCoins = async (
if (redeemablePrizeCash < manaCashAmount) {
throw new APIError(
500,
'Insufficient redeemable prize cash. Indeterminate state, may need to refund',
'Insufficient redeemable sweepcash. Indeterminate state, may need to refund',
{ response: props }
)
}
Expand Down
2 changes: 1 addition & 1 deletion backend/api/src/resolve-market.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const resolveMarketMain: APIHandler<
) {
throw new APIError(
403,
'Only the Manifold account and approved mods can resolve prize cash markets'
'Only the Manifold account and approved mods can resolve sweepcash markets'
)
}

Expand Down
2 changes: 1 addition & 1 deletion backend/api/src/unresolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const verifyUserCanUnresolve = async (
if (isProd() && token === 'CASH' && userId !== HOUSE_LIQUIDITY_PROVIDER_ID) {
throw new APIError(
403,
`Only the Manifold account can unresolve prize cash markets`
`Only the Manifold account can unresolve sweepcash markets`
)
}

Expand Down
2 changes: 1 addition & 1 deletion backend/shared/src/calculate-redeemable-prize-cash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from './supabase/sql-builder'
import { log } from './utils'

// Gets the total amount of prize cash that a user can redeem for usd, before fees
// Gets the total amount of sweepcash that a user can redeem for usd, before fees
export async function calculateRedeemablePrizeCash(
pg: SupabaseDirectClient,
userId: string
Expand Down
4 changes: 2 additions & 2 deletions twitch-bot/web/pages/metrics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ function Panel(props: { className?: string; children?: ReactNode; disabled?: boo
<div className={clsx('bg-canvas-0 dark:border-ink-500 dark:bg-ink-900 relative grow rounded-xl border p-2', className)}>
{disabled && (
<div
className="text-ink-0 absolute top-0 left-0 z-50 flex h-full w-full items-center justify-center text-2xl opacity-50"
className="text-ink-0 absolute left-0 top-0 z-50 flex h-full w-full items-center justify-center text-2xl opacity-50"
style={{ background: 'repeating-linear-gradient(45deg,#606dbc,#606dbc 10px,#465298 10px,#465298 20px)' }}
>
Coming soon
Expand Down Expand Up @@ -398,7 +398,7 @@ function MetricsPage() {
<PanelRaw name="New bots" days={days} propName={'newBots'} />
<PanelRaw name="Twitch links" days={days} propName={'twitchLinks'} />
<PanelRaw name="Commands used" days={days} propName={'commandsUsed'} />
<PanelRaw name="Active users" days={days} propName={'activeUsers'} />
<PanelRaw name="Active traders" days={days} propName={'activeUsers'} />
</Row>
<Panel className="relative h-96 overflow-hidden !p-0" disabled>
<CanvasChart />
Expand Down
6 changes: 3 additions & 3 deletions web/components/stats/mana-summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const categoryToLabel = {
investment_value: 'invested',
loan_total: 'loans',
amm_liquidity: 'amm liquidity',
total_cash_value: 'total prize cash',
cash_balance: 'prize cash balance',
total_cash_value: 'total sweepcash',
cash_balance: 'sweepcash balance',
cash_investment_value: 'invested',
amm_cash_liquidity: 'amm liquidity',
}
Expand Down Expand Up @@ -57,7 +57,7 @@ export const ManaSupplySummary = (props: {
<>
<Title>Mana supply over time</Title>
<StackedChart data={manaData} />
<Title className="mt-4">Prize cash supply supply over time</Title>
<Title className="mt-4">Sweepcash supply supply over time</Title>
<StackedChart data={cashData} />
</>
)
Expand Down
6 changes: 3 additions & 3 deletions web/pages/admin/cash-stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ export function CustomCashAnalytics(props: { stats: Row<'daily_stats'>[] }) {

return (
<Col className="px-4 sm:pl-6 sm:pr-16">
<Title>Active users</Title>
<Title>Active traders</Title>
<p className="text-ink-500">
An active user is a user who has traded in, commented on, or created a
An active trader is a user who has traded in, commented on, or created a
sweep cash question.
</p>
<div className="text-ink-500 mt-2">
Expand Down Expand Up @@ -126,7 +126,7 @@ export function CustomCashAnalytics(props: { stats: Row<'daily_stats'>[] }) {

<Title>Retention</Title>
<p className="text-ink-500">
What fraction of active users are still active after the given time
What fraction of active traders are still active after the given time
period?
</p>
<Tabs
Expand Down
8 changes: 4 additions & 4 deletions web/pages/stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,11 @@ export function CustomAnalytics(props: {
return (
<Col className="px-4 sm:pl-6 sm:pr-16">
<div className="flex items-start justify-between">
<Title>Active users</Title>
<Title>Active traders</Title>
<Button onClick={() => getStats().then(setStats)}>Reload All</Button>
</div>
<p className="text-ink-500">
An active user is a user who has traded in, commented on, or created a
An active trader is a user who has traded in, commented on, or created a
question.
</p>
<div className="text-ink-500 mt-2">
Expand Down Expand Up @@ -376,7 +376,7 @@ export function CustomAnalytics(props: {
<Spacer h={8} />
<Title>Retention</Title>
<p className="text-ink-500">
What fraction of active users are still active after the given time
What fraction of active traders are still active after the given time
period?
</p>
<Tabs
Expand Down Expand Up @@ -560,7 +560,7 @@ export function CustomAnalytics(props: {
]}
/>
<Spacer h={8} />
<Title>Total prize cash {TRADED_TERM}</Title>
<Title>Total sweepcash {TRADED_TERM}</Title>
<p className="text-ink-500">Sum of cash {TRADE_TERM} amounts.</p>
<Tabs
className="mb-4"
Expand Down

0 comments on commit 9e333cb

Please sign in to comment.