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 branch 'development' of github.com:gnosis/safe-react into feature/address-book-suggestions

This commit is contained in:
Mati Dastugue 2020-06-29 12:57:14 -03:00
parent 89100d5158 222ace288c
commit f21913d84a
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -159,7 +159,7 @@
"async-sema": "^3.1.0", "async-sema": "^3.1.0",
"axios": "0.19.2", "axios": "0.19.2",
"bignumber.js": "9.0.0", "bignumber.js": "9.0.0",
"bnc-onboard": "1.9.4", "bnc-onboard": "1.10.0",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"concurrently": "^5.2.0", "concurrently": "^5.2.0",
"connected-react-router": "6.8.0", "connected-react-router": "6.8.0",

9
src/components/TextBox/index.tsx
View File

@ -9,8 +9,13 @@ const Box = styled.p`
border: solid 2px ${border}; border: solid 2px ${border};
` `
const TextBox = ({ children }: any) => { type Props = {
return <Box>{children}</Box> children: React.ReactNode
className?: string
}
const TextBox = ({ children, ...rest }: Props): React.ReactElement => {
return <Box {...rest}>{children}</Box>
} }
export default TextBox export default TextBox

6
src/routes/safe/components/Apps/confirmTransactions.tsx
View File

@ -54,6 +54,10 @@ const IconText = styled.div`
margin-right: 4px; margin-right: 4px;
} }
` `
const StyledTextBox = styled(TextBox)`
max-width: 444px;
`
const isTxValid = (t: SafeAppTx): boolean => { const isTxValid = (t: SafeAppTx): boolean => {
if (!['string', 'number'].includes(typeof t.value)) { if (!['string', 'number'].includes(typeof t.value)) {
return false return false
@ -111,7 +115,7 @@ const confirmTransactions = (
</div> </div>
<div className="section"> <div className="section">
<Heading tag="h3">Data (hex encoded)*</Heading> <Heading tag="h3">Data (hex encoded)*</Heading>
<TextBox>{tx.data}</TextBox> <StyledTextBox>{tx.data}</StyledTextBox>
</div> </div>
</CollapseContent> </CollapseContent>
</Collapse> </Collapse>

40
yarn.lock
View File

@ -2396,7 +2396,7 @@
"@restless/sanitizers" "^0.2.4" "@restless/sanitizers" "^0.2.4"
reactive-properties "^0.1.11" reactive-properties "^0.1.11"
"@walletconnect/client@^1.0.11": "@walletconnect/client@^1.0.5":
version "1.0.11" version "1.0.11"
resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.0.11.tgz#ee58d2662e433cb67c5d2157c1b4525f864ab6ec" resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.0.11.tgz#ee58d2662e433cb67c5d2157c1b4525f864ab6ec"
integrity sha512-NVMDRUuLMqRPmzR7xjVfRcuXegvrCTtzuVyU8iYEnriZ3fFZcFj3PWVzN44RvLYQ4yUxWzeUkXIVRmmecOLMbQ== integrity sha512-NVMDRUuLMqRPmzR7xjVfRcuXegvrCTtzuVyU8iYEnriZ3fFZcFj3PWVzN44RvLYQ4yUxWzeUkXIVRmmecOLMbQ==
@ -2415,7 +2415,7 @@
"@walletconnect/types" "^1.0.11" "@walletconnect/types" "^1.0.11"
"@walletconnect/utils" "^1.0.11" "@walletconnect/utils" "^1.0.11"
"@walletconnect/http-connection@^1.0.11": "@walletconnect/http-connection@^1.0.5":
version "1.0.11" version "1.0.11"
resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.0.11.tgz#3c00ab02b4e6f4ffa1aa346b19569e585609dfa2" resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.0.11.tgz#3c00ab02b4e6f4ffa1aa346b19569e585609dfa2"
integrity sha512-kT9tKfp0KfKO+WkufSEi2Ppcgni2LB1Qly66uV3xZEwqouY+8Fs7Rf/BQ9o8KmosnP9WxBjgO+S4OMDWNLHCdA== integrity sha512-kT9tKfp0KfKO+WkufSEi2Ppcgni2LB1Qly66uV3xZEwqouY+8Fs7Rf/BQ9o8KmosnP9WxBjgO+S4OMDWNLHCdA==
@ -2438,7 +2438,7 @@
resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.0.11.tgz#55a060fb113524e75ed675fce1ab50bb6c5aa1ce" resolved "https://registry.yarnpkg.com/@walletconnect/mobile-registry/-/mobile-registry-1.0.11.tgz#55a060fb113524e75ed675fce1ab50bb6c5aa1ce"
integrity sha512-E78BfSr4RNSUPl/4Qpfg4bPO+QynMqUj55X20S41z1aGIYhXNM33sUVWGkbxO5rHuHYLB9Z5O/ob0sENKCXAfA== integrity sha512-E78BfSr4RNSUPl/4Qpfg4bPO+QynMqUj55X20S41z1aGIYhXNM33sUVWGkbxO5rHuHYLB9Z5O/ob0sENKCXAfA==
"@walletconnect/qrcode-modal@^1.0.11": "@walletconnect/qrcode-modal@^1.0.5":
version "1.0.11" version "1.0.11"
resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.0.11.tgz#5b34d583c034aed74307350797c66ddce6193744" resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.0.11.tgz#5b34d583c034aed74307350797c66ddce6193744"
integrity sha512-GsSQ/E3ixBEiQz3EOFypW2FCFIS6G37crpJunkLhefi9w2/CMeQ5bk4SIFKyGsAv6uEtwAcPVh7tNkoiGEsb2A== integrity sha512-GsSQ/E3ixBEiQz3EOFypW2FCFIS6G37crpJunkLhefi9w2/CMeQ5bk4SIFKyGsAv6uEtwAcPVh7tNkoiGEsb2A==
@ -2457,7 +2457,7 @@
"@walletconnect/types" "^1.0.11" "@walletconnect/types" "^1.0.11"
ws "7.3.0" ws "7.3.0"
"@walletconnect/types@^1.0.11": "@walletconnect/types@^1.0.11", "@walletconnect/types@^1.0.5":
version "1.0.11" version "1.0.11"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.0.11.tgz#6dd23eb3a8dd2824f76cc2c54217ecca8229d0a2" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.0.11.tgz#6dd23eb3a8dd2824f76cc2c54217ecca8229d0a2"
integrity sha512-ysIQI6DsMELQAAt5zk2ZMKKyOwgk+XP4KeOhmDk+sIQskBugFl0ARl5iQZzGz9pcrHdlg1Fi7ucGw3UaExqIVA== integrity sha512-ysIQI6DsMELQAAt5zk2ZMKKyOwgk+XP4KeOhmDk+sIQskBugFl0ARl5iQZzGz9pcrHdlg1Fi7ucGw3UaExqIVA==
@ -2472,16 +2472,15 @@
enc-utils "2.1.0" enc-utils "2.1.0"
js-sha3 "0.8.0" js-sha3 "0.8.0"
"@walletconnect/web3-provider@^1.0.0-beta.47": "@walletconnect/web3-provider@^1.0.5":
version "1.0.11" version "1.0.5"
resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.0.11.tgz#462d84808379f5ec8747e46de217286d61837620" resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.0.5.tgz#c7e3d1a1449b3f1fd6125e3fabd361394dd1ecdd"
integrity sha512-ppzYwfrVtl5j8zMOPl07v5w+Gb0ptspQm3TGUqVVClaIdXt96uCBBPxwi5bZa4pSXVKgJvI9EbKzaqUS8kVsyQ== integrity sha512-oxrkE1kMZl7mlno7lmupLZS+slDC83nZh5UbE4B2Gr0aOTfT1lqyQMkvSXYOcl0fjR+p0x6iJ4sh0nvhV6Loug==
dependencies: dependencies:
"@walletconnect/client" "^1.0.11" "@walletconnect/client" "^1.0.5"
"@walletconnect/http-connection" "^1.0.11" "@walletconnect/http-connection" "^1.0.5"
"@walletconnect/qrcode-modal" "^1.0.11" "@walletconnect/qrcode-modal" "^1.0.5"
"@walletconnect/types" "^1.0.11" "@walletconnect/types" "^1.0.5"
"@walletconnect/utils" "^1.0.11"
web3-provider-engine "15.0.7" web3-provider-engine "15.0.7"
"@web3-js/scrypt-shim@^0.1.0": "@web3-js/scrypt-shim@^0.1.0":
@ -4083,20 +4082,20 @@ bn.js@^5.1.1, bn.js@^5.1.2:
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0"
integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
bnc-onboard@1.9.4: bnc-onboard@1.10.0:
version "1.9.4" version "1.10.0"
resolved "https://registry.yarnpkg.com/bnc-onboard/-/bnc-onboard-1.9.4.tgz#c70c41652234009708e3a2334ab064a3a4c008c3" resolved "https://registry.yarnpkg.com/bnc-onboard/-/bnc-onboard-1.10.0.tgz#f1c2797b10060808a20b46fa072c57a466bb5f6a"
integrity sha512-mtecvcE/I4+6fydWXVZrrw1OD/UaiR36IojyIeXqxEg6tI/6pu0DsJhszWF5FeN83dg1qOy24eo4rTNh8WKItQ== integrity sha512-d/Xj1RxoDOL3IN7bdD0ZENjSkbMXcvn+cWLLOi/7XbI+H+elDZS/knAnYLa99j54Mu+odTSXuBy94EwvXbey0w==
dependencies: dependencies:
"@ledgerhq/hw-app-eth" "^5.7.0" "@ledgerhq/hw-app-eth" "^5.7.0"
"@ledgerhq/hw-transport-u2f" "^5.7.0" "@ledgerhq/hw-transport-u2f" "^5.7.0"
"@portis/web3" "^2.0.0-beta.42" "@portis/web3" "^2.0.0-beta.42"
"@toruslabs/torus-embed" "^1.3.0" "@toruslabs/torus-embed" "^1.3.0"
"@unilogin/provider" "^0.5.21" "@unilogin/provider" "^0.5.21"
"@walletconnect/web3-provider" "^1.0.0-beta.47" "@walletconnect/web3-provider" "^1.0.5"
authereum "^0.0.4-beta.157" authereum "^0.0.4-beta.157"
bignumber.js "^9.0.0" bignumber.js "^9.0.0"
bnc-sdk "^2.1.3" bnc-sdk "^2.1.4"
bowser "^2.5.2" bowser "^2.5.2"
ethereumjs-tx "^2.1.2" ethereumjs-tx "^2.1.2"
ethereumjs-util "^6.2.0" ethereumjs-util "^6.2.0"
@ -4109,7 +4108,7 @@ bnc-onboard@1.9.4:
walletlink "^2.0.2" walletlink "^2.0.2"
web3-provider-engine "^15.0.4" web3-provider-engine "^15.0.4"
bnc-sdk@^2.1.3: bnc-sdk@^2.1.4:
version "2.1.4" version "2.1.4"
resolved "https://registry.yarnpkg.com/bnc-sdk/-/bnc-sdk-2.1.4.tgz#23267198f5a48e800d9c2406f6d04a767cab5643" resolved "https://registry.yarnpkg.com/bnc-sdk/-/bnc-sdk-2.1.4.tgz#23267198f5a48e800d9c2406f6d04a767cab5643"
integrity sha512-aU7DYweE+6tfTvZE7NOOfQsieU2Zyrav6o/xwuLt+uKGvrkblIeg1aqBW1yAQBEg4LCHEygX6TwZk8VznDAh3g== integrity sha512-aU7DYweE+6tfTvZE7NOOfQsieU2Zyrav6o/xwuLt+uKGvrkblIeg1aqBW1yAQBEg4LCHEygX6TwZk8VznDAh3g==
@ -17627,6 +17626,7 @@ websocket@^1.0.31:
dependencies: dependencies:
debug "^2.2.0" debug "^2.2.0"
es5-ext "^0.10.50" es5-ext "^0.10.50"
gulp "^4.0.2"
nan "^2.14.0" nan "^2.14.0"
typedarray-to-buffer "^3.1.5" typedarray-to-buffer "^3.1.5"
yaeti "^0.0.6" yaeti "^0.0.6"