From 6284fb8b32b55ca77b79fad9958cd642c6cb67d4 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Thu, 23 May 2019 11:50:57 +0200
Subject: [PATCH] tandard

---
 src/app/ui/tooltip.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/app/ui/tooltip.js b/src/app/ui/tooltip.js
index b568326021..b49f70ae57 100644
--- a/src/app/ui/tooltip.js
+++ b/src/app/ui/tooltip.js
@@ -25,6 +25,7 @@ class Toaster {
   }
   render (tooltipText, actionElement, opts) {
     opts = defaultOptions(opts)
+<<<<<<< HEAD
     let canShorten = true
     if (tooltipText instanceof Element) {
       canShorten = false
@@ -37,6 +38,19 @@ class Toaster {
             tooltipText = JSON.stringify(tooltipText)
           } catch (e) {
           }
+=======
+    if (typeof (tooltipText) === 'object' && tooltipText.message !== undefined) {
+      tooltipText = tooltipText.message
+    }
+
+    if (typeof tooltipText === 'object') {
+      if (tooltipText.message) {
+        tooltipText = tooltipText.message
+      } else {
+        try {
+          tooltipText = JSON.stringify(tooltipText)
+        } catch (e) {
+>>>>>>> c2943a2b... tandard
         }
       }
     }