This commit is contained in:
Adrian Brzeziński 2023-07-06 16:24:07 +02:00 committed by GitHub
parent 86491fe2a4
commit b07aa77f1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions

View File

@ -33,14 +33,16 @@ const TradeSummary = ({
const { t } = useTranslation(['common', 'trade'])
const { group } = useMangoGroup()
const tradeForm = mangoStore((s) => s.tradeForm)
const orderbook = mangoStore((s) => s.selectedMarket.orderbook)
const { selectedMarket, quoteBank } = useSelectedMarket()
const openPerpPositions = useOpenPerpPositions()
// calc new avg price if an open position exists
const avgEntryPrice = useMemo(() => {
if (
!openPerpPositions.length ||
!openPerpPositions?.length ||
!selectedMarket ||
!orderbook ||
selectedMarket instanceof Serum3Market
)
return
@ -51,11 +53,10 @@ const TradeSummary = ({
const { baseSize, price, reduceOnly, side, tradeType } = tradeForm
if (!openPosition || !price) return
if (!openPosition || !price || !tradeForm.baseSize) return
let orderPrice = parseFloat(price)
if (tradeType === 'Market') {
const orderbook = mangoStore((s) => s.selectedMarket.orderbook)
orderPrice = calculateEstPriceForBaseSize(
orderbook,
parseFloat(tradeForm.baseSize),
@ -90,7 +91,7 @@ const TradeSummary = ({
const newTotalCost = currentAvgPrice * currentSize + orderPrice * tradeSize
const newAvgEntryPrice = newTotalCost / newTotalSize
return newAvgEntryPrice
}, [openPerpPositions, selectedMarket, tradeForm])
}, [openPerpPositions, selectedMarket, tradeForm, orderbook])
const maintProjectedHealth = useMemo(() => {
if (!mangoAccount || !group) return 100

View File

@ -21,17 +21,10 @@
dependencies:
ws "^8.13.0"
<<<<<<< Updated upstream
"@blockworks-foundation/mango-v4@^0.17.1":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@blockworks-foundation/mango-v4/-/mango-v4-0.17.1.tgz#889a57a20e70c4daa22314eddb7e8f25185e3544"
integrity sha512-oHievogTUndHxjmM6zd7pXgoSw8IM4hk6XvuPEhu/IhF17jD0wYj23eZmM4VEselZ46hLdIwJITP4tui2+/xlg==
=======
"@blockworks-foundation/mango-v4@^0.17.2":
version "0.17.2"
resolved "https://registry.yarnpkg.com/@blockworks-foundation/mango-v4/-/mango-v4-0.17.2.tgz#2219c6f77e5d4eb6d1f4f9433aec4d7070fc1adf"
integrity sha512-zGSX40BK3yW+9sGQO6k/+4Vq/v5d+Wmhqt/BfBENvSrZhFbrk6w6ib4aEsiIx/NcTLZorVPrdB75nP0JZ1IYjA==
>>>>>>> Stashed changes
dependencies:
"@coral-xyz/anchor" "^0.27.0"
"@project-serum/serum" "0.13.65"