diff --git a/components/ContentSectionRedeem.tsx b/components/ContentSectionRedeem.tsx index 61fb7e0..b3888fd 100644 --- a/components/ContentSectionRedeem.tsx +++ b/components/ContentSectionRedeem.tsx @@ -1,206 +1,154 @@ import Button from './Button' -import GradientText from './GradientText' +import LinkLeft from './LinkLeft' +//import GradientText from "./GradientText" -const ContentSection = () => { +const ContentSectionRedeem = () => { return ( -
-
-
-

- It is still the early days. -

-

- This is the first moment for non-developers to participate in - helping build the Mango protocol by supporting the inception of the - protocol's Insurance Fund. -

-
- - {/* Section 1 */} - -
-
-
-
-
-
-

- What is Mango? -

-

- Mango is a decentralized autonomous organization. Its - purpose is to contribute maximum value for the defi - ecosystem and its developer community to create - commercially viable decentralized trading and lending - products for traders. -

- -

- Why the Insurance fund? -

-

- Mango protocol is powered by lenders providing their - capital for the community to use for trading and borrowing - purposes. The insurance fund is the last line of defense - for protecting our mango lenders. -

-
- -
-

- What is the $MNGO token? -

-

- We believe that substantial rewards to a strong developer - community and liquidity incentives are the essential - drivers for growth and therefore the foundation of the - Mango DAO. -

-

- Mango Governance tokens ($MNGO) will serve as the - incentive for those who can prove their work is useful to - the DAO. -

- - -

- - $MNGO - {' '} - were only provided to contributors who helped build the - protocol. -

-
-
-
+ <> + {/* Section 2 */} +
+
+
+
+

+ Now what? +

+

+ The journey has just begun, here's what happens next +

-
-
- - {/* Section 2 */} -
-

- How it works. -

-

- We take the view that token sales should be simple, transparent and - minimize randomness and luck in the distribution. -

-
-
-
-
-
-
-
-

- Deposit your USDC contribution. -

-

- Users deposit USDC into a vault during the event period to - set their contribution amount. -

-
-
-
-
- -
-
-
-
-

- 48 hour participation period. -

-

- The event will span over a 2 day period split into two - sections,{' '} - - Unrestricted - {' '} - and{' '} - Restricted. -

-
-
-

- - Unrestricted - -

-

- During the unrestricted period users may deposit or - withdraw their USDC from the vault. During the - unrestricted period price can fluctuate. +

+
+
+
+
+
+

+ With power comes great responsibility +

+

+ Mango is the first DAO on Solana to use on-chain + governance, this is a big step towrds complete + decentralization. It means that founding members do + not control the DAO, the DAO is actually controlled by + all of us; the MNGO holders. +
+
+ As MNGO holders our highest responsibility is to + command and protect the DAO and it's value. + Holders have the responsibility to make the rules and + decide on the protocols future. Together we will build + the constitution, together we will push for progress, + together we will grow the protocol.{' '}

- -
-

- - Restricted - -

-

- After 24 hours deposits will be restricted and only - withdrawals allowed. During the restricted period - price can only go down. +

+
+
+
+
+
+
+

+ MNGO in the pool? +

+

+ We all want MNGO to be traded on Mango V3 at launch. + This means MNGO needs liquidity on-par with other top + traded tokens on serum. There are no backroom deals, + no one officially to make markets for us. +
+
+ We will be creating a Raydium pool with incentives to + help provide initial liquidity but we also need the + community to add liquidity to the pool and orderbooks.

-
-
-
-
-
-
-
-

- Why does it work this way? -

-

- Simple mechanisms are easier to build, explain, understand - and are harder to exploit. A transparent mechanism - increases participation because buyers are more confident - there are no hidden tricks that could harm them. -

-

- Elements of luck engineered into the mechanism distribute - value randomly to those who are most willing to do the - arbitrary, worthless tasks to get the free value. -

- {/*

- We believe all "excess" value should be captured - by token holders in the DAO. -

*/} +
+
+
+
+
+

+ MNGO holder & maker of markets +

+

+ Provide liquidity on the upcoming perp markets, the + DAO will vote on liquidity incentives for perp + markets, +

+ link to SDK + link to docs with devnet tutorial +
+
+
+
+
+
+
+
+

+ The road to full decentralization +

+

