Mar 16 Fixes

apps/api/app/api/v1/users/username/[username]/route.ts

@@ -17,8 +17,6 @@ export async function GET(
 
     return NextResponse.json({ data: user })
   } catch (error) {
-    console.log(error) // eslint-disable-line no-console -- Log error for debugging
-
     if (error instanceof UserNotFoundError) {
       return NextResponse.json({ error: error.message }, { status: 404 })
     }

packages/lists/components/ListMarketRow.tsx

@@ -101,7 +101,7 @@ export function ListMarketRow({
 
       <ResolveMarketDialog
         market={market}
-        open={isResolving === market.id}
+        open={isResolving === market.id && canResolve}
         onClose={() => setResolving(undefined)}
         onSuccess={onRevalidate}
       />

packages/lists/components/ListPage.tsx

@@ -39,6 +39,8 @@ export function ListPage({
   const { selected, setSelected } = useSelectedItems()
   const [isAddMore, setIsAddMore] = useSearchParam('addMore')
   const [isEditing, setIsEditing] = useSearchParam('edit')
+  const canEdit = user ? canModifyList({ list, user }) : false
+  const canAddMore = user ? canAddToList({ list, userId: user.id }) : false
 
   const handleRevalidateBalance = async () => {
     void onRevalidate?.()
@@ -48,11 +50,7 @@ export function ListPage({
 
   return (
     <Card className="flex-1">
-      <ListToolbar
-        list={list}
-        canEdit={user ? canModifyList({ list, user }) : false}
-        onInitiateEdit={() => setIsEditing('true')}
-      />
+      <ListToolbar list={list} canEdit={canEdit} onInitiateEdit={() => setIsEditing('true')} />
 
       <CardHeader className="pt-0 md:pt-0">
         <CardTitle className="leading-relaxed">{list.title}</CardTitle>
@@ -110,7 +108,7 @@ export function ListPage({
           </Card>
         ) : null}
 
-        {canAddToList({ list, userId: user?.id }) ? (
+        {canAddMore ? (
           <div className="flex justify-end">
             <Button variant="ghost" className="text-muted-foreground" size="sm" onClick={() => setIsAddMore('true')}>
               <PlusIcon className="h-4 w-4" /> Add more
@@ -147,14 +145,14 @@ export function ListPage({
       <EditListDialog
         key={list.updatedAt.toString()} // reset form when list updates
         list={list}
-        open={isEditing === 'true'}
+        open={isEditing === 'true' && canEdit}
         onClose={() => setIsEditing(undefined)}
         onSuccess={onRevalidate}
       />
 
       <AddMoreListDialog
         list={list}
-        open={isAddMore != null}
+        open={isAddMore != null && canAddMore}
         onClose={() => setIsAddMore(undefined)}
         onSuccess={onRevalidate}
       />

packages/markets/components/MarketOverviewPage.tsx

@@ -28,7 +28,7 @@ import { UserLink } from '@play-money/users/components/UserLink'
 import { useUser } from '@play-money/users/context/UserContext'
 import { useSelectedItems } from '../../ui/src/contexts/SelectedItemContext'
 import { useSearchParam } from '../../ui/src/hooks/useSearchParam'
-import { canModifyMarket, isMarketClosed } from '../rules'
+import { canModifyMarket, isMarketClosed, isMarketTradable } from '../rules'
 import { ExtendedMarket } from '../types'
 import { EditMarketDialog } from './EditMarketDialog'
 import { EditMarketOptionDialog } from './EditMarketOptionDialog'
@@ -68,6 +68,8 @@ export function MarketOverviewPage({
   const [, setResolving] = useSearchParam('resolve')
   const isCreator = user?.id === market.createdBy
   const probabilities = marketOptionBalancesToProbabilities(balance?.amm)
+  const canEdit = user ? canModifyMarket({ market, user }) : false
+  const canTrade = isMarketTradable({ market })
 
   const mostLikelyOption = market.options.reduce((prev, current) =>
     (prev.probability || 0) > (current.probability || 0) ? prev : current
@@ -111,7 +113,7 @@ export function MarketOverviewPage({
       <Card className="flex-1">
         <MarketToolbar
           market={market}
-          canEdit={user ? canModifyMarket({ market, user }) : false}
+          canEdit={canEdit}
           onInitiateEdit={() => setIsEditing('true')}
           onInitiateBoost={() => setIsBoosting('true')}
           onRevalidate={handleRevalidateBalance}
@@ -279,20 +281,20 @@ export function MarketOverviewPage({
         <EditMarketDialog
           key={market.updatedAt.toString()} // reset form when market updates
           market={market}
-          open={isEditing === 'true'}
+          open={isEditing === 'true' && canEdit}
           onClose={() => setIsEditing(undefined)}
           onSuccess={onRevalidate}
         />
         <EditMarketOptionDialog
           market={market}
           optionId={isEditOption!}
-          open={isEditOption != null}
+          open={isEditOption != null && canEdit}
           onClose={() => setIsEditOption(undefined)}
           onSuccess={onRevalidate}
         />
         <LiquidityBoostDialog
           market={market}
-          open={isBoosting === 'true'}
+          open={isBoosting === 'true' && canTrade}
           onClose={() => setIsBoosting(undefined)}
           onSuccess={handleRevalidateBalance}
         />

packages/markets/components/MarketSellForm.tsx

@@ -104,7 +104,7 @@ export function MarketSellForm({
 
   const proportionateCost =
     (form.getValues('amount') * (selectedPosition?.cost || 0)) / (selectedPosition?.quantity || 0)
-  const disabled = !selectedPosition || new Decimal(selectedPosition.quantity).toDecimalPlaces(4).lt(0)
+  const disabled = !selectedPosition || new Decimal(selectedPosition.quantity).toDecimalPlaces(4).lte(0)
   const orderedOptions = _.orderBy(options, 'createdAt')
 
   return (

packages/markets/components/MarketToolbar.tsx

@@ -162,14 +162,14 @@ export function MarketToolbar({
 
       <ResolveMarketDialog
         market={market}
-        open={isResolving === 'true'}
+        open={isResolving === 'true' && canResolve}
         onClose={() => setResolving(undefined)}
         onSuccess={onRevalidate}
       />
 
       <CancelMarketDialog
         market={market}
-        open={isCanceling === 'true'}
+        open={isCanceling === 'true' && canCancel}
         onClose={() => setCanceling(undefined)}
         onSuccess={onRevalidate}
       />

packages/markets/lib/createMarketSellTransaction.ts

@@ -1,5 +1,6 @@
 import Decimal from 'decimal.js'
 import { executeTransaction } from '@play-money/finance/lib/executeTransaction'
+import { findBalanceChange } from '@play-money/finance/lib/helpers'
 import { executeTrade } from './executeTrade'
 import { updateMarketBalances } from './updateMarketBalances'
 import { updateMarketOptionProbabilities } from './updateMarketOptionProbabilities'
@@ -36,6 +37,12 @@ export async function createMarketSellTransaction({
     additionalLogic: async (txParams) => {
       // Create or update the position before we value it
       await updateMarketPosition({ ...txParams, marketId, accountId, optionId })
+      const primaryChange = findBalanceChange({
+        balanceChanges: txParams.balanceChanges,
+        accountId,
+        assetType: 'CURRENCY',
+        assetId: 'PRIMARY',
+      })!
 
       const [balances] = await Promise.all([
         updateMarketBalances({ ...txParams, marketId }),
@@ -47,7 +54,7 @@ export async function createMarketSellTransaction({
           },
           data: {
             liquidityCount: {
-              decrement: amount.toNumber(),
+              decrement: primaryChange.change,
             },
             updatedAt: new Date(),
           },