ghostchain/ghost-dao-interface
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ghostchain:cffaad697391d42eb8281aa1b011ca6edd2a3d55
Branches Tags
ghostchain:main
ghostchain:extension-integration
..
compare: ghostchain:b44b6f0c149db22718fc9621aae4d56b9007b143
Branches Tags
ghostchain:main
ghostchain:extension-integration

No commits in common. "cffaad697391d42eb8281aa1b011ca6edd2a3d55" and "b44b6f0c149db22718fc9621aae4d56b9007b143" have entirely different histories.
cffaad6973 ... b44b6f0c14

2 changed files with 26 additions and 28 deletions
Show Stats Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "ghost-dao-interface", "name": "ghost-dao-interface",
"private": true, "private": true,
"version": "0.3.11", "version": "0.3.9",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

22
src/containers/Bridge/Bridge.jsx
View File

@ -194,7 +194,7 @@ const Bridge = ({ chainId, address, config, connect }) => {
const clapsNeeded = Math.floor(clapsInSessionLength * appluseThreshold / 100); const clapsNeeded = Math.floor(clapsInSessionLength * appluseThreshold / 100);
const step = finalization > 0 const step = finalization > 0
? 0 ? 0
: receivedClapsLength < clapsNeeded && !transactionApplaused : receivedClapsLength < clapsNeeded
? 1 ? 1
: !transactionApplaused : !transactionApplaused
? 2 ? 2
@ -272,8 +272,12 @@ const Bridge = ({ chainId, address, config, connect }) => {
} else { } else {
setIsPending(true); setIsPending(true);
try {
const txHash = await ghost(chainId, address, convertedReceiver, preparedAmount); const txHash = await ghost(chainId, address, convertedReceiver, preparedAmount);
await ghstBalanceRefetch();
setReceiver("");
setAmount("");
setIsPending(false);
const transaction = { const transaction = {
sessionIndex: currentSession ?? 0, sessionIndex: currentSession ?? 0,
@ -292,12 +296,6 @@ const Bridge = ({ chainId, address, config, connect }) => {
if (providerDetail) { if (providerDetail) {
setActiveTxIndex(newStoredTransactions.length - 1) setActiveTxIndex(newStoredTransactions.length - 1)
} }
} finally {
await ghstBalanceRefetch();
setReceiver("");
setAmount("");
setIsPending(false);
}
} }
} }
@ -478,7 +476,7 @@ const Bridge = ({ chainId, address, config, connect }) => {
</Box> </Box>
</Box> </Box>
{(currentRecord?.step ?? 3) < 3 && (currentSession && currentRecord && currentSession > (currentRecord.sessionIndex ?? 0) + 2) && {(currentRecord?.step ?? 0) < 3 && currentSession > (currentRecord?.sessionIndex ?? 0) + 2 &&
<Box display="flex" flexDirection="column" gap="5px"> <Box display="flex" flexDirection="column" gap="5px">
<PrimaryButton <PrimaryButton
fullWidth fullWidth
@ -515,7 +513,7 @@ const Bridge = ({ chainId, address, config, connect }) => {
> >
{authorities?.map((authority, idx) => { {authorities?.map((authority, idx) => {
const authorityAddress = ss58Address(authority.asHex(), 1996); const authorityAddress = ss58Address(authority.asHex(), 1996);
const disabled = clapsInSession?.find((info => info.at(0) === idx))?.at(1)?.disabled; const disabled = clapsInSession?.at(idx)?.at(1)?.disabled;
const clapped = receivedClaps?.some(authId => authId === idx); const clapped = receivedClaps?.some(authId => authId === idx);
return ( return (
@ -777,7 +775,7 @@ const Bridge = ({ chainId, address, config, connect }) => {
> >
{authorities?.map((authority, idx) => { {authorities?.map((authority, idx) => {
const authorityAddress = ss58Address(authority.asHex(), 1996); const authorityAddress = ss58Address(authority.asHex(), 1996);
const clapInfo = clapsInSession?.find((info => info.at(0) === idx))?.at(1); const clapInfo = clapsInSession?.at(idx)?.at(1);
return ( return (
<Box <Box
@ -810,7 +808,7 @@ const Bridge = ({ chainId, address, config, connect }) => {
</Box> </Box>
</>} /> </>} />
</Box>} </Box>}
<Typography fontSize="12px" lineHeight="15px">{clapsInSessionLength} / {authorities?.length ?? 0}</Typography> <Typography fontSize="12px" lineHeight="15px">{clapsInSessionLength}</Typography>
</Box> </Box>
</Box> </Box>
) )