From ff025ecfe60fefd02ed803a367d904783bd1b618 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Mon, 12 Nov 2018 16:30:21 +0100
Subject: [PATCH 01/13] Refactor noErrors function helper when validating forms

---
 src/components/forms/validator.js                   | 2 ++
 src/routes/open/components/SafeOwnersForm/index.jsx | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/forms/validator.js b/src/components/forms/validator.js
index 0d0e5956..38e65462 100644
--- a/src/components/forms/validator.js
+++ b/src/components/forms/validator.js
@@ -71,3 +71,5 @@ export const inLimit = (limit: number, base: number, baseText: string, symbol: s
 
   return `Should not exceed ${max} ${symbol} (amount to reach ${baseText})`
 }
+
+export const noErrorsOn = (name: string, errors: Object) => errors[name] === undefined
diff --git a/src/routes/open/components/SafeOwnersForm/index.jsx b/src/routes/open/components/SafeOwnersForm/index.jsx
index 297327e4..4ef98bab 100644
--- a/src/routes/open/components/SafeOwnersForm/index.jsx
+++ b/src/routes/open/components/SafeOwnersForm/index.jsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import { withStyles } from '@material-ui/core/styles'
 import Field from '~/components/forms/Field'
 import TextField from '~/components/forms/TextField'
-import { required, composeValidators, uniqueAddress, mustBeEthereumAddress } from '~/components/forms/validator'
+import { required, composeValidators, uniqueAddress, mustBeEthereumAddress, noErrorsOn } from '~/components/forms/validator'
 import Block from '~/components/layout/Block'
 import Button from '~/components/layout/Button'
 import Row from '~/components/layout/Row'
@@ -75,8 +75,6 @@ const getAddressValidators = (addresses: string[], position: number) => {
   return composeValidators(required, mustBeEthereumAddress, uniqueAddress(copy))
 }
 
-const noErrorsOn = (name: string, errors: Object) => errors[name] === undefined
-
 export const ADD_OWNER_BUTTON = '+ ADD ANOTHER OWNER'
 
 export const calculateValuesAfterRemoving = (index: number, notRemovedOwners: number, values: Object) => {

From 767fc8c7ea91fc43e4b42e520b75abff20768300 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Mon, 12 Nov 2018 16:32:04 +0100
Subject: [PATCH 02/13] Adding load safe route to react-router #75

---
 src/routes/index.js  | 8 +++++++-
 src/routes/routes.js | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/routes/index.js b/src/routes/index.js
index e02b1dbf..fc2c8be3 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -4,7 +4,7 @@ import Loadable from 'react-loadable'
 import { Switch, Redirect, Route } from 'react-router-dom'
 import Loader from '~/components/Loader'
 import Welcome from './welcome/container'
-import { SAFELIST_ADDRESS, OPEN_ADDRESS, SAFE_PARAM_ADDRESS, WELCOME_ADDRESS, SETTINS_ADDRESS, OPENING_ADDRESS } from './routes'
+import { SAFELIST_ADDRESS, OPEN_ADDRESS, SAFE_PARAM_ADDRESS, WELCOME_ADDRESS, SETTINS_ADDRESS, OPENING_ADDRESS, LOAD_ADDRESS } from './routes'
 
 const Safe = Loadable({
   loader: () => import('./safe/container'),
@@ -31,6 +31,11 @@ const Opening = Loadable({
   loading: Loader,
 })
 
+const Load = Loadable({
+  loader: () => import('./load/container/Load'),
+  loading: Loader,
+})
+
 const SAFE_ADDRESS = `${SAFELIST_ADDRESS}/:${SAFE_PARAM_ADDRESS}`
 const SAFE_SETTINGS = `${SAFE_ADDRESS}${SETTINS_ADDRESS}`
 
@@ -45,6 +50,7 @@ const Routes = () => (
     <Route exact path={SAFE_ADDRESS} component={Safe} />
     <Route exact path={SAFE_SETTINGS} component={Settings} />
     <Route exact path={OPENING_ADDRESS} component={Opening} />
+    <Route exact path={LOAD_ADDRESS} component={Load} />
   </Switch>
 )
 
diff --git a/src/routes/routes.js b/src/routes/routes.js
index ca326218..a3f95255 100644
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -4,6 +4,7 @@ import { history } from '~/store'
 export const SAFE_PARAM_ADDRESS = 'address'
 export const SAFELIST_ADDRESS = '/safes'
 export const OPEN_ADDRESS = '/open'
+export const LOAD_ADDRESS = '/load'
 export const WELCOME_ADDRESS = '/welcome'
 export const SETTINS_ADDRESS = '/settings'
 export const OPENING_ADDRESS = '/opening'

From 59392764623f4e675b1b43a5126b1282675bef8c Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Mon, 12 Nov 2018 16:33:31 +0100
Subject: [PATCH 03/13] Redirecting Welcome's load onClick to load route #75

---
 src/routes/welcome/components/Layout.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/welcome/components/Layout.jsx b/src/routes/welcome/components/Layout.jsx
index 10985fb9..dc152c08 100644
--- a/src/routes/welcome/components/Layout.jsx
+++ b/src/routes/welcome/components/Layout.jsx
@@ -5,7 +5,7 @@ import Heading from '~/components/layout/Heading'
 import Img from '~/components/layout/Img'
 import Button from '~/components/layout/Button'
 import Link from '~/components/layout/Link'
-import { OPEN_ADDRESS } from '~/routes/routes'
+import { OPEN_ADDRESS, LOAD_ADDRESS } from '~/routes/routes'
 import { marginButtonImg } from '~/theme/variables'
 import styles from './Layout.scss'
 
@@ -43,7 +43,7 @@ export const CreateSafe = ({ size, provider }: SafeProps) => (
 export const LoadSafe = ({ size, provider }: SafeProps) => (
   <Button
     component={Link}
-    to={OPEN_ADDRESS}
+    to={LOAD_ADDRESS}
     variant="outlined"
     size={size || 'medium'}
     color="primary"

From 4ee3a05eab75b4b38e100985cde7d90ae0434002 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Mon, 12 Nov 2018 16:34:02 +0100
Subject: [PATCH 04/13] Load route's container #75

---
 src/routes/load/container/Load.jsx    | 39 +++++++++++++++++++++++++++
 src/routes/load/container/actions.js  | 12 +++++++++
 src/routes/load/container/selector.js |  8 ++++++
 3 files changed, 59 insertions(+)
 create mode 100644 src/routes/load/container/Load.jsx
 create mode 100644 src/routes/load/container/actions.js
 create mode 100644 src/routes/load/container/selector.js

diff --git a/src/routes/load/container/Load.jsx b/src/routes/load/container/Load.jsx
new file mode 100644
index 00000000..e07d4f69
--- /dev/null
+++ b/src/routes/load/container/Load.jsx
@@ -0,0 +1,39 @@
+// @flow
+import * as React from 'react'
+import { connect } from 'react-redux'
+import Page from '~/components/layout/Page'
+import selector from './selector'
+import actions, { type Actions } from './actions'
+import Layout from '../components/Layout'
+
+type Props = Actions & {
+  provider: string,
+  userAccount: string,
+  network: string,
+}
+
+export const loadSafe = async (): Promise<void> => {
+
+}
+
+class Open extends React.Component<Props> {
+  onLoadSafeSubmit = async () => {
+    //
+  }
+
+  render() {
+    const { provider, network } = this.props
+
+    return (
+      <Page>
+        <Layout
+          network={network}
+          provider={provider}
+          onLoadSafeSubmit={this.onLoadSafeSubmit}
+        />
+      </Page>
+    )
+  }
+}
+
+export default connect(selector, actions)(Open)
diff --git a/src/routes/load/container/actions.js b/src/routes/load/container/actions.js
new file mode 100644
index 00000000..f8fb5039
--- /dev/null
+++ b/src/routes/load/container/actions.js
@@ -0,0 +1,12 @@
+// @flow
+import addSafe from '~/routes/safe/store/actions/addSafe'
+
+export type AddSafe = typeof addSafe
+
+export type Actions = {
+  addSafe: typeof addSafe,
+}
+
+export default {
+  addSafe,
+}
diff --git a/src/routes/load/container/selector.js b/src/routes/load/container/selector.js
new file mode 100644
index 00000000..658cc2a4
--- /dev/null
+++ b/src/routes/load/container/selector.js
@@ -0,0 +1,8 @@
+// @flow
+import { createStructuredSelector } from 'reselect'
+import { providerNameSelector, networkSelector } from '~/logic/wallets/store/selectors'
+
+export default createStructuredSelector({
+  provider: providerNameSelector,
+  network: networkSelector,
+})

From fcb996cd2adc4717598d073986f44692ba4af1bf Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Mon, 12 Nov 2018 16:34:38 +0100
Subject: [PATCH 05/13] Load route components #75

---
 .../load/components/DetailsForm/index.jsx     | 131 ++++++++++++++++++
 src/routes/load/components/Layout.jsx         |  69 +++++++++
 .../components/ReviewInformation/index.jsx    | 105 ++++++++++++++
 src/routes/load/components/fields.js          |   4 +
 4 files changed, 309 insertions(+)
 create mode 100644 src/routes/load/components/DetailsForm/index.jsx
 create mode 100644 src/routes/load/components/Layout.jsx
 create mode 100644 src/routes/load/components/ReviewInformation/index.jsx
 create mode 100644 src/routes/load/components/fields.js

diff --git a/src/routes/load/components/DetailsForm/index.jsx b/src/routes/load/components/DetailsForm/index.jsx
new file mode 100644
index 00000000..28e0ba04
--- /dev/null
+++ b/src/routes/load/components/DetailsForm/index.jsx
@@ -0,0 +1,131 @@
+// @flow
+import * as React from 'react'
+import contract from 'truffle-contract'
+import { withStyles } from '@material-ui/core/styles'
+import Field from '~/components/forms/Field'
+import { composeValidators, required, noErrorsOn, mustBeEthereumAddress } from '~/components/forms/validator'
+import TextField from '~/components/forms/TextField'
+import InputAdornment from '@material-ui/core/InputAdornment'
+import CheckCircle from '@material-ui/icons/CheckCircle'
+import Block from '~/components/layout/Block'
+import Paragraph from '~/components/layout/Paragraph'
+import OpenPaper from '~/components/Stepper/OpenPaper'
+import { FIELD_LOAD_NAME, FIELD_LOAD_ADDRESS } from '~/routes/load/components/fields'
+import { getWeb3 } from '~/logic/wallets/getWeb3'
+import { promisify } from '~/utils/promisify'
+import SafeProxy from '#/Proxy.json'
+import { getGnosisSafeContract } from '~/logic/contracts/safeContracts'
+
+type Props = {
+  classes: Object,
+  errors: Object,
+}
+
+const styles = () => ({
+  root: {
+    display: 'flex',
+    maxWidth: '460px',
+  },
+  check: {
+    color: '#03AE60',
+    height: '20px',
+  },
+})
+
+export const SAFE_INSTANCE_ERROR = 'Address given is not a safe instance'
+export const SAFE_MASTERCOPY_ERROR = 'Mastercopy used by this safe is not the same'
+
+export const safeFieldsValidation = async (values: Object) => {
+  const errors = {}
+
+  const web3 = getWeb3()
+  const safeAddress = values[FIELD_LOAD_ADDRESS]
+  if (!safeAddress || mustBeEthereumAddress(safeAddress) !== undefined) {
+    return errors
+  }
+
+  // https://solidity.readthedocs.io/en/latest/metadata.html#usage-for-source-code-verification
+  const metaData = 'a165'
+
+  const code = await promisify(cb => web3.eth.getCode(safeAddress, cb))
+  const codeWithoutMetadata = code.substring(0, code.lastIndexOf(metaData))
+
+  const proxyCode = SafeProxy.deployedBytecode
+  const proxyCodeWithoutMetadata = proxyCode.substring(0, proxyCode.lastIndexOf(metaData))
+
+  const safeInstance = codeWithoutMetadata === proxyCodeWithoutMetadata
+  if (!safeInstance) {
+    errors[FIELD_LOAD_ADDRESS] = SAFE_INSTANCE_ERROR
+
+    return errors
+  }
+
+  // check mastercopy
+  const proxy = contract(SafeProxy)
+  proxy.setProvider(web3.currentProvider)
+  const proxyInstance = proxy.at(safeAddress)
+  const proxyImplementation = await proxyInstance.implementation()
+
+  const GnosisSafe = getGnosisSafeContract(web3)
+  const safeMaster = await GnosisSafe.deployed()
+  const masterCopy = safeMaster.address
+
+  const sameMasterCopy = proxyImplementation === masterCopy
+  if (!sameMasterCopy) {
+    errors[FIELD_LOAD_ADDRESS] = SAFE_MASTERCOPY_ERROR
+  }
+
+  return errors
+}
+
+const Details = ({ classes, errors }: Props) => (
+  <React.Fragment>
+    <Block margin="sm">
+      <Paragraph noMargin size="md" color="primary">
+        Adding an existing Safe only requires the Safe address. Optionally you can give it a name.
+        In case your connected client is not the owner of the Safe, the interface will essentially provide you a
+        read-only view.
+      </Paragraph>
+    </Block>
+    <Block className={classes.root}>
+      <Field
+        name={FIELD_LOAD_NAME}
+        component={TextField}
+        type="text"
+        validate={required}
+        placeholder="Name of the Safe"
+        text="Safe name"
+      />
+    </Block>
+    <Block margin="lg" className={classes.root}>
+      <Field
+        name={FIELD_LOAD_ADDRESS}
+        component={TextField}
+        inputAdornment={noErrorsOn(FIELD_LOAD_ADDRESS, errors) && {
+          endAdornment: (
+            <InputAdornment position="end">
+              <CheckCircle className={classes.check} />
+            </InputAdornment>
+          ),
+        }}
+        type="text"
+        validate={composeValidators(required, mustBeEthereumAddress)}
+        placeholder="Safe Address*"
+        text="Safe Address"
+      />
+    </Block>
+  </React.Fragment>
+)
+
+const DetailsForm = withStyles(styles)(Details)
+
+const DetailsPage = () => (controls: React$Node, { errors }: Object) => (
+  <React.Fragment>
+    <OpenPaper controls={controls} container={605}>
+      <DetailsForm errors={errors} />
+    </OpenPaper>
+  </React.Fragment>
+)
+
+
+export default DetailsPage
diff --git a/src/routes/load/components/Layout.jsx b/src/routes/load/components/Layout.jsx
new file mode 100644
index 00000000..75c36269
--- /dev/null
+++ b/src/routes/load/components/Layout.jsx
@@ -0,0 +1,69 @@
+// @flow
+import * as React from 'react'
+import Stepper from '~/components/Stepper'
+import Block from '~/components/layout/Block'
+import Heading from '~/components/layout/Heading'
+import Row from '~/components/layout/Row'
+import IconButton from '@material-ui/core/IconButton'
+import ReviewInformation from '~/routes/load/components/ReviewInformation'
+import DetailsForm, { safeFieldsValidation } from '~/routes/load/components/DetailsForm'
+import ChevronLeft from '@material-ui/icons/ChevronLeft'
+import { history } from '~/store'
+import { secondary } from '~/theme/variables'
+
+const getSteps = () => [
+  'Details', 'Review',
+]
+
+type Props = {
+  provider: string,
+  network: string,
+  onLoadSafeSubmit: () => Promise<void>,
+}
+
+const iconStyle = {
+  color: secondary,
+  width: '32px',
+  height: '32px',
+}
+
+const back = () => {
+  history.goBack()
+}
+
+const Layout = ({
+  provider, onLoadSafeSubmit, network,
+}: Props) => {
+  const steps = getSteps()
+
+  return (
+    <React.Fragment>
+      { provider
+        ? (
+          <Block>
+            <Row align="center">
+              <IconButton onClick={back} style={iconStyle} disableRipple>
+                <ChevronLeft />
+              </IconButton>
+              <Heading tag="h2">Load existing Safe</Heading>
+            </Row>
+            <Stepper
+              onSubmit={onLoadSafeSubmit}
+              steps={steps}
+            >
+              <Stepper.Page validate={safeFieldsValidation}>
+                { DetailsForm }
+              </Stepper.Page>
+              <Stepper.Page network={network}>
+                { ReviewInformation }
+              </Stepper.Page>
+            </Stepper>
+          </Block>
+        )
+        : <div>No metamask detected</div>
+      }
+    </React.Fragment>
+  )
+}
+
+export default Layout
diff --git a/src/routes/load/components/ReviewInformation/index.jsx b/src/routes/load/components/ReviewInformation/index.jsx
new file mode 100644
index 00000000..935016c1
--- /dev/null
+++ b/src/routes/load/components/ReviewInformation/index.jsx
@@ -0,0 +1,105 @@
+// @flow
+import * as React from 'react'
+import Block from '~/components/layout/Block'
+import { withStyles } from '@material-ui/core/styles'
+import OpenInNew from '@material-ui/icons/OpenInNew'
+import Identicon from '~/components/Identicon'
+import OpenPaper from '~/components/Stepper/OpenPaper'
+import Row from '~/components/layout/Row'
+import Paragraph from '~/components/layout/Paragraph'
+import { xs, sm, lg, border, secondary } from '~/theme/variables'
+import { openAddressInEtherScan } from '~/logic/wallets/getWeb3'
+import { FIELD_LOAD_NAME, FIELD_LOAD_ADDRESS } from '~/routes/load/components/fields'
+
+const openIconStyle = {
+  height: '16px',
+  color: secondary,
+}
+
+const styles = () => ({
+  details: {
+    padding: lg,
+    borderRight: `solid 1px ${border}`,
+    height: '100%',
+  },
+  name: {
+    letterSpacing: '-0.6px',
+  },
+  container: {
+    marginTop: xs,
+    alignItems: 'center',
+  },
+  address: {
+    paddingLeft: '6px',
+  },
+  open: {
+    paddingLeft: sm,
+    width: 'auto',
+    '&:hover': {
+      cursor: 'pointer',
+    },
+  },
+})
+
+type LayoutProps = {
+  network: string,
+}
+
+type Props = LayoutProps & {
+  values: Object,
+  classes: Object,
+}
+
+const ReviewComponent = ({ values, classes, network }: Props) => {
+  const safeAddress = values[FIELD_LOAD_ADDRESS]
+
+  return (
+    <React.Fragment>
+      <Block className={classes.details}>
+        <Block margin="lg">
+          <Paragraph size="sm" color="disabled" noMargin>
+            Name of the Safe
+          </Paragraph>
+          <Paragraph size="lg" color="primary" noMargin weight="bolder" className={classes.name}>
+            {values[FIELD_LOAD_NAME]}
+          </Paragraph>
+        </Block>
+        <Block margin="lg">
+          <Paragraph size="sm" color="disabled" noMargin>
+            Safe address
+          </Paragraph>
+          <Row className={classes.container}>
+            <Identicon address={safeAddress} diameter={32} />
+            <Paragraph size="md" color="disabled" noMargin className={classes.address}>{safeAddress}</Paragraph>
+            <OpenInNew
+              className={classes.open}
+              style={openIconStyle}
+              onClick={openAddressInEtherScan(safeAddress, network)}
+            />
+          </Row>
+        </Block>
+        <Block margin="lg">
+          <Paragraph size="sm" color="disabled" noMargin>
+            Connected wallet client is owner?
+          </Paragraph>
+          <Paragraph size="lg" color="primary" noMargin weight="bolder" className={classes.name}>
+            No (read-only)
+          </Paragraph>
+        </Block>
+      </Block>
+    </React.Fragment>
+  )
+}
+
+const ReviewPage = withStyles(styles)(ReviewComponent)
+
+const Review = ({ network }: LayoutProps) => (controls: React$Node, { values }: Object) => (
+  <React.Fragment>
+    <OpenPaper controls={controls} padding={false}>
+      <ReviewPage network={network} values={values} />
+    </OpenPaper>
+  </React.Fragment>
+)
+
+
+export default Review
diff --git a/src/routes/load/components/fields.js b/src/routes/load/components/fields.js
new file mode 100644
index 00000000..9e2693a5
--- /dev/null
+++ b/src/routes/load/components/fields.js
@@ -0,0 +1,4 @@
+// @flow
+export const FIELD_LOAD_NAME: string = 'name'
+export const FIELD_LOAD_ADDRESS: string = 'address'
+

From 09c4a2037f7546776c70515ce75092c584a942c7 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Tue, 13 Nov 2018 10:27:04 +0100
Subject: [PATCH 06/13] Created load safe DOM test #75

---
 src/test/safe.dom.create.test.js |  2 +-
 src/test/safe.dom.load.test.js   | 60 ++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 src/test/safe.dom.load.test.js

diff --git a/src/test/safe.dom.create.test.js b/src/test/safe.dom.create.test.js
index e0500382..913b46c4 100644
--- a/src/test/safe.dom.create.test.js
+++ b/src/test/safe.dom.create.test.js
@@ -33,7 +33,7 @@ const fillOpenSafeForm = async (localStore: Store<GlobalState>) => {
 
 const INTERVAL = 500
 const MAX_TIMES_EXECUTED = 30
-const whenSafeDeployed = () => new Promise((resolve, reject) => {
+export const whenSafeDeployed = (): Promise<string> => new Promise((resolve, reject) => {
   let times = 0
   const interval = setInterval(() => {
     if (times >= MAX_TIMES_EXECUTED) {
diff --git a/src/test/safe.dom.load.test.js b/src/test/safe.dom.load.test.js
new file mode 100644
index 00000000..5a68f214
--- /dev/null
+++ b/src/test/safe.dom.load.test.js
@@ -0,0 +1,60 @@
+// @flow
+import * as React from 'react'
+import { type Store } from 'redux'
+import TestUtils from 'react-dom/test-utils'
+import { Provider } from 'react-redux'
+import { ConnectedRouter } from 'react-router-redux'
+import Load from '~/routes/load/container/Load'
+import { aNewStore, history, type GlobalState } from '~/store'
+import { sleep } from '~/utils/timer'
+import { getProviderInfo } from '~/logic/wallets/getWeb3'
+import addProvider from '~/logic/wallets/store/actions/addProvider'
+import { makeProvider } from '~/logic/wallets/store/model/provider'
+import { aMinedSafe } from './builder/safe.redux.builder'
+import { whenSafeDeployed } from './safe.dom.create.test'
+
+const travelToLoadRoute = async (localStore: Store<GlobalState>) => {
+  const provider = await getProviderInfo()
+  const walletRecord = makeProvider(provider)
+  localStore.dispatch(addProvider(walletRecord))
+
+  return (
+    TestUtils.renderIntoDocument((
+      <Provider store={localStore}>
+        <ConnectedRouter history={history}>
+          <Load />
+        </ConnectedRouter>
+      </Provider>
+    ))
+  )
+}
+
+describe('DOM > Feature > LOAD a safe', () => {
+  it('load correctly a created safe', async () => {
+    const store = aNewStore()
+    const address = await aMinedSafe(store)
+    const LoadDom = await travelToLoadRoute(store)
+
+    const form = TestUtils.findRenderedDOMComponentWithTag(LoadDom, 'form')
+    const inputs = TestUtils.scryRenderedDOMComponentsWithTag(LoadDom, 'input')
+
+    // Fill Safe's name
+    const fieldName = inputs[0]
+    TestUtils.Simulate.change(fieldName, { target: { value: 'Adolfo Safe' } })
+    TestUtils.Simulate.submit(form)
+    await sleep(400)
+
+    // Fill Safe's name
+    const fieldAddress = inputs[1]
+    TestUtils.Simulate.change(fieldAddress, { target: { value: address } })
+    TestUtils.Simulate.submit(form)
+    await sleep(400)
+
+    // Submit
+    TestUtils.Simulate.submit(form)
+    await sleep(400)
+
+    const deployedAddress = await whenSafeDeployed()
+    expect(deployedAddress).toBe(address)
+  })
+})

From b0adbb0a49a702e72e09be3ec9a43a2efe4b1e70 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Tue, 13 Nov 2018 17:08:17 +0100
Subject: [PATCH 07/13] Implemented loadSafe logic function #75 in Load
 component

---
 src/routes/load/container/Load.jsx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/routes/load/container/Load.jsx b/src/routes/load/container/Load.jsx
index e07d4f69..4114e70e 100644
--- a/src/routes/load/container/Load.jsx
+++ b/src/routes/load/container/Load.jsx
@@ -2,8 +2,10 @@
 import * as React from 'react'
 import { connect } from 'react-redux'
 import Page from '~/components/layout/Page'
+import { buildSafe } from '~/routes/safe/store/actions/fetchSafe'
+import { SAFES_KEY, load, saveSafes } from '~/utils/localStorage'
 import selector from './selector'
-import actions, { type Actions } from './actions'
+import actions, { type Actions, type UpdateSafe } from './actions'
 import Layout from '../components/Layout'
 
 type Props = Actions & {
@@ -12,13 +14,21 @@ type Props = Actions & {
   network: string,
 }
 
-export const loadSafe = async (): Promise<void> => {
+export const loadSafe = async (safeName: string, safeAddress: string, updateSafe: UpdateSafe) => {
+  const safeRecord = await buildSafe(safeAddress, safeName)
 
+  await updateSafe(safeRecord)
+
+  const storedSafes = load(SAFES_KEY) || {}
+  storedSafes[safeAddress] = safeRecord.toJSON()
+
+  saveSafes(storedSafes)
 }
 
 class Open extends React.Component<Props> {
   onLoadSafeSubmit = async () => {
-    //
+    // call loadSafe
+    // travel to safe route
   }
 
   render() {

From 9a4c54671b6c750c7da5f4c003e6cef36026889a Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Tue, 13 Nov 2018 17:08:41 +0100
Subject: [PATCH 08/13] updateSafe action in Load container #75

---
 src/routes/load/container/actions.js  | 8 ++++----
 src/routes/safe/store/reducer/safe.js | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/routes/load/container/actions.js b/src/routes/load/container/actions.js
index f8fb5039..08a56d7e 100644
--- a/src/routes/load/container/actions.js
+++ b/src/routes/load/container/actions.js
@@ -1,12 +1,12 @@
 // @flow
-import addSafe from '~/routes/safe/store/actions/addSafe'
+import updateSafe from '~/routes/safe/store/actions/updateSafe'
 
-export type AddSafe = typeof addSafe
+export type UpdateSafe = typeof updateSafe
 
 export type Actions = {
-  addSafe: typeof addSafe,
+  updateSafe: typeof updateSafe,
 }
 
 export default {
-  addSafe,
+  updateSafe,
 }
diff --git a/src/routes/safe/store/reducer/safe.js b/src/routes/safe/store/reducer/safe.js
index 95091ae1..48f7a3bc 100644
--- a/src/routes/safe/store/reducer/safe.js
+++ b/src/routes/safe/store/reducer/safe.js
@@ -71,6 +71,7 @@ export default handleActions({
 
     const safes = state.set(action.payload.address, safe)
     saveSafes(safes.toJSON())
+
     return safes
   },
 }, Map())

From d42f4f0a4b4a4cf1a7ad454b0fb350a5dfec8504 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Tue, 13 Nov 2018 17:09:31 +0100
Subject: [PATCH 09/13] First test: load safe not present in storage #75

---
 src/test/safe.redux.load.test.js | 56 ++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 src/test/safe.redux.load.test.js

diff --git a/src/test/safe.redux.load.test.js b/src/test/safe.redux.load.test.js
new file mode 100644
index 00000000..6970528c
--- /dev/null
+++ b/src/test/safe.redux.load.test.js
@@ -0,0 +1,56 @@
+// @flow
+import { Map, List } from 'immutable'
+import { type Safe } from '~/routes/safe/store/model/safe'
+import { aNewStore } from '~/store'
+import { aMinedSafe } from '~/test/builder/safe.redux.builder'
+import updateSafe from '~/routes/safe/store/actions/updateSafe'
+import { loadSafe } from '~/routes/load/container/Load'
+import { safesMapSelector } from '~/routes/safeList/store/selectors'
+import { makeOwner } from '~/routes/safe/store/model/owner'
+import { getWeb3 } from '~/logic/wallets/getWeb3'
+import { promisify } from '~/utils/promisify'
+import { safesInitialState } from '~/routes/safe/store/reducer/safe'
+
+describe('Safe - redux load safe', () => {
+  let store
+  let address: string
+  beforeEach(async () => {
+    store = aNewStore()
+    address = await aMinedSafe(store)
+    localStorage.clear()
+  })
+
+  it('if safe is not present, store and persist it with default names', async () => {
+    const safeName = 'Loaded Safe'
+    const safeAddress = address
+    const updateSafeFn: any = (...args) => store.dispatch(updateSafe(...args))
+
+    await loadSafe(safeName, safeAddress, updateSafeFn)
+
+    const safes: Map<string, Safe> = safesMapSelector(store.getState())
+    expect(safes.size).toBe(1)
+    if (!safes) throw new Error()
+    const safe = safes.get(safeAddress)
+    if (!safe) throw new Error()
+
+    expect(safe.get('name')).toBe(safeName)
+    expect(safe.get('threshold')).toBe(1)
+    expect(safe.get('address')).toBe(safeAddress)
+    const accounts = await promisify(cb => getWeb3().eth.getAccounts(cb))
+    expect(safe.get('owners')).toEqual(List([makeOwner({ name: 'UNKNOWN', address: accounts[0] })]))
+
+    expect(safesInitialState()).toEqual(safes)
+  })
+
+  it('if safe is not present but owners, store and persist it with stored names', async () => {
+
+  })
+
+  it('if safe is present but no owners, store and persist it with default names', async () => {
+
+  })
+
+  it('if safe is present but owners, store and persist it with stored names', async () => {
+
+  })
+})

From 7b0f8fa448f011ee8a15959c859417de13156d43 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Wed, 14 Nov 2018 10:44:25 +0100
Subject: [PATCH 10/13] Redux tests when loading an existing safe

---
 src/test/safe.redux.load.test.js | 61 ++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/test/safe.redux.load.test.js b/src/test/safe.redux.load.test.js
index 6970528c..fd39b766 100644
--- a/src/test/safe.redux.load.test.js
+++ b/src/test/safe.redux.load.test.js
@@ -6,18 +6,21 @@ import { aMinedSafe } from '~/test/builder/safe.redux.builder'
 import updateSafe from '~/routes/safe/store/actions/updateSafe'
 import { loadSafe } from '~/routes/load/container/Load'
 import { safesMapSelector } from '~/routes/safeList/store/selectors'
-import { makeOwner } from '~/routes/safe/store/model/owner'
+import { makeOwner, type Owner } from '~/routes/safe/store/model/owner'
 import { getWeb3 } from '~/logic/wallets/getWeb3'
 import { promisify } from '~/utils/promisify'
 import { safesInitialState } from '~/routes/safe/store/reducer/safe'
+import { setOwners, OWNERS_KEY } from '~/utils/localStorage'
 
 describe('Safe - redux load safe', () => {
   let store
   let address: string
+  let accounts
   beforeEach(async () => {
     store = aNewStore()
     address = await aMinedSafe(store)
     localStorage.clear()
+    accounts = await promisify(cb => getWeb3().eth.getAccounts(cb))
   })
 
   it('if safe is not present, store and persist it with default names', async () => {
@@ -36,21 +39,75 @@ describe('Safe - redux load safe', () => {
     expect(safe.get('name')).toBe(safeName)
     expect(safe.get('threshold')).toBe(1)
     expect(safe.get('address')).toBe(safeAddress)
-    const accounts = await promisify(cb => getWeb3().eth.getAccounts(cb))
     expect(safe.get('owners')).toEqual(List([makeOwner({ name: 'UNKNOWN', address: accounts[0] })]))
 
     expect(safesInitialState()).toEqual(safes)
   })
 
   it('if safe is not present but owners, store and persist it with stored names', async () => {
+    const safeName = 'Loaded Safe'
+    const safeAddress = address
+    const ownerName = 'Foo Bar Restores'
+    const updateSafeFn: any = (...args) => store.dispatch(updateSafe(...args))
+    const owner: Owner = makeOwner({ name: ownerName, address: accounts[0] })
+    setOwners(safeAddress, List([owner]))
 
+    await loadSafe(safeName, safeAddress, updateSafeFn)
+
+    const safes: Map<string, Safe> = safesMapSelector(store.getState())
+    expect(safes.size).toBe(1)
+    if (!safes) throw new Error()
+    const safe = safes.get(safeAddress)
+    if (!safe) throw new Error()
+
+    expect(safe.get('name')).toBe(safeName)
+    expect(safe.get('threshold')).toBe(1)
+    expect(safe.get('address')).toBe(safeAddress)
+    expect(safe.get('owners')).toEqual(List([makeOwner({ name: ownerName, address: accounts[0] })]))
+
+    expect(safesInitialState()).toEqual(safes)
   })
 
   it('if safe is present but no owners, store and persist it with default names', async () => {
+    const safeAddress = await aMinedSafe(store)
+    localStorage.removeItem(`${OWNERS_KEY}-${safeAddress}`)
 
+    const safeName = 'Loaded Safe'
+    const updateSafeFn: any = (...args) => store.dispatch(updateSafe(...args))
+    await loadSafe(safeName, safeAddress, updateSafeFn)
+
+    const safes: Map<string, Safe> = safesMapSelector(store.getState())
+    expect(safes.size).toBe(2)
+    if (!safes) throw new Error()
+    const safe = safes.get(safeAddress)
+    if (!safe) throw new Error()
+
+    expect(safe.get('name')).toBe(safeName)
+    expect(safe.get('threshold')).toBe(1)
+    expect(safe.get('address')).toBe(safeAddress)
+    expect(safe.get('owners')).toEqual(List([makeOwner({ name: 'UNKNOWN', address: accounts[0] })]))
+
+    expect(safesInitialState()).toEqual(safes)
   })
 
   it('if safe is present but owners, store and persist it with stored names', async () => {
+    const safeAddress = await aMinedSafe(store)
 
+    const safeName = 'Loaded Safe'
+    const updateSafeFn: any = (...args) => store.dispatch(updateSafe(...args))
+    await loadSafe(safeName, safeAddress, updateSafeFn)
+
+    const safes: Map<string, Safe> = safesMapSelector(store.getState())
+    expect(safes.size).toBe(2)
+    if (!safes) throw new Error()
+    const safe = safes.get(safeAddress)
+    if (!safe) throw new Error()
+
+    expect(safe.get('name')).toBe(safeName)
+    expect(safe.get('threshold')).toBe(1)
+    expect(safe.get('address')).toBe(safeAddress)
+    expect(safe.get('owners')).toEqual(List([makeOwner({ name: 'Adol 1 Eth Account', address: accounts[0] })]))
+
+    expect(safesInitialState()).toEqual(safes)
   })
 })

From 936b2bc51cd3bfd25d2ddea1bd675c52e8d9ffa9 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Wed, 14 Nov 2018 10:50:52 +0100
Subject: [PATCH 11/13] Adding click handler when finishing load steps #75

---
 src/routes/load/components/Layout.jsx |  2 +-
 src/routes/load/container/Load.jsx    | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/routes/load/components/Layout.jsx b/src/routes/load/components/Layout.jsx
index 75c36269..65c3241c 100644
--- a/src/routes/load/components/Layout.jsx
+++ b/src/routes/load/components/Layout.jsx
@@ -18,7 +18,7 @@ const getSteps = () => [
 type Props = {
   provider: string,
   network: string,
-  onLoadSafeSubmit: () => Promise<void>,
+  onLoadSafeSubmit: (values: Object) => Promise<void>,
 }
 
 const iconStyle = {
diff --git a/src/routes/load/container/Load.jsx b/src/routes/load/container/Load.jsx
index 4114e70e..3997f819 100644
--- a/src/routes/load/container/Load.jsx
+++ b/src/routes/load/container/Load.jsx
@@ -4,9 +4,12 @@ import { connect } from 'react-redux'
 import Page from '~/components/layout/Page'
 import { buildSafe } from '~/routes/safe/store/actions/fetchSafe'
 import { SAFES_KEY, load, saveSafes } from '~/utils/localStorage'
+import { SAFELIST_ADDRESS } from '~/routes/routes'
+import { history } from '~/store'
 import selector from './selector'
 import actions, { type Actions, type UpdateSafe } from './actions'
 import Layout from '../components/Layout'
+import { FIELD_LOAD_NAME, FIELD_LOAD_ADDRESS } from '../components/fields'
 
 type Props = Actions & {
   provider: string,
@@ -26,9 +29,19 @@ export const loadSafe = async (safeName: string, safeAddress: string, updateSafe
 }
 
 class Open extends React.Component<Props> {
-  onLoadSafeSubmit = async () => {
-    // call loadSafe
-    // travel to safe route
+  onLoadSafeSubmit = async (values: Object) => {
+    try {
+      const { updateSafe } = this.props
+      const safeName = values[FIELD_LOAD_NAME]
+      const safeAddress = values[FIELD_LOAD_ADDRESS]
+
+      loadSafe(safeName, safeAddress, updateSafe)
+      const url = `${SAFELIST_ADDRESS}/${safeAddress}`
+      history.push(url)
+    } catch (error) {
+      // eslint-disable-next-line
+      console.log('Error while loading the Safe' + error)
+    }
   }
 
   render() {

From cafbfb38d973a061eb2a0a638f9867ff41a8bd5b Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Wed, 14 Nov 2018 12:45:10 +0100
Subject: [PATCH 12/13] Calculating isOwner property in ReviewInfo component
 #75

---
 src/routes/load/components/Layout.jsx         |  11 +-
 .../components/ReviewInformation/index.jsx    | 122 ++++++++++++------
 src/routes/load/container/Load.jsx            |  13 +-
 src/routes/load/container/selector.js         |  17 ++-
 4 files changed, 107 insertions(+), 56 deletions(-)

diff --git a/src/routes/load/components/Layout.jsx b/src/routes/load/components/Layout.jsx
index 65c3241c..95beb9c9 100644
--- a/src/routes/load/components/Layout.jsx
+++ b/src/routes/load/components/Layout.jsx
@@ -1,5 +1,6 @@
 // @flow
 import * as React from 'react'
+import ChevronLeft from '@material-ui/icons/ChevronLeft'
 import Stepper from '~/components/Stepper'
 import Block from '~/components/layout/Block'
 import Heading from '~/components/layout/Heading'
@@ -7,17 +8,15 @@ import Row from '~/components/layout/Row'
 import IconButton from '@material-ui/core/IconButton'
 import ReviewInformation from '~/routes/load/components/ReviewInformation'
 import DetailsForm, { safeFieldsValidation } from '~/routes/load/components/DetailsForm'
-import ChevronLeft from '@material-ui/icons/ChevronLeft'
 import { history } from '~/store'
 import { secondary } from '~/theme/variables'
+import { type SelectorProps } from '~/routes/load/container/selector'
 
 const getSteps = () => [
   'Details', 'Review',
 ]
 
-type Props = {
-  provider: string,
-  network: string,
+type Props = SelectorProps & {
   onLoadSafeSubmit: (values: Object) => Promise<void>,
 }
 
@@ -32,7 +31,7 @@ const back = () => {
 }
 
 const Layout = ({
-  provider, onLoadSafeSubmit, network,
+  provider, onLoadSafeSubmit, network, userAddress,
 }: Props) => {
   const steps = getSteps()
 
@@ -54,7 +53,7 @@ const Layout = ({
               <Stepper.Page validate={safeFieldsValidation}>
                 { DetailsForm }
               </Stepper.Page>
-              <Stepper.Page network={network}>
+              <Stepper.Page network={network} userAddress={userAddress}>
                 { ReviewInformation }
               </Stepper.Page>
             </Stepper>
diff --git a/src/routes/load/components/ReviewInformation/index.jsx b/src/routes/load/components/ReviewInformation/index.jsx
index 935016c1..1790e910 100644
--- a/src/routes/load/components/ReviewInformation/index.jsx
+++ b/src/routes/load/components/ReviewInformation/index.jsx
@@ -8,8 +8,10 @@ import OpenPaper from '~/components/Stepper/OpenPaper'
 import Row from '~/components/layout/Row'
 import Paragraph from '~/components/layout/Paragraph'
 import { xs, sm, lg, border, secondary } from '~/theme/variables'
-import { openAddressInEtherScan } from '~/logic/wallets/getWeb3'
+import { openAddressInEtherScan, getWeb3 } from '~/logic/wallets/getWeb3'
 import { FIELD_LOAD_NAME, FIELD_LOAD_ADDRESS } from '~/routes/load/components/fields'
+import { sameAddress } from '~/logic/wallets/ethAddresses'
+import { getGnosisSafeContract } from '~/logic/contracts/safeContracts'
 
 const openIconStyle = {
   height: '16px',
@@ -43,6 +45,7 @@ const styles = () => ({
 
 type LayoutProps = {
   network: string,
+  userAddress: string,
 }
 
 type Props = LayoutProps & {
@@ -50,53 +53,92 @@ type Props = LayoutProps & {
   classes: Object,
 }
 
-const ReviewComponent = ({ values, classes, network }: Props) => {
-  const safeAddress = values[FIELD_LOAD_ADDRESS]
+type State = {
+  isOwner: boolean,
+}
 
-  return (
-    <React.Fragment>
-      <Block className={classes.details}>
-        <Block margin="lg">
-          <Paragraph size="sm" color="disabled" noMargin>
-            Name of the Safe
-          </Paragraph>
-          <Paragraph size="lg" color="primary" noMargin weight="bolder" className={classes.name}>
-            {values[FIELD_LOAD_NAME]}
-          </Paragraph>
+class ReviewComponent extends React.PureComponent<Props, State> {
+  state = {
+    isOwner: false,
+  }
+
+  componentDidMount = async () => {
+    this.mounted = true
+
+    const { values, userAddress } = this.props
+    const safeAddress = values[FIELD_LOAD_ADDRESS]
+    const web3 = getWeb3()
+
+    const GnosisSafe = getGnosisSafeContract(web3)
+    const gnosisSafe = GnosisSafe.at(safeAddress)
+    const owners = await gnosisSafe.getOwners()
+    if (!owners) {
+      return
+    }
+
+    const isOwner = owners.find((owner: string) => sameAddress(owner, userAddress)) !== undefined
+    if (this.mounted) {
+      this.setState(() => ({ isOwner }))
+    }
+  }
+
+  componentWillUnmount() {
+    this.mounted = false
+  }
+
+  mounted = false
+
+  render() {
+    const { values, classes, network } = this.props
+    const { isOwner } = this.state
+
+    const safeAddress = values[FIELD_LOAD_ADDRESS]
+
+    return (
+      <React.Fragment>
+        <Block className={classes.details}>
+          <Block margin="lg">
+            <Paragraph size="sm" color="disabled" noMargin>
+              Name of the Safe
+            </Paragraph>
+            <Paragraph size="lg" color="primary" noMargin weight="bolder" className={classes.name}>
+              {values[FIELD_LOAD_NAME]}
+            </Paragraph>
+          </Block>
+          <Block margin="lg">
+            <Paragraph size="sm" color="disabled" noMargin>
+              Safe address
+            </Paragraph>
+            <Row className={classes.container}>
+              <Identicon address={safeAddress} diameter={32} />
+              <Paragraph size="md" color="disabled" noMargin className={classes.address}>{safeAddress}</Paragraph>
+              <OpenInNew
+                className={classes.open}
+                style={openIconStyle}
+                onClick={openAddressInEtherScan(safeAddress, network)}
+              />
+            </Row>
+          </Block>
+          <Block margin="lg">
+            <Paragraph size="sm" color="disabled" noMargin>
+              Connected wallet client is owner?
+            </Paragraph>
+            <Paragraph size="lg" color="primary" noMargin weight="bolder" className={classes.name}>
+              { isOwner ? 'Yes' : 'No (read-only)' }
+            </Paragraph>
+          </Block>
         </Block>
-        <Block margin="lg">
-          <Paragraph size="sm" color="disabled" noMargin>
-            Safe address
-          </Paragraph>
-          <Row className={classes.container}>
-            <Identicon address={safeAddress} diameter={32} />
-            <Paragraph size="md" color="disabled" noMargin className={classes.address}>{safeAddress}</Paragraph>
-            <OpenInNew
-              className={classes.open}
-              style={openIconStyle}
-              onClick={openAddressInEtherScan(safeAddress, network)}
-            />
-          </Row>
-        </Block>
-        <Block margin="lg">
-          <Paragraph size="sm" color="disabled" noMargin>
-            Connected wallet client is owner?
-          </Paragraph>
-          <Paragraph size="lg" color="primary" noMargin weight="bolder" className={classes.name}>
-            No (read-only)
-          </Paragraph>
-        </Block>
-      </Block>
-    </React.Fragment>
-  )
+      </React.Fragment>
+    )
+  }
 }
 
 const ReviewPage = withStyles(styles)(ReviewComponent)
 
-const Review = ({ network }: LayoutProps) => (controls: React$Node, { values }: Object) => (
+const Review = ({ network, userAddress }: LayoutProps) => (controls: React$Node, { values }: Object) => (
   <React.Fragment>
     <OpenPaper controls={controls} padding={false}>
-      <ReviewPage network={network} values={values} />
+      <ReviewPage network={network} values={values} userAddress={userAddress} />
     </OpenPaper>
   </React.Fragment>
 )
diff --git a/src/routes/load/container/Load.jsx b/src/routes/load/container/Load.jsx
index 3997f819..27f3e96e 100644
--- a/src/routes/load/container/Load.jsx
+++ b/src/routes/load/container/Load.jsx
@@ -6,16 +6,12 @@ import { buildSafe } from '~/routes/safe/store/actions/fetchSafe'
 import { SAFES_KEY, load, saveSafes } from '~/utils/localStorage'
 import { SAFELIST_ADDRESS } from '~/routes/routes'
 import { history } from '~/store'
-import selector from './selector'
+import selector, { type SelectorProps } from './selector'
 import actions, { type Actions, type UpdateSafe } from './actions'
 import Layout from '../components/Layout'
 import { FIELD_LOAD_NAME, FIELD_LOAD_ADDRESS } from '../components/fields'
 
-type Props = Actions & {
-  provider: string,
-  userAccount: string,
-  network: string,
-}
+type Props = SelectorProps & Actions
 
 export const loadSafe = async (safeName: string, safeAddress: string, updateSafe: UpdateSafe) => {
   const safeRecord = await buildSafe(safeAddress, safeName)
@@ -45,7 +41,9 @@ class Open extends React.Component<Props> {
   }
 
   render() {
-    const { provider, network } = this.props
+    const {
+      provider, network, userAddress,
+    } = this.props
 
     return (
       <Page>
@@ -53,6 +51,7 @@ class Open extends React.Component<Props> {
           network={network}
           provider={provider}
           onLoadSafeSubmit={this.onLoadSafeSubmit}
+          userAddress={userAddress}
         />
       </Page>
     )
diff --git a/src/routes/load/container/selector.js b/src/routes/load/container/selector.js
index 658cc2a4..28f673b9 100644
--- a/src/routes/load/container/selector.js
+++ b/src/routes/load/container/selector.js
@@ -1,8 +1,19 @@
 // @flow
-import { createStructuredSelector } from 'reselect'
-import { providerNameSelector, networkSelector } from '~/logic/wallets/store/selectors'
+import { createStructuredSelector, type Selector } from 'reselect'
+import { providerNameSelector, networkSelector, userAccountSelector } from '~/logic/wallets/store/selectors'
+import { type GlobalState } from '~/store'
 
-export default createStructuredSelector({
+export type SelectorProps = {
+  provider: string,
+  network: string,
+  userAddress: string,
+}
+
+const structuredSelector: Selector<GlobalState, any, any> = createStructuredSelector({
   provider: providerNameSelector,
   network: networkSelector,
+  userAddress: userAccountSelector,
 })
+
+export default structuredSelector
+

From bd80d2f882102208600f8a3d9d652442dc4d42a9 Mon Sep 17 00:00:00 2001
From: apanizo <adolfo.panizo@gmail.com>
Date: Wed, 14 Nov 2018 17:13:22 +0100
Subject: [PATCH 13/13] Added DOM test for loading safe #75

---
 src/logic/contracts/safeContracts.js          |  6 ++++++
 .../load/components/DetailsForm/index.jsx     |  5 ++---
 src/routes/load/container/Load.jsx            |  6 +++---
 src/test/builder/safe.dom.utils.js            | 20 ++++++++++++++++++
 src/test/safe.dom.create.test.js              | 21 +------------------
 src/test/safe.dom.load.test.js                | 10 ++++-----
 6 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/logic/contracts/safeContracts.js b/src/logic/contracts/safeContracts.js
index c1cd1c9c..af120c89 100644
--- a/src/logic/contracts/safeContracts.js
+++ b/src/logic/contracts/safeContracts.js
@@ -54,6 +54,12 @@ const createMasterCopies = async () => {
 
 export const initContracts = ensureOnce(process.env.NODE_ENV === 'test' ? createMasterCopies : instanciateMasterCopies)
 
+export const getSafeMasterContract = async () => {
+  await initContracts()
+
+  return safeMaster
+}
+
 export const deploySafeContract = async (
   safeAccounts: string[],
   numConfirmations: number,
diff --git a/src/routes/load/components/DetailsForm/index.jsx b/src/routes/load/components/DetailsForm/index.jsx
index 28e0ba04..a8f849d3 100644
--- a/src/routes/load/components/DetailsForm/index.jsx
+++ b/src/routes/load/components/DetailsForm/index.jsx
@@ -14,7 +14,7 @@ import { FIELD_LOAD_NAME, FIELD_LOAD_ADDRESS } from '~/routes/load/components/fi
 import { getWeb3 } from '~/logic/wallets/getWeb3'
 import { promisify } from '~/utils/promisify'
 import SafeProxy from '#/Proxy.json'
-import { getGnosisSafeContract } from '~/logic/contracts/safeContracts'
+import { getSafeMasterContract } from '~/logic/contracts/safeContracts'
 
 type Props = {
   classes: Object,
@@ -66,8 +66,7 @@ export const safeFieldsValidation = async (values: Object) => {
   const proxyInstance = proxy.at(safeAddress)
   const proxyImplementation = await proxyInstance.implementation()
 
-  const GnosisSafe = getGnosisSafeContract(web3)
-  const safeMaster = await GnosisSafe.deployed()
+  const safeMaster = await getSafeMasterContract()
   const masterCopy = safeMaster.address
 
   const sameMasterCopy = proxyImplementation === masterCopy
diff --git a/src/routes/load/container/Load.jsx b/src/routes/load/container/Load.jsx
index 27f3e96e..9fe41921 100644
--- a/src/routes/load/container/Load.jsx
+++ b/src/routes/load/container/Load.jsx
@@ -24,14 +24,14 @@ export const loadSafe = async (safeName: string, safeAddress: string, updateSafe
   saveSafes(storedSafes)
 }
 
-class Open extends React.Component<Props> {
+class Load extends React.Component<Props> {
   onLoadSafeSubmit = async (values: Object) => {
     try {
       const { updateSafe } = this.props
       const safeName = values[FIELD_LOAD_NAME]
       const safeAddress = values[FIELD_LOAD_ADDRESS]
 
-      loadSafe(safeName, safeAddress, updateSafe)
+      await loadSafe(safeName, safeAddress, updateSafe)
       const url = `${SAFELIST_ADDRESS}/${safeAddress}`
       history.push(url)
     } catch (error) {
@@ -58,4 +58,4 @@ class Open extends React.Component<Props> {
   }
 }
 
-export default connect(selector, actions)(Open)
+export default connect(selector, actions)(Load)
diff --git a/src/test/builder/safe.dom.utils.js b/src/test/builder/safe.dom.utils.js
index a1ee690c..c0bb6dbe 100644
--- a/src/test/builder/safe.dom.utils.js
+++ b/src/test/builder/safe.dom.utils.js
@@ -115,3 +115,23 @@ export const travelToTokens = (store: Store, address: string): React$Component<{
 
   return createDom(store)
 }
+
+const INTERVAL = 500
+const MAX_TIMES_EXECUTED = 30
+export const whenSafeDeployed = (): Promise<string> => new Promise((resolve, reject) => {
+  let times = 0
+  const interval = setInterval(() => {
+    if (times >= MAX_TIMES_EXECUTED) {
+      clearInterval(interval)
+      reject()
+    }
+
+    const url = `${window.location}`
+    const regex = /.*safes\/(0x[a-f0-9A-F]*)/
+    const safeAddress = url.match(regex)
+    if (safeAddress) {
+      resolve(safeAddress[1])
+    }
+    times += 1
+  }, INTERVAL)
+})
diff --git a/src/test/safe.dom.create.test.js b/src/test/safe.dom.create.test.js
index 913b46c4..61abdbd2 100644
--- a/src/test/safe.dom.create.test.js
+++ b/src/test/safe.dom.create.test.js
@@ -14,6 +14,7 @@ import addProvider from '~/logic/wallets/store/actions/addProvider'
 import { makeProvider } from '~/logic/wallets/store/model/provider'
 import { promisify } from '~/utils/promisify'
 import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
+import { whenSafeDeployed } from './builder/safe.dom.utils'
 
 const fillOpenSafeForm = async (localStore: Store<GlobalState>) => {
   const provider = await getProviderInfo()
@@ -31,26 +32,6 @@ const fillOpenSafeForm = async (localStore: Store<GlobalState>) => {
   )
 }
 
-const INTERVAL = 500
-const MAX_TIMES_EXECUTED = 30
-export const whenSafeDeployed = (): Promise<string> => new Promise((resolve, reject) => {
-  let times = 0
-  const interval = setInterval(() => {
-    if (times >= MAX_TIMES_EXECUTED) {
-      clearInterval(interval)
-      reject()
-    }
-
-    const url = `${window.location}`
-    const regex = /.*safes\/(0x[a-f0-9A-F]*)/
-    const safeAddress = url.match(regex)
-    if (safeAddress) {
-      resolve(safeAddress[1])
-    }
-    times += 1
-  }, INTERVAL)
-})
-
 const deploySafe = async (safe: React$Component<{}>, threshold: number, numOwners: number) => {
   const web3 = getWeb3()
   const accounts = await promisify(cb => web3.eth.getAccounts(cb))
diff --git a/src/test/safe.dom.load.test.js b/src/test/safe.dom.load.test.js
index 5a68f214..f74057b4 100644
--- a/src/test/safe.dom.load.test.js
+++ b/src/test/safe.dom.load.test.js
@@ -11,7 +11,7 @@ import { getProviderInfo } from '~/logic/wallets/getWeb3'
 import addProvider from '~/logic/wallets/store/actions/addProvider'
 import { makeProvider } from '~/logic/wallets/store/model/provider'
 import { aMinedSafe } from './builder/safe.redux.builder'
-import { whenSafeDeployed } from './safe.dom.create.test'
+import { whenSafeDeployed } from './builder/safe.dom.utils'
 
 const travelToLoadRoute = async (localStore: Store<GlobalState>) => {
   const provider = await getProviderInfo()
@@ -41,12 +41,11 @@ describe('DOM > Feature > LOAD a safe', () => {
     // Fill Safe's name
     const fieldName = inputs[0]
     TestUtils.Simulate.change(fieldName, { target: { value: 'Adolfo Safe' } })
-    TestUtils.Simulate.submit(form)
-    await sleep(400)
-
-    // Fill Safe's name
     const fieldAddress = inputs[1]
     TestUtils.Simulate.change(fieldAddress, { target: { value: address } })
+    await sleep(400)
+
+    // Click next
     TestUtils.Simulate.submit(form)
     await sleep(400)
 
@@ -54,6 +53,7 @@ describe('DOM > Feature > LOAD a safe', () => {
     TestUtils.Simulate.submit(form)
     await sleep(400)
 
+
     const deployedAddress = await whenSafeDeployed()
     expect(deployedAddress).toBe(address)
   })