Skip to content

Commit

Permalink
General issues (metaplex-foundation#1147)
Browse files Browse the repository at this point in the history
* fix padding on art selection modal

* fixed amount selection on instant sale

* redirect and reload to home when creating an auction

* changelog
  • Loading branch information
yamijuan authored Dec 8, 2021
1 parent 5ce1d4a commit 91acd02
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ incremented for features.
- Ability to use PSD instead of PNGs in the candy machine CLI
- Parallelize with batchSize command the candy machine CLI uploader
- Add ability for a candy machine owner to update existing candies using an old and new cache file
- Adds a minumum auction funds modal to prevent people from making bad auctions
- Adds a minimum auction funds modal to prevent people from making bad auctions
- Implement NFT Packs Redeem
- Remove Websockets for useMeta
- Redirect to home and reload on auction creation

### Fixes

Expand All @@ -66,6 +67,8 @@ incremented for features.
- Fix issue where ata is not detected during ticket punching in FLP
- Fix issue where random shuffled array is not using in image generation
- Fix NFT Packs creation transaction failing when adding multiple items
- Fix layout on token selection
- Fix type of sale and edition number for non master edition NFTs

### Breaking

Expand Down
1 change: 1 addition & 0 deletions js/packages/web/src/views/auctionCreate/artSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export const ArtSelector = (props: ArtSelectorProps) => {
onOk={confirm}
width={1100}
footer={null}
className={"modalp-40"}
>
<Row className="call-to-action" style={{ marginBottom: 0 }}>
<h2>Select the NFT you want to sell</h2>
Expand Down
15 changes: 10 additions & 5 deletions js/packages/web/src/views/auctionCreate/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -827,10 +827,13 @@ const InstantSaleStep = ({
}

//console.log("OBJ MINT", mint.toBase58())
const isMasterEdition = !!attributes?.items?.[0]?.masterEdition;

const copiesEnabled = useMemo(
() => !!attributes?.items?.[0]?.masterEdition?.info?.maxSupply,
[attributes?.items?.[0]],
() => {
const maxSupply = attributes?.items?.[0]?.masterEdition?.info?.maxSupply;
return !!maxSupply && maxSupply.toNumber() > 0;
},[attributes?.items?.[0]]
);
const artistFilter = useCallback(
(i: SafetyDepositDraft) =>
Expand Down Expand Up @@ -882,7 +885,7 @@ const InstantSaleStep = ({
Sell limited number of copies
</Option>
)}
{!copiesEnabled && (
{!copiesEnabled && isMasterEdition && (
<Option value={InstantSaleType.Open}>
Sell unlimited number of copies
</Option>
Expand Down Expand Up @@ -2104,8 +2107,10 @@ const Congrats = (props: {
</Button>
<Button
className="metaplex-button"
onClick={_ =>
history.push(`/auction/${props.auction?.auction.toString()}`)
onClick={() => {
history.push(`/`);
history.go(0);
}
}
>
<span>See it in your auctions</span>
Expand Down
5 changes: 5 additions & 0 deletions js/packages/web/src/views/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
color: #ffffff;
}
}
.modalp-40 {
.ant-modal-body {
padding: 40px;
}
}

.width-100 {
width: 100% !important;
Expand Down

0 comments on commit 91acd02

Please sign in to comment.