Added code that prevents double addition of contracts

trufflesuite · May 17, 2018 · 6ccdbe1 · 6ccdbe1
1 parent cd92f7a
commit 6ccdbe1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/dist/drizzle.js b/dist/drizzle.js
diff --git a/src/contracts/contractsReducer.js b/src/contracts/contractsReducer.js
@@ -7,7 +7,7 @@ const contractsReducer = (state = initialState, action) => {
    * Contract Status
    */
 
-  if (action.type === 'ADD_CONTRACT') {
+  if (action.type === 'CONTRACT_INITIALIZING') {
     return {
       ...state,
       [action.contractConfig.contractName]: generateContractInitialState(action.contractConfig)

diff --git a/src/contracts/contractsSaga.js b/src/contracts/contractsSaga.js
@@ -6,6 +6,7 @@ export function* addContract({drizzle, contractConfig, events, web3}) {
   // Prevents double-adding contracts
   if (drizzle.loadingContract[contractConfig.contractName]) { return false }
   drizzle.loadingContract[contractConfig.contractName] = true
+  yield put({type: 'CONTRACT_INITIALIZING', contractConfig})
   let drizzleContract
   if (contractConfig.web3Contract) {
     drizzleContract = yield call(instantiateWeb3Contract, {web3Contract: contractConfig.web3Contract, name: contractConfig.contractName, events, store: drizzle.store, web3})