Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
431f236
adding validator logos for regen
prakritimalik Mar 28, 2023
7a78f4f
Merge pull request #152 from ingenuity-build/preprod
prakritimalik Mar 28, 2023
0d3aa6b
Merge pull request #154 from ingenuity-build/feature/adding-regen-val…
prakritimalik Mar 29, 2023
05160f9
updating stargaze airdrop
prakritimalik Mar 29, 2023
c20c48d
Merge pull request #155 from ingenuity-build/feature/update-stargaze-…
Mar 29, 2023
212b256
Merge pull request #156 from ingenuity-build/preprod
Mar 29, 2023
609adce
changes to show osmosis msg on FE
prakritimalik Mar 31, 2023
1c52228
whitelist osmosis
prakritimalik Mar 31, 2023
8a179e2
update time
prakritimalik Mar 31, 2023
3ac3ece
Merge pull request #158 from ingenuity-build/feature/show-osmosis-mes…
Mar 31, 2023
ef2a9cb
wip
prakritimalik Mar 31, 2023
c65e26c
Merge pull request #159 from ingenuity-build/feature/whitelist-osmosis
Mar 31, 2023
ab6b837
Merge pull request #160 from ingenuity-build/preprod
prakritimalik Apr 1, 2023
cfe4d24
osmosis pool message
prakritimalik Apr 4, 2023
eccd719
Merge pull request #161 from ingenuity-build/feature/osmosis-pool-com…
prakritimalik Apr 4, 2023
92f2694
Merge pull request #162 from ingenuity-build/preprod
prakritimalik Apr 4, 2023
31d2b9f
add osmosis pool
prakritimalik Apr 17, 2023
3802fdd
Merge pull request #166 from ingenuity-build/feature/osmosis-pool
prakritimalik Apr 17, 2023
15f0f5b
Merge pull request #167 from ingenuity-build/preprod
prakritimalik Apr 17, 2023
c28eb5d
resolving merge conflicts
prakritimalik Apr 19, 2023
5a3903e
resolving merge conflicts
prakritimalik Apr 19, 2023
91bce07
resolving merge conflicts
prakritimalik Apr 19, 2023
caf78e4
updating w latest develop
prakritimalik Apr 19, 2023
a87277a
wip
prakritimalik Apr 20, 2023
5d54a8e
Merge pull request #172 from ingenuity-build/feature/update-preprod-w…
prakritimalik Apr 20, 2023
cc6631f
UI updates
prakritimalik Apr 24, 2023
74dc73f
Merge pull request #173 from ingenuity-build/feature/updates-for-fe
prakritimalik Apr 24, 2023
34d9c25
remove hover from airdrop cards
prakritimalik Apr 24, 2023
8e94eef
Merge pull request #174 from ingenuity-build/feature/fix-airdrop-netw…
prakritimalik Apr 24, 2023
c14d3ed
Merge pull request #175 from ingenuity-build/preprod
prakritimalik Apr 24, 2023
aadd71b
update timing of SI
prakritimalik Apr 27, 2023
74f8a66
Merge pull request #176 from ingenuity-build/feature/update-SI-timings
prakritimalik Apr 27, 2023
fbb45ca
Merge pull request #177 from ingenuity-build/preprod
prakritimalik Apr 27, 2023
92769fe
changes to update assets page
prakritimalik May 8, 2023
c3b540f
wip
prakritimalik May 8, 2023
64fc30f
Merge pull request #180 from ingenuity-build/feature/assets-page-updates
prakritimalik May 8, 2023
f441f51
fixing typo
prakritimalik May 8, 2023
5a3f6c7
Merge pull request #181 from ingenuity-build/feature/assets-page-updates
prakritimalik May 8, 2023
9d3e0d4
Merge pull request #182 from ingenuity-build/preprod
prakritimalik May 9, 2023
e2146a6
remove cosmos from whitelisted zones
prakritimalik May 16, 2023
c4acd12
Update src/components/staking-interface/delegate/ConnectWallet.tsx
ajansari95 May 16, 2023
861d9b9
Merge pull request #183 from ingenuity-build/feature/remove-cosmos-fr…
prakritimalik May 16, 2023
c374b79
Update ConnectWallet.tsx
prakritimalik May 16, 2023
032d8c8
Removing TFM links
prakritimalik May 24, 2023
220f9ea
Merge pull request #185 from ingenuity-build/feature/remove-tfm-links
prakritimalik May 24, 2023
f207bdc
adding cosmos to whitelisted zones
prakritimalik May 24, 2023
38d9840
Merge pull request #186 from ingenuity-build/feature/add-cosmos-to-wh…
ajansari95 May 24, 2023
76787d7
changes to close fe
prakritimalik May 30, 2023
3feacda
Merge pull request #187 from ingenuity-build/feature/close-fe
prakritimalik May 30, 2023
74fd909
Merge pull request #188 from ingenuity-build/preprod
ajansari95 May 30, 2023
088299d
Revert "Closing the FE"
ajansari95 May 30, 2023
3f6764a
Merge pull request #189 from ingenuity-build/revert-188-preprod
ajansari95 May 30, 2023
30f9ef0
msg change
muku314115 Jul 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

