aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pending-msg.js
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-09-06 00:03:44 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-09-06 00:03:44 +0800
commite647337a8a34d8fb4b5a8081888ec32ce5fd27a0 (patch)
tree2060fcf05407d4cec876332a70d25418237a724d /ui/app/components/pending-msg.js
parent45fc1d6ec356232e51fe4a9cc1f01929e35e8014 (diff)
parent2885a9547187ce1ad0fb3bed1935387d901942a8 (diff)
downloadtangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.gz
tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.tar.zst
tangerine-wallet-browser-e647337a8a34d8fb4b5a8081888ec32ce5fd27a0.zip
Resolve merge conflict from master
Diffstat (limited to 'ui/app/components/pending-msg.js')
-rw-r--r--ui/app/components/pending-msg.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/app/components/pending-msg.js b/ui/app/components/pending-msg.js
index b2cac164a..b7133cda8 100644
--- a/ui/app/components/pending-msg.js
+++ b/ui/app/components/pending-msg.js
@@ -18,6 +18,9 @@ PendingMsg.prototype.render = function () {
h('div', {
key: msgData.id,
+ style: {
+ maxWidth: '350px',
+ },
}, [
// header
@@ -35,7 +38,7 @@ PendingMsg.prototype.render = function () {
}, `Signing this message can have
dangerous side effects. Only sign messages from
sites you fully trust with your entire account.
- This will be fixed in a future version.`),
+ This dangerous method will be removed in a future version.`),
// message details
h(PendingTxDetails, state),