diff --git a/js/packages/common/src/contexts/meta/processAuctions.ts b/js/packages/common/src/contexts/meta/processAuctions.ts index b1f4105..d9966a0 100644 --- a/js/packages/common/src/contexts/meta/processAuctions.ts +++ b/js/packages/common/src/contexts/meta/processAuctions.ts @@ -12,8 +12,8 @@ import { MAX_AUCTION_DATA_EXTENDED_SIZE, } from '../../actions'; import { AUCTION_ID } from '../../utils'; -import { ParsedAccount } from '../accounts/types'; -import { cache } from '../accounts/cache'; +import { ParsedAccount } from '../accounts'; +import { cache } from '../accounts'; import { CheckAccountFunc, ProcessAccountsFunc } from './types'; export const processAuctions: ProcessAccountsFunc = ( diff --git a/js/packages/common/src/contexts/meta/processMetaplexAccounts.ts b/js/packages/common/src/contexts/meta/processMetaplexAccounts.ts index da324f1..8ae7693 100644 --- a/js/packages/common/src/contexts/meta/processMetaplexAccounts.ts +++ b/js/packages/common/src/contexts/meta/processMetaplexAccounts.ts @@ -18,11 +18,11 @@ import { BidRedemptionTicketV2, decodeSafetyDepositConfig, SafetyDepositConfig, -} from '../../models/metaplex'; +} from '../../models'; import { ProcessAccountsFunc } from './types'; import { METAPLEX_ID, programIds } from '../../utils'; -import { ParsedAccount } from '../accounts/types'; -import { cache } from '../accounts/cache'; +import { ParsedAccount } from '../accounts'; +import { cache } from '../accounts'; export const processMetaplexAccounts: ProcessAccountsFunc = async ( { account, pubkey }, diff --git a/js/packages/common/src/contexts/meta/queryExtendedMetadata.ts b/js/packages/common/src/contexts/meta/queryExtendedMetadata.ts index f265168..10f429b 100644 --- a/js/packages/common/src/contexts/meta/queryExtendedMetadata.ts +++ b/js/packages/common/src/contexts/meta/queryExtendedMetadata.ts @@ -1,10 +1,10 @@ import { MintInfo } from '@solana/spl-token'; import { Connection } from '@solana/web3.js'; import { Metadata } from '../../actions'; -import { ParsedAccount } from '../accounts/types'; -import { cache } from '../accounts/cache'; -import { getMultipleAccounts } from '../accounts/getMultipleAccounts'; -import { MintParser } from '../accounts/parsesrs'; +import { ParsedAccount } from '../accounts'; +import { cache } from '../accounts'; +import { getMultipleAccounts } from '../accounts'; +import { MintParser } from '../accounts'; export const queryExtendedMetadata = async ( connection: Connection, diff --git a/js/packages/web/src/components/AuctionCard/index.tsx b/js/packages/web/src/components/AuctionCard/index.tsx index 1d80ddd..4e26d29 100644 --- a/js/packages/web/src/components/AuctionCard/index.tsx +++ b/js/packages/web/src/components/AuctionCard/index.tsx @@ -525,16 +525,14 @@ export const AuctionCard = ({ const allowBidToPublic = myPayingAccount && !auctionView.myBidderPot && - isAuctionManagerAuthorityNotWalletOwner && - instantSalePrice; + isAuctionManagerAuthorityNotWalletOwner; const allowBidToAuctionOwner = myPayingAccount && !isAuctionManagerAuthorityNotWalletOwner && - isAuctionItemMaster && - instantSalePrice; + isAuctionItemMaster; // Placing a "bid" of the full amount results in a purchase to redeem. - if (allowBidToPublic || allowBidToAuctionOwner) { + if (instantSalePrice && (allowBidToPublic || allowBidToAuctionOwner)) { try { const bid = await sendPlaceBid( connection, @@ -542,7 +540,7 @@ export const AuctionCard = ({ myPayingAccount.pubkey, auctionView, accountByMint, - auctionView.auctionDataExtended?.info.instantSalePrice, + instantSalePrice, ); setLastBid(bid); } catch (e) {