NODE_ENV="test"
QUICKSILVER_API="https://lcd.test.quicksilver.zone"
ZONE_URL="test.quicksilver.zone"
REACT_APP_WHITELISTED_ZONES="uni-6,elgafar-1,osmo-test-4,regen-redwood-1,theta-testnet-001"
NODE_ENV="preprod"
QUICKSILVER_API="https://lcd.quicksilver.zone"
ZONE_URL="quicksilver.zone"
REACT_APP_WHITELISTED_ZONES="osmosis-1,stargaze-1,regen-1,cosmoshub-4"
REACT_APP_ENABLE_UNBONDING="true"
REACT_APP_ENABLE_SET_INTENT="true"
REACT_APP_ENABLE_CLAIMS="true"
Expand Down
8 changes: 4 additions & 4 deletions public/env.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
window.env = {
"NODE_ENV": "test",
"QUICKSILVER_API": "https://lcd.test.quicksilver.zone",
"ZONE_URL": "test.quicksilver.zone",
"NODE_ENV": "preprod",
"QUICKSILVER_API": "https://lcd.quicksilver.zone",
"ZONE_URL": "quicksilver.zone",
"REACT_APP_ENABLE_SET_INTENT": "true",
"REACT_APP_ENABLE_UNBONDING": "true",
"REACT_APP_ENABLE_CLAIMS": "true",
"REACT_APP_WHITELISTED_ZONES": "uni-6,elgafar-1,osmo-test-4,regen-redwood-1,theta-testnet-001",
"REACT_APP_WHITELISTED_ZONES": "osmosis-1,stargaze-1,regen-1,cosmoshub-4",
"APY_ZONES_ENDPOINT": "https://chains.cosmos.directory"
};
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions src/components/airdrops-interface/Airdrops.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ font-size: 24px;
z-index: 3;
}

