Add alternate UI for pending personal_sign messages

2 files changed, 12 insertions, 14 deletions

diff --git a/ui/app/components/pending-personal-msg.js b/ui/app/components/pending-personal-msg.js
index b2cac164a..f4bde91dc 100644
--- a/ui/app/components/pending-personal-msg.js
+++ b/ui/app/components/pending-personal-msg.js
@@ -28,15 +28,6 @@ PendingMsg.prototype.render = function () {
         },
       }, 'Sign Message'),
 
-      h('.error', {
-        style: {
-          margin: '10px',
-        },
-      }, `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.`),
-
       // message details
       h(PendingTxDetails, state),
 
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 672ea54ae..571ae85b6 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -118,18 +118,25 @@ ConfirmTxScreen.prototype.render = function () {
 }
 
 function currentTxView (opts) {
+  log.info('rendering current tx view')
   const { txData } = opts
-  const { txParams, msgParams } = txData
+  const { txParams, msgParams, type } = txData
 
-  log.info('rendering current tx view')
   if (txParams) {
-    // This is a pending transaction
     log.debug('txParams detected, rendering pending tx')
     return h(PendingTx, opts)
+
   } else if (msgParams) {
-    // This is a pending message to sign
     log.debug('msgParams detected, rendering pending msg')
-    return h(PendingMsg, opts)
+
+    if (type === 'eth_sign') {
+      log.debug('rendering eth_sign message')
+      return h(PendingMsg, opts)
+
+    } else if (type === 'personal_sign') {
+      log.debug('rendering personal_sign message')
+      return h(PendingPersonalMsg, opts)
+    }
   }
 }
 ConfirmTxScreen.prototype.checkBalanceAgainstTx = function (txData) {