From d8c7c17e45ce546a51ce5c0d704ee9430743beca Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:20:18 -0300
Subject: [PATCH 01/40] Added callback to button continue

---
 src/components/Common/ButtonContinue.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Common/ButtonContinue.js b/src/components/Common/ButtonContinue.js
index c8d9a5ed3..1a413acf4 100644
--- a/src/components/Common/ButtonContinue.js
+++ b/src/components/Common/ButtonContinue.js
@@ -7,13 +7,13 @@ export class ButtonContinue extends Component {
    * @returns {*}
    */
   render() {
-    const { status, type } = this.props
+    const { status, type, onClick } = this.props
     const submitButtonClass = classNames('button', 'button_fill', 'button_no_border', {
       button_disabled: !status
     })
 
     return (
-      <button type={type} disabled={!status} className={submitButtonClass}>
+      <button onClick={onClick} type={type} disabled={!status} className={submitButtonClass}>
         Continue
       </button>
     )

From 76fc2727d186ba4b2e2c60d8cd5350a217c3543e Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:21:06 -0300
Subject: [PATCH 02/40] Add function to convert keys to lowercase

---
 src/utils/utils.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index c7f2b357d..1967a77d5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -178,3 +178,18 @@ export const toBigNumber = (value, force = true) => {
 export const sleep = async ms => {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
+
+export const objectKeysToLowerCase = input => {
+  if (typeof input !== 'object') {
+    return input
+  }
+  if (Array.isArray(input)) {
+    return input.map(objectKeysToLowerCase)
+  }
+  return Object.keys(input).reduce((newObj, key) => {
+    let val = input[key]
+    let newVal = typeof val === 'object' ? objectKeysToLowerCase(val) : val
+    newObj[key.toLowerCase()] = newVal
+    return newObj
+  }, {})
+}

From 4cd18b5e09a79fd2ce8fe951e72ef61a3b76b092 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:22:13 -0300
Subject: [PATCH 03/40] Refactoring, add setProperty

---
 src/stores/Web3Store.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/stores/Web3Store.js b/src/stores/Web3Store.js
index 8739813c1..d16d5d6c0 100644
--- a/src/stores/Web3Store.js
+++ b/src/stores/Web3Store.js
@@ -1,5 +1,5 @@
 import Web3 from 'web3'
-import { observable } from 'mobx'
+import { observable, action } from 'mobx'
 import { getNetworkID } from '../utils/utils'
 import { CrowdsaleConfig } from '../components/Common/config'
 import { CHAINS, REACT_PREFIX } from '../utils/constants'
@@ -12,20 +12,25 @@ class Web3Store {
   @observable curAddress
   @observable accounts
 
-  constructor(strategies) {
+  constructor() {
     this.getWeb3(web3 => {
       if (web3) {
         this.web3 = web3
         web3.eth.getAccounts().then(accounts => {
           this.accounts = accounts
           if (accounts.length > 0) {
-            this.curAddress = accounts[0]
+            this.setProperty('curAddress', accounts[0])
           }
         })
       }
     })
   }
 
+  @action
+  setProperty = (property, value) => {
+    this[property] = value
+  }
+
   getInfuraLink = network => {
     const infuraTokenEnvVar = process.env[`${REACT_PREFIX}INFURA_TOKEN`]
     return `https://${network}.infura.io/${infuraTokenEnvVar}`
@@ -72,7 +77,7 @@ class Web3Store {
     } else {
       // window.web3 == web3 most of the time. Don't override the provided,
       // web3, just wrap it in your Web3.
-      var myWeb3 = new Web3(web3.currentProvider)
+      let myWeb3 = new Web3(web3.currentProvider)
 
       cb(myWeb3, false)
       return myWeb3

From 40d1ee1f2b99be96aa45b746edb9dc61b37347db Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:22:50 -0300
Subject: [PATCH 04/40] Validate tiers on key 0

---
 src/stores/TierStore.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/stores/TierStore.js b/src/stores/TierStore.js
index 0bc5296ca..3232f4431 100644
--- a/src/stores/TierStore.js
+++ b/src/stores/TierStore.js
@@ -103,14 +103,32 @@ class TierStore {
 
   @action
   updateWalletAddress = (value, validity) => {
-    this.tiers[0].walletAddress = value
-    this.validTiers[0].walletAddress = validity
+    if (this.tiers.length > 0) {
+      this.tiers[0].walletAddress = value
+    } else {
+      this.tiers.push({ walletAddress: value })
+    }
+
+    if (this.validTiers.length > 0) {
+      this.validTiers[0].walletAddress = validity
+    } else {
+      this.validTiers.push({ walletAddress: validity })
+    }
   }
 
   @action
   updateBurnExcess = (value, validity) => {
-    this.tiers[0].burnExcess = value
-    this.validTiers[0].burnExcess = validity
+    if (this.tiers.length > 0) {
+      this.tiers[0].burnExcess = value
+    } else {
+      this.tiers.push({ burnExcess: value })
+    }
+
+    if (this.validTiers[0].length > 0) {
+      this.validTiers[0].burnExcess = validity
+    } else {
+      this.validTiers.push({ burnExcess: validity })
+    }
   }
 
   @action

From a468e4e44aef22169f315116046a0cc8c5b2a005 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:23:45 -0300
Subject: [PATCH 05/40] keep type of gas selected

---
 src/stores/GeneralStore.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/stores/GeneralStore.js b/src/stores/GeneralStore.js
index 4c496e2c3..bd97474fc 100644
--- a/src/stores/GeneralStore.js
+++ b/src/stores/GeneralStore.js
@@ -1,10 +1,11 @@
-import { observable, action } from 'mobx'
+import { observable, action, computed } from 'mobx'
 import { GAS_PRICE } from '../utils/constants'
 import autosave from './autosave'
 
 class GeneralStore {
   @observable networkID
   @observable gasPrice = GAS_PRICE.FAST.PRICE
+  @observable gasTypeSelected
 
   constructor() {
     this.reset()
@@ -21,10 +22,22 @@ class GeneralStore {
     this.gasPrice = gasPrice
   }
 
+  @action
+  setGasTypeSelected = gasTypeSeleted => {
+    this.gasTypeSelected = gasTypeSeleted
+  }
+
   @action
   reset = () => {
     this.networkID = undefined
     this.gasPrice = GAS_PRICE.FAST.PRICE
+    this.gasTypeSelected = GAS_PRICE.SLOW
+  }
+
+  // Getters
+  @computed
+  get getGasTypeSelected() {
+    return this.gasTypeSelected
   }
 }
 

From efd197a528119654a7221c9aca6cbf41f18c4d47 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:24:31 -0300
Subject: [PATCH 06/40] Refactoring to keep data

---
 src/components/stepThree/GasPriceInput.js | 86 +++++++++++++++--------
 1 file changed, 58 insertions(+), 28 deletions(-)

diff --git a/src/components/stepThree/GasPriceInput.js b/src/components/stepThree/GasPriceInput.js
index f1e6d29bf..9847b223b 100644
--- a/src/components/stepThree/GasPriceInput.js
+++ b/src/components/stepThree/GasPriceInput.js
@@ -1,14 +1,28 @@
 import React, { Component } from 'react'
 import { GAS_PRICE } from '../../utils/constants'
+import { objectKeysToLowerCase } from '../../utils/utils'
 import { Error } from '../Common/Error'
+import { inject, observer } from 'mobx-react'
 
+@inject('generalStore')
+@observer
 class GasPriceInput extends Component {
-  constructor(props) {
-    super(props)
+  state = {
+    isCustom: false,
+    customGasPrice: 0,
+    gasTypeSelected: {}
+  }
+
+  async componentDidMount() {
+    const { generalStore } = this.props
+    const gasTypeSelected = objectKeysToLowerCase(generalStore.getGasTypeSelected)
+    this.setState({ gasTypeSelected: gasTypeSelected })
 
-    this.state = {
-      isCustom: false,
-      customGasPrice: undefined
+    if (gasTypeSelected.id === GAS_PRICE.CUSTOM.ID) {
+      this.setState({
+        isCustom: true,
+        customGasPrice: gasTypeSelected.price
+      })
     }
   }
 
@@ -16,36 +30,44 @@ class GasPriceInput extends Component {
     this.setState({
       isCustom: false
     })
-    this.props.input.onChange(value)
+
+    const gasTypeSelected = objectKeysToLowerCase(value)
+    this.handleGasType(gasTypeSelected)
+    this.props.input.onChange(gasTypeSelected)
   }
 
   handleCustomSelected = () => {
-    const { input, gasPrices } = this.props
-
-    const newState = { isCustom: true }
+    this.setState({
+      isCustom: true
+    })
 
-    if (this.state.customGasPrice === undefined) {
-      const slow = gasPrices.find(gasPrice => gasPrice.id === GAS_PRICE.SLOW.ID)
-      newState.customGasPrice = slow.price
+    let gasTypeSelected = objectKeysToLowerCase(GAS_PRICE.CUSTOM)
+    if (this.state.customGasPrice) {
+      gasTypeSelected.price = this.state.customGasPrice
     }
 
-    this.setState(newState, () => {
-      input.onChange(
-        Object.assign(
-          {},
-          {
-            id: GAS_PRICE.CUSTOM.ID,
-            price: this.state.customGasPrice
-          }
-        )
-      )
+    this.handleGasType(gasTypeSelected)
+    this.props.input.onChange(gasTypeSelected)
+  }
+
+  handleGasType = value => {
+    const { updateGasTypeSelected } = this.props
+
+    updateGasTypeSelected(value)
+    this.setState({
+      gasTypeSelected: value
     })
   }
 
   handleCustomGasPriceChange = value => {
-    const { input } = this.props
+    const { updateGasTypeSelected, input } = this.props
+
+    let gasTypeSelected = this.state.gasTypeSelected
+    gasTypeSelected.price = value
 
+    updateGasTypeSelected(gasTypeSelected)
     this.setState({
+      gasTypeSelected: gasTypeSelected,
       customGasPrice: value
     })
 
@@ -60,9 +82,12 @@ class GasPriceInput extends Component {
     )
   }
 
+  compareChecked = value => {
+    return new String(this.state.gasTypeSelected.id).valueOf() === new String(value).valueOf()
+  }
+
   render() {
     const { input, side, gasPrices } = this.props
-
     return (
       <div className={side}>
         <label htmlFor={input.name} className="label">
@@ -74,11 +99,13 @@ class GasPriceInput extends Component {
               <input
                 id={gasPrice.id}
                 type="radio"
-                checked={input.value.id === gasPrice.id}
-                onChange={() => {
+                value={gasPrice.id}
+                checked={this.compareChecked(gasPrice.id)}
+                name="gas-price"
+                onChange={e => {
                   gasPrice.id !== GAS_PRICE.CUSTOM.ID
                     ? this.handleNonCustomSelected(gasPrice)
-                    : this.handleCustomSelected()
+                    : this.handleCustomSelected(e.target.value)
                 }}
               />
               <span className="title">{gasPrice.description}</span>
@@ -91,7 +118,10 @@ class GasPriceInput extends Component {
             type="number"
             className="input"
             value={this.state.customGasPrice}
-            onChange={e => this.handleCustomGasPriceChange(e.target.value)}
+            name="gas-price-custom-value"
+            onChange={e => {
+              this.handleCustomGasPriceChange(e.target.value)
+            }}
           />
         ) : null}
         <p className="description">Slow is cheap, fast is expensive</p>

From 02661dae0a10a9fed0ae155b34e379e96657a10f Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:25:19 -0300
Subject: [PATCH 07/40] Refactoring to keep data

---
 src/components/stepThree/index.js | 56 +++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index ee7bfe800..817eb2c4c 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -2,7 +2,7 @@ import React from 'react'
 import '../../assets/stylesheets/application.css'
 import { Form } from 'react-final-form'
 import arrayMutators from 'final-form-arrays'
-import { getNetworkVersion, getNetWorkNameById } from '../../utils/blockchainHelpers'
+import { getNetworkVersion, getNetWorkNameById, checkWeb3 } from '../../utils/blockchainHelpers'
 import { StepNavigation } from '../Common/StepNavigation'
 import { NAVIGATION_STEPS, CHAINS } from '../../utils/constants'
 import { inject, observer } from 'mobx-react'
@@ -11,6 +11,7 @@ import { noGasPriceAvailable, warningOnMainnetAlert } from '../../utils/alerts'
 import { getStep3Component } from './utils'
 import createDecorator from 'final-form-calculate'
 import logdown from 'logdown'
+import { sleep } from '../../utils/utils'
 
 const logger = logdown('TW:stepThree')
 
@@ -29,29 +30,40 @@ const { CROWDSALE_SETUP } = NAVIGATION_STEPS
 )
 @observer
 export class stepThree extends React.Component {
-  constructor(props) {
-    super(props)
+  state = {
+    loading: false,
+    reload: false,
+    initialTiers: []
+  }
+
+  async componentDidMount() {
+    const { web3Store, gasPriceStore } = this.props
+    await checkWeb3(web3Store.web3)
+
+    this.setState({ loading: true })
+    const initialTiers = await this.load()
 
-    this.state = {
-      loading: true
+    try {
+      await gasPriceStore.updateValues()
+    } catch (error) {
+      noGasPriceAvailable()
     }
+
+    this.setState({ loading: false, initialTiers: initialTiers })
+    window.scrollTo(0, 0)
   }
 
-  componentWillMount() {
-    const { gasPriceStore, tierStore, web3Store } = this.props
+  async load() {
+    const { tierStore, web3Store } = this.props
+
+    await sleep(1000)
 
     if (tierStore.tiers.length === 0) {
+      logger.log('Web3store', web3Store)
       tierStore.addCrowdsale(web3Store.curAddress)
     }
-    this.initialTiers = JSON.parse(JSON.stringify(tierStore.tiers))
-
-    gasPriceStore
-      .updateValues()
-      .catch(() => noGasPriceAvailable())
-      .then(() => {
-        this.setState({ loading: false })
-        window.scrollTo(0, 0)
-      })
+
+    return JSON.parse(JSON.stringify(tierStore.tiers))
   }
 
   goToDeploymentStage = () => {
@@ -121,6 +133,16 @@ export class stepThree extends React.Component {
   })
 
   render() {
+    if (this.state.initialTiers.length === 0) {
+      //Not render the form until tiers are setup
+      return (
+        <section className="steps steps_crowdsale-contract" ref="three">
+          <StepNavigation activeStep={CROWDSALE_SETUP} />
+          <Loader show={this.state.loading} />
+        </section>
+      )
+    }
+
     const { generalStore, tierStore, gasPriceStore, tokenStore, web3Store, crowdsaleStore } = this.props
     let stepThreeComponent = getStep3Component(crowdsaleStore.strategy)
 
@@ -136,7 +158,7 @@ export class stepThree extends React.Component {
             gasPrice: gasPriceStore.gasPricesInGwei[0],
             whitelistEnabled: 'no',
             burnExcess: 'no',
-            tiers: this.initialTiers
+            tiers: this.state.initialTiers
           }}
           component={stepThreeComponent}
           addCrowdsale={tierStore.addCrowdsale}

From 445c8a8fe99c8856088387f82c732c07e8d433e1 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:25:53 -0300
Subject: [PATCH 08/40] Add button continue, callback to update

---
 .../stepThree/StepThreeFormMintedCapped.js    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/components/stepThree/StepThreeFormMintedCapped.js b/src/components/stepThree/StepThreeFormMintedCapped.js
index 9216b4744..ffd36c553 100644
--- a/src/components/stepThree/StepThreeFormMintedCapped.js
+++ b/src/components/stepThree/StepThreeFormMintedCapped.js
@@ -4,8 +4,8 @@ import { FieldArray } from 'react-final-form-arrays'
 import { WhenFieldChanges } from '../Common/WhenFieldChanges'
 import { InputField2 } from '../Common/InputField2'
 import GasPriceInput from './GasPriceInput'
+import { ButtonContinue } from '../Common/ButtonContinue'
 import { gweiToWei } from '../../utils/utils'
-import classnames from 'classnames'
 import {
   composeValidators,
   isAddress,
@@ -38,12 +38,12 @@ export const StepThreeFormMintedCapped = ({
   values,
   invalid,
   pristine,
+  submitting,
+  errors,
   mutators: { push },
   ...props
 }) => {
-  const submitButtonClass = classnames('button', 'button_fill', {
-    button_disabled: pristine || invalid
-  })
+  const status = !(submitting || invalid)
 
   const addTier = () => {
     props.addCrowdsale()
@@ -51,6 +51,15 @@ export const StepThreeFormMintedCapped = ({
     push('tiers', JSON.parse(JSON.stringify(lastTier)))
   }
 
+  /**
+   * Set gas type selected on gas price input
+   * @param value
+   */
+  const updateGasTypeSelected = value => {
+    const { generalStore } = props
+    generalStore.setGasTypeSelected(value)
+  }
+
   const handleOnChange = ({ values }) => {
     props.tierStore.updateWalletAddress(values.walletAddress, VALID)
     props.generalStore.setGasPrice(gweiToWei(values.gasPrice.price))
@@ -69,8 +78,10 @@ export const StepThreeFormMintedCapped = ({
       props.tierStore.setTierProperty(tier.whitelistEnabled, 'whitelistEnabled', index)
       props.tierStore.validateTiers('supply', index)
     })
+    const endTime =
+      values && values.tiers && values.tiers.length > 0 ? values.tiers[values.tiers.length - 1].endTime : null
     props.crowdsaleStore.setProperty('supply', totalSupply)
-    props.crowdsaleStore.setProperty('endTime', values.tiers[values.tiers.length - 1].endTime)
+    props.crowdsaleStore.setProperty('endTime', endTime)
   }
 
   const whenWhitelistBlock = tierInd => {
@@ -114,6 +125,7 @@ export const StepThreeFormMintedCapped = ({
               component={InputField2}
               validate={isAddress()}
               errorStyle={inputErrorStyle}
+              value={values.walletAddress}
               side="left"
               label={WALLET_ADDRESS}
               description={DESCRIPTION.WALLET}
@@ -124,6 +136,7 @@ export const StepThreeFormMintedCapped = ({
               component={GasPriceInput}
               side="right"
               gasPrices={props.gasPricesInGwei}
+              updateGasTypeSelected={updateGasTypeSelected}
               validate={value =>
                 composeValidators(
                   isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
@@ -143,9 +156,7 @@ export const StepThreeFormMintedCapped = ({
         <div className="button button_fill_secondary" onClick={addTier}>
           Add Tier
         </div>
-        <span onClick={handleSubmit} className={submitButtonClass}>
-          Continue
-        </span>
+        <ButtonContinue onClick={handleSubmit} status={status} />
       </div>
 
       <FormSpy subscription={{ values: true }} onChange={handleOnChange} />

From 92f42779a5f6397fa3206879fdb3ed949f2fa37a Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 08:42:52 -0300
Subject: [PATCH 09/40] Add button continue and callback

---
 .../stepThree/StepThreeFormDutchAuction.js    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/stepThree/StepThreeFormDutchAuction.js b/src/components/stepThree/StepThreeFormDutchAuction.js
index 968013c08..b85b2c1ea 100644
--- a/src/components/stepThree/StepThreeFormDutchAuction.js
+++ b/src/components/stepThree/StepThreeFormDutchAuction.js
@@ -4,8 +4,8 @@ import { FieldArray } from 'react-final-form-arrays'
 import { WhenFieldChanges } from '../Common/WhenFieldChanges'
 import { InputField2 } from '../Common/InputField2'
 import GasPriceInput from './GasPriceInput'
+import { ButtonContinue } from '../Common/ButtonContinue'
 import { gweiToWei } from '../../utils/utils'
-import classnames from 'classnames'
 import {
   composeValidators,
   isAddress,
@@ -33,10 +33,17 @@ const inputErrorStyle = {
   height: '20px'
 }
 
-export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, pristine, ...props }) => {
-  const submitButtonClass = classnames('button', 'button_fill', {
-    button_disabled: pristine || invalid
-  })
+export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, pristine, ...props }) => {
+  const status = !(submitting || invalid)
+
+  /**
+   * Set gas type selected on gas price input
+   * @param value
+   */
+  const updateGasTypeSelected = value => {
+    const { generalStore } = props
+    generalStore.setGasTypeSelected(value)
+  }
 
   const handleOnChange = ({ values }) => {
     props.tierStore.updateWalletAddress(values.walletAddress, VALID)
@@ -125,6 +132,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, pristine, ...
               component={GasPriceInput}
               side="right"
               gasPrices={props.gasPricesInGwei}
+              updateGasTypeSelected={updateGasTypeSelected}
               validate={value =>
                 composeValidators(
                   isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
@@ -141,9 +149,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, pristine, ...
       </FieldArray>
 
       <div className="button-container">
-        <span onClick={handleSubmit} className={submitButtonClass}>
-          Continue
-        </span>
+        <ButtonContinue onClick={handleSubmit} status={status} />
       </div>
 
       <FormSpy subscription={{ values: true }} onChange={handleOnChange} />

From 6de6eef8b553ee8c8bdfec088eb683397cbd7f56 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 10:59:59 -0300
Subject: [PATCH 10/40] Update snapshots

---
 .../__snapshots__/ManageForm.spec.js.snap     | 30 +++++++++++++++++++
 .../__snapshots__/StepTwoForm.spec.js.snap    |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/test/components/manage/__snapshots__/ManageForm.spec.js.snap b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
index 89e5b4a01..1bdea1b6e 100644
--- a/test/components/manage/__snapshots__/ManageForm.spec.js.snap
+++ b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
@@ -19,6 +19,11 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
   generalStore={
     GeneralStore {
       "gasPrice": 15000000000,
+      "gasTypeSelected": Object {
+        "DESCRIPTION": "Safe and Cheap",
+        "ID": "slow",
+        "PRICE": 5000000000,
+      },
       "networkID": undefined,
     }
   }
@@ -255,6 +260,11 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
             generalStore={
               GeneralStore {
                 "gasPrice": 15000000000,
+                "gasTypeSelected": Object {
+                  "DESCRIPTION": "Safe and Cheap",
+                  "ID": "slow",
+                  "PRICE": 5000000000,
+                },
                 "networkID": undefined,
               }
             }
@@ -336,6 +346,11 @@ exports[`ManageForm should render the component with tiers 1`] = `
   generalStore={
     GeneralStore {
       "gasPrice": 15000000000,
+      "gasTypeSelected": Object {
+        "DESCRIPTION": "Safe and Cheap",
+        "ID": "slow",
+        "PRICE": 5000000000,
+      },
       "networkID": undefined,
     }
   }
@@ -1093,6 +1108,11 @@ exports[`ManageForm should render the component with tiers 1`] = `
             generalStore={
               GeneralStore {
                 "gasPrice": 15000000000,
+                "gasTypeSelected": Object {
+                  "DESCRIPTION": "Safe and Cheap",
+                  "ID": "slow",
+                  "PRICE": 5000000000,
+                },
                 "networkID": undefined,
               }
             }
@@ -4402,6 +4422,11 @@ exports[`ManageForm should render the component without tiers 1`] = `
   generalStore={
     GeneralStore {
       "gasPrice": 15000000000,
+      "gasTypeSelected": Object {
+        "DESCRIPTION": "Safe and Cheap",
+        "ID": "slow",
+        "PRICE": 5000000000,
+      },
       "networkID": undefined,
     }
   }
@@ -4638,6 +4663,11 @@ exports[`ManageForm should render the component without tiers 1`] = `
             generalStore={
               GeneralStore {
                 "gasPrice": 15000000000,
+                "gasTypeSelected": Object {
+                  "DESCRIPTION": "Safe and Cheap",
+                  "ID": "slow",
+                  "PRICE": 5000000000,
+                },
                 "networkID": undefined,
               }
             }
diff --git a/test/components/stepTwo/__snapshots__/StepTwoForm.spec.js.snap b/test/components/stepTwo/__snapshots__/StepTwoForm.spec.js.snap
index a824a2a52..49b559e8e 100644
--- a/test/components/stepTwo/__snapshots__/StepTwoForm.spec.js.snap
+++ b/test/components/stepTwo/__snapshots__/StepTwoForm.spec.js.snap
@@ -183,6 +183,7 @@ exports[`StepTwoForm should render StepTwoForm for Dutch Auction Crowdsale 1`] =
     <button
       className="button button_fill button_no_border button_disabled"
       disabled={true}
+      onClick={undefined}
       type="submit"
     >
       Continue
@@ -502,6 +503,7 @@ exports[`StepTwoForm should render StepTwoForm for Minted Capped Crowdsale 1`] =
     <button
       className="button button_fill button_no_border"
       disabled={false}
+      onClick={undefined}
       type="submit"
     >
       Continue

From a2531e04673346c554277e528031b16a7410725d Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 14 Aug 2018 14:33:01 -0300
Subject: [PATCH 11/40] Add burn excess support

---
 src/components/stepThree/GasPriceInput.js     |  1 +
 .../stepThree/StepThreeFormDutchAuction.js    | 10 ++++++++--
 src/components/stepThree/index.js             | 20 +++++++++++++------
 src/stores/GeneralStore.js                    |  7 +++++++
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/components/stepThree/GasPriceInput.js b/src/components/stepThree/GasPriceInput.js
index 9847b223b..43b1ad879 100644
--- a/src/components/stepThree/GasPriceInput.js
+++ b/src/components/stepThree/GasPriceInput.js
@@ -83,6 +83,7 @@ class GasPriceInput extends Component {
   }
 
   compareChecked = value => {
+    // eslint-disable-next-line
     return new String(this.state.gasTypeSelected.id).valueOf() === new String(value).valueOf()
   }
 
diff --git a/src/components/stepThree/StepThreeFormDutchAuction.js b/src/components/stepThree/StepThreeFormDutchAuction.js
index b85b2c1ea..614ee41a6 100644
--- a/src/components/stepThree/StepThreeFormDutchAuction.js
+++ b/src/components/stepThree/StepThreeFormDutchAuction.js
@@ -45,6 +45,12 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
     generalStore.setGasTypeSelected(value)
   }
 
+  const handleBurnExcessChange = (value, input) => {
+    const { generalStore } = props
+    generalStore.setBurnExcess(value)
+    input.onChange(value)
+  }
+
   const handleOnChange = ({ values }) => {
     props.tierStore.updateWalletAddress(values.walletAddress, VALID)
     props.tierStore.updateBurnExcess(values.burnExcess, VALID)
@@ -107,7 +113,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
                             type="radio"
                             checked={input.value === 'yes'}
                             value="yes"
-                            onChange={() => input.onChange('yes')}
+                            onChange={e => handleBurnExcessChange(e.target.value, input)}
                           />
                           <span className="title">yes</span>
                         </label>
@@ -116,7 +122,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
                             type="radio"
                             checked={input.value === 'no'}
                             value="no"
-                            onChange={() => input.onChange('no')}
+                            onChange={e => handleBurnExcessChange(e.target.value, input)}
                           />
                           <span className="title">no</span>
                         </label>
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index 817eb2c4c..249903814 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -33,7 +33,8 @@ export class stepThree extends React.Component {
   state = {
     loading: false,
     reload: false,
-    initialTiers: []
+    initialTiers: [],
+    burnExcess: 'no'
   }
 
   async componentDidMount() {
@@ -41,7 +42,7 @@ export class stepThree extends React.Component {
     await checkWeb3(web3Store.web3)
 
     this.setState({ loading: true })
-    const initialTiers = await this.load()
+    const { initialTiers, burnExcess } = await this.load()
 
     try {
       await gasPriceStore.updateValues()
@@ -49,12 +50,16 @@ export class stepThree extends React.Component {
       noGasPriceAvailable()
     }
 
-    this.setState({ loading: false, initialTiers: initialTiers })
+    this.setState({
+      loading: false,
+      initialTiers: initialTiers,
+      burnExcess: burnExcess
+    })
     window.scrollTo(0, 0)
   }
 
   async load() {
-    const { tierStore, web3Store } = this.props
+    const { tierStore, generalStore, web3Store } = this.props
 
     await sleep(1000)
 
@@ -63,7 +68,10 @@ export class stepThree extends React.Component {
       tierStore.addCrowdsale(web3Store.curAddress)
     }
 
-    return JSON.parse(JSON.stringify(tierStore.tiers))
+    return {
+      initialTiers: JSON.parse(JSON.stringify(tierStore.tiers)),
+      burnExcess: generalStore.burnExcess
+    }
   }
 
   goToDeploymentStage = () => {
@@ -157,7 +165,7 @@ export class stepThree extends React.Component {
             walletAddress: web3Store.curAddress,
             gasPrice: gasPriceStore.gasPricesInGwei[0],
             whitelistEnabled: 'no',
-            burnExcess: 'no',
+            burnExcess: this.state.burnExcess,
             tiers: this.state.initialTiers
           }}
           component={stepThreeComponent}
diff --git a/src/stores/GeneralStore.js b/src/stores/GeneralStore.js
index bd97474fc..f4adbeaca 100644
--- a/src/stores/GeneralStore.js
+++ b/src/stores/GeneralStore.js
@@ -6,6 +6,7 @@ class GeneralStore {
   @observable networkID
   @observable gasPrice = GAS_PRICE.FAST.PRICE
   @observable gasTypeSelected
+  @observable burnExcess
 
   constructor() {
     this.reset()
@@ -27,11 +28,17 @@ class GeneralStore {
     this.gasTypeSelected = gasTypeSeleted
   }
 
+  @action
+  setBurnExcess = burnExcess => {
+    this.burnExcess = burnExcess
+  }
+
   @action
   reset = () => {
     this.networkID = undefined
     this.gasPrice = GAS_PRICE.FAST.PRICE
     this.gasTypeSelected = GAS_PRICE.SLOW
+    this.burnExcess = 'no'
   }
 
   // Getters

From dc10df64bb4fe689ccc3abce957c90c795d8caab Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 15 Aug 2018 08:01:16 -0300
Subject: [PATCH 12/40] Validate tiers with dutch auction

---
 src/components/stepThree/index.js | 7 +++++--
 src/stores/TierStore.js           | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index 249903814..2a4ed88e1 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -59,7 +59,7 @@ export class stepThree extends React.Component {
   }
 
   async load() {
-    const { tierStore, generalStore, web3Store } = this.props
+    const { tierStore, generalStore, web3Store, crowdsaleStore } = this.props
 
     await sleep(1000)
 
@@ -68,8 +68,11 @@ export class stepThree extends React.Component {
       tierStore.addCrowdsale(web3Store.curAddress)
     }
 
+    let initialTiers = []
+    initialTiers.push(tierStore.getTiers(crowdsaleStore))
+
     return {
-      initialTiers: JSON.parse(JSON.stringify(tierStore.tiers)),
+      initialTiers: initialTiers,
       burnExcess: generalStore.burnExcess
     }
   }
diff --git a/src/stores/TierStore.js b/src/stores/TierStore.js
index 3232f4431..f9c9fb573 100644
--- a/src/stores/TierStore.js
+++ b/src/stores/TierStore.js
@@ -334,6 +334,14 @@ class TierStore {
   validateWhitelistedAddressLength(tierIndex) {
     return this.tiers[tierIndex].whitelist.length < LIMIT_WHITELISTED_ADDRESSES
   }
+
+  getTiers(crowdsaleStore) {
+    if (crowdsaleStore.isDutchAuction) {
+      return JSON.parse(JSON.stringify(this.tiers))[0]
+    } else {
+      return JSON.parse(JSON.stringify(this.tiers))
+    }
+  }
 }
 
 export default TierStore

From 0f95b1c7ca4abf82b7f754fd0ab2a9ee9fa9b563 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 15 Aug 2018 11:49:04 -0300
Subject: [PATCH 13/40] Add mutator and validator

---
 .../stepThree/StepThreeFormDutchAuction.js    | 37 +++++++++++++++----
 src/components/stepThree/index.js             |  8 +++-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/components/stepThree/StepThreeFormDutchAuction.js b/src/components/stepThree/StepThreeFormDutchAuction.js
index 614ee41a6..5d372a7b0 100644
--- a/src/components/stepThree/StepThreeFormDutchAuction.js
+++ b/src/components/stepThree/StepThreeFormDutchAuction.js
@@ -33,7 +33,7 @@ const inputErrorStyle = {
   height: '20px'
 }
 
-export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, pristine, ...props }) => {
+export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, pristine, form, reload, ...props }) => {
   const status = !(submitting || invalid)
 
   /**
@@ -45,13 +45,36 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
     generalStore.setGasTypeSelected(value)
   }
 
+  const handleValidateGasPrice = value => {
+    const errors = composeValidators(
+      isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
+      isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_THAN)(0.1)
+    )(value.price)
+    if (errors) return errors.shift()
+  }
+
   const handleBurnExcessChange = (value, input) => {
     const { generalStore } = props
     generalStore.setBurnExcess(value)
     input.onChange(value)
   }
 
-  const handleOnChange = ({ values }) => {
+  const setFieldAsTouched = ({ values, errors }) => {
+    if (reload) {
+      const tiers = values && values.tiers ? values.tiers : []
+      tiers.forEach((tier, index) => {
+        form.mutators.setFieldTouched(`tiers[${index}].startTime`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].endTime`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].minRate`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].maxRate`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].supply`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].minCap`, true)
+      })
+      form.mutators.setFieldTouched(`gasPrice`, true)
+    }
+  }
+
+  const handleOnChange = ({ values, errors }) => {
     props.tierStore.updateWalletAddress(values.walletAddress, VALID)
     props.tierStore.updateBurnExcess(values.burnExcess, VALID)
     props.generalStore.setGasPrice(gweiToWei(values.gasPrice.price))
@@ -74,6 +97,9 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
     const endTime = tiers.length > 0 ? tiers[tiers.length - 1].endTime : null
     props.crowdsaleStore.setProperty('supply', totalSupply)
     props.crowdsaleStore.setProperty('endTime', endTime)
+
+    // Set fields as touched
+    setFieldAsTouched({ values, errors })
   }
 
   return (
@@ -139,12 +165,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
               side="right"
               gasPrices={props.gasPricesInGwei}
               updateGasTypeSelected={updateGasTypeSelected}
-              validate={value =>
-                composeValidators(
-                  isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
-                  isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_THAN)(0.1)
-                )(value.price)
-              }
+              validate={value => handleValidateGasPrice(value)}
             />
           </div>
         </div>
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index 2a4ed88e1..0738d0255 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -12,6 +12,7 @@ import { getStep3Component } from './utils'
 import createDecorator from 'final-form-calculate'
 import logdown from 'logdown'
 import { sleep } from '../../utils/utils'
+import setFieldTouched from 'final-form-set-field-touched'
 
 const logger = logdown('TW:stepThree')
 
@@ -66,6 +67,10 @@ export class stepThree extends React.Component {
     if (tierStore.tiers.length === 0) {
       logger.log('Web3store', web3Store)
       tierStore.addCrowdsale(web3Store.curAddress)
+    } else {
+      this.setState({
+        reload: true
+      })
     }
 
     let initialTiers = []
@@ -162,7 +167,7 @@ export class stepThree extends React.Component {
         <StepNavigation activeStep={CROWDSALE_SETUP} />
         <Form
           onSubmit={this.handleOnSubmit}
-          mutators={{ ...arrayMutators }}
+          mutators={{ ...arrayMutators, setFieldTouched }}
           decorators={[this.calculator]}
           initialValues={{
             walletAddress: web3Store.curAddress,
@@ -178,6 +183,7 @@ export class stepThree extends React.Component {
           tierStore={tierStore}
           generalStore={generalStore}
           crowdsaleStore={crowdsaleStore}
+          reload={this.state.reload}
         />
         <Loader show={this.state.loading} />
       </section>

From 3097b613cd2c42b5c414c1d753bf14500a909bb7 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 15 Aug 2018 12:28:02 -0300
Subject: [PATCH 14/40] Refactor

---
 src/components/stepThree/index.js | 9 +++++++--
 src/stores/TierStore.js           | 7 -------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index 0738d0255..53c3b2027 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -73,8 +73,13 @@ export class stepThree extends React.Component {
       })
     }
 
-    let initialTiers = []
-    initialTiers.push(tierStore.getTiers(crowdsaleStore))
+    let initialTiers
+
+    if (crowdsaleStore.isDutchAuction) {
+      initialTiers = [JSON.parse(JSON.stringify(tierStore.tiers))[0]]
+    } else {
+      initialTiers = JSON.parse(JSON.stringify(tierStore.tiers))
+    }
 
     return {
       initialTiers: initialTiers,
diff --git a/src/stores/TierStore.js b/src/stores/TierStore.js
index f9c9fb573..525ec368c 100644
--- a/src/stores/TierStore.js
+++ b/src/stores/TierStore.js
@@ -335,13 +335,6 @@ class TierStore {
     return this.tiers[tierIndex].whitelist.length < LIMIT_WHITELISTED_ADDRESSES
   }
 
-  getTiers(crowdsaleStore) {
-    if (crowdsaleStore.isDutchAuction) {
-      return JSON.parse(JSON.stringify(this.tiers))[0]
-    } else {
-      return JSON.parse(JSON.stringify(this.tiers))
-    }
-  }
 }
 
 export default TierStore

From 3d3ad43872fd5a2a8ded4c5bce75eecaab69aea4 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 15 Aug 2018 12:28:33 -0300
Subject: [PATCH 15/40] Fix lint

---
 src/stores/TierStore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/TierStore.js b/src/stores/TierStore.js
index 525ec368c..3232f4431 100644
--- a/src/stores/TierStore.js
+++ b/src/stores/TierStore.js
@@ -334,7 +334,6 @@ class TierStore {
   validateWhitelistedAddressLength(tierIndex) {
     return this.tiers[tierIndex].whitelist.length < LIMIT_WHITELISTED_ADDRESSES
   }
-
 }
 
 export default TierStore

From 1467b11c695a1f74954ae7d4dcf19f72d211c3ba Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 15 Aug 2018 16:24:40 -0300
Subject: [PATCH 16/40] Add mutator, validator for supply input

---
 src/components/Common/TierBlock.js            | 17 ++++++--
 .../stepThree/StepThreeFormDutchAuction.js    |  3 ++
 .../stepThree/StepThreeFormMintedCapped.js    | 40 +++++++++++++++----
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/components/Common/TierBlock.js b/src/components/Common/TierBlock.js
index 80f86f632..302cfd4ed 100644
--- a/src/components/Common/TierBlock.js
+++ b/src/components/Common/TierBlock.js
@@ -21,6 +21,14 @@ const inputErrorStyle = {
 }
 
 export const TierBlock = ({ fields, ...props }) => {
+  const onChangeWhitelisted = (value, input, index) => {
+    //Clear whitelist
+    if (props.tierStore) {
+      props.tierStore.emptyWhitelist(index)
+    }
+    return input.onChange(value)
+  }
+
   return (
     <div>
       {fields.map((name, index) => (
@@ -90,7 +98,7 @@ export const TierBlock = ({ fields, ...props }) => {
                           type="radio"
                           checked={input.value === 'yes'}
                           value="yes"
-                          onChange={() => input.onChange('yes')}
+                          onChange={() => onChangeWhitelisted('yes', input, index)}
                         />
                         <span className="title">yes</span>
                       </label>
@@ -100,7 +108,7 @@ export const TierBlock = ({ fields, ...props }) => {
                           type="radio"
                           checked={input.value === 'no'}
                           value="no"
-                          onChange={() => input.onChange('no')}
+                          onChange={() => onChangeWhitelisted('no', input, index)}
                         />
                         <span className="title">no</span>
                       </label>
@@ -128,7 +136,10 @@ export const TierBlock = ({ fields, ...props }) => {
                 name={`${name}.supply`}
                 errorStyle={inputErrorStyle}
                 side="right"
-                disabled={props.tierStore && props.tierStore.tiers[index].whitelist.length}
+                disabled={
+                  (props.tierStore && props.tierStore.tiers[index].whitelistEnabled === 'yes') ||
+                  (props.tierStore && props.tierStore.tiers[index].whitelist.length)
+                }
               />
             </div>
             <div className="input-block-container">
diff --git a/src/components/stepThree/StepThreeFormDutchAuction.js b/src/components/stepThree/StepThreeFormDutchAuction.js
index 5d372a7b0..e924e32d0 100644
--- a/src/components/stepThree/StepThreeFormDutchAuction.js
+++ b/src/components/stepThree/StepThreeFormDutchAuction.js
@@ -63,6 +63,9 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
     if (reload) {
       const tiers = values && values.tiers ? values.tiers : []
       tiers.forEach((tier, index) => {
+        form.mutators.setFieldTouched(`tiers[${index}].tier`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].updatable`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].whitelistEnabled`, true)
         form.mutators.setFieldTouched(`tiers[${index}].startTime`, true)
         form.mutators.setFieldTouched(`tiers[${index}].endTime`, true)
         form.mutators.setFieldTouched(`tiers[${index}].minRate`, true)
diff --git a/src/components/stepThree/StepThreeFormMintedCapped.js b/src/components/stepThree/StepThreeFormMintedCapped.js
index ffd36c553..2e6768df6 100644
--- a/src/components/stepThree/StepThreeFormMintedCapped.js
+++ b/src/components/stepThree/StepThreeFormMintedCapped.js
@@ -40,7 +40,9 @@ export const StepThreeFormMintedCapped = ({
   pristine,
   submitting,
   errors,
-  mutators: { push },
+  mutators: { push, setFieldTouched },
+  form,
+  reload,
   ...props
 }) => {
   const status = !(submitting || invalid)
@@ -60,6 +62,32 @@ export const StepThreeFormMintedCapped = ({
     generalStore.setGasTypeSelected(value)
   }
 
+  const handleValidateGasPrice = value => {
+    const errors = composeValidators(
+      isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
+      isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_THAN)(0.1)
+    )(value.price)
+    if (errors) return errors.shift()
+  }
+
+  const setFieldAsTouched = ({ values, errors }) => {
+    if (reload) {
+      const tiers = values && values.tiers ? values.tiers : []
+      tiers.forEach((tier, index) => {
+        form.mutators.setFieldTouched(`tiers[${index}].tier`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].updatable`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].whitelistEnabled`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].startTime`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].endTime`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].minRate`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].maxRate`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].supply`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].minCap`, true)
+      })
+      form.mutators.setFieldTouched(`gasPrice`, true)
+    }
+  }
+
   const handleOnChange = ({ values }) => {
     props.tierStore.updateWalletAddress(values.walletAddress, VALID)
     props.generalStore.setGasPrice(gweiToWei(values.gasPrice.price))
@@ -82,6 +110,9 @@ export const StepThreeFormMintedCapped = ({
       values && values.tiers && values.tiers.length > 0 ? values.tiers[values.tiers.length - 1].endTime : null
     props.crowdsaleStore.setProperty('supply', totalSupply)
     props.crowdsaleStore.setProperty('endTime', endTime)
+
+    // Set fields as touched
+    setFieldAsTouched({ values, errors })
   }
 
   const whenWhitelistBlock = tierInd => {
@@ -137,12 +168,7 @@ export const StepThreeFormMintedCapped = ({
               side="right"
               gasPrices={props.gasPricesInGwei}
               updateGasTypeSelected={updateGasTypeSelected}
-              validate={value =>
-                composeValidators(
-                  isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
-                  isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_THAN)(0.1)
-                )(value.price)
-              }
+              validate={value => handleValidateGasPrice(value)}
             />
           </div>
         </div>

From 704f2e27e411fac668020b7d04237a77becedb5c Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 10:03:54 -0300
Subject: [PATCH 17/40] Add rate as touched

---
 src/components/stepThree/StepThreeFormDutchAuction.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/stepThree/StepThreeFormDutchAuction.js b/src/components/stepThree/StepThreeFormDutchAuction.js
index e924e32d0..d1e4a21dc 100644
--- a/src/components/stepThree/StepThreeFormDutchAuction.js
+++ b/src/components/stepThree/StepThreeFormDutchAuction.js
@@ -67,6 +67,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
         form.mutators.setFieldTouched(`tiers[${index}].updatable`, true)
         form.mutators.setFieldTouched(`tiers[${index}].whitelistEnabled`, true)
         form.mutators.setFieldTouched(`tiers[${index}].startTime`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].rate`, true)
         form.mutators.setFieldTouched(`tiers[${index}].endTime`, true)
         form.mutators.setFieldTouched(`tiers[${index}].minRate`, true)
         form.mutators.setFieldTouched(`tiers[${index}].maxRate`, true)
@@ -163,6 +164,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
               </div>
             </div>
             <Field
+              id="gasPrice"
               name="gasPrice"
               component={GasPriceInput}
               side="right"

From e07e669e5765bec024eb0e5834e1de173800ae05 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 10:04:17 -0300
Subject: [PATCH 18/40] Add rate as touched

---
 src/components/stepThree/StepThreeFormMintedCapped.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/stepThree/StepThreeFormMintedCapped.js b/src/components/stepThree/StepThreeFormMintedCapped.js
index 2e6768df6..f353df0eb 100644
--- a/src/components/stepThree/StepThreeFormMintedCapped.js
+++ b/src/components/stepThree/StepThreeFormMintedCapped.js
@@ -78,6 +78,7 @@ export const StepThreeFormMintedCapped = ({
         form.mutators.setFieldTouched(`tiers[${index}].updatable`, true)
         form.mutators.setFieldTouched(`tiers[${index}].whitelistEnabled`, true)
         form.mutators.setFieldTouched(`tiers[${index}].startTime`, true)
+        form.mutators.setFieldTouched(`tiers[${index}].rate`, true)
         form.mutators.setFieldTouched(`tiers[${index}].endTime`, true)
         form.mutators.setFieldTouched(`tiers[${index}].minRate`, true)
         form.mutators.setFieldTouched(`tiers[${index}].maxRate`, true)

From 957bfce247e1d0d59333cb0a54337f023552a733 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 10:04:41 -0300
Subject: [PATCH 19/40] Send gas type selected on change

---
 src/components/stepThree/GasPriceInput.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/components/stepThree/GasPriceInput.js b/src/components/stepThree/GasPriceInput.js
index 43b1ad879..141a0100f 100644
--- a/src/components/stepThree/GasPriceInput.js
+++ b/src/components/stepThree/GasPriceInput.js
@@ -71,15 +71,7 @@ class GasPriceInput extends Component {
       customGasPrice: value
     })
 
-    input.onChange(
-      Object.assign(
-        {},
-        {
-          id: GAS_PRICE.CUSTOM.ID,
-          price: value
-        }
-      )
-    )
+    input.onChange(gasTypeSelected)
   }
 
   compareChecked = value => {

From 8be411b9f0846a82dca647cfb0f2d31e5d6e498a Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 10:05:15 -0300
Subject: [PATCH 20/40] Support gas type selected on refresh page

---
 src/components/stepThree/index.js | 13 ++++++++-----
 src/stores/GeneralStore.js        |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index 53c3b2027..3d529a234 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -35,7 +35,8 @@ export class stepThree extends React.Component {
     loading: false,
     reload: false,
     initialTiers: [],
-    burnExcess: 'no'
+    burnExcess: 'no',
+    gasTypeSelected: {}
   }
 
   async componentDidMount() {
@@ -43,7 +44,7 @@ export class stepThree extends React.Component {
     await checkWeb3(web3Store.web3)
 
     this.setState({ loading: true })
-    const { initialTiers, burnExcess } = await this.load()
+    const { initialTiers, burnExcess, gasTypeSelected } = await this.load()
 
     try {
       await gasPriceStore.updateValues()
@@ -54,7 +55,8 @@ export class stepThree extends React.Component {
     this.setState({
       loading: false,
       initialTiers: initialTiers,
-      burnExcess: burnExcess
+      burnExcess: burnExcess,
+      gasTypeSelected: gasTypeSelected
     })
     window.scrollTo(0, 0)
   }
@@ -83,7 +85,8 @@ export class stepThree extends React.Component {
 
     return {
       initialTiers: initialTiers,
-      burnExcess: generalStore.burnExcess
+      burnExcess: generalStore.burnExcess,
+      gasTypeSelected: generalStore.getGasTypeSelected
     }
   }
 
@@ -176,7 +179,7 @@ export class stepThree extends React.Component {
           decorators={[this.calculator]}
           initialValues={{
             walletAddress: web3Store.curAddress,
-            gasPrice: gasPriceStore.gasPricesInGwei[0],
+            gasPrice: this.state.gasTypeSelected,
             whitelistEnabled: 'no',
             burnExcess: this.state.burnExcess,
             tiers: this.state.initialTiers
diff --git a/src/stores/GeneralStore.js b/src/stores/GeneralStore.js
index f4adbeaca..1957b4657 100644
--- a/src/stores/GeneralStore.js
+++ b/src/stores/GeneralStore.js
@@ -44,7 +44,7 @@ class GeneralStore {
   // Getters
   @computed
   get getGasTypeSelected() {
-    return this.gasTypeSelected
+    return this.gasTypeSelected || GAS_PRICE.SLOW
   }
 }
 

From 5925f179ecdc2be69d822b3f3ccb5228d7cad67e Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 10:26:41 -0300
Subject: [PATCH 21/40] Disable supply when whitelist is enable for dutch
 strategy

---
 src/components/Common/DutchAuctionBlock.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/Common/DutchAuctionBlock.js b/src/components/Common/DutchAuctionBlock.js
index e64d789e8..84ac6409c 100644
--- a/src/components/Common/DutchAuctionBlock.js
+++ b/src/components/Common/DutchAuctionBlock.js
@@ -69,6 +69,14 @@ export const DutchAuctionBlock = inject('tierStore', 'tokenStore')(
       return composeValidators(...listOfValidations)(value)
     }
 
+    const onChangeWhitelisted = (value, input, index) => {
+      //Clear whitelist
+      if (tierStore) {
+        tierStore.emptyWhitelist(index)
+      }
+      return input.onChange(value)
+    }
+
     return (
       <div>
         {fields.map((name, index) => (
@@ -153,7 +161,10 @@ export const DutchAuctionBlock = inject('tierStore', 'tokenStore')(
                   side="left"
                   label={SUPPLY_SHORT}
                   description={DESCRIPTION.SUPPLY}
-                  disabled={tierStore && tierStore.tiers[index].whitelist.length}
+                  disabled={
+                    (tierStore && tierStore.tiers[index].whitelistEnabled === 'yes') ||
+                    (tierStore && tierStore.tiers[index].whitelist.length)
+                  }
                 />
                 <Field
                   name={`${name}.whitelistEnabled`}
@@ -166,7 +177,7 @@ export const DutchAuctionBlock = inject('tierStore', 'tokenStore')(
                             type="radio"
                             checked={input.value === 'yes'}
                             value="yes"
-                            onChange={() => input.onChange('yes')}
+                            onChange={() => onChangeWhitelisted('yes', input, index)}
                           />
                           <span className="title">yes</span>
                         </label>
@@ -175,7 +186,7 @@ export const DutchAuctionBlock = inject('tierStore', 'tokenStore')(
                             type="radio"
                             checked={input.value === 'no'}
                             value="no"
-                            onChange={() => input.onChange('no')}
+                            onChange={() => onChangeWhitelisted('no', input, index)}
                           />
                           <span className="title">no</span>
                         </label>

From a5f682dcc7626f61f750de00e550b7d24ea76001 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 10:29:59 -0300
Subject: [PATCH 22/40] Update snapshots

---
 .../components/manage/__snapshots__/ManageForm.spec.js.snap | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/components/manage/__snapshots__/ManageForm.spec.js.snap b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
index 1bdea1b6e..76cc354ce 100644
--- a/test/components/manage/__snapshots__/ManageForm.spec.js.snap
+++ b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
@@ -18,6 +18,7 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
   }
   generalStore={
     GeneralStore {
+      "burnExcess": "no",
       "gasPrice": 15000000000,
       "gasTypeSelected": Object {
         "DESCRIPTION": "Safe and Cheap",
@@ -259,6 +260,7 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
             }
             generalStore={
               GeneralStore {
+                "burnExcess": "no",
                 "gasPrice": 15000000000,
                 "gasTypeSelected": Object {
                   "DESCRIPTION": "Safe and Cheap",
@@ -345,6 +347,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
   }
   generalStore={
     GeneralStore {
+      "burnExcess": "no",
       "gasPrice": 15000000000,
       "gasTypeSelected": Object {
         "DESCRIPTION": "Safe and Cheap",
@@ -1107,6 +1110,7 @@ exports[`ManageForm should render the component with tiers 1`] = `
             }
             generalStore={
               GeneralStore {
+                "burnExcess": "no",
                 "gasPrice": 15000000000,
                 "gasTypeSelected": Object {
                   "DESCRIPTION": "Safe and Cheap",
@@ -4421,6 +4425,7 @@ exports[`ManageForm should render the component without tiers 1`] = `
   }
   generalStore={
     GeneralStore {
+      "burnExcess": "no",
       "gasPrice": 15000000000,
       "gasTypeSelected": Object {
         "DESCRIPTION": "Safe and Cheap",
@@ -4662,6 +4667,7 @@ exports[`ManageForm should render the component without tiers 1`] = `
             }
             generalStore={
               GeneralStore {
+                "burnExcess": "no",
                 "gasPrice": 15000000000,
                 "gasTypeSelected": Object {
                   "DESCRIPTION": "Safe and Cheap",

From add416c3338c90fa915776669712550074699fda Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 11:01:18 -0300
Subject: [PATCH 23/40] Change to lowercase

---
 src/stores/GeneralStore.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stores/GeneralStore.js b/src/stores/GeneralStore.js
index 1957b4657..2deabd2b7 100644
--- a/src/stores/GeneralStore.js
+++ b/src/stores/GeneralStore.js
@@ -1,6 +1,7 @@
 import { observable, action, computed } from 'mobx'
 import { GAS_PRICE } from '../utils/constants'
 import autosave from './autosave'
+import { objectKeysToLowerCase } from '../utils/utils'
 
 class GeneralStore {
   @observable networkID
@@ -37,14 +38,14 @@ class GeneralStore {
   reset = () => {
     this.networkID = undefined
     this.gasPrice = GAS_PRICE.FAST.PRICE
-    this.gasTypeSelected = GAS_PRICE.SLOW
+    this.gasTypeSelected = objectKeysToLowerCase(GAS_PRICE.SLOW)
     this.burnExcess = 'no'
   }
 
   // Getters
   @computed
   get getGasTypeSelected() {
-    return this.gasTypeSelected || GAS_PRICE.SLOW
+    return this.gasTypeSelected || objectKeysToLowerCase(GAS_PRICE.SLOW)
   }
 }
 

From 71b72be92f711b7e19c0411c9e98a6b26c5b3237 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 16 Aug 2018 15:46:54 -0300
Subject: [PATCH 24/40] Update snapshot

---
 .../__snapshots__/ManageForm.spec.js.snap     | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/components/manage/__snapshots__/ManageForm.spec.js.snap b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
index 76cc354ce..ba0bf4c9c 100644
--- a/test/components/manage/__snapshots__/ManageForm.spec.js.snap
+++ b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
@@ -21,9 +21,9 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
       "burnExcess": "no",
       "gasPrice": 15000000000,
       "gasTypeSelected": Object {
-        "DESCRIPTION": "Safe and Cheap",
-        "ID": "slow",
-        "PRICE": 5000000000,
+        "description": "Safe and Cheap",
+        "id": "slow",
+        "price": 5000000000,
       },
       "networkID": undefined,
     }
@@ -263,9 +263,9 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
                 "burnExcess": "no",
                 "gasPrice": 15000000000,
                 "gasTypeSelected": Object {
-                  "DESCRIPTION": "Safe and Cheap",
-                  "ID": "slow",
-                  "PRICE": 5000000000,
+                  "description": "Safe and Cheap",
+                  "id": "slow",
+                  "price": 5000000000,
                 },
                 "networkID": undefined,
               }
@@ -350,9 +350,9 @@ exports[`ManageForm should render the component with tiers 1`] = `
       "burnExcess": "no",
       "gasPrice": 15000000000,
       "gasTypeSelected": Object {
-        "DESCRIPTION": "Safe and Cheap",
-        "ID": "slow",
-        "PRICE": 5000000000,
+        "description": "Safe and Cheap",
+        "id": "slow",
+        "price": 5000000000,
       },
       "networkID": undefined,
     }
@@ -1113,9 +1113,9 @@ exports[`ManageForm should render the component with tiers 1`] = `
                 "burnExcess": "no",
                 "gasPrice": 15000000000,
                 "gasTypeSelected": Object {
-                  "DESCRIPTION": "Safe and Cheap",
-                  "ID": "slow",
-                  "PRICE": 5000000000,
+                  "description": "Safe and Cheap",
+                  "id": "slow",
+                  "price": 5000000000,
                 },
                 "networkID": undefined,
               }
@@ -4428,9 +4428,9 @@ exports[`ManageForm should render the component without tiers 1`] = `
       "burnExcess": "no",
       "gasPrice": 15000000000,
       "gasTypeSelected": Object {
-        "DESCRIPTION": "Safe and Cheap",
-        "ID": "slow",
-        "PRICE": 5000000000,
+        "description": "Safe and Cheap",
+        "id": "slow",
+        "price": 5000000000,
       },
       "networkID": undefined,
     }
@@ -4670,9 +4670,9 @@ exports[`ManageForm should render the component without tiers 1`] = `
                 "burnExcess": "no",
                 "gasPrice": 15000000000,
                 "gasTypeSelected": Object {
-                  "DESCRIPTION": "Safe and Cheap",
-                  "ID": "slow",
-                  "PRICE": 5000000000,
+                  "description": "Safe and Cheap",
+                  "id": "slow",
+                  "price": 5000000000,
                 },
                 "networkID": undefined,
               }

From b1db8d9ec888d1e43be17fbbef8ea54d2fdc1318 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Fri, 17 Aug 2018 08:46:38 -0300
Subject: [PATCH 25/40] Change language constant 'Greater or Equal Than'

---
 src/components/stepThree/StepThreeFormDutchAuction.js | 2 +-
 src/components/stepThree/StepThreeFormMintedCapped.js | 2 +-
 src/utils/constants.js                                | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/stepThree/StepThreeFormDutchAuction.js b/src/components/stepThree/StepThreeFormDutchAuction.js
index d1e4a21dc..314cf29e0 100644
--- a/src/components/stepThree/StepThreeFormDutchAuction.js
+++ b/src/components/stepThree/StepThreeFormDutchAuction.js
@@ -48,7 +48,7 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
   const handleValidateGasPrice = value => {
     const errors = composeValidators(
       isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
-      isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_THAN)(0.1)
+      isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_OR_EQUAL_THAN)(0.1)
     )(value.price)
     if (errors) return errors.shift()
   }
diff --git a/src/components/stepThree/StepThreeFormMintedCapped.js b/src/components/stepThree/StepThreeFormMintedCapped.js
index f353df0eb..996362dd1 100644
--- a/src/components/stepThree/StepThreeFormMintedCapped.js
+++ b/src/components/stepThree/StepThreeFormMintedCapped.js
@@ -65,7 +65,7 @@ export const StepThreeFormMintedCapped = ({
   const handleValidateGasPrice = value => {
     const errors = composeValidators(
       isDecimalPlacesNotGreaterThan(VALIDATION_MESSAGES.DECIMAL_PLACES_9)(9),
-      isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_THAN)(0.1)
+      isGreaterOrEqualThan(VALIDATION_MESSAGES.NUMBER_GREATER_OR_EQUAL_THAN)(0.1)
     )(value.price)
     if (errors) return errors.shift()
   }
diff --git a/src/utils/constants.js b/src/utils/constants.js
index d384764fc..c2b22ab11 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -147,7 +147,8 @@ export const VALIDATION_MESSAGES = {
   DATE_IS_SAME_OR_PREVIOUS: 'Should be same or previous than specified time',
   PATTERN: 'Should match the specified pattern',
   DECIMAL_PLACES_9: 'Should not have more than 9 decimals',
-  NUMBER_GREATER_THAN: 'Should be greater than 0.1'
+  NUMBER_GREATER_THAN: 'Should be greater than 0.1',
+  NUMBER_GREATER_OR_EQUAL_THAN: 'Should be greater or equal than 0.1'
 }
 
 //descriptions of input fields

From b006fbb7dc5b625c81e3b973c670d7ea9db616da Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Fri, 17 Aug 2018 09:49:26 -0300
Subject: [PATCH 26/40] Update gas type selected on father component

---
 src/components/stepThree/GasPriceInput.js     | 33 +++++++++++++++++--
 .../stepThree/StepThreeFormDutchAuction.js    |  4 +--
 .../stepThree/StepThreeFormMintedCapped.js    |  4 +--
 src/components/stepThree/index.js             |  9 +++++
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/components/stepThree/GasPriceInput.js b/src/components/stepThree/GasPriceInput.js
index 141a0100f..b81cb20d6 100644
--- a/src/components/stepThree/GasPriceInput.js
+++ b/src/components/stepThree/GasPriceInput.js
@@ -27,16 +27,27 @@ class GasPriceInput extends Component {
   }
 
   handleNonCustomSelected = value => {
+    const { input } = this.props
     this.setState({
       isCustom: false
     })
 
     const gasTypeSelected = objectKeysToLowerCase(value)
     this.handleGasType(gasTypeSelected)
-    this.props.input.onChange(gasTypeSelected)
+
+    input.onChange(
+      Object.assign(
+        {},
+        {
+          id: gasTypeSelected.id,
+          price: gasTypeSelected.price
+        }
+      )
+    )
   }
 
   handleCustomSelected = () => {
+    const { input } = this.props
     this.setState({
       isCustom: true
     })
@@ -47,7 +58,15 @@ class GasPriceInput extends Component {
     }
 
     this.handleGasType(gasTypeSelected)
-    this.props.input.onChange(gasTypeSelected)
+    input.onChange(
+      Object.assign(
+        {},
+        {
+          id: gasTypeSelected.id,
+          price: gasTypeSelected.price
+        }
+      )
+    )
   }
 
   handleGasType = value => {
@@ -71,7 +90,15 @@ class GasPriceInput extends Component {
       customGasPrice: value
     })
 
-    input.onChange(gasTypeSelected)
+    input.onChange(
+      Object.assign(
+        {},
+        {
+          id: gasTypeSelected.id,
+          price: value
+        }
+      )
+    )
   }
 
   compareChecked = value => {
diff --git a/src/components/stepThree/StepThreeFormDutchAuction.js b/src/components/stepThree/StepThreeFormDutchAuction.js
index 314cf29e0..931297294 100644
--- a/src/components/stepThree/StepThreeFormDutchAuction.js
+++ b/src/components/stepThree/StepThreeFormDutchAuction.js
@@ -41,8 +41,8 @@ export const StepThreeFormDutchAuction = ({ handleSubmit, invalid, submitting, p
    * @param value
    */
   const updateGasTypeSelected = value => {
-    const { generalStore } = props
-    generalStore.setGasTypeSelected(value)
+    const { updateGasTypeSelected } = props
+    updateGasTypeSelected(value)
   }
 
   const handleValidateGasPrice = value => {
diff --git a/src/components/stepThree/StepThreeFormMintedCapped.js b/src/components/stepThree/StepThreeFormMintedCapped.js
index 996362dd1..3025403cb 100644
--- a/src/components/stepThree/StepThreeFormMintedCapped.js
+++ b/src/components/stepThree/StepThreeFormMintedCapped.js
@@ -58,8 +58,8 @@ export const StepThreeFormMintedCapped = ({
    * @param value
    */
   const updateGasTypeSelected = value => {
-    const { generalStore } = props
-    generalStore.setGasTypeSelected(value)
+    const { updateGasTypeSelected } = props
+    updateGasTypeSelected(value)
   }
 
   const handleValidateGasPrice = value => {
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index 3d529a234..7c661bd11 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -156,6 +156,14 @@ export class stepThree extends React.Component {
     }
   })
 
+  updateGasTypeSelected = value => {
+    const { generalStore } = this.props
+    this.setState({
+      gasTypeSelected: value
+    })
+    generalStore.setGasTypeSelected(value)
+  }
+
   render() {
     if (this.state.initialTiers.length === 0) {
       //Not render the form until tiers are setup
@@ -188,6 +196,7 @@ export class stepThree extends React.Component {
           addCrowdsale={tierStore.addCrowdsale}
           gasPricesInGwei={gasPriceStore.gasPricesInGwei}
           decimals={tokenStore.decimals}
+          updateGasTypeSelected={this.updateGasTypeSelected}
           tierStore={tierStore}
           generalStore={generalStore}
           crowdsaleStore={crowdsaleStore}

From 812ce85711832f352e67e2a01e4f45195ffbf371 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Fri, 17 Aug 2018 18:27:42 -0300
Subject: [PATCH 27/40] Change custom gas price constant, change event onChange

---
 src/components/stepThree/GasPriceInput.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/stepThree/GasPriceInput.js b/src/components/stepThree/GasPriceInput.js
index b81cb20d6..cfce0478a 100644
--- a/src/components/stepThree/GasPriceInput.js
+++ b/src/components/stepThree/GasPriceInput.js
@@ -9,7 +9,7 @@ import { inject, observer } from 'mobx-react'
 class GasPriceInput extends Component {
   state = {
     isCustom: false,
-    customGasPrice: 0,
+    customGasPrice: 0.1,
     gasTypeSelected: {}
   }
 
@@ -35,18 +35,10 @@ class GasPriceInput extends Component {
     const gasTypeSelected = objectKeysToLowerCase(value)
     this.handleGasType(gasTypeSelected)
 
-    input.onChange(
-      Object.assign(
-        {},
-        {
-          id: gasTypeSelected.id,
-          price: gasTypeSelected.price
-        }
-      )
-    )
+    input.onChange(gasTypeSelected)
   }
 
-  handleCustomSelected = () => {
+  handleCustomSelected = value => {
     const { input } = this.props
     this.setState({
       isCustom: true

From 74907910e5f120f5778a7dd16ced8c382384f617 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 21 Aug 2018 07:05:44 -0300
Subject: [PATCH 28/40] Added custom gas price constant, remove set state

---
 src/components/stepThree/GasPriceInput.js | 2 +-
 src/components/stepThree/index.js         | 3 ---
 src/utils/constants.js                    | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/stepThree/GasPriceInput.js b/src/components/stepThree/GasPriceInput.js
index cfce0478a..0cbd17f40 100644
--- a/src/components/stepThree/GasPriceInput.js
+++ b/src/components/stepThree/GasPriceInput.js
@@ -9,7 +9,7 @@ import { inject, observer } from 'mobx-react'
 class GasPriceInput extends Component {
   state = {
     isCustom: false,
-    customGasPrice: 0.1,
+    customGasPrice: GAS_PRICE.CUSTOM.PRICE,
     gasTypeSelected: {}
   }
 
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index 7c661bd11..e0a724a8d 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -158,9 +158,6 @@ export class stepThree extends React.Component {
 
   updateGasTypeSelected = value => {
     const { generalStore } = this.props
-    this.setState({
-      gasTypeSelected: value
-    })
     generalStore.setGasTypeSelected(value)
   }
 
diff --git a/src/utils/constants.js b/src/utils/constants.js
index c2b22ab11..491c52df1 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -87,7 +87,7 @@ export const GAS_PRICE = {
   },
   CUSTOM: {
     ID: 'custom',
-    PRICE: 0,
+    PRICE: 0.1,
     DESCRIPTION: 'Custom'
   },
   API: {

From 73d9f36771a2cd559a8699bf21cfa5f7790d507c Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Fri, 17 Aug 2018 15:41:29 -0300
Subject: [PATCH 29/40] Validate network change

---
 src/components/stepFour/index.js  | 28 ++++++++++++++++++++++++----
 src/components/stepThree/index.js |  4 ++--
 src/utils/alerts.js               |  8 ++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
index 69f2fef5c..da7f5584c 100644
--- a/src/components/stepFour/index.js
+++ b/src/components/stepFour/index.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { Component } from 'react'
 import '../../assets/stylesheets/application.css'
 import {
   buildDeploymentSteps,
@@ -10,7 +10,7 @@ import {
   scrollToBottom,
   SUMMARY_FILE_CONTENTS
 } from './utils'
-import { noContractDataAlert, successfulDeployment, skippingTransaction } from '../../utils/alerts'
+import { noContractDataAlert, successfulDeployment, skippingTransaction, networkChanged } from '../../utils/alerts'
 import {
   DESCRIPTION,
   NAVIGATION_STEPS,
@@ -34,6 +34,8 @@ import { PreventRefresh } from '../Common/PreventRefresh'
 import cancelDeploy from '../../utils/cancelDeploy'
 import PropTypes from 'prop-types'
 import logdown from 'logdown'
+import { getNetworkVersion } from '../../utils/blockchainHelpers'
+let promiseRetry = require('promise-retry')
 
 const logger = logdown('TW:stepFour')
 
@@ -69,10 +71,11 @@ const {
   'tokenStore',
   'web3Store',
   'deploymentStore',
+  'generalStore',
   'crowdsaleStore'
 )
 @observer
-export class stepFour extends React.Component {
+export class stepFour extends Component {
   constructor(props, context) {
     super(props)
     this.state = {
@@ -100,7 +103,7 @@ export class stepFour extends React.Component {
     toast.showToaster({ message: TOAST.MESSAGE.CONTRACT_DOWNLOAD_SUCCESS, options })
   }
 
-  componentDidMount() {
+  async componentDidMount() {
     scrollToBottom()
     copy('copy')
     if (!this.props.deploymentStore.hasEnded) {
@@ -111,6 +114,16 @@ export class stepFour extends React.Component {
     if (!this.props.deploymentStore.invalidAccount) {
       this.deployCrowdsale()
     }
+
+    await promiseRetry(async retry => {
+      const networkChangedResult = await this.checkNetworkChanged()
+      if (networkChangedResult) {
+        this.hideModal()
+        await networkChanged()
+        this.showModal()
+        retry()
+      }
+    })
   }
 
   deployCrowdsale = () => {
@@ -154,6 +167,13 @@ export class stepFour extends React.Component {
     logger.error([failedAt, err])
   }
 
+  checkNetworkChanged = async () => {
+    const { generalStore } = this.props
+    const networkIDFromNifty = await getNetworkVersion()
+    const networkIDFromStore = generalStore.networkID
+    return networkIDFromNifty !== networkIDFromStore
+  }
+
   skipTransaction = () => {
     const { deploymentStore } = this.props
 
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index e0a724a8d..f6f92161d 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { Component } from 'react'
 import '../../assets/stylesheets/application.css'
 import { Form } from 'react-final-form'
 import arrayMutators from 'final-form-arrays'
@@ -30,7 +30,7 @@ const { CROWDSALE_SETUP } = NAVIGATION_STEPS
   'crowdsaleStore'
 )
 @observer
-export class stepThree extends React.Component {
+export class stepThree extends Component {
   state = {
     loading: false,
     reload: false,
diff --git a/src/utils/alerts.js b/src/utils/alerts.js
index acad0b071..7919fd6c8 100644
--- a/src/utils/alerts.js
+++ b/src/utils/alerts.js
@@ -318,3 +318,11 @@ export function maxCapExceedsSupply(count) {
     type: 'info'
   })
 }
+
+export function networkChanged() {
+  return sweetAlert2({
+    title: 'Network changed',
+    html: 'The network id was modified, please set up nifty wallet with the network id which you started',
+    type: 'warning'
+  })
+}

From 8ca582f6f9c20c79278c44d399189d9ed639a8e0 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 21 Aug 2018 09:46:29 -0300
Subject: [PATCH 30/40] Change how gas type is set

---
 src/components/stepFour/index.js  | 13 +++++++------
 src/components/stepThree/index.js |  9 +++++++--
 src/stores/GeneralStore.js        |  9 ++++-----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
index da7f5584c..37f5bc7d4 100644
--- a/src/components/stepFour/index.js
+++ b/src/components/stepFour/index.js
@@ -76,14 +76,15 @@ const {
 )
 @observer
 export class stepFour extends Component {
+  state = {
+    contractDownloaded: false,
+    modal: false,
+    preventRefresh: true,
+    transactionFailed: false
+  }
+
   constructor(props, context) {
     super(props)
-    this.state = {
-      contractDownloaded: false,
-      modal: false,
-      preventRefresh: true,
-      transactionFailed: false
-    }
 
     const { deploymentStore } = props
 
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index f6f92161d..018adefad 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -44,7 +44,6 @@ export class stepThree extends Component {
     await checkWeb3(web3Store.web3)
 
     this.setState({ loading: true })
-    const { initialTiers, burnExcess, gasTypeSelected } = await this.load()
 
     try {
       await gasPriceStore.updateValues()
@@ -52,6 +51,8 @@ export class stepThree extends Component {
       noGasPriceAvailable()
     }
 
+    const { initialTiers, burnExcess, gasTypeSelected } = await this.load()
+
     this.setState({
       loading: false,
       initialTiers: initialTiers,
@@ -62,7 +63,7 @@ export class stepThree extends Component {
   }
 
   async load() {
-    const { tierStore, generalStore, web3Store, crowdsaleStore } = this.props
+    const { tierStore, generalStore, web3Store, crowdsaleStore, gasPriceStore } = this.props
 
     await sleep(1000)
 
@@ -83,6 +84,10 @@ export class stepThree extends Component {
       initialTiers = JSON.parse(JSON.stringify(tierStore.tiers))
     }
 
+    if (!generalStore.getGasTypeSelected) {
+      generalStore.setGasTypeSelected(gasPriceStore.gasPricesInGwei[0])
+    }
+
     return {
       initialTiers: initialTiers,
       burnExcess: generalStore.burnExcess,
diff --git a/src/stores/GeneralStore.js b/src/stores/GeneralStore.js
index 2deabd2b7..2a6ddcc72 100644
--- a/src/stores/GeneralStore.js
+++ b/src/stores/GeneralStore.js
@@ -1,11 +1,10 @@
 import { observable, action, computed } from 'mobx'
 import { GAS_PRICE } from '../utils/constants'
 import autosave from './autosave'
-import { objectKeysToLowerCase } from '../utils/utils'
 
 class GeneralStore {
   @observable networkID
-  @observable gasPrice = GAS_PRICE.FAST.PRICE
+  @observable gasPrice = GAS_PRICE.SLOW.PRICE
   @observable gasTypeSelected
   @observable burnExcess
 
@@ -37,15 +36,15 @@ class GeneralStore {
   @action
   reset = () => {
     this.networkID = undefined
-    this.gasPrice = GAS_PRICE.FAST.PRICE
-    this.gasTypeSelected = objectKeysToLowerCase(GAS_PRICE.SLOW)
+    this.gasPrice = GAS_PRICE.SLOW.PRICE
+    this.gasTypeSelected = undefined
     this.burnExcess = 'no'
   }
 
   // Getters
   @computed
   get getGasTypeSelected() {
-    return this.gasTypeSelected || objectKeysToLowerCase(GAS_PRICE.SLOW)
+    return this.gasTypeSelected
   }
 }
 

From 7ebd9ac9a05978fa6a6c35b73ad82c7d9b0e89f3 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 21 Aug 2018 10:56:29 -0300
Subject: [PATCH 31/40] Update snapshot

---
 .../__snapshots__/ManageForm.spec.js.snap     | 48 +++++--------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/test/components/manage/__snapshots__/ManageForm.spec.js.snap b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
index ba0bf4c9c..bf6327074 100644
--- a/test/components/manage/__snapshots__/ManageForm.spec.js.snap
+++ b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
@@ -19,12 +19,8 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
   generalStore={
     GeneralStore {
       "burnExcess": "no",
-      "gasPrice": 15000000000,
-      "gasTypeSelected": Object {
-        "description": "Safe and Cheap",
-        "id": "slow",
-        "price": 5000000000,
-      },
+      "gasPrice": 5000000000,
+      "gasTypeSelected": undefined,
       "networkID": undefined,
     }
   }
@@ -261,12 +257,8 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
             generalStore={
               GeneralStore {
                 "burnExcess": "no",
-                "gasPrice": 15000000000,
-                "gasTypeSelected": Object {
-                  "description": "Safe and Cheap",
-                  "id": "slow",
-                  "price": 5000000000,
-                },
+                "gasPrice": 5000000000,
+                "gasTypeSelected": undefined,
                 "networkID": undefined,
               }
             }
@@ -348,12 +340,8 @@ exports[`ManageForm should render the component with tiers 1`] = `
   generalStore={
     GeneralStore {
       "burnExcess": "no",
-      "gasPrice": 15000000000,
-      "gasTypeSelected": Object {
-        "description": "Safe and Cheap",
-        "id": "slow",
-        "price": 5000000000,
-      },
+      "gasPrice": 5000000000,
+      "gasTypeSelected": undefined,
       "networkID": undefined,
     }
   }
@@ -1111,12 +1099,8 @@ exports[`ManageForm should render the component with tiers 1`] = `
             generalStore={
               GeneralStore {
                 "burnExcess": "no",
-                "gasPrice": 15000000000,
-                "gasTypeSelected": Object {
-                  "description": "Safe and Cheap",
-                  "id": "slow",
-                  "price": 5000000000,
-                },
+                "gasPrice": 5000000000,
+                "gasTypeSelected": undefined,
                 "networkID": undefined,
               }
             }
@@ -4426,12 +4410,8 @@ exports[`ManageForm should render the component without tiers 1`] = `
   generalStore={
     GeneralStore {
       "burnExcess": "no",
-      "gasPrice": 15000000000,
-      "gasTypeSelected": Object {
-        "description": "Safe and Cheap",
-        "id": "slow",
-        "price": 5000000000,
-      },
+      "gasPrice": 5000000000,
+      "gasTypeSelected": undefined,
       "networkID": undefined,
     }
   }
@@ -4668,12 +4648,8 @@ exports[`ManageForm should render the component without tiers 1`] = `
             generalStore={
               GeneralStore {
                 "burnExcess": "no",
-                "gasPrice": 15000000000,
-                "gasTypeSelected": Object {
-                  "description": "Safe and Cheap",
-                  "id": "slow",
-                  "price": 5000000000,
-                },
+                "gasPrice": 5000000000,
+                "gasTypeSelected": undefined,
                 "networkID": undefined,
               }
             }

From e0fffffd8785f354efc0612c0fd931d30c5adaae Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 21 Aug 2018 15:10:58 -0300
Subject: [PATCH 32/40] Add alert info if contracts already deployed

---
 src/components/stepFour/index.js | 41 ++++++++++++++++++++++----------
 src/utils/alerts.js              |  8 +++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
index 37f5bc7d4..a7138b79f 100644
--- a/src/components/stepFour/index.js
+++ b/src/components/stepFour/index.js
@@ -10,7 +10,13 @@ import {
   scrollToBottom,
   SUMMARY_FILE_CONTENTS
 } from './utils'
-import { noContractDataAlert, successfulDeployment, skippingTransaction, networkChanged } from '../../utils/alerts'
+import {
+  noContractDataAlert,
+  successfulDeployment,
+  skippingTransaction,
+  networkChanged,
+  deployHasEnded
+} from '../../utils/alerts'
 import {
   DESCRIPTION,
   NAVIGATION_STEPS,
@@ -88,7 +94,9 @@ export class stepFour extends Component {
 
     const { deploymentStore } = props
 
-    if (!deploymentStore.deployInProgress) {
+    logger.log(`Deployment progress`, deploymentStore.deployInProgress)
+    logger.log(`Deployment has ended`, deploymentStore.hasEnded)
+    if (!deploymentStore.deployInProgress && !deploymentStore.hasEnded) {
       deploymentStore.setDeploymentStep(0)
       deploymentStore.setDeployerAccount(context.selectedAccount)
     }
@@ -105,17 +113,13 @@ export class stepFour extends Component {
   }
 
   async componentDidMount() {
-    scrollToBottom()
-    copy('copy')
-    if (!this.props.deploymentStore.hasEnded) {
-      this.showModal()
-    }
+    const { deploymentStore } = this.props
 
-    // If user reloads with an invalid account, don't start the deploy automatically
-    if (!this.props.deploymentStore.invalidAccount) {
-      this.deployCrowdsale()
+    // Check if deploy has ended
+    if (deploymentStore.hasEnded) {
+      return await deployHasEnded()
     }
-
+    // Check if network has changed
     await promiseRetry(async retry => {
       const networkChangedResult = await this.checkNetworkChanged()
       if (networkChangedResult) {
@@ -125,6 +129,17 @@ export class stepFour extends Component {
         retry()
       }
     })
+
+    scrollToBottom()
+    copy('copy')
+    if (!deploymentStore.hasEnded) {
+      this.showModal()
+    }
+
+    // If user reloads with an invalid account, don't start the deploy automatically
+    if (!deploymentStore.invalidAccount) {
+      this.deployCrowdsale()
+    }
   }
 
   deployCrowdsale = () => {
@@ -172,7 +187,9 @@ export class stepFour extends Component {
     const { generalStore } = this.props
     const networkIDFromNifty = await getNetworkVersion()
     const networkIDFromStore = generalStore.networkID
-    return networkIDFromNifty !== networkIDFromStore
+    logger.log(`Network id from store`, networkIDFromStore)
+    logger.log(`Network id from nifty wallet`, networkIDFromNifty)
+    return +networkIDFromNifty !== +networkIDFromStore
   }
 
   skipTransaction = () => {
diff --git a/src/utils/alerts.js b/src/utils/alerts.js
index 7919fd6c8..0c3270dd6 100644
--- a/src/utils/alerts.js
+++ b/src/utils/alerts.js
@@ -326,3 +326,11 @@ export function networkChanged() {
     type: 'warning'
   })
 }
+
+export function deployHasEnded() {
+  return sweetAlert2({
+    title: 'Deploy ended',
+    html: 'The deploy is finished',
+    type: 'info'
+  })
+}

From 816b22ed0e3f0c98ca39b3171e37e1e4fae12853 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 22 Aug 2018 10:50:14 -0300
Subject: [PATCH 33/40] Add clear storage on manage section

---
 src/components/Home/index.js   | 47 +++++-----------------------------
 src/components/manage/index.js | 20 ++++++++++++---
 src/utils/utils.js             | 35 +++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/src/components/Home/index.js b/src/components/Home/index.js
index 69635501a..928b8bb8e 100644
--- a/src/components/Home/index.js
+++ b/src/components/Home/index.js
@@ -4,7 +4,7 @@ import CrowdsalesList from '../Common/CrowdsalesList'
 import { Loader } from '../Common/Loader'
 import { loadRegistryAddresses } from '../../utils/blockchainHelpers'
 import { ModalContainer } from '../Common/ModalContainer'
-import { toast } from '../../utils/utils'
+import { toast, clearStorage } from '../../utils/utils'
 import { TOAST, NAVIGATION_STEPS, DOWNLOAD_STATUS } from '../../utils/constants'
 import { inject, observer } from 'mobx-react'
 import { checkWeb3, getNetworkVersion } from '../../utils/blockchainHelpers'
@@ -55,15 +55,15 @@ export class Home extends Component {
     try {
       await loadRegistryAddresses()
       this.setState({
-        loading: false,
         showModal: true
       })
     } catch (e) {
       logger.error('There was a problem loading the crowdsale addresses from the registry', e)
-      this.setState({
-        loading: false
-      })
     }
+
+    this.setState({
+      loading: false
+    })
   }
 
   goNextStep = async () => {
@@ -71,7 +71,7 @@ export class Home extends Component {
     if (storage.has('DeploymentStore') && storage.get('DeploymentStore').deploymentStep) {
       this.props.history.push('/')
     } else {
-      this.clearStorage()
+      clearStorage(this.props)
       await this.reloadStorage()
       this.props.history.push('1')
     }
@@ -99,41 +99,6 @@ export class Home extends Component {
     }
   }
 
-  clearStorage() {
-    // Generate of stores to clear
-    const toArray = ({
-      generalStore,
-      contractStore,
-      crowdsaleStore,
-      gasPriceStore,
-      deploymentStore,
-      reservedTokenStore,
-      stepTwoValidationStore,
-      tierStore,
-      tokenStore
-    }) => {
-      return [
-        generalStore,
-        contractStore,
-        crowdsaleStore,
-        gasPriceStore,
-        deploymentStore,
-        reservedTokenStore,
-        stepTwoValidationStore,
-        tierStore,
-        tokenStore
-      ]
-    }
-
-    const storesToClear = toArray(this.props)
-    for (let storeToClear of storesToClear) {
-      if (typeof storeToClear.reset === 'function') {
-        logger.log('Store to be cleared:', storeToClear.constructor.name)
-        storeToClear.reset()
-      }
-    }
-  }
-
   onClick = crowdsaleAddress => {
     this.props.history.push(`manage/${crowdsaleAddress}`)
   }
diff --git a/src/components/manage/index.js b/src/components/manage/index.js
index db4c3dbc5..4147d56a4 100644
--- a/src/components/manage/index.js
+++ b/src/components/manage/index.js
@@ -23,7 +23,7 @@ import {
   checkWeb3,
   isAddressValid
 } from '../../utils/blockchainHelpers'
-import { isExecIDValid, isNetworkIDValid, toast, toBigNumber } from '../../utils/utils'
+import { isExecIDValid, isNetworkIDValid, toast, toBigNumber, clearStorage } from '../../utils/utils'
 import { getCrowdsaleAssets } from '../../stores/utils'
 import { getFieldsToUpdate, processTier, updateTierAttribute } from './utils'
 import { Loader } from '../Common/Loader'
@@ -39,7 +39,18 @@ import logdown from 'logdown'
 
 const logger = logdown('TW:manage')
 
-@inject('crowdsaleStore', 'web3Store', 'tierStore', 'contractStore', 'generalStore', 'tokenStore', 'gasPriceStore')
+@inject(
+  'crowdsaleStore',
+  'web3Store',
+  'tierStore',
+  'contractStore',
+  'reservedTokenStore',
+  'stepTwoValidationStore',
+  'generalStore',
+  'tokenStore',
+  'gasPriceStore',
+  'deploymentStore'
+)
 @observer
 export class Manage extends Component {
   constructor(props) {
@@ -65,8 +76,9 @@ export class Manage extends Component {
     setTimeout(() => window.scrollTo(0, 0), 500)
   }
 
-  componentWillMount() {
-    this.preparePage()
+  async componentWillMount() {
+    clearStorage(this.props)
+    await this.preparePage()
   }
 
   preparePage = async () => {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 1967a77d5..c3b60947f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -193,3 +193,38 @@ export const objectKeysToLowerCase = input => {
     return newObj
   }, {})
 }
+
+export const clearStorage = props => {
+  // Generate of stores to clear
+  const toArray = ({
+    generalStore,
+    contractStore,
+    crowdsaleStore,
+    gasPriceStore,
+    deploymentStore,
+    reservedTokenStore,
+    stepTwoValidationStore,
+    tierStore,
+    tokenStore
+  }) => {
+    return [
+      generalStore,
+      contractStore,
+      crowdsaleStore,
+      gasPriceStore,
+      deploymentStore,
+      reservedTokenStore,
+      stepTwoValidationStore,
+      tierStore,
+      tokenStore
+    ]
+  }
+
+  const storesToClear = toArray(props)
+  for (let storeToClear of storesToClear) {
+    if (typeof storeToClear.reset === 'function') {
+      logger.log('Store to be cleared:', storeToClear.constructor.name)
+      storeToClear.reset()
+    }
+  }
+}

From bfc37fcaa582a4b97b330f8ea9b5a1bf8bd225c0 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Fri, 17 Aug 2018 15:41:29 -0300
Subject: [PATCH 34/40] Validate network change

---
 src/components/stepFour/index.js  | 28 ++++++++++++++++++++++++----
 src/components/stepThree/index.js |  4 ++--
 src/utils/alerts.js               |  8 ++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
index 69f2fef5c..da7f5584c 100644
--- a/src/components/stepFour/index.js
+++ b/src/components/stepFour/index.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { Component } from 'react'
 import '../../assets/stylesheets/application.css'
 import {
   buildDeploymentSteps,
@@ -10,7 +10,7 @@ import {
   scrollToBottom,
   SUMMARY_FILE_CONTENTS
 } from './utils'
-import { noContractDataAlert, successfulDeployment, skippingTransaction } from '../../utils/alerts'
+import { noContractDataAlert, successfulDeployment, skippingTransaction, networkChanged } from '../../utils/alerts'
 import {
   DESCRIPTION,
   NAVIGATION_STEPS,
@@ -34,6 +34,8 @@ import { PreventRefresh } from '../Common/PreventRefresh'
 import cancelDeploy from '../../utils/cancelDeploy'
 import PropTypes from 'prop-types'
 import logdown from 'logdown'
+import { getNetworkVersion } from '../../utils/blockchainHelpers'
+let promiseRetry = require('promise-retry')
 
 const logger = logdown('TW:stepFour')
 
@@ -69,10 +71,11 @@ const {
   'tokenStore',
   'web3Store',
   'deploymentStore',
+  'generalStore',
   'crowdsaleStore'
 )
 @observer
-export class stepFour extends React.Component {
+export class stepFour extends Component {
   constructor(props, context) {
     super(props)
     this.state = {
@@ -100,7 +103,7 @@ export class stepFour extends React.Component {
     toast.showToaster({ message: TOAST.MESSAGE.CONTRACT_DOWNLOAD_SUCCESS, options })
   }
 
-  componentDidMount() {
+  async componentDidMount() {
     scrollToBottom()
     copy('copy')
     if (!this.props.deploymentStore.hasEnded) {
@@ -111,6 +114,16 @@ export class stepFour extends React.Component {
     if (!this.props.deploymentStore.invalidAccount) {
       this.deployCrowdsale()
     }
+
+    await promiseRetry(async retry => {
+      const networkChangedResult = await this.checkNetworkChanged()
+      if (networkChangedResult) {
+        this.hideModal()
+        await networkChanged()
+        this.showModal()
+        retry()
+      }
+    })
   }
 
   deployCrowdsale = () => {
@@ -154,6 +167,13 @@ export class stepFour extends React.Component {
     logger.error([failedAt, err])
   }
 
+  checkNetworkChanged = async () => {
+    const { generalStore } = this.props
+    const networkIDFromNifty = await getNetworkVersion()
+    const networkIDFromStore = generalStore.networkID
+    return networkIDFromNifty !== networkIDFromStore
+  }
+
   skipTransaction = () => {
     const { deploymentStore } = this.props
 
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index e0a724a8d..f6f92161d 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { Component } from 'react'
 import '../../assets/stylesheets/application.css'
 import { Form } from 'react-final-form'
 import arrayMutators from 'final-form-arrays'
@@ -30,7 +30,7 @@ const { CROWDSALE_SETUP } = NAVIGATION_STEPS
   'crowdsaleStore'
 )
 @observer
-export class stepThree extends React.Component {
+export class stepThree extends Component {
   state = {
     loading: false,
     reload: false,
diff --git a/src/utils/alerts.js b/src/utils/alerts.js
index f1aa648c3..7075ecbfe 100644
--- a/src/utils/alerts.js
+++ b/src/utils/alerts.js
@@ -334,3 +334,11 @@ export function maxCapExceedsSupply(count) {
     type: 'info'
   })
 }
+
+export function networkChanged() {
+  return sweetAlert2({
+    title: 'Network changed',
+    html: 'The network id was modified, please set up nifty wallet with the network id which you started',
+    type: 'warning'
+  })
+}

From 2f419657fdb486a05eb23298051b005ad1cd4961 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 21 Aug 2018 09:46:29 -0300
Subject: [PATCH 35/40] Change how gas type is set

---
 src/components/stepFour/index.js  | 13 +++++++------
 src/components/stepThree/index.js |  9 +++++++--
 src/stores/GeneralStore.js        |  9 ++++-----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
index da7f5584c..37f5bc7d4 100644
--- a/src/components/stepFour/index.js
+++ b/src/components/stepFour/index.js
@@ -76,14 +76,15 @@ const {
 )
 @observer
 export class stepFour extends Component {
+  state = {
+    contractDownloaded: false,
+    modal: false,
+    preventRefresh: true,
+    transactionFailed: false
+  }
+
   constructor(props, context) {
     super(props)
-    this.state = {
-      contractDownloaded: false,
-      modal: false,
-      preventRefresh: true,
-      transactionFailed: false
-    }
 
     const { deploymentStore } = props
 
diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
index f6f92161d..018adefad 100644
--- a/src/components/stepThree/index.js
+++ b/src/components/stepThree/index.js
@@ -44,7 +44,6 @@ export class stepThree extends Component {
     await checkWeb3(web3Store.web3)
 
     this.setState({ loading: true })
-    const { initialTiers, burnExcess, gasTypeSelected } = await this.load()
 
     try {
       await gasPriceStore.updateValues()
@@ -52,6 +51,8 @@ export class stepThree extends Component {
       noGasPriceAvailable()
     }
 
+    const { initialTiers, burnExcess, gasTypeSelected } = await this.load()
+
     this.setState({
       loading: false,
       initialTiers: initialTiers,
@@ -62,7 +63,7 @@ export class stepThree extends Component {
   }
 
   async load() {
-    const { tierStore, generalStore, web3Store, crowdsaleStore } = this.props
+    const { tierStore, generalStore, web3Store, crowdsaleStore, gasPriceStore } = this.props
 
     await sleep(1000)
 
@@ -83,6 +84,10 @@ export class stepThree extends Component {
       initialTiers = JSON.parse(JSON.stringify(tierStore.tiers))
     }
 
+    if (!generalStore.getGasTypeSelected) {
+      generalStore.setGasTypeSelected(gasPriceStore.gasPricesInGwei[0])
+    }
+
     return {
       initialTiers: initialTiers,
       burnExcess: generalStore.burnExcess,
diff --git a/src/stores/GeneralStore.js b/src/stores/GeneralStore.js
index 2deabd2b7..2a6ddcc72 100644
--- a/src/stores/GeneralStore.js
+++ b/src/stores/GeneralStore.js
@@ -1,11 +1,10 @@
 import { observable, action, computed } from 'mobx'
 import { GAS_PRICE } from '../utils/constants'
 import autosave from './autosave'
-import { objectKeysToLowerCase } from '../utils/utils'
 
 class GeneralStore {
   @observable networkID
-  @observable gasPrice = GAS_PRICE.FAST.PRICE
+  @observable gasPrice = GAS_PRICE.SLOW.PRICE
   @observable gasTypeSelected
   @observable burnExcess
 
@@ -37,15 +36,15 @@ class GeneralStore {
   @action
   reset = () => {
     this.networkID = undefined
-    this.gasPrice = GAS_PRICE.FAST.PRICE
-    this.gasTypeSelected = objectKeysToLowerCase(GAS_PRICE.SLOW)
+    this.gasPrice = GAS_PRICE.SLOW.PRICE
+    this.gasTypeSelected = undefined
     this.burnExcess = 'no'
   }
 
   // Getters
   @computed
   get getGasTypeSelected() {
-    return this.gasTypeSelected || objectKeysToLowerCase(GAS_PRICE.SLOW)
+    return this.gasTypeSelected
   }
 }
 

From 2d3940597ac870fe4830c7916d7750848b08bcc4 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 21 Aug 2018 10:56:29 -0300
Subject: [PATCH 36/40] Update snapshot

---
 .../__snapshots__/ManageForm.spec.js.snap     | 48 +++++--------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/test/components/manage/__snapshots__/ManageForm.spec.js.snap b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
index ba0bf4c9c..bf6327074 100644
--- a/test/components/manage/__snapshots__/ManageForm.spec.js.snap
+++ b/test/components/manage/__snapshots__/ManageForm.spec.js.snap
@@ -19,12 +19,8 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
   generalStore={
     GeneralStore {
       "burnExcess": "no",
-      "gasPrice": 15000000000,
-      "gasTypeSelected": Object {
-        "description": "Safe and Cheap",
-        "id": "slow",
-        "price": 5000000000,
-      },
+      "gasPrice": 5000000000,
+      "gasTypeSelected": undefined,
       "networkID": undefined,
     }
   }
@@ -261,12 +257,8 @@ exports[`ManageForm should render for Dutch Auction 1`] = `
             generalStore={
               GeneralStore {
                 "burnExcess": "no",
-                "gasPrice": 15000000000,
-                "gasTypeSelected": Object {
-                  "description": "Safe and Cheap",
-                  "id": "slow",
-                  "price": 5000000000,
-                },
+                "gasPrice": 5000000000,
+                "gasTypeSelected": undefined,
                 "networkID": undefined,
               }
             }
@@ -348,12 +340,8 @@ exports[`ManageForm should render the component with tiers 1`] = `
   generalStore={
     GeneralStore {
       "burnExcess": "no",
-      "gasPrice": 15000000000,
-      "gasTypeSelected": Object {
-        "description": "Safe and Cheap",
-        "id": "slow",
-        "price": 5000000000,
-      },
+      "gasPrice": 5000000000,
+      "gasTypeSelected": undefined,
       "networkID": undefined,
     }
   }
@@ -1111,12 +1099,8 @@ exports[`ManageForm should render the component with tiers 1`] = `
             generalStore={
               GeneralStore {
                 "burnExcess": "no",
-                "gasPrice": 15000000000,
-                "gasTypeSelected": Object {
-                  "description": "Safe and Cheap",
-                  "id": "slow",
-                  "price": 5000000000,
-                },
+                "gasPrice": 5000000000,
+                "gasTypeSelected": undefined,
                 "networkID": undefined,
               }
             }
@@ -4426,12 +4410,8 @@ exports[`ManageForm should render the component without tiers 1`] = `
   generalStore={
     GeneralStore {
       "burnExcess": "no",
-      "gasPrice": 15000000000,
-      "gasTypeSelected": Object {
-        "description": "Safe and Cheap",
-        "id": "slow",
-        "price": 5000000000,
-      },
+      "gasPrice": 5000000000,
+      "gasTypeSelected": undefined,
       "networkID": undefined,
     }
   }
@@ -4668,12 +4648,8 @@ exports[`ManageForm should render the component without tiers 1`] = `
             generalStore={
               GeneralStore {
                 "burnExcess": "no",
-                "gasPrice": 15000000000,
-                "gasTypeSelected": Object {
-                  "description": "Safe and Cheap",
-                  "id": "slow",
-                  "price": 5000000000,
-                },
+                "gasPrice": 5000000000,
+                "gasTypeSelected": undefined,
                 "networkID": undefined,
               }
             }

From 45d7b235c2fe710d4ab3f3a4efbaba27a9bf2517 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Tue, 21 Aug 2018 15:10:58 -0300
Subject: [PATCH 37/40] Add alert info if contracts already deployed

---
 src/components/stepFour/index.js | 41 ++++++++++++++++++++++----------
 src/utils/alerts.js              |  8 +++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
index 37f5bc7d4..a7138b79f 100644
--- a/src/components/stepFour/index.js
+++ b/src/components/stepFour/index.js
@@ -10,7 +10,13 @@ import {
   scrollToBottom,
   SUMMARY_FILE_CONTENTS
 } from './utils'
-import { noContractDataAlert, successfulDeployment, skippingTransaction, networkChanged } from '../../utils/alerts'
+import {
+  noContractDataAlert,
+  successfulDeployment,
+  skippingTransaction,
+  networkChanged,
+  deployHasEnded
+} from '../../utils/alerts'
 import {
   DESCRIPTION,
   NAVIGATION_STEPS,
@@ -88,7 +94,9 @@ export class stepFour extends Component {
 
     const { deploymentStore } = props
 
-    if (!deploymentStore.deployInProgress) {
+    logger.log(`Deployment progress`, deploymentStore.deployInProgress)
+    logger.log(`Deployment has ended`, deploymentStore.hasEnded)
+    if (!deploymentStore.deployInProgress && !deploymentStore.hasEnded) {
       deploymentStore.setDeploymentStep(0)
       deploymentStore.setDeployerAccount(context.selectedAccount)
     }
@@ -105,17 +113,13 @@ export class stepFour extends Component {
   }
 
   async componentDidMount() {
-    scrollToBottom()
-    copy('copy')
-    if (!this.props.deploymentStore.hasEnded) {
-      this.showModal()
-    }
+    const { deploymentStore } = this.props
 
-    // If user reloads with an invalid account, don't start the deploy automatically
-    if (!this.props.deploymentStore.invalidAccount) {
-      this.deployCrowdsale()
+    // Check if deploy has ended
+    if (deploymentStore.hasEnded) {
+      return await deployHasEnded()
     }
-
+    // Check if network has changed
     await promiseRetry(async retry => {
       const networkChangedResult = await this.checkNetworkChanged()
       if (networkChangedResult) {
@@ -125,6 +129,17 @@ export class stepFour extends Component {
         retry()
       }
     })
+
+    scrollToBottom()
+    copy('copy')
+    if (!deploymentStore.hasEnded) {
+      this.showModal()
+    }
+
+    // If user reloads with an invalid account, don't start the deploy automatically
+    if (!deploymentStore.invalidAccount) {
+      this.deployCrowdsale()
+    }
   }
 
   deployCrowdsale = () => {
@@ -172,7 +187,9 @@ export class stepFour extends Component {
     const { generalStore } = this.props
     const networkIDFromNifty = await getNetworkVersion()
     const networkIDFromStore = generalStore.networkID
-    return networkIDFromNifty !== networkIDFromStore
+    logger.log(`Network id from store`, networkIDFromStore)
+    logger.log(`Network id from nifty wallet`, networkIDFromNifty)
+    return +networkIDFromNifty !== +networkIDFromStore
   }
 
   skipTransaction = () => {
diff --git a/src/utils/alerts.js b/src/utils/alerts.js
index 7075ecbfe..b0534f12a 100644
--- a/src/utils/alerts.js
+++ b/src/utils/alerts.js
@@ -342,3 +342,11 @@ export function networkChanged() {
     type: 'warning'
   })
 }
+
+export function deployHasEnded() {
+  return sweetAlert2({
+    title: 'Deploy ended',
+    html: 'The deploy is finished',
+    type: 'info'
+  })
+}

From 41091eae5f766a502bcd7e45f89e8754425d7fc4 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 22 Aug 2018 10:50:14 -0300
Subject: [PATCH 38/40] Add clear storage on manage section

---
 src/components/Home/index.js   | 47 +++++-----------------------------
 src/components/manage/index.js | 20 ++++++++++++---
 src/utils/utils.js             | 35 +++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/src/components/Home/index.js b/src/components/Home/index.js
index 69635501a..928b8bb8e 100644
--- a/src/components/Home/index.js
+++ b/src/components/Home/index.js
@@ -4,7 +4,7 @@ import CrowdsalesList from '../Common/CrowdsalesList'
 import { Loader } from '../Common/Loader'
 import { loadRegistryAddresses } from '../../utils/blockchainHelpers'
 import { ModalContainer } from '../Common/ModalContainer'
-import { toast } from '../../utils/utils'
+import { toast, clearStorage } from '../../utils/utils'
 import { TOAST, NAVIGATION_STEPS, DOWNLOAD_STATUS } from '../../utils/constants'
 import { inject, observer } from 'mobx-react'
 import { checkWeb3, getNetworkVersion } from '../../utils/blockchainHelpers'
@@ -55,15 +55,15 @@ export class Home extends Component {
     try {
       await loadRegistryAddresses()
       this.setState({
-        loading: false,
         showModal: true
       })
     } catch (e) {
       logger.error('There was a problem loading the crowdsale addresses from the registry', e)
-      this.setState({
-        loading: false
-      })
     }
+
+    this.setState({
+      loading: false
+    })
   }
 
   goNextStep = async () => {
@@ -71,7 +71,7 @@ export class Home extends Component {
     if (storage.has('DeploymentStore') && storage.get('DeploymentStore').deploymentStep) {
       this.props.history.push('/')
     } else {
-      this.clearStorage()
+      clearStorage(this.props)
       await this.reloadStorage()
       this.props.history.push('1')
     }
@@ -99,41 +99,6 @@ export class Home extends Component {
     }
   }
 
-  clearStorage() {
-    // Generate of stores to clear
-    const toArray = ({
-      generalStore,
-      contractStore,
-      crowdsaleStore,
-      gasPriceStore,
-      deploymentStore,
-      reservedTokenStore,
-      stepTwoValidationStore,
-      tierStore,
-      tokenStore
-    }) => {
-      return [
-        generalStore,
-        contractStore,
-        crowdsaleStore,
-        gasPriceStore,
-        deploymentStore,
-        reservedTokenStore,
-        stepTwoValidationStore,
-        tierStore,
-        tokenStore
-      ]
-    }
-
-    const storesToClear = toArray(this.props)
-    for (let storeToClear of storesToClear) {
-      if (typeof storeToClear.reset === 'function') {
-        logger.log('Store to be cleared:', storeToClear.constructor.name)
-        storeToClear.reset()
-      }
-    }
-  }
-
   onClick = crowdsaleAddress => {
     this.props.history.push(`manage/${crowdsaleAddress}`)
   }
diff --git a/src/components/manage/index.js b/src/components/manage/index.js
index 3fd9a6589..4b00300f8 100644
--- a/src/components/manage/index.js
+++ b/src/components/manage/index.js
@@ -23,7 +23,7 @@ import {
   checkWeb3,
   isAddressValid
 } from '../../utils/blockchainHelpers'
-import { isExecIDValid, isNetworkIDValid, toast, toBigNumber } from '../../utils/utils'
+import { isExecIDValid, isNetworkIDValid, toast, toBigNumber, clearStorage } from '../../utils/utils'
 import { getCrowdsaleAssets } from '../../stores/utils'
 import { getFieldsToUpdate, processTier, updateTierAttribute } from './utils'
 import { Loader } from '../Common/Loader'
@@ -39,7 +39,18 @@ import logdown from 'logdown'
 
 const logger = logdown('TW:manage')
 
-@inject('crowdsaleStore', 'web3Store', 'tierStore', 'contractStore', 'generalStore', 'tokenStore', 'gasPriceStore')
+@inject(
+  'crowdsaleStore',
+  'web3Store',
+  'tierStore',
+  'contractStore',
+  'reservedTokenStore',
+  'stepTwoValidationStore',
+  'generalStore',
+  'tokenStore',
+  'gasPriceStore',
+  'deploymentStore'
+)
 @observer
 export class Manage extends Component {
   constructor(props) {
@@ -65,8 +76,9 @@ export class Manage extends Component {
     setTimeout(() => window.scrollTo(0, 0), 500)
   }
 
-  componentWillMount() {
-    this.preparePage()
+  async componentWillMount() {
+    clearStorage(this.props)
+    await this.preparePage()
   }
 
   preparePage = async () => {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6542d71c4..0e9c02fab 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -198,3 +198,38 @@ export const objectKeysToLowerCase = input => {
     return newObj
   }, {})
 }
+
+export const clearStorage = props => {
+  // Generate of stores to clear
+  const toArray = ({
+    generalStore,
+    contractStore,
+    crowdsaleStore,
+    gasPriceStore,
+    deploymentStore,
+    reservedTokenStore,
+    stepTwoValidationStore,
+    tierStore,
+    tokenStore
+  }) => {
+    return [
+      generalStore,
+      contractStore,
+      crowdsaleStore,
+      gasPriceStore,
+      deploymentStore,
+      reservedTokenStore,
+      stepTwoValidationStore,
+      tierStore,
+      tokenStore
+    ]
+  }
+
+  const storesToClear = toArray(props)
+  for (let storeToClear of storesToClear) {
+    if (typeof storeToClear.reset === 'function') {
+      logger.log('Store to be cleared:', storeToClear.constructor.name)
+      storeToClear.reset()
+    }
+  }
+}

From 173d03a0b4f898237f699983f77c9fd2ba5254d3 Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Wed, 29 Aug 2018 18:20:39 -0300
Subject: [PATCH 39/40] Sort crowdsales list

---
 src/utils/blockchainHelpers.js | 42 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/utils/blockchainHelpers.js b/src/utils/blockchainHelpers.js
index 9be286169..ea94f6886 100644
--- a/src/utils/blockchainHelpers.js
+++ b/src/utils/blockchainHelpers.js
@@ -347,33 +347,29 @@ async function getOwnerApplicationsInstancesForProxy() {
   const proxiesRegistryContract = await attachToSpecificCrowdsaleContract('ProxiesRegistry')
   const accounts = await web3.eth.getAccounts()
 
-  const promises = []
-  const crowdsales = []
-  const proxyAddrs = await proxiesRegistryContract.methods.getCrowdsalesForUser(accounts[0]).call()
+  const proxyAddress = await proxiesRegistryContract.methods.getCrowdsalesForUser(accounts[0]).call()
   const mintedCapped = process.env[`${REACT_PREFIX}MINTED_CAPPED_APP_NAME`].toLowerCase()
   const dutchAuction = process.env[`${REACT_PREFIX}DUTCH_APP_NAME`].toLowerCase()
-  proxyAddrs.forEach(proxyAddr => {
-    let promise = new Promise(async (resolve, reject) => {
-      const abi = contractStore.MintedCappedProxy.abi // we can use minted caped proxy ABI for minted capped and Dutch acution
-      try {
-        const contractInstance = await attachToContract(abi, proxyAddr)
-        const contractAppName = await contractInstance.methods.app_name().call()
-        const appName = removeTrailingNUL(web3.utils.toAscii(contractAppName))
-        const appNameLowerCase = appName.toLowerCase()
-        if (appNameLowerCase.includes(mintedCapped) || appNameLowerCase.includes(dutchAuction)) {
-          crowdsales.push({ appName, execID: proxyAddr })
-        }
-        resolve()
-      } catch (error) {
-        logger.error(error)
-        resolve()
+
+  const whenCrowdsales = proxyAddress.map(async proxyAddr => {
+    const abi = contractStore.MintedCappedProxy.abi // we can use minted caped proxy ABI for minted capped and Dutch auction
+    try {
+      const contractInstance = await attachToContract(abi, proxyAddr)
+      const contractAppName = await contractInstance.methods.app_name().call()
+      const appName = removeTrailingNUL(web3.utils.toAscii(contractAppName))
+      const appNameLowerCase = appName.toLowerCase()
+      if (appNameLowerCase.includes(mintedCapped) || appNameLowerCase.includes(dutchAuction)) {
+        return { appName, execID: proxyAddr }
       }
-    })
-    promises.push(promise)
-  })
-  return Promise.all(promises).then(() => {
-    return Promise.all(crowdsales)
+    } catch (error) {
+      logger.error(error)
+    }
+    return null
   })
+
+  const crowdsales = await Promise.all(whenCrowdsales)
+
+  return crowdsales.filter(crowdsale => crowdsale).reverse()
 }
 
 // eslint-disable-next-line no-unused-vars

From 83b7d709f264b31d182d12895582acad09caeb2d Mon Sep 17 00:00:00 2001
From: Mariano Aguero <mariano.aguero@altoros.com>
Date: Thu, 30 Aug 2018 09:26:45 -0300
Subject: [PATCH 40/40] Add function import

---
 src/components/stepFour/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/stepFour/index.js b/src/components/stepFour/index.js
index 30d484ff8..077678184 100644
--- a/src/components/stepFour/index.js
+++ b/src/components/stepFour/index.js
@@ -34,7 +34,7 @@ import { PreventRefresh } from '../Common/PreventRefresh'
 import cancelDeploy from '../../utils/cancelDeploy'
 import PropTypes from 'prop-types'
 import logdown from 'logdown'
-import { checkNetWorkByID } from '../../utils/blockchainHelpers'
+import { checkNetWorkByID, getNetworkVersion } from '../../utils/blockchainHelpers'
 import { CrowdsaleConfig } from '../Common/config'
 import { ButtonContinue } from '../Common/ButtonContinue'
 import classNames from 'classnames'