.network-card {
.assets-interface .network-card {
background: #282828;
border: 2px solid #282828;
border-radius: 5px;
Expand All @@ -30,4 +30,12 @@ font-size: 24px;
.network-image {
height: 75px;
padding-left: 16px;
}
}

.airdrop-heading {
color :#D35100
}

.assets-interface .networks{
z-index:3
}
11 changes: 10 additions & 1 deletion src/components/airdrops-interface/Airdrops.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import './Airdrops.css';
import { useSelector, useDispatch } from 'react-redux'
import { networksSelector, fetchNetworks } from '../../slices/networks'
import {airdropsSelector, fetchStargazeAirdropAllocation} from '../../slices/airdrops';
import { Tooltip as ReactTooltip} from "react-tooltip";
import Question from '../../assets/icons/question-mark.svg';

export default function Airdrop() {
const [address, setAddress] = useState('');
Expand All @@ -29,7 +31,14 @@ export default function Airdrop() {
<div className="assets-interface row mx-0 w-100">
<div className="mt-3 mb-5 networks w-75 justify-content-center m-auto">
<div className="row">
<h2 className="mt-5 text-center mb-4">Airdrops</h2>
<h2 className="mt-5 text-center mb-4">Airdrops<span><img id="airdrop" className="question" src={Question}/></span></h2>
<div className="text-center">
<ReactTooltip
anchorId="airdrop"
place="bottom"
content={`Quicksilver performs an airdrop to the community of each onboarded chain. Check back for the latest airdrop news. `}
/>
</div>
{networks.map((network: any) =>
<>
{/* <button onClick={() => onButtonClick(network)} className="connect-wallet-button mt-5"><span><img src={network.image}/></span> {network.label} {parseFloat(network.value?.redemption_rate).toFixed(4)} {network?.apy * 100}</button> </> */}
Expand Down
9 changes: 9 additions & 0 deletions src/components/assets-interface/Assets.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,13 @@ color: #D35100
.pool {
height:12px;
margin-top: -2px;
}

.quicksilver-bal {
font-size: 12px;
color: #898989;
}

.asset-detail {
z-index: 4;
}
87 changes: 54 additions & 33 deletions src/components/assets-interface/Assets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,25 @@ export default function Assets() {
const [sum, setsum] = useState<number>(0);
const [showAssets, setShowAssets] = useState(true);

const {balances, isQSWalletConnected, quicksilverClient, quicksilverAddress} = useSelector(quicksilverSelector);
const {balances, isQSWalletConnected, quicksilverClient, quicksilverAddress, walletType} = useSelector(quicksilverSelector);
const { networks, hasErrors } = useSelector(networksSelector);
const [denomArray, setDenomArray] = useState<Array<string>>([])
const {isPoolModalOpen} = useSelector(poolModalSelector)
useEffect(() => {
if(isQSWalletConnected && networks) {
let denomArray : Array<string> = [];
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<string> = [];
// 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])



Expand Down Expand Up @@ -251,36 +251,57 @@ These rewards will be distributed on an epochly basis (every 3 days).
{/* {sum === 0 && <h5 className="mt-4">Calculating...</h5>} */}
{hasErrors && <p className="text-center"> There's an issue with fetching the network list. Please try again.</p>}
{/* {sum !==0 && <h5 className="mt-4"><span className="amount">$ {sum.toFixed(4)} </span>in {balances.length} assets across Quicksilver chain</h5>} */}
{balances.length > 0 && <div className="mt-3 validators row w-100 justify-content-start text-center">
{balances.length > 0 && <div className="mt-3 validators row w-100 justify-content-start text-center mb-4">
{balances.filter((bal: any) => (networks.find((y:any) => y.value.local_denom === bal.denom)) || bal.denom === 'uqck').map((bal: Coin, i: number) =>

<div className={`asset-card col-3 m-3 ${bal.denom !== 'uqck' ? 'order-1' : ''}`} key={i}>
<img className="d-block mx-auto" src={params[bal.denom]}/>
<div className="d-flex mt-2 align-items-baseline justify-content-center">

<h5 className="font-bold"> {(+(bal.amount)/1000000).toFixed(3)} {bal.denom !== 'uqck' && <span>{bal.denom[1] + bal.denom.slice(2).toUpperCase()}</span>}</h5>
<div className={`col-4 asset-detail ${bal.denom !== 'uqck' ? 'order-1' : ''}`} key={i}>
<div className="asset-card m-2 mt-4">
<div className="d-flex justify-content-center align-items-center">
<img className="d-block" src={params[bal.denom]}/>
<h3 > {bal.denom !== 'uqck' && <span>{bal.denom[1] + bal.denom.slice(2).toUpperCase()}</span>}</h3>
{bal.denom === 'uqck' && <h3 className="text-center mx-2"> QCK</h3>}
</div>
<div className="d-flex flex-column mt-4 align-items-center justify-content-center">

<h5 className="mb-0 font-bold"> {(+(bal.amount)/1000000).toFixed(3)} {bal.denom[1] + bal.denom.slice(2).toUpperCase()} </h5>
<p className="mt-0 quicksilver-bal">QUICKSILVER BALANCE</p>



{bal.denom === 'uqck' && <h5 className="text-center mx-2"> QCK</h5>}



</div>
{bal.denom !== 'uqck' && <h6> ≈ {((networks.find((y:any) => y.value.local_denom === bal.denom).value.redemption_rate) * +(bal.amount)/1000000).toFixed(3) } { bal.denom.slice(2).toUpperCase()}</h6>}
{bal.denom !== 'uqck' && <p className="redemption-rate"> at current redemption rate <span><img id={i.toLocaleString()} className="question" src={Question}/></span></p>}
{bal.denom !== 'uqck' && <ReactTooltip
anchorId={i.toLocaleString()}
place="bottom"
content={`The current redemption rate is ${(+(networks.find((y:any) => y.value.local_denom === bal.denom).value.redemption_rate)).toFixed(4) } ${bal.denom[1] + bal.denom.slice(2).toUpperCase()} per ${bal.denom.slice(2).toUpperCase()} `}
/>}
{bal.denom === 'uqatom' && <a href="https://app.osmosis.zone/pool/944" target="_blank" className="pool-text">Pool on Osmosis <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqregen' && <a href="https://app.osmosis.zone/pool/948" target="_blank" className="pool-text">Pool on Osmosis <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqstars' && <a href="https://app.osmosis.zone/pool/903" target="_blank" className="pool-text">Pool on Osmosis <span><img className="pool" src={ExternalLink}/></span></a>}
<p className={`text-center ${bal.denom == 'uqck' ? 'invisible' : ''}`}>
1 {bal.denom[1] + bal.denom.slice(2).toUpperCase() } = {(+(networks.find((y:any) => y.value.local_denom === bal.denom)?.value.redemption_rate)).toFixed(4) } {bal.denom.slice(2).toUpperCase() } at current redemption rate
</p>

{bal.denom === 'uqatom' && <a href="https://app.osmosis.zone/pool/944" target="_blank" className="pool-text">Osmosis Pool <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqregen' && <a href="https://app.osmosis.zone/pool/948" target="_blank" className="pool-text">Osmosis Pool <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqstars' && <a href="https://app.osmosis.zone/pool/903" target="_blank" className="pool-text">Osmosis Pool <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqosmo' && <a href="https://app.osmosis.zone/pool/956" target="_blank" className="pool-text">Osmosis Pool <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqck' && walletType === 'keplr' && <a href="http://wallet.keplr.app/" target="_blank" className="pool-text">Stake QCK <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqck' && walletType === 'leap' && <a href="https://cosmos.leapwallet.io/home" target="_blank" className="pool-text">Stake QCK <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqck' && walletType === 'cosmostation' && <a href="https://wallet.cosmostation.io/cosmos" target="_blank" className="pool-text">Stake QCK <span><img className="pool" src={ExternalLink}/></span></a>}


<div className="d-flex mt-2 justify-content-around">
{bal.denom === 'uqatom' && <a href=" https://tfm.com/bridge?chainFrom=osmosis-1&chainTo=quicksilver-2&token0=ibc%2FFA602364BEC305A696CBDF987058E99D8B479F0318E47314C49173E8838C5BAC" target="_blank" className="pool-text">Deposit <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqregen' && <a href="https://tfm.com/bridge?chainFrom=osmosis-1&chainTo=quicksilver-2&token0=ibc%2F79A676508A2ECA1021EDDC7BB9CF70CEEC9514C478DA526A5A8B3E78506C2206" target="_blank" className="pool-text">Deposit <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqstars' && <a href=" https://tfm.com/bridge?chainFrom=osmosis-1&chainTo=quicksilver-2&token0=ibc%2F46C83BB054E12E189882B5284542DB605D94C99827E367C9192CF0579CD5BC83" target="_blank" className="pool-text">Deposit <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqosmo' && <a href="https://tfm.com/bridge?chainFrom=osmosis-1&chainTo=quicksilver-2&token0=ibc%2F42D24879D4569CE6477B7E88206ADBFE47C222C6CAD51A54083E4A72594269FC" target="_blank" className="pool-text"> Deposit <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqck' && <a href="https://tfm.com/bridge?chainFrom=osmosis-1&chainTo=quicksilver-2&token0=ibc%2F635CB83EF1DFE598B10A3E90485306FD0D47D34217A4BE5FD9977FA010A5367D" target="_blank" className="pool-text"> Deposit <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqatom' && <a href="https://tfm.com/bridge?chainFrom=quicksilver-2&chainTo=osmosis-1&token0=uqatom" target="_blank" className="pool-text">Withdraw <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqregen' && <a href="https://tfm.com/bridge?chainFrom=quicksilver-2&chainTo=osmosis-1&token0=uqregen" target="_blank" className="pool-text">Withdraw <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqstars' && <a href="https://tfm.com/bridge?chainFrom=quicksilver-2&chainTo=osmosis-1&token0=uqregen" target="_blank" className="pool-text">Withdraw <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqosmo' && <a href="https://tfm.com/bridge?chainFrom=quicksilver-2&chainTo=osmosis-1&token0=uqosmo" target="_blank" className="pool-text">Withdraw <span><img className="pool" src={ExternalLink}/></span></a>}
{bal.denom === 'uqck' && <a href="https://tfm.com/bridge?chainTo=osmosis-1&chainFrom=quicksilver-2&token0=uqck" target="_blank" className="pool-text">Withdraw <span><img className="pool" src={ExternalLink}/></span></a>}
</div>
{/* {bal.denom === 'uqstars' && <button onClick={onPoolButtonClick} className="w-100 prev-button"> Use {bal.denom[1] + bal.denom.slice(2).toUpperCase()} </button>} */}
</div>



</div>

)}

Expand Down
2 changes: 1 addition & 1 deletion src/components/navbar/Navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
background: #1A1A1A;
position: fixed !important;
width:100vw !important;
z-index: 4;
z-index: 1000;
}

.navbar-nav .nav-item a {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ useEffect(() => {
{(zoneBalance) > 0.31 && <div className="staking-pane d-flex flex-column mt-4">
<h4 className="mt-3">Allocate Stake</h4>
<p className="mt-2 allocation-message">
Signalling Intent will be enabled Q1 2023. Until such time, your stake will be allocated evenly amongst all the active validators of the chains supported by Quicksilver. However, you can use the sliders now to determine how you would like the protocol to start allocating your stake once Signalling intent is enabled.
Quicksilver is the only liquid staking protocol that lets you choose your preferred validator for liquid staking. Liquid staked delegations may take up to 21 days to appear on your preferred validator due to global limits on concurrent redelegations.
<br/>
<br/>
If you signal your intent several times before the feature is enabled, the protocol will take into consideration the final intent you have set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ padding: 1rem;
width: 70px;
border-radius: 5px;
margin-left: 10px;
font-size: 14px;
font-size: 10px;
margin-top: 10px;
}

Expand All @@ -99,6 +99,6 @@ padding: 1rem;
width: 80px;
border-radius: 5px;
margin-left: 10px;
font-size: 14px;
font-size: 10px;
margin-top: 10px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ export default function ChooseValidators() {
if(selectedValidatorList.length === 0 ) {
// let newArray = [];
// newArray = validators.map((val: any) => { val.active = false; return val});
let newData = validators.filter((val:any) => val.status === 'BOND_STATUS_BONDED').map((val: any) =>
let newData = validators.filter((val:any) => val.status === 'BOND_STATUS_BONDED').filter((val:any) => val.status === 'BOND_STATUS_BONDED').map((val: any) =>
Object.assign({}, val, {active:false})
)
setValidators([...newData].sort(() => Math.random() - 0.5));
} else {
let newData = validators.filter((val:any) => val.status === 'BOND_STATUS_BONDED').map((val: any) => {
let newData = validators.filter((val:any) => val.status === 'BOND_STATUS_BONDED').filter((val:any) => val.status === 'BOND_STATUS_BONDED').map((val: any) => {
if(selectedValidatorList.find((x: any) => x.address === val.address)) {
return Object.assign({}, val, {active: true})
} else {
Expand Down Expand Up @@ -177,6 +177,8 @@ const onNext = () => {
}




return (

<div className="validator-selection-pane d-flex flex-column align-items-center">
Expand Down Expand Up @@ -234,7 +236,7 @@ const onNext = () => {

<div className="mt-2 button-container">
<button onClick={onPrevious} className="prev-button mx-3" > Previous</button>
<button disabled={selectedValidators.length > 8 || selectedValidators.length === 0 } className="next-button mx-3 mb-5" onClick={onNext} >Next</button>
<button disabled={selectedValidators.length > 8 || selectedValidators.length === 0 } className="next-button mx-3 mb-5 mb-5" onClick={onNext} >Next</button>
</div>
{isInactiveValsModalOpen && <InactiveValidatorsModal />}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import Confetti from 'react-confetti'
import './CongratulationsPane.css';
import { setStakingStep } from "../../../slices/stakingActiveStep";
import { useSelector, useDispatch } from 'react-redux'
import { setSelectedValidatorList } from "../../../slices/validatorList";
import { setSelectedValidatorList } from "../../../slices/validatorList";
import Moment from 'moment';

import { selectedNetworkSelector} from "../../../slices/selectedNetwork";
import { selectedNetworkSelector, setSelectedNetworkFunc} from "../../../slices/selectedNetwork";


export default function CongratulationsPane() {
Expand Down Expand Up @@ -37,9 +37,11 @@ export default function CongratulationsPane() {

const stakeAnotherNetwork = () => {
// @ts-expect-error
dispatch(setStakingStep(2));
dispatch(setStakingStep(1));
// @ts-expect-error
dispatch(setSelectedValidatorList([]))
// @ts-expect-error
dispatch(setSelectedNetworkFunc("Select a network"));


}
Expand All @@ -51,7 +53,7 @@ export default function CongratulationsPane() {
{showOsmoMessage && <h5 className="mt-2"> Due to congestion on the Osmosis chain, the minting of qOSMO can take longer than usual.</h5>}
<h5 className="mt-2">Your {selectedNetwork.local_denom[1] + selectedNetwork.local_denom.slice(2).toUpperCase()} will arrive in your Quicksilver wallet shortly.</h5>
<div className="button-container mt-4">
<button onClick={stakeAnotherNetwork} className="stake mx-2"> Stake Another </button>
<button onClick={stakeAnotherNetwork} className="stake mx-2"> Stake Another Asset </button>
</div>
</div>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ background: #FFFFFF;
padding-left: 16px;;
}

.network-card:hover {
.connect-wallet-pane .network-card:hover {
cursor: pointer;
border: 2px solid #D35100;
}
10 changes: 10 additions & 0 deletions src/components/staking-interface/delegate/NetworkSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { validatorListSelector } from "../../../slices/validatorList";
import Moment from 'moment';



export default function NetworkSelection() {
const dispatch = useDispatch()
const { networks, hasErrors } = useSelector(networksSelector);
Expand Down Expand Up @@ -69,6 +70,14 @@ if (Moment(time, 'HH:mm').isBetween(beforeTime, afterTime)) {
}
}, [selectedNetwork])

useEffect(() => {
if(validatorList.length > 0) {
setLoadingValidators(false);
}
}, [validatorList])



useEffect(() => {
if(validatorList.length > 0) {
setLoadingValidators(false);
Expand Down Expand Up @@ -168,6 +177,7 @@ useEffect(() => {
{selectedNetwork.liquidity_module && <button className={`stake-existing-delegations-button mx-3 ${selectedNetwork === "Select a network" ? 'd-none' : ''}`} > Stake Existing Delegations </button>}

</div>}

{showOsmoMessage && <h5 className="mt-5 w-50 text-center m-auto">OSMO deposits are disabled due to congestion on the Osmosis Network during the Osmosis epoch boundary from 17:00 - 17:30 UTC.</h5>}
<div className="button-container">
{showOsmoMessage && <button onClick={onBack} className="prev-button mx-3 mt-5" > Back</button>}
Expand Down