Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
0e6c1ee
changing URL to test
prakritimalik Nov 24, 2022
906b6a3
Merge pull request #13 from ingenuity-build/develop
prakritimalik Nov 24, 2022
d7fc6be
Merge pull request #16 from ingenuity-build/develop
prakritimalik Nov 24, 2022
0e944b7
Merge pull request #18 from ingenuity-build/develop
prakritimalik Nov 25, 2022
03a2586
Merge pull request #20 from ingenuity-build/develop
prakritimalik Nov 25, 2022
a1445b2
Merge pull request #21 from ingenuity-build/testnet-fixes
Nov 28, 2022
ae3f1d5
Merge branch 'test' into develop
Nov 28, 2022
10bd09e
Merge pull request #22 from ingenuity-build/develop
Nov 28, 2022
3edcfc2
Merge pull request #23 from ingenuity-build/develop
Nov 28, 2022
4cda88a
Merge pull request #24 from ingenuity-build/develop
Nov 28, 2022
9a9843e
Merge pull request #26 from ingenuity-build/develop
Dec 1, 2022
1e8e16d
Merge pull request #30 from ingenuity-build/develop
Dec 1, 2022
290e60d
Merge pull request #32 from ingenuity-build/develop
Dec 9, 2022
d72a082
Merge pull request #34 from ingenuity-build/develop
Dec 20, 2022
f5b3c97
Merge pull request #36 from ingenuity-build/develop
Dec 20, 2022
18da40a
Merge pull request #40 from ingenuity-build/develop
Dec 21, 2022
8847234
Merge pull request #41 from ingenuity-build/test
Dec 21, 2022
01aa342
Bump loader-utils from 2.0.2 to 2.0.4
dependabot[bot] Dec 21, 2022
9a3515c
Bump minimatch and recursive-readdir
dependabot[bot] Dec 21, 2022
92fc2a2
Merge pull request #45 from ingenuity-build/develop
Dec 22, 2022
fb5513d
Merge pull request #46 from ingenuity-build/test
Dec 22, 2022
b01e9a4
Merge pull request #48 from ingenuity-build/develop
Dec 22, 2022
08f3ad2
Merge pull request #49 from ingenuity-build/test
Dec 22, 2022
81dd195
Merge pull request #51 from ingenuity-build/develop
Dec 23, 2022
9896ce4
Merge pull request #52 from ingenuity-build/test
Dec 23, 2022
31a121c
Merge pull request #54 from ingenuity-build/develop
Dec 23, 2022
03cfd7f
Merge pull request #55 from ingenuity-build/test
Dec 23, 2022
adbf8ae
Merge pull request #56 from ingenuity-build/develop
Dec 23, 2022
f7a7542
Merge pull request #57 from ingenuity-build/test
Dec 23, 2022
432a6f9
Merge pull request #59 from ingenuity-build/develop
Dec 23, 2022
ad2310e
Merge pull request #60 from ingenuity-build/test
Dec 23, 2022
b3f5b73
Merge pull request #62 from ingenuity-build/develop
ajansari95 Dec 23, 2022
eb2b267
Merge pull request #63 from ingenuity-build/test
ajansari95 Dec 23, 2022
b7967b9
Merge pull request #43 from ingenuity-build/dependabot/npm_and_yarn/m…
Dec 26, 2022
8128351
Merge pull request #42 from ingenuity-build/dependabot/npm_and_yarn/l…
Dec 26, 2022
670074b
Merge pull request #64 from ingenuity-build/revert-disable-staking
Dec 26, 2022
a6c8d88
Revert "Revert "hiding connect wallet buttons""
Dec 28, 2022
3d769c7
Merge pull request #65 from ingenuity-build/revert-64-revert-disable-…
Dec 28, 2022
8cc2c7c
updating message
prakritimalik Jan 3, 2023
3c13147
Merge pull request #66 from ingenuity-build/feature/update-message
Jan 3, 2023
a3246fc
changes for preprod branch
prakritimalik Jan 6, 2023
1b29d3d
changes for prod chain.ts
prakritimalik Jan 6, 2023
dcbd145
updating version of cosmjs
prakritimalik Jan 6, 2023
4fd7f2f
updating quicksilver chainid
prakritimalik Jan 6, 2023
7c13478
changes to front end
prakritimalik Jan 9, 2023
0e56bf1
adding social media icons
prakritimalik Jan 9, 2023
ad714f0
Merge pull request #69 from ingenuity-build/feature/front-end-changes
Jan 9, 2023
497ab01
removing marker io extension
prakritimalik Jan 11, 2023
0a50056
Merge pull request #71 from ingenuity-build/feature/remove-markerio
prakritimalik Jan 11, 2023
84afad2
Merge pull request #75 from ingenuity-build/preprod
Jan 18, 2023
1f9b0e2
Revert "Merge preprod to master"
Jan 18, 2023
e6b2364
Merge pull request #76 from ingenuity-build/revert-75-preprod
Jan 18, 2023
adb8296
remove marker io
prakritimalik Jan 20, 2023
7390511
fix freegrant typo
prakritimalik Jan 20, 2023
87c1ada
updating unbonding msg
prakritimalik Jan 20, 2023
79f3f79
Merge pull request #78 from ingenuity-build/feature/remove-marker-io
prakritimalik Jan 20, 2023
4738ed2
update cosmjs
prakritimalik Jan 20, 2023
a3c1af2
Merge pull request #79 from ingenuity-build/feature/remove-marker-io
prakritimalik Jan 20, 2023
6792ea1
update preprod branch
prakritimalik Jan 21, 2023
ad16236
Merge pull request #80 from ingenuity-build/feature/update-preprod
Jan 21, 2023
549600c
update staking successful message
prakritimalik Jan 23, 2023
3c1b058
update message
prakritimalik Jan 23, 2023
c474a41
Merge pull request #82 from ingenuity-build/feature/update-staking-me…
Jan 23, 2023
f2bb0f8
changes to update msg
prakritimalik Jan 23, 2023
7264d9e
Merge pull request #84 from ingenuity-build/feature/update-staking-sc…
Jan 23, 2023
404dace
wip
prakritimalik Jan 23, 2023
07a8261
Merge pull request #86 from ingenuity-build/feature/search-validators
Jan 23, 2023
2e3a1df
changes to randomise validator list
prakritimalik Jan 24, 2023
cc05a91
Merge pull request #87 from ingenuity-build/feature/randomise-validat…
prakritimalik Jan 24, 2023
7a4c88a
update css search bar
prakritimalik Jan 24, 2023
972f305
Merge pull request #88 from ingenuity-build/feature/update-search-bar
prakritimalik Jan 24, 2023
5a7c8da
wip
prakritimalik Jan 26, 2023
cc3f9b7
change resolution
prakritimalik Jan 26, 2023
9f5530f
Merge pull request #90 from ingenuity-build/feature/handle-smaller-re…
Jan 26, 2023
a427ff7
update develop
prakritimalik Feb 3, 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,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"
8 changes: 8 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
REACT_APP_ENABLE_SET_INTENT="false"
REACT_APP_ENABLE_CLAIMS="true"

[context.preprod.environment]
NODE_ENV = "preprod"
QUICKSILVER_API = "https://lcd.quicksilver.zone"
ZONE_URL = "quicksilver.zone"
REACT_APP_ENABLE_UNBONDING="false"
REACT_APP_ENABLE_SET_INTENT="false"
REACT_APP_ENABLE_CLAIMS="true"

[context.develop.environment]
NODE_ENV = "dev"
QUICKSILVER_API = "https://lcd.dev.quicksilver.zone"
Expand Down
616 changes: 211 additions & 405 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@cosmjs/stargate": "^0.28.4",
"@cosmjs/stargate": "^0.29.5",
"@keplr-wallet/stores": "^0.10.3",
"@keplr-wallet/types": "^0.10.3",
"@reduxjs/toolkit": "^1.8.5",
Expand Down Expand Up @@ -82,6 +82,6 @@
"REACT_APP_ENABLE_UNBONDING",
"REACT_APP_ENABLE_CLAIMS"
]
},
},
"homepage": ""
}
8 changes: 4 additions & 4 deletions public/env.js
Original file line number Diff line number Diff line change
@@ -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"
};
36 changes: 35 additions & 1 deletion src/components/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,38 @@
display: flex;
justify-content: center;
align-items: center;
}
}

.mobile-message {
display: none;
}

@media (max-width: 1279.98px) {
.navbar .navbar-logo {
background:#1A1A1A;

}
.img-logo {
display: none;
}

.unbonding-message, .staking-interface, .navbar ul, .navbar .connect-wallet-button, .connect-wallet, .navbar .custom-class, .assets-interface {
display: none !important;

}

.mobile-message {
display: flex !important;
justify-content: center;
align-items: center;
margin-top: 58px;
position: absolute;
min-height: calc(100vh - 58px);
background:#1A1A1A;
width: 100vw;
}

.mobile-message h4 {
color: #fff;
}
}
6 changes: 5 additions & 1 deletion src/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ function App() {




React.useEffect(() => {
let timer: any;
if(!isIdle) {
timer = setInterval( () => {
if(isQSWalletConnected) {
//connectKeplr();
fetchKeplrDetails(val);
console.log('hey');
// setBalances(new Map<string, Map<string, number>>(balances.set(chainId, new Map<string, number>(networkBalances.set(bal.denom, parseInt(bal.amount))))));
}
}, 6000)
Expand Down Expand Up @@ -132,7 +132,11 @@ const fetchKeplrDetails = async (val: any) => {
<div className="img-logo text-center">
<img className="logo-stroke" src={LogoStroke} alt="Quicksilver Logo"/>
</div>

{location.pathname !== '/' && <Navbar loading={loading} setLoading={setLoading} handleClickOpen={handleClickOpen} />}
<div className="mobile-message p-3">
<h4>The current display window is too small. Minimum supported resolution is 1280 pixels wide.</h4>
</div>
<Routes>
<Route path="/" element={<Landing/>}/>

Expand Down
1 change: 1 addition & 0 deletions src/components/assets-interface/Assets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ export default function Assets() {
<h4 className="sub-heading"> Hey there! </h4>
<h1 className="mt-3"> Connect your wallet to get started! </h1>
<button onClick={onButtonClick} className="connect-wallet-button mt-5"> Connect Wallet </button>
{/* <h4 className="sub-heading"> Assets screen will be enabled soon. Stay tuned.</h4> */}
</div>
</div>

Expand Down
2 changes: 0 additions & 2 deletions src/components/navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ export default function Navbar(props: PropComponent) {
let roBalance = await val.getAllBalances(bech32);
// @ts-expect-error
dispatch(setNetworkBalance(roBalance));
console.log('roBalance',roBalance);
}
}

Expand All @@ -160,7 +159,6 @@ export default function Navbar(props: PropComponent) {
if(isQSWalletConnected) {
//connectKeplr();
fetchNetworkDetails(val);
console.log('VAL', val)
// setBalances(new Map<string, Map<string, number>>(balances.set(chainId, new Map<string, number>(networkBalances.set(bal.denom, parseInt(bal.amount))))));
}
}, 10000)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export default function ChooseAllocations() {
if(balances !== []) {
let balance = balances.find((bal: any) => bal.denom === selectedNetwork.local_denom);
if(balance) {
console.log(balance)
setQCKBalance((balance.amount)/1000000);

}
Expand Down Expand Up @@ -81,7 +80,6 @@ useEffect(() => {
}, [])

useEffect(() => {
console.log('Checking use Effect');
if(isMax.current) {

calculateMax()
Expand Down Expand Up @@ -126,10 +124,6 @@ useEffect(() => {

}
else if(selectedValidatorList.length !== 6 && selectedValidatorList.length > 1) {

console.log('Amount' , stakingAmount);
console.log('Length' , selectedValidatorList.length);
console.log('Value', value);
selectedValidatorList.forEach((x: any) => {
let newAllocationProp : any = {...allocationProp};

Expand Down
14 changes: 13 additions & 1 deletion src/components/staking-interface/delegate/ChooseValidators.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ padding: 1rem;
.validator-selection-pane .validators {
max-height: 41vh;
overflow-y: auto;
width: 90%;
}

.max-button {
Expand All @@ -43,4 +44,15 @@ padding: 1rem;
.next-button:disabled {
background: #D87D44;
border: #D87D44;
}
}

.search {
border-radius: 10px;
width: 275px;
padding: 5px;
height: 45px;
}

.choose-heading {
margin-left: 0px;
}
41 changes: 28 additions & 13 deletions src/components/staking-interface/delegate/ChooseValidators.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,30 @@ export default function ChooseValidators() {


const filterData = () => {
setValidators(validatorList.filter((val: any) => val.name.toLowerCase().includes(searchTerm.toLowerCase())));
let newData = validatorList.map((val: any) => {
if(selectedValidators.find((x: any) => x.address === val.address)) {
return Object.assign({}, val, {active: true})
} else {
return Object.assign({}, val, {active:false})
}
}
)
setValidators(newData.filter((val: any) => val.name.toLowerCase().includes(searchTerm.toLowerCase())));
}

React.useEffect(() => {
if(searchTerm) {
filterData();
} else {

setValidators(validatorList)
let newData = validatorList.map((val: any) => {
if(selectedValidators.find((x: any) => x.address === val.address)) {
return Object.assign({}, val, {active: true})
} else {
return Object.assign({}, val, {active:false})
}
}
)
setValidators(newData);
}
},[searchTerm])

Expand All @@ -55,8 +70,7 @@ export default function ChooseValidators() {
let newData = validators.map((val: any) =>
Object.assign({}, val, {active:false})
)
console.log(newData);
setValidators(newData);
setValidators([...newData].sort(() => Math.random() - 0.5));
} else {
let newData = validators.map((val: any) => {
if(selectedValidatorList.find((x: any) => x.address === val.address)) {
Expand All @@ -66,8 +80,7 @@ export default function ChooseValidators() {
}
}
)
console.log(newData)
setValidators(newData);
setValidators([...newData].sort(() => Math.random() - 0.5));
}
// validatorList.find((x: any) => x.address === row.validator_address )?.name

Expand Down Expand Up @@ -121,12 +134,12 @@ const onNext = () => {
return (

<div className="validator-selection-pane d-flex flex-column align-items-center">
<h2 className="mt-3"> Choose validators </h2>
<h2 className="mt-3 choose-heading"> Choose Validators </h2>

{/* <input className="mt-2 px-2" type="text" value={searchTerm} onChange={handleChange} placeholder="Search validators"/> */}
<input className="mt-2 px-2 search" type="text" value={searchTerm} onChange={handleChange} placeholder="Search Validators"/>

<div className="mt-3 validators row w-100 justify-content-center">
{validators.length === 0 && <p className="text-center"> There's an issue with fetching validator list. Please try again</p>}
<div className="mt-3 validators row justify-content-center">
{validatorList.length === 0 && !hasErrors && <p className="text-center"> There's an issue with fetching validator list. Please try again</p>}
{validators.map((row: any) =>
<>
<div onClick={ (e) => addValidator(e,row)} className={`validator-card col-3 m-3 ${row?.active ? 'val-active' : ''}`}>
Expand All @@ -138,16 +151,18 @@ const onNext = () => {
{/* <h4 className="font-bold"> Reward </h4> */}
</div>
</div>
{hasErrors && <p> There's an issue with fetching the validators. Please try again</p>}
</div>

</>

)}
{hasErrors && <p className="text-center"> There's an issue with fetching the validators. Please try again</p>}

</div>
<p className="text-center mt-3">Showing {validators.length} validators... </p>
{selectedValidators.length > 8 && <p className="mt-3"> A maximum of 8 validators can be selected</p>}

<div className="mt-5 button-container">
<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" onClick={onNext} >Next</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ export default function CongratulationsPane() {
<>
<div className="congratulations-pane d-flex mt-5 justify-content-center align-items-center flex-column">
<h4 className="mt-5">Your assets have been successfully staked!</h4>
<h5 className="mt-2">Your qAssets will arrive in your Quicksilver wallet shortly.</h5>
<div className="button-container mt-4">
<button onClick={stakeAnotherNetwork} className="stake mx-2"> Stake on another network </button>
<button onClick={stakeAnotherNetwork} className="stake mx-2"> Stake again </button>
</div>
</div>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default function ConnectWallet() {
<h4 className="sub-heading"> Hey there! </h4>
<h1 className="mt-3"> Connect your wallet to get started! </h1>
<button onClick={onButtonClick} className="connect-wallet-button mt-5"> Connect Wallet </button>
{/* <h4 className="sub-heading"> Deposits will be enabled soon. Stay tuned. </h4> */}
</div>
</>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export default function NetworkSelection() {
if(balances !== []) {
let balance = balances.find((bal: any) => bal.denom === selectedNetwork.local_denom);
if(balance) {
console.log(balance)
setQCKBalance((balance.amount)/1000000);
} else
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/staking-interface/delegate/Stake.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function Stake() {

return (
<>
<p className="unbonding-message"> The Unbonding feature will be enabled early January 2023. Any assets you stake to the protocol will remain locked until that time.</p>
<p className="unbonding-message"> The Unbonding feature will be enabled early Q1 2023. Any assets you stake to the protocol will remain locked until that time.</p>
<div className="staking-interface row mx-0">
<div className="stepper col-2 d-flex flex-column ">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,6 @@ export default function RedelegateAllocations() {
redelegateValidatorList.forEach((x: any) => {

sum = sum + allocationProp[x.address]['value'] ; console.log(allocationProp[x.address]['value'])})
console.log(sum);
if(sum < 100) {
console.log("Please allocation more atoms");
} else if(sum > 100) {
console.log("Please allocation less atoms");
} else {
console.log("please proceed");
}
setSum(sum);

}
Expand All @@ -95,7 +87,7 @@ export default function RedelegateAllocations() {

}
out = out.toString();
console.log(out);


let msg = {
typeUrl: "/quicksilver.interchainstaking.v1.MsgSignalIntent",
Expand Down
Loading