diff --git a/.env b/.env index 5779902..e3d5f47 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -NODE_ENV="test" -QUICKSILVER_API="https://lcd.test.quicksilver.zone" -ZONE_URL="test.quicksilver.zone" -REACT_APP_ENABLE_UNBONDING="false" +NODE_ENV="dev" +QUICKSILVER_API="https://lcd.dev.quicksilver.zone" +ZONE_URL="dev.quicksilver.zone" +REACT_APP_ENABLE_UNBONDING="true" REACT_APP_ENABLE_SET_INTENT="false" -REACT_APP_ENABLE_CLAIMS="true" \ No newline at end of file +REACT_APP_ENABLE_CLAIMS="true" diff --git a/public/env.js b/public/env.js index 0fc06a2..a50f7f0 100644 --- a/public/env.js +++ b/public/env.js @@ -1,8 +1,8 @@ window.env = { - "NODE_ENV": "test", - "QUICKSILVER_API": "https://lcd.test.quicksilver.zone", - "ZONE_URL": "test.quicksilver.zone", + "NODE_ENV": "dev", + "QUICKSILVER_API": "https://lcd.dev.quicksilver.zone", + "ZONE_URL": "dev.quicksilver.zone", "REACT_APP_ENABLE_SET_INTENT": "false", - "REACT_APP_ENABLE_UNBONDING": "false", + "REACT_APP_ENABLE_UNBONDING": "true", "REACT_APP_ENABLE_CLAIMS": "true" }; \ No newline at end of file diff --git a/src/components/airdrops-interface/Airdrops.tsx b/src/components/airdrops-interface/Airdrops.tsx index b924fc0..a527e97 100644 --- a/src/components/airdrops-interface/Airdrops.tsx +++ b/src/components/airdrops-interface/Airdrops.tsx @@ -9,11 +9,11 @@ export default function Airdrop() {
- {!showAirdrops &&
+ {!showAirdrops &&
-

Airdrop

+

Airdrop

Coming soon

-
+

Over 50% of the Genesis supply will be going to incentivising the community and driving usage. Eligible stakers of chains onboarded on the Protocol will receive airdrops upon the onboarding of said chains. This means that stakers of chains that do not exist yet will receive a QCK airdrop in the future.
diff --git a/src/components/assets-interface/Assets.css b/src/components/assets-interface/Assets.css index d57ebaa..8b5e7d3 100644 --- a/src/components/assets-interface/Assets.css +++ b/src/components/assets-interface/Assets.css @@ -35,10 +35,10 @@ h2 { .asset-card { - background: #282828; + background: #282828; border: 2px solid #282828; border-radius: 5px; - padding: 1rem; + padding: 1rem 3rem 1rem 3rem; } diff --git a/src/components/assets-interface/Assets.tsx b/src/components/assets-interface/Assets.tsx index ddb9f4b..f994dab 100644 --- a/src/components/assets-interface/Assets.tsx +++ b/src/components/assets-interface/Assets.tsx @@ -43,21 +43,21 @@ export default function Assets() { const { networks, hasErrors } = useSelector(networksSelector); const [denomArray, setDenomArray] = useState>([]) - // useEffect(() => { - // if(isQSWalletConnected && networks) { - // let denomArray : Array = []; - // networks.forEach((network: any) => denomArray.push(network.value.local_denom)); - // denomArray.push('uqck'); - // setDenomArray(denomArray); - // if(!sum) { - // fetchSum(); - // } - // } - // // if(messages.length == 0) { - // // queryXccLookup(); - // // } + useEffect(() => { + if(isQSWalletConnected && networks) { + let denomArray : Array = []; + networks.forEach((network: any) => denomArray.push(network.value.local_denom)); + denomArray.push('uqck'); + setDenomArray(denomArray); + if(!sum) { + fetchSum(); + } + } + if(messages.length == 0) { + queryXccLookup(); + } - // }, [balances]) + }, [balances]) const onButtonClick = () => { // @ts-expect-error @@ -109,6 +109,7 @@ export default function Assets() { // } const onClaimsClick = async (e: any) => { + if (messages.length == 0) { alert("nope!") return @@ -156,7 +157,7 @@ export default function Assets() { "gas": "400000", "amount": [ { - "denom": "umuon", + "denom": "uqck", "amount": "300" } ] @@ -203,70 +204,70 @@ export default function Assets() { return ( <> - {!isQSWalletConnected &&

+ {!isQSWalletConnected &&
-
-

Hey there!

-

Connect your wallet to get started!

- -
+
+

Hey there!

+

Connect your wallet to get started!

+
- -
} - {isQSWalletConnected &&
-
- {showAssets &&
-
-
-

Claim Participation Rewards

-

Coming soon

- {/* */} -

- Participation Rewards are QCK token emissions that will reward Protocol users for delegating to decentralized, performant validators that are active in governance. -

-These rewards will be distributed on an epochly basis (every 3 days). -

- -
- -
-

My Assets

+
+ } + + {isQSWalletConnected &&
+ {showAssets &&
+
+

Participation Rewards Claims

+

Coming soon

+
+

Participation Rewards are QCK token emissions that will reward Protocol users for delegating to decentralized, performant validators that are active in governance.

+

These rewards will be distributed on an epochly basis (every 3 days).

+ +
+ +

My Assets

{/* {sum === 0 &&
Calculating...
} */} {hasErrors &&

There's an issue with fetching the network list. Please try again.

} {/* {sum !==0 &&
$ {sum.toFixed(4)} in {balances.length} assets across Quicksilver chain
} */} - {balances.length > 0 &&
- {balances.map((bal: Coin, i: number) => - -
- - -
+ {balances.length > 0 && +
+ {balances.map((bal: Coin, i: number) => + +
+ + +
+ +

{(+(bal.amount)/1000000).toFixed(2)}

+ {bal.denom !== 'uqck' &&
{bal.denom[1] + bal.denom.slice(2).toUpperCase()}
} + {bal.denom === 'uqck' &&
QCK
} +
+ +
-

{(+(bal.amount)/1000000).toFixed(2)}

- {bal.denom !== 'uqck' &&
{bal.denom[1] + bal.denom.slice(2).toUpperCase()}
} - {bal.denom === 'uqck' &&
QCK
} -
-
- - - - -)} - -
} -{balances.length === 0 &&
-
You currently do not have any assets on the Quicksilver chain.
-
} + )} +
+ } -
} -{!showAssets &&
-
-

Coming Soon!

+ {balances.length === 0 && +
+
You currently do not have any assets on the Quicksilver chain.
-
} + } + +
+
+} +{!showAssets && +
+
+

Coming Soon!

+
+} +
} diff --git a/src/components/governance-interface/Governance.tsx b/src/components/governance-interface/Governance.tsx index 6392679..b12f8b1 100644 --- a/src/components/governance-interface/Governance.tsx +++ b/src/components/governance-interface/Governance.tsx @@ -9,11 +9,11 @@ export default function Governance() {
- {!showAirdrops &&
+ {!showAirdrops &&
-

Governance by Proxy

+

Governance by Proxy

Coming soon

-
+

Governance by Proxy will allow users to retain their voting rights when liquid staking their assets, and continue participating in network governance while staking assets through the Protocol.
diff --git a/src/components/landing-screen/Landing.css b/src/components/landing-screen/Landing.css index 6d22371..c218ed6 100644 --- a/src/components/landing-screen/Landing.css +++ b/src/components/landing-screen/Landing.css @@ -14,7 +14,7 @@ .landing-page .landing-page-content a { background: #D35100; -border-radius: 20px; +border-radius: 5px; font-family: 'Mulish'; font-style: normal; font-weight: 600; diff --git a/src/components/navbar/Navbar.css b/src/components/navbar/Navbar.css index 57cde56..1dacd36 100644 --- a/src/components/navbar/Navbar.css +++ b/src/components/navbar/Navbar.css @@ -4,7 +4,7 @@ } .navbar { - background: #1A1A1A; + background: #282828; position: fixed !important; width:100vw !important; z-index: 4; @@ -21,7 +21,7 @@ color: #FFFFFF; .navbar .connect-wallet, .navbar .connect-wallet-button { background: #D35100; -border-radius: 10px; +border-radius: 5px; font-family: 'Mulish'; font-style: normal; font-weight: 600; @@ -44,11 +44,6 @@ color: #FFFFFF; font-weight: 700 !important; } -.navbar .navbar-logo { - background: #333333; -} - - .navbar .nav-icon-stake { height: 30px; margin-right:1px; diff --git a/src/components/staking-interface/delegate/ChooseAllocations.css b/src/components/staking-interface/delegate/ChooseAllocations.css index 5fcb037..9fd37bf 100644 --- a/src/components/staking-interface/delegate/ChooseAllocations.css +++ b/src/components/staking-interface/delegate/ChooseAllocations.css @@ -6,7 +6,7 @@ .allocation-pane .staking-pane { z-index: 3; align-items: center; - border-radius: 30px; + border-radius: 5px; width: 60%; padding: 20px; background: #282828; diff --git a/src/components/staking-interface/delegate/CongratulationsPane.css b/src/components/staking-interface/delegate/CongratulationsPane.css index 845814e..7b1944b 100644 --- a/src/components/staking-interface/delegate/CongratulationsPane.css +++ b/src/components/staking-interface/delegate/CongratulationsPane.css @@ -1,6 +1,6 @@ .congratulations-pane .stake, .congratulations-pane .use-qassets { background: #D35100; -border-radius: 10px; +border-radius: 5px; font-size: 18px; line-height: 30px; font-weight: 400; diff --git a/src/components/staking-interface/delegate/ConnectWallet.css b/src/components/staking-interface/delegate/ConnectWallet.css index 759cff9..1f1e883 100644 --- a/src/components/staking-interface/delegate/ConnectWallet.css +++ b/src/components/staking-interface/delegate/ConnectWallet.css @@ -12,7 +12,7 @@ width: 415px; height: 60px; background: #D35100; - border-radius: 20px; + border-radius: 5px; font-style: normal; font-weight: 400; font-size: 28px; diff --git a/src/components/staking-interface/delegate/NetworkSelection.css b/src/components/staking-interface/delegate/NetworkSelection.css index 1b71c69..7e109dd 100644 --- a/src/components/staking-interface/delegate/NetworkSelection.css +++ b/src/components/staking-interface/delegate/NetworkSelection.css @@ -1,6 +1,6 @@ .wallet-details { align-items: center; - border-radius: 30px; + border-radius: 5px; width: 60%; padding: 20px; background: #282828; @@ -24,7 +24,7 @@ .prev-button { background: hwb(0 100% 0%); -border-radius: 10px; +border-radius: 5px; font-weight: 400; font-size: 18px; color: #D35100; @@ -37,7 +37,7 @@ padding: 5px 20px; .stake-liquid-atoms-button, .stake-existing-delegations-button, .next-button { background: #D35100; -border-radius: 10px; +border-radius: 5px; font-size: 18px; line-height: 30px; font-weight: 400; @@ -72,7 +72,7 @@ border: 2px solid #D35100; .copy-button { background: white; - border-radius: 10px; + border-radius: 5px; font-size: 18px; font-weight: 400; color: #D35100; diff --git a/src/components/staking-interface/delegate/NetworkSelection.tsx b/src/components/staking-interface/delegate/NetworkSelection.tsx index 31cd6e0..5b2e4f6 100644 --- a/src/components/staking-interface/delegate/NetworkSelection.tsx +++ b/src/components/staking-interface/delegate/NetworkSelection.tsx @@ -35,7 +35,7 @@ export default function NetworkSelection() { } useEffect(() => { - if(balances.length > 0) { + if(balances && balances.length > 0) { let balance = balances.find((bal: any) => bal.denom === selectedNetwork.local_denom); if(balance) { console.log(balance) @@ -57,7 +57,7 @@ useEffect(() => { useEffect(() => { - if(networkBalances.length > 0) { + if(networkBalances && networkBalances.length > 0) { let balance = networkBalances.find((bal: any) => bal.denom === selectedNetwork.base_denom); if(balance) { setZoneBalance((balance.amount)/1000000); diff --git a/src/components/staking-interface/delegate/Stake.tsx b/src/components/staking-interface/delegate/Stake.tsx index 0bdd42c..7f425a3 100644 --- a/src/components/staking-interface/delegate/Stake.tsx +++ b/src/components/staking-interface/delegate/Stake.tsx @@ -29,66 +29,10 @@ export default function Stake() { return ( <> -

The Unbonding feature will be enabled early January 2023. Any assets you stake to the protocol will remain locked until that time.

+

The Unbonding feature will be enabled early January 2023. Any assets you stake to the protocol will remain locked until that time.

-
- - {location.pathname === '/stake/delegate' && <> -
-
- Quicksilver logo -
-
-
-
Connect Wallet
-
-
-
-
- Quicksilver logo=2 ? LogoWhite : LogoGray}/> -
-
-
-
= 2 ? " step-text-bold" : "step-text-gray")}> Choose a Network
-
-
-
-
- Quicksilver logo=3 ? LogoWhite : LogoGray}/> -
-
-
-
= 3 ? " step-text-bold" : "step-text-gray")}>Allocate your Stake
-
-
-
-
- Quicksilver logo -
-
-
Stake
-
- -
- - - } -
- -
+ +
Delegate diff --git a/src/components/staking-interface/delegate/SummaryValidators.css b/src/components/staking-interface/delegate/SummaryValidators.css index 88cb49c..8aa85ef 100644 --- a/src/components/staking-interface/delegate/SummaryValidators.css +++ b/src/components/staking-interface/delegate/SummaryValidators.css @@ -1,6 +1,6 @@ .stake-button { background: #D35100; - border-radius: 10px; + border-radius: 5px; font-size: 18px; line-height: 30px; font-weight: 400; diff --git a/src/components/staking-interface/redelegate/RedelegateNetworkSelection.css b/src/components/staking-interface/redelegate/RedelegateNetworkSelection.css index 52d3d1c..2be3ef8 100644 --- a/src/components/staking-interface/redelegate/RedelegateNetworkSelection.css +++ b/src/components/staking-interface/redelegate/RedelegateNetworkSelection.css @@ -1,7 +1,7 @@ .redelegate-pane { padding: 50px; z-index: 3; - border-radius: 30px; + border-radius: 5px; background: #282828; } @@ -9,7 +9,7 @@ .reset-intent { z-index: 3; background: #D35100; - border-radius: 10px; + border-radius: 5px; font-size: 18px; line-height: 30px; font-weight: 400; diff --git a/src/components/staking-interface/undelegate/Undelegate.css b/src/components/staking-interface/undelegate/Undelegate.css index 18cd430..2e58022 100644 --- a/src/components/staking-interface/undelegate/Undelegate.css +++ b/src/components/staking-interface/undelegate/Undelegate.css @@ -1,6 +1,6 @@ .unbond { background: #D35100; -border-radius: 10px; +border-radius: 5px; font-size: 18px; line-height: 30px; font-weight: 400;