swap only listing fix

This commit is contained in:
Adrian Brzeziński 2023-11-28 17:03:52 +01:00
parent d39a0de99a
commit 24f4e2569d
1 changed files with 18 additions and 17 deletions

View File

@ -359,7 +359,9 @@ const ListToken = ({ goBack }: { goBack: () => void }) => {
const swapInfos = swaps?.bestRoute?.routePlan?.map((x) => x.swapInfo)
const orcaPool = swapInfos?.find(
(x) => x.label?.toLowerCase().includes('orca'),
(x) =>
x.label?.toLowerCase().includes('orca') ||
x.label?.toLowerCase().includes('whirlpool'),
)
const raydiumPool = swapInfos?.find(
(x) => x.label?.toLowerCase().includes('raydium'),
@ -581,21 +583,19 @@ const ListToken = ({ goBack }: { goBack: () => void }) => {
proposalTx.push(trustlessIx)
}
const registerMarketix = await client!.program.methods
.serum3RegisterMarket(Number(advForm.marketIndex), advForm.marketName)
.accounts({
group: group!.publicKey,
admin: MANGO_DAO_WALLET,
serumProgram: new PublicKey(advForm.openBookProgram),
serumMarketExternal: advForm.listForSwapOnly
? undefined
: new PublicKey(advForm.openBookMarketExternalPk),
baseBank: new PublicKey(advForm.baseBankPk),
quoteBank: new PublicKey(advForm.quoteBankPk),
payer: MANGO_DAO_WALLET,
})
.instruction()
if (listingTier !== 'UNTRUSTED') {
if (listingTier !== 'UNTRUSTED' && !advForm.listForSwapOnly) {
const registerMarketix = await client!.program.methods
.serum3RegisterMarket(Number(advForm.marketIndex), advForm.marketName)
.accounts({
group: group!.publicKey,
admin: MANGO_DAO_WALLET,
serumProgram: new PublicKey(advForm.openBookProgram),
serumMarketExternal: new PublicKey(advForm.openBookMarketExternalPk),
baseBank: new PublicKey(advForm.baseBankPk),
quoteBank: new PublicKey(advForm.quoteBankPk),
payer: MANGO_DAO_WALLET,
})
.instruction()
proposalTx.push(registerMarketix)
}
const rp = new ReferralProvider(connection)
@ -1053,7 +1053,8 @@ const ListToken = ({ goBack }: { goBack: () => void }) => {
{!advForm.oraclePk && listingTier && !loadingListingParams ? (
<li
className={`my-4 pl-2 ${
!advForm.openBookMarketExternalPk
!advForm.openBookMarketExternalPk &&
!advForm.listForSwapOnly
? 'disabled pointer-events-none opacity-60'
: ''
}`}