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

add check for ethereum provider and enable if not yet connected

This commit is contained in:
Barry Gitarts 2019-08-20 11:10:36 -04:00 committed by Barry G
parent 0aeaae5935
commit 27cc5dae9f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/projects/FundProject.jsx
View File

@ -34,7 +34,7 @@ const addProjectSucessMsg = response => {
}
const formatPercent = number => Number(number).toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2})
const SubmissionSection = ({ classes, projectData, projectId, commitTime, profileData, startPolling }) => {
const { account, openSnackBar, prices } = useContext(FundingContext)
const { account, enableEthereum, openSnackBar, prices } = useContext(FundingContext)
const { projectAge, projectAssets, manifest } = projectData
const { pledgesInfos } = profileData
const pledgesInfo = pledgesInfos[0]
@ -45,6 +45,7 @@ const SubmissionSection = ({ classes, projectData, projectId, commitTime, profil
const createdDate = getDateCreated(projectAge)
const percentToGoal = manifest ? formatPercent(Number(totalPledged) / Number(manifest.goal)) : formatPercent(0)
const isCreator = projectData.creator === account
const buttonText = account ? 'Fund' : 'Connect & Fund'
return (
<Formik
initialValues={{
@ -54,7 +55,8 @@ const SubmissionSection = ({ classes, projectData, projectId, commitTime, profil
const { amount } = values
const { goalToken } = manifest
const { chainReadibleFn } = getTokenByAddress(goalToken)
const args = [projectId, account, goalToken, chainReadibleFn(amount)]
const userAccount = account ? account : await enableEthereum()
const args = [projectId, userAccount, goalToken, chainReadibleFn(amount)]
const toSend = addGiverAndDonate(...args)
const estimatedGas = await toSend.estimateGas()
@ -162,7 +164,7 @@ const SubmissionSection = ({ classes, projectData, projectId, commitTime, profil
/>
<div className={classes.amountText}>{getTokenLabel(manifest.goalToken)}</div>
</div>
<Button type="submit" color="primary" variant="contained" className={classnames(classes.formButton)}>{isSubmitting ? 'Ethereum Submission In Progress' : 'Fund'}</Button>
<Button type="submit" color="primary" variant="contained" className={classnames(classes.formButton)}>{isSubmitting ? 'Ethereum Submission In Progress' : buttonText}</Button>
</div>}
</form>
)

6
src/dapp.js
View File

@ -36,6 +36,10 @@ class App extends React.Component {
this.setGraphClient(network)
this.getAndSetPrices()
if (window.ethereum) {
const { selectedAddress: account } = window.ethereum
if (account) this.setState({ account })
}
}
@ -67,6 +71,7 @@ class App extends React.Component {
const account = await web3.eth.getCoinbase()
this.setState({ account })
this.web3Init()
return account
}
getAndSetPrices = async () => {
@ -125,6 +130,7 @@ class App extends React.Component {
appendPledges,
appendFundProfile,
account,
enableEthereum,
transferPledgeAmounts,
authorizedPayments,
needsInit,