+ Starts off with the feeling (heres what we've + done to keep mango decentralized) ends with the CTA of + (heres how you can help, heres what we need) +

+

+ rough tech roadmap with link to trello +

+

+ if you can help us build it, send us proposals the DAO + will vote on grants +

+
+
-
-
-
-
-
-

- MNGO unlocked and distributed. -

-

- At event conclusion $MNGO gets distributed in propotion to - a users USDC contribution.{' '} -

+
+
+
+
+

+ Join the Discord +

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed + do eiusmod tempor incididunt ut labore et dolore magna + aliqua. Ut enim ad minim veniam, quis nostrud exercitation + ullamco laboris nisi ut aliquip ex ea commodo consequat.{' '} +

+
+
+ mango markets +
- +
-
+ ) } -export default ContentSection +export default ContentSectionRedeem diff --git a/components/ContentSectionRisks.tsx b/components/ContentSectionRisks.tsx index 2104110..4c003ed 100644 --- a/components/ContentSectionRisks.tsx +++ b/components/ContentSectionRisks.tsx @@ -1,4 +1,4 @@ -//import LinkLeft from "./LinkLeft" +import LinkLeft from './LinkLeft' const ContentSectionRisks = () => { return ( @@ -80,11 +80,13 @@ const ContentSectionRisks = () => { distributing MNGO from the DAO will be inflationary.

- {/* - - Learn about it in the docs - - */} + + Learn about it in the docs +

diff --git a/components/ContributionModal.tsx b/components/ContributionModal.tsx index fc11b5c..3100bfc 100644 --- a/components/ContributionModal.tsx +++ b/components/ContributionModal.tsx @@ -172,7 +172,7 @@ const ContributionModal = () => { return ( <> -
+
{!submitted && !submitting && @@ -180,7 +180,7 @@ const ContributionModal = () => { !(connected && toLateToDeposit) && ( <>

The journey starts here.

-

When you're ready, deposit your USDC

+

When you're ready, deposit your USDC.

)} @@ -191,13 +191,13 @@ const ContributionModal = () => { toLateToDeposit && ( <>

We're sorry, you missed it.

-

The sale period has ended

+

The sale period has ended.

)} {!submitted && submitting && ( <> -

Approve the transaction

+

Approve the transaction.

Almost there...

)} @@ -205,21 +205,21 @@ const ContributionModal = () => { {submitted && !submitting && ( <>

- You've contributed ${usdFormat.format(contributionAmount)} + You've contributed ${usdFormat.format(contributionAmount)}.

-

Unlock to edit your contribution amount

+

Unlock to edit your contribution amount.

)} {editContribution && !submitting && ( <>

- You've contributed ${usdFormat.format(redeemableBalance)} -

{' '} + You've contributed ${usdFormat.format(redeemableBalance)}. +

{endDeposits?.isBefore() && endIdo?.isAfter() ? 'You can only reduce your contribution during the grace period. Reducing cannot be reversed.' - : 'Increase or reduce your contribution'} + : 'Increase or reduce your contribution.'}

)} diff --git a/components/FooterSection.tsx b/components/FooterSection.tsx index 5e3b045..c4dcaba 100644 --- a/components/FooterSection.tsx +++ b/components/FooterSection.tsx @@ -136,7 +136,7 @@ const FooterSection = () => { > Perpetual Futures {' '} - + SOON
  • { return ( -
    -
    -
    -

    +
    +
    +
    +

    The event has ended.
    It’s time to redeem your  $MNGO

    -

    +

    Thank you for your contributions, soon you will be able to help decide the future of Mango.

    diff --git a/components/MangoPill.tsx b/components/MangoPill.tsx index 530aa3d..7abe6a3 100644 --- a/components/MangoPill.tsx +++ b/components/MangoPill.tsx @@ -1,11 +1,11 @@ -const MangoPill = () => { +const MangoPill = (props: any) => { return (

    - Soon + {props.children}

    ) diff --git a/components/NavBarBeta.tsx b/components/NavBarBeta.tsx index b2ea028..d2c027e 100644 --- a/components/NavBarBeta.tsx +++ b/components/NavBarBeta.tsx @@ -110,7 +110,7 @@ const NavBarBeta = () => { } absolute z-50 -ml-4 mt-3 transform px-2 w-screen max-w-md sm:px-0 lg:ml-0 lg:left-1/2 lg:-translate-x-1/2`} >     @@ -384,12 +415,11 @@ const NavBarBeta = () => {

    Mango DAO

    - - {/* */}{' '} + WEN
    diff --git a/components/RedeemModal.tsx b/components/RedeemModal.tsx index cda5df9..11bfaec 100644 --- a/components/RedeemModal.tsx +++ b/components/RedeemModal.tsx @@ -44,9 +44,9 @@ const RedeemModal = () => { setSubmitting(true) } - useEffect(() => { - actions.fetchMints() - }, []) + // useEffect(() => { + // actions.fetchMints() + // }, []) useEffect(() => { setLoading(true) @@ -70,18 +70,18 @@ const RedeemModal = () => { return ( <> -
    +
    {!submitting ? ( <> -

    Redeem your MNGO

    - {/*

    Welcome to the DAO, let's build together.

    */} +

    Redeem your MNGO.

    +

    Welcome to the DAO, let's build together.

    ) : null} {submitting ? ( <> -

    Approve the transaction

    +

    Approve the transaction.

    Almost there...

    ) : null} diff --git a/hooks/usePool.tsx b/hooks/usePool.tsx index c9206d4..0f4e38d 100644 --- a/hooks/usePool.tsx +++ b/hooks/usePool.tsx @@ -4,19 +4,19 @@ import useWalletStore from '../stores/useWalletStore' export default function usePool() { const pool = useWalletStore((s) => s.pool) - /* const startIdo = pool ? moment.unix(pool.startIdoTs.toNumber()) : undefined const endIdo = pool ? moment.unix(pool.endIdoTs.toNumber()) : undefined const endDeposits = pool ? moment.unix(pool.endDepositsTs.toNumber()) : undefined - */ + /* // override for announcement const unixTs = 1628553600 const startIdo = moment.unix(unixTs) const endDeposits = moment.unix(unixTs).add(1, 'days') const endIdo = moment.unix(unixTs).add(2, 'days') + */ return { pool, startIdo, endIdo, endDeposits } } diff --git a/idls/ido_pool.json b/idls/ido_pool.json index 6a4312a..3ad9ad2 100644 --- a/idls/ido_pool.json +++ b/idls/ido_pool.json @@ -397,6 +397,6 @@ } ], "metadata": { - "address": "CRU6hX2GgtdabESgkoMswMrUdRFxHhCVYmS292VN1Nnn" + "address": "6QXNNAPkPsWjd1j3qQJTvRFgSNPARMhF2tE8g1WeGyrM" } } diff --git a/public/img/redeem1.png b/public/img/redeem1.png new file mode 100644 index 0000000..8e648af Binary files /dev/null and b/public/img/redeem1.png differ diff --git a/public/img/redeem2.png b/public/img/redeem2.png new file mode 100644 index 0000000..c2dea56 Binary files /dev/null and b/public/img/redeem2.png differ diff --git a/public/img/redeem3.png b/public/img/redeem3.png new file mode 100644 index 0000000..ea8eacc Binary files /dev/null and b/public/img/redeem3.png differ diff --git a/public/img/redeem4.png b/public/img/redeem4.png new file mode 100644 index 0000000..8c2f3b4 Binary files /dev/null and b/public/img/redeem4.png differ diff --git a/public/img/redeem5.png b/public/img/redeem5.png new file mode 100644 index 0000000..d071e9e Binary files /dev/null and b/public/img/redeem5.png differ diff --git a/public/preview.jpg b/public/preview.jpg deleted file mode 100644 index 471aad1..0000000 Binary files a/public/preview.jpg and /dev/null differ diff --git a/stores/useWalletStore.tsx b/stores/useWalletStore.tsx index f1d8bea..7b9b619 100644 --- a/stores/useWalletStore.tsx +++ b/stores/useWalletStore.tsx @@ -26,10 +26,10 @@ import { calculateNativeAmountUnsafe } from '../utils/balance' export const ENDPOINTS: EndpointInfo[] = [ { name: 'mainnet-beta', - url: 'https://api.mainnet-beta.solana.com/', - websocket: 'https://api.mainnet-beta.solana.com/', - programId: '', - poolKey: '', + url: 'https://mango.rpcpool.com/', + websocket: 'https://mango.rpcpool.com/', + programId: '6QXNNAPkPsWjd1j3qQJTvRFgSNPARMhF2tE8g1WeGyrM', + poolKey: 'AHBj9LAjxStT2YQHN6QdfHKpZLtEVr8ACqeFgYcPsTnr', }, { name: 'devnet', @@ -52,7 +52,7 @@ export const ENDPOINTS: EndpointInfo[] = [ }, ] -const CLUSTER = 'devnet' +const CLUSTER = 'mainnet-beta' const ENDPOINT = ENDPOINTS.find((e) => e.name === CLUSTER) const DEFAULT_CONNECTION = new Connection(ENDPOINT.url, 'recent') const WEBSOCKET_CONNECTION = new Connection(ENDPOINT.websocket, 'recent') diff --git a/tailwind.config.js b/tailwind.config.js index 445a8f3..b8493ca 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -22,8 +22,13 @@ module.exports = { 'risk-two': "url('../public/img/risk2.png')", 'risk-three': "url('../public/img/risk3.png')", 'risk-four': "url('../public/img/risk4.png')", + 'redeem-one': "url('../public/img/redeem1.png')", + 'redeem-two': "url('../public/img/redeem2.png')", + 'redeem-three': "url('../public/img/redeem3.png')", + 'redeem-four': "url('../public/img/redeem4.png')", }), height: { + 350: '350px', 550: '550px', 650: '650px', 750: '750px',