Merge branch 'development' of github.com:gnosis/safe-react into 110-sort-out-tests
This commit is contained in:
commit
bf3ade5209
|
@ -41,7 +41,7 @@ const OpenPaper = ({
|
|||
<Block style={containerStyle} className={`${classes.container} ${padding ? classes.padding : ''}`}>
|
||||
{children}
|
||||
</Block>
|
||||
{ controls }
|
||||
{controls}
|
||||
</Paper>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -62,7 +62,13 @@ export const safeFieldsValidation = async (values: Object) => {
|
|||
|
||||
// check mastercopy
|
||||
const proxyAddressFromStorage = await web3.eth.getStorageAt(safeAddress, 0)
|
||||
const checksummedProxyAddress = web3.utils.toChecksumAddress(proxyAddressFromStorage)
|
||||
// https://www.reddit.com/r/ethereum/comments/6l3da1/how_long_are_ethereum_addresses/
|
||||
// ganache returns plain address
|
||||
// rinkeby returns 0x0000000000000+{40 address charachers}
|
||||
// address comes last so we just get last 40 charachers (1byte = 2hex chars)
|
||||
const checksummedProxyAddress = web3.utils.toChecksumAddress(
|
||||
`0x${proxyAddressFromStorage.substr(proxyAddressFromStorage.length - 40)}`,
|
||||
)
|
||||
const safeMaster = await getSafeMasterContract()
|
||||
const masterCopy = safeMaster.address
|
||||
|
||||
|
|
|
@ -116,6 +116,7 @@ export default createMuiTheme({
|
|||
order: 0,
|
||||
marginTop: '0px',
|
||||
backgroundColor: '#EAE9EF',
|
||||
zIndex: 1, // for firefox
|
||||
},
|
||||
},
|
||||
MuiInput: {
|
||||
|
|
Loading…
Reference in New Issue