From 7271d465e10c472534babd86d14010456481df23 Mon Sep 17 00:00:00 2001 From: nicosampler Date: Fri, 26 Jun 2020 11:10:05 -0300 Subject: [PATCH 1/4] Fix: Sapp confirmTXs modal width. --- src/components/TextBox/index.tsx | 4 ++-- src/routes/safe/components/Apps/confirmTransactions.tsx | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/TextBox/index.tsx b/src/components/TextBox/index.tsx index fe83677f..09f01ebe 100644 --- a/src/components/TextBox/index.tsx +++ b/src/components/TextBox/index.tsx @@ -9,8 +9,8 @@ const Box = styled.p` border: solid 2px ${border}; ` -const TextBox = ({ children }: any) => { - return {children} +const TextBox = ({ children, ...rest }: { children: React.ReactNode }): React.ReactElement => { + return {children} } export default TextBox diff --git a/src/routes/safe/components/Apps/confirmTransactions.tsx b/src/routes/safe/components/Apps/confirmTransactions.tsx index b1afcf8d..f5ad686c 100644 --- a/src/routes/safe/components/Apps/confirmTransactions.tsx +++ b/src/routes/safe/components/Apps/confirmTransactions.tsx @@ -54,6 +54,10 @@ const IconText = styled.div` margin-right: 4px; } ` +const StyledTextBox = styled(TextBox)` + max-width: 444px; +` + const isTxValid = (t: SafeAppTx): boolean => { if (!['string', 'number'].includes(typeof t.value)) { return false @@ -111,7 +115,7 @@ const confirmTransactions = (
Data (hex encoded)* - {tx.data} + {tx.data}
From ecf9e1dd79812193033dfbd13047fd1063ef53af Mon Sep 17 00:00:00 2001 From: nicosampler Date: Fri, 26 Jun 2020 12:19:29 -0300 Subject: [PATCH 2/4] explicitly type classNames --- src/components/TextBox/index.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/TextBox/index.tsx b/src/components/TextBox/index.tsx index 09f01ebe..a9a8ef01 100644 --- a/src/components/TextBox/index.tsx +++ b/src/components/TextBox/index.tsx @@ -9,7 +9,12 @@ const Box = styled.p` border: solid 2px ${border}; ` -const TextBox = ({ children, ...rest }: { children: React.ReactNode }): React.ReactElement => { +type Props = { + children: React.ReactNode + classNames?: string +} + +const TextBox = ({ children, ...rest }: Props): React.ReactElement => { return {children} } From 5ddb48741155421119119b23003302e8665f1b48 Mon Sep 17 00:00:00 2001 From: nicosampler Date: Fri, 26 Jun 2020 12:29:01 -0300 Subject: [PATCH 3/4] typo --- src/components/TextBox/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TextBox/index.tsx b/src/components/TextBox/index.tsx index a9a8ef01..db34972a 100644 --- a/src/components/TextBox/index.tsx +++ b/src/components/TextBox/index.tsx @@ -11,7 +11,7 @@ const Box = styled.p` type Props = { children: React.ReactNode - classNames?: string + className?: string } const TextBox = ({ children, ...rest }: Props): React.ReactElement => { From 222ace288cd3091ad019aefeb19d24d9ea1f10e4 Mon Sep 17 00:00:00 2001 From: Mati Dastugue Date: Mon, 29 Jun 2020 09:33:56 -0300 Subject: [PATCH 4/4] Bump onboardjs version (#1049) Co-authored-by: Mati Dastugue Co-authored-by: Mikhail Mikheev --- package.json | 2 +- yarn.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 32d9d3ae..1e969774 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "async-sema": "^3.1.0", "axios": "0.19.2", "bignumber.js": "9.0.0", - "bnc-onboard": "1.9.4", + "bnc-onboard": "1.10.0", "classnames": "^2.2.6", "concurrently": "^5.2.0", "connected-react-router": "6.8.0", diff --git a/yarn.lock b/yarn.lock index 0bc94691..5195d5ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2396,7 +2396,7 @@ "@restless/sanitizers" "^0.2.4" reactive-properties "^0.1.11" -"@walletconnect/client@^1.0.11": +"@walletconnect/client@^1.0.5": version "1.0.11" resolved "https://registry.yarnpkg.com/@walletconnect/client/-/client-1.0.11.tgz#ee58d2662e433cb67c5d2157c1b4525f864ab6ec" integrity sha512-NVMDRUuLMqRPmzR7xjVfRcuXegvrCTtzuVyU8iYEnriZ3fFZcFj3PWVzN44RvLYQ4yUxWzeUkXIVRmmecOLMbQ== @@ -2415,7 +2415,7 @@ "@walletconnect/types" "^1.0.11" "@walletconnect/utils" "^1.0.11" -"@walletconnect/http-connection@^1.0.11": +"@walletconnect/http-connection@^1.0.5": version "1.0.11" resolved "https://registry.yarnpkg.com/@walletconnect/http-connection/-/http-connection-1.0.11.tgz#3c00ab02b4e6f4ffa1aa346b19569e585609dfa2" 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" integrity sha512-E78BfSr4RNSUPl/4Qpfg4bPO+QynMqUj55X20S41z1aGIYhXNM33sUVWGkbxO5rHuHYLB9Z5O/ob0sENKCXAfA== -"@walletconnect/qrcode-modal@^1.0.11": +"@walletconnect/qrcode-modal@^1.0.5": version "1.0.11" resolved "https://registry.yarnpkg.com/@walletconnect/qrcode-modal/-/qrcode-modal-1.0.11.tgz#5b34d583c034aed74307350797c66ddce6193744" integrity sha512-GsSQ/E3ixBEiQz3EOFypW2FCFIS6G37crpJunkLhefi9w2/CMeQ5bk4SIFKyGsAv6uEtwAcPVh7tNkoiGEsb2A== @@ -2457,7 +2457,7 @@ "@walletconnect/types" "^1.0.11" ws "7.3.0" -"@walletconnect/types@^1.0.11": +"@walletconnect/types@^1.0.11", "@walletconnect/types@^1.0.5": version "1.0.11" resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-1.0.11.tgz#6dd23eb3a8dd2824f76cc2c54217ecca8229d0a2" integrity sha512-ysIQI6DsMELQAAt5zk2ZMKKyOwgk+XP4KeOhmDk+sIQskBugFl0ARl5iQZzGz9pcrHdlg1Fi7ucGw3UaExqIVA== @@ -2472,16 +2472,15 @@ enc-utils "2.1.0" js-sha3 "0.8.0" -"@walletconnect/web3-provider@^1.0.0-beta.47": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.0.11.tgz#462d84808379f5ec8747e46de217286d61837620" - integrity sha512-ppzYwfrVtl5j8zMOPl07v5w+Gb0ptspQm3TGUqVVClaIdXt96uCBBPxwi5bZa4pSXVKgJvI9EbKzaqUS8kVsyQ== +"@walletconnect/web3-provider@^1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@walletconnect/web3-provider/-/web3-provider-1.0.5.tgz#c7e3d1a1449b3f1fd6125e3fabd361394dd1ecdd" + integrity sha512-oxrkE1kMZl7mlno7lmupLZS+slDC83nZh5UbE4B2Gr0aOTfT1lqyQMkvSXYOcl0fjR+p0x6iJ4sh0nvhV6Loug== dependencies: - "@walletconnect/client" "^1.0.11" - "@walletconnect/http-connection" "^1.0.11" - "@walletconnect/qrcode-modal" "^1.0.11" - "@walletconnect/types" "^1.0.11" - "@walletconnect/utils" "^1.0.11" + "@walletconnect/client" "^1.0.5" + "@walletconnect/http-connection" "^1.0.5" + "@walletconnect/qrcode-modal" "^1.0.5" + "@walletconnect/types" "^1.0.5" web3-provider-engine "15.0.7" "@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" integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA== -bnc-onboard@1.9.4: - version "1.9.4" - resolved "https://registry.yarnpkg.com/bnc-onboard/-/bnc-onboard-1.9.4.tgz#c70c41652234009708e3a2334ab064a3a4c008c3" - integrity sha512-mtecvcE/I4+6fydWXVZrrw1OD/UaiR36IojyIeXqxEg6tI/6pu0DsJhszWF5FeN83dg1qOy24eo4rTNh8WKItQ== +bnc-onboard@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/bnc-onboard/-/bnc-onboard-1.10.0.tgz#f1c2797b10060808a20b46fa072c57a466bb5f6a" + integrity sha512-d/Xj1RxoDOL3IN7bdD0ZENjSkbMXcvn+cWLLOi/7XbI+H+elDZS/knAnYLa99j54Mu+odTSXuBy94EwvXbey0w== dependencies: "@ledgerhq/hw-app-eth" "^5.7.0" "@ledgerhq/hw-transport-u2f" "^5.7.0" "@portis/web3" "^2.0.0-beta.42" "@toruslabs/torus-embed" "^1.3.0" "@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" bignumber.js "^9.0.0" - bnc-sdk "^2.1.3" + bnc-sdk "^2.1.4" bowser "^2.5.2" ethereumjs-tx "^2.1.2" ethereumjs-util "^6.2.0" @@ -4109,7 +4108,7 @@ bnc-onboard@1.9.4: walletlink "^2.0.2" web3-provider-engine "^15.0.4" -bnc-sdk@^2.1.3: +bnc-sdk@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/bnc-sdk/-/bnc-sdk-2.1.4.tgz#23267198f5a48e800d9c2406f6d04a767cab5643" integrity sha512-aU7DYweE+6tfTvZE7NOOfQsieU2Zyrav6o/xwuLt+uKGvrkblIeg1aqBW1yAQBEg4LCHEygX6TwZk8VznDAh3g== @@ -17263,9 +17262,9 @@ web3-provider-engine@^15.0.4: xhr "^2.2.0" xtend "^4.0.1" -"web3-provider-engine@git+https://github.com/trufflesuite/provider-engine.git#web3-one": +"web3-provider-engine@https://github.com/trufflesuite/provider-engine#web3-one": version "14.0.6" - resolved "git+https://github.com/trufflesuite/provider-engine.git#9694f5b4e5500651bd2ff689df8529bb5cf6b96f" + resolved "https://github.com/trufflesuite/provider-engine#9694f5b4e5500651bd2ff689df8529bb5cf6b96f" dependencies: async "^2.5.0" backoff "^2.5.0" @@ -17627,6 +17626,7 @@ websocket@^1.0.31: dependencies: debug "^2.2.0" es5-ext "^0.10.50" + gulp "^4.0.2" nan "^2.14.0" typedarray-to-buffer "^3.1.5" yaeti "^0.0.6"