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

Merge pull request #245 from gnosis/240-match-owner-names 

Bug #240: Fix the order of the owners addresses when creating a Safe
This commit is contained in:
Germán Martínez 2019-11-06 17:22:56 +01:00 committed by GitHub
parent 74f9956b73 9b0c503fbf
commit 101ac77dbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1153 additions and 506 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
package.json
View File

@ -33,14 +33,14 @@
"dependencies": {
"@gnosis.pm/safe-contracts": "^1.0.0",
"@gnosis.pm/util-contracts": "2.0.4",
"@material-ui/core": "4.5.1",
"@material-ui/core": "4.6.0",
"@material-ui/icons": "4.5.1",
"@testing-library/jest-dom": "4.1.2",
"@testing-library/jest-dom": "4.2.3",
"@welldone-software/why-did-you-render": "3.3.8",
"axios": "0.19.0",
"bignumber.js": "9.0.0",
"connected-react-router": "6.5.2",
"date-fns": "2.5.0",
"date-fns": "2.6.0",
"ethereum-ens": "0.7.8",
"final-form": "4.18.5",
"history": "4.10.1",
@ -50,14 +50,14 @@
"notistack": "https://github.com/gnosis/notistack.git#v0.9.4",
"optimize-css-assets-webpack-plugin": "5.0.3",
"qrcode.react": "^0.9.3",
"react": "16.10.2",
"react-dom": "16.10.2",
"react": "16.11.0",
"react-dom": "16.11.0",
"react-final-form": "6.3.0",
"react-final-form-listeners": "^1.0.2",
"react-hot-loader": "4.12.15",
"react-infinite-scroll-component": "4.5.3",
"react-infinite-scroll-component": "5.0.2",
"react-qr-reader": "^2.2.1",
"react-redux": "7.1.1",
"react-redux": "7.1.3",
"react-router-dom": "5.1.2",
"react-window": "^1.8.5",
"recompose": "^0.30.0",
@ -65,18 +65,18 @@
"redux-actions": "^2.6.5",
"redux-thunk": "^2.3.0",
"reselect": "^4.0.0",
"web3": "1.2.1"
"web3": "1.2.2"
},
"devDependencies": {
"@babel/cli": "7.6.4",
"@babel/core": "7.6.4",
"@babel/plugin-proposal-class-properties": "7.5.5",
"@babel/plugin-proposal-decorators": "7.6.0",
"@babel/cli": "7.7.0",
"@babel/core": "7.7.0",
"@babel/plugin-proposal-class-properties": "7.7.0",
"@babel/plugin-proposal-decorators": "7.7.0",
"@babel/plugin-proposal-do-expressions": "7.6.0",
"@babel/plugin-proposal-export-default-from": "7.5.2",
"@babel/plugin-proposal-export-namespace-from": "7.5.2",
"@babel/plugin-proposal-function-bind": "^7.2.0",
"@babel/plugin-proposal-function-sent": "7.5.0",
"@babel/plugin-proposal-function-sent": "7.7.0",
"@babel/plugin-proposal-json-strings": "^7.2.0",
"@babel/plugin-proposal-logical-assignment-operators": "^7.2.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.4.4",
@ -88,17 +88,17 @@
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/plugin-transform-member-expression-literals": "^7.2.0",
"@babel/plugin-transform-property-literals": "^7.2.0",
"@babel/polyfill": "7.6.0",
"@babel/preset-env": "7.6.3",
"@babel/polyfill": "7.7.0",
"@babel/preset-env": "7.7.1",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "7.6.3",
"@babel/preset-react": "7.7.0",
"@sambego/storybook-state": "^1.3.6",
"@storybook/addon-actions": "5.2.4",
"@storybook/addon-knobs": "5.2.4",
"@storybook/addon-links": "5.2.4",
"@storybook/react": "5.2.4",
"@testing-library/react": "9.3.0",
"autoprefixer": "9.6.5",
"@storybook/addon-actions": "5.2.5",
"@storybook/addon-knobs": "5.2.5",
"@storybook/addon-links": "5.2.5",
"@storybook/react": "5.2.5",
"@testing-library/react": "9.3.2",
"autoprefixer": "9.7.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "10.0.3",
"babel-jest": "24.9.0",
@ -109,17 +109,17 @@
"classnames": "^2.2.6",
"css-loader": "3.2.0",
"detect-port": "^1.3.0",
"eslint": "5.16.0",
"eslint": "6.6.0",
"eslint-config-airbnb": "18.0.1",
"eslint-plugin-flowtype": "4.3.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jest": "22.19.0",
"eslint-plugin-jest": "23.0.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.16.0",
"ethereumjs-abi": "0.6.8",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"file-loader": "4.2.0",
"flow-bin": "0.109.0",
"flow-bin": "0.111.3",
"fs-extra": "8.1.0",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
@ -128,7 +128,7 @@
"json-loader": "^0.5.7",
"mini-css-extract-plugin": "0.8.0",
"postcss-loader": "^3.0.0",
"postcss-mixins": "6.2.2",
"postcss-mixins": "6.2.3",
"postcss-simple-vars": "^5.0.2",
"pre-commit": "^1.2.2",
"prettier-eslint-cli": "5.0.0",
@ -136,15 +136,15 @@
"storybook-host": "5.1.0",
"storybook-router": "^0.3.4",
"style-loader": "1.0.0",
"truffle": "5.0.40",
"truffle": "5.0.43",
"truffle-contract": "4.0.31",
"truffle-solidity-loader": "0.1.32",
"uglifyjs-webpack-plugin": "2.2.0",
"url-loader": "2.2.0",
"webpack": "4.41.2",
"webpack-bundle-analyzer": "3.6.0",
"webpack-cli": "3.3.9",
"webpack-dev-server": "3.8.2",
"webpack-cli": "3.3.10",
"webpack-dev-server": "3.9.0",
"webpack-manifest-plugin": "2.2.0"
}
}

4
src/routes/open/container/Open.jsx
View File

@ -25,10 +25,10 @@ export type OpenState = {
}
export const createSafe = async (values: Object, userAccount: string, addSafe: AddSafe): Promise<OpenState> => {
const ownerAddresses = getAccountsFrom(values)
const numConfirmations = getThresholdFrom(values)
const name = getSafeNameFrom(values)
const ownersNames = getNamesFrom(values)
const ownerAddresses = getAccountsFrom(values)
await initContracts()
@ -38,7 +38,7 @@ export const createSafe = async (values: Object, userAccount: string, addSafe: A
const safeAddress = safe.logs[0].args.proxy
const safeContract = await getGnosisSafeInstanceAt(safeAddress)
const safeProps = await buildSafe(safeAddress, name)
const owners = getOwnersFrom(ownersNames, ownerAddresses.sort())
const owners = getOwnersFrom(ownersNames, ownerAddresses)
safeProps.owners = owners
addSafe(safeProps)

1597
yarn.lock
View File

File diff suppressed because it is too large Load Diff