change auction view for instant sale

This commit is contained in:
Maxim Gordienko 2021-09-09 15:31:52 +03:00
parent cb507827df
commit b14ece2ad9
3 changed files with 12 additions and 13 deletions

View File

@ -7,12 +7,7 @@ import {
import { programIds } from '../utils/programIds'; import { programIds } from '../utils/programIds';
import { deserializeUnchecked, serialize } from 'borsh'; import { deserializeUnchecked, serialize } from 'borsh';
import BN from 'bn.js'; import BN from 'bn.js';
import { import { findProgramAddress, StringPublicKey, toPublicKey } from '../utils';
findProgramAddress,
METADATA_PROGRAM_ID,
StringPublicKey,
toPublicKey,
} from '../utils';
export const METADATA_PREFIX = 'metadata'; export const METADATA_PREFIX = 'metadata';
export const EDITION = 'edition'; export const EDITION = 'edition';
export const RESERVATION = 'reservation'; export const RESERVATION = 'reservation';

View File

@ -19,7 +19,6 @@ import {
BidderMetadata, BidderMetadata,
MAX_METADATA_LEN, MAX_METADATA_LEN,
MAX_EDITION_LEN, MAX_EDITION_LEN,
placeBid,
useWalletModal, useWalletModal,
} from '@oyster/common'; } from '@oyster/common';
import { useWallet } from '@solana/wallet-adapter-react'; import { useWallet } from '@solana/wallet-adapter-react';
@ -253,6 +252,11 @@ export const AuctionCard = ({
const isAuctionNotStarted = const isAuctionNotStarted =
auctionView.auction.info.state === AuctionState.Created; auctionView.auction.info.state === AuctionState.Created;
//if instant sale auction bid and claimed hide buttons
if (auctionView.isInstantSale && auctionView.myBidderPot?.info.emptied) {
return <></>
}
return ( return (
<div className="auction-container" style={style}> <div className="auction-container" style={style}>
<Col> <Col>
@ -517,14 +521,10 @@ export const AuctionCard = ({
auctionView.auctionDataExtended?.info.instantSalePrice, auctionView.auctionDataExtended?.info.instantSalePrice,
); );
setLastBid(bid); setLastBid(bid);
// TODO: Remove this by propating necessary information to sendRedeemBid
// window.location.reload();
} }
await update(); await update();
setShowBidModal(false);
// Claim the purchase // Claim the purchase
try { try {
await sendRedeemBid( await sendRedeemBid(
@ -536,7 +536,11 @@ export const AuctionCard = ({
prizeTrackingTickets, prizeTrackingTickets,
bidRedemptions, bidRedemptions,
bids, bids,
).then(() => setShowRedeemedBidModal(true)); ).then(async () => {
await update();
setShowBidModal(false);
setShowRedeemedBidModal(true);
});
} catch (e) { } catch (e) {
console.error(e); console.error(e);
setShowRedemptionIssue(true); setShowRedemptionIssue(true);

View File

@ -228,7 +228,7 @@ export const AuctionView = () => {
{!auction && <Skeleton paragraph={{ rows: 6 }} />} {!auction && <Skeleton paragraph={{ rows: 6 }} />}
{auction && <AuctionCard auctionView={auction} />} {auction && <AuctionCard auctionView={auction} />}
<AuctionBids auctionView={auction} /> {!auction?.isInstantSale && <AuctionBids auctionView={auction} />}
</Col> </Col>
</Row> </Row>
</> </>