diff --git a/app/dapp.js b/app/dapp.js index 4f58f89..84ca6eb 100644 --- a/app/dapp.js +++ b/app/dapp.js @@ -1,8 +1,7 @@ import React from 'react' import { HashRouter as Router, Route, Link, Switch } from 'react-router-dom' -import EmbarkJS from 'Embark/EmbarkJS'; -import LPVault from 'Embark/contracts/LPVault'; -import LiquidPledgingMock from 'Embark/contracts/LiquidPledgingMock'; +import EmbarkJS from 'Embark/EmbarkJS' +import LPVault from 'Embark/contracts/LPVault' import web3 from 'Embark/web3' import { initVaultAndLP, vaultPledgingNeedsInit, standardTokenApproval, getLpAllowance } from './utils/initialize' import { getAllLPEvents, getAllVaultEvents, getProfileEvents, formatFundProfileEvent, getAuthorizedPayments } from './utils/events' @@ -11,8 +10,10 @@ import { FundingContext } from './context' import { cancelProfile } from './utils/fundProfiles' import MainCointainer from './components/MainCointainer' import { getTransfersMemo } from './selectors/pledging' +import { getLiquidPledgingContract } from './utils/contracts' const { getNetworkType } = web3.eth.net +let LiquidPledging class App extends React.Component { state = { @@ -29,9 +30,11 @@ class App extends React.Component { EmbarkJS.onReady(async (err) => { getNetworkType().then(async network => { const { environment } = EmbarkJS + LiquidPledging = getLiquidPledgingContract() + console.log({network, environment}) const isInitialized = await vaultPledgingNeedsInit() if (!!isInitialized) { - console.log('mock_time:', await LiquidPledgingMock.mock_time.call()) + console.log('mock_time:', await LiquidPledging.mock_time.call()) const lpAllowance = await getLpAllowance() const fundProfiles = await getProfileEvents() const allPledges = await getAllPledges() diff --git a/app/utils/contracts.js b/app/utils/contracts.js new file mode 100644 index 0000000..f354160 --- /dev/null +++ b/app/utils/contracts.js @@ -0,0 +1,9 @@ +import EmbarkJS from 'Embark/EmbarkJS' +import LiquidPledgingMock from 'Embark/contracts/LiquidPledgingMock' +import LiquidPledging from 'Embark/contracts/LiquidPledging' + +export const getLiquidPledgingContract = () => { + const { environment } = EmbarkJS + if (environment === 'development') return LiquidPledgingMock + return LiquidPledging +}