status-im
/
liquid-funding
mirror of https://github.com/status-im/liquid-funding.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

filter out confirmed pledges from paying screen

This commit is contained in:
Barry Gitarts 2019-05-24 12:17:22 -04:00
parent c0423b10e0
commit 44543271c2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/projects/ProjectPledges.jsx
View File

@ -192,13 +192,13 @@ const SubmissionSection = ({ classes, openSnackBar, syncWithRemote, pledges, ple
toSend.send({gas: estimatedGas}) toSend.send({gas: estimatedGas})
.then(async res => { .then(async res => {
console.log({res}) console.log({res})
openSnackBar('success', 'Withdraws initiated')
}) })
.catch(e => { .catch(e => {
openSnackBar('error', 'An error has occured with the transaction') openSnackBar('error', 'An error has occured with the transaction')
console.log({e}) console.log({e})
}) })
.finally(() => { .finally(() => {
openSnackBar('success', 'Withdraws initiated')
syncWithRemote() syncWithRemote()
}) })
}} }}
@ -256,12 +256,12 @@ function CenteredTabs({ pledged, paying, paid, pledgeType, setPledgeType }) {
); );
} }
function ProjectPledges({classes, match, projectAddedEvents, pledges, authorizedPayments}) { function ProjectPledges({classes, match, projectAddedEvents, pledges, authorizedPayments, confirmedPayments}) {
const [pledgeType, setPledgeType] = useState(0) const [pledgeType, setPledgeType] = useState(0)
const projectId = match.params.id const projectId = match.params.id
const { manifest, delegateProfiles, openSnackBar, syncWithRemote } = useProjectData(projectId, projectAddedEvents) const { manifest, delegateProfiles, openSnackBar, syncWithRemote } = useProjectData(projectId, projectAddedEvents)
const delegatePledges = useProfileData(delegateProfiles) const delegatePledges = useProfileData(delegateProfiles)
const enrichedPledges = usePledgesAuthorizations(pledges, authorizedPayments).filter(p => Number(p.amount) > 0) const enrichedPledges = usePledgesAuthorizations(pledges, authorizedPayments, confirmedPayments).filter(p => Number(p.amount) > 0)
const pledged = enrichedPledges.filter(p => p.pledgeState === 0) const pledged = enrichedPledges.filter(p => p.pledgeState === 0)
const paying = enrichedPledges.filter(p => p.pledgeState === 1) const paying = enrichedPledges.filter(p => p.pledgeState === 1)
const paid = enrichedPledges.filter(p => p.pledgeState === 2) const paid = enrichedPledges.filter(p => p.pledgeState === 2)
@ -310,6 +310,9 @@ export default withDatabase(withObservables([], ({ database, match }) => ({
).observe(), ).observe(),
authorizedPayments: database.collections.get('vault_events').query( authorizedPayments: database.collections.get('vault_events').query(
Q.where('event', 'AuthorizePayment') Q.where('event', 'AuthorizePayment')
).observe(),
confirmedPayments: database.collections.get('vault_events').query(
Q.where('event', 'ConfirmPayment')
).observe() ).observe()
}))(StyledPledges)) }))(StyledPledges))

8
src/components/projects/hooks.js
View File

@ -144,11 +144,15 @@ function mergePledgesAuthorizations(pledges, authorizations, setState) {
}) })
setState(enriched) setState(enriched)
} }
export function usePledgesAuthorizations(pledges, authorizations) { export function usePledgesAuthorizations(pledges, authorizations, confirmedPayments) {
const [enrichedPledges, setEnrichedPledges] = useState(pledges) const [enrichedPledges, setEnrichedPledges] = useState(pledges)
const confirmedIds = confirmedPayments.map(p => p.returnValues.idPayment)
const filteredAuths = authorizations.filter(
a => !confirmedIds.includes(a.returnValues.idPayment)
)
useEffect(() => { useEffect(() => {
mergePledgesAuthorizations(pledges, authorizations, setEnrichedPledges) mergePledgesAuthorizations(pledges, filteredAuths, setEnrichedPledges)
}, [pledges, authorizations]) }, [pledges, authorizations])
return enrichedPledges return enrichedPledges