Merge remote-tracking branch 'origin/develop' into fix/#194-ETH-class…

…ic-styles-changes
omni · Mar 27, 2019 · ff7b7f0 · ff7b7f0
2 parents aab6c61 + bb5f96c
commit ff7b7f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 31 deletions.
diff --git a/public/index.html b/public/index.html
@@ -13,28 +13,7 @@
         <link href="https://fonts.googleapis.com/css?family=Nunito:300,400,700" rel="stylesheet">
         <link rel="manifest" href="%PUBLIC_URL%/favicons/manifest.json">
         <link rel="shortcut icon" href="%PUBLIC_URL%/favicons/favicon.ico">
-        <title>POA Bridge UI app</title>
-        <!-- Start of poanet Zendesk Widget script -->
-        <script>
-            /*<![CDATA[*/
-            window.zE || (function(e, t, s) {
-                var n = window.zE = window.zEmbed = function() {
-                        n._.push(arguments)
-                    },
-                    a = n.s = e.createElement(t),
-                    r = e.getElementsByTagName(t)[0];
-                n.set = function(e) {
-                    n.set._.push(e)
-                }, n._ = [], n.set._ = [], a.async = true, a.setAttribute("charset", "utf-8"), a.src = "https://static.zdassets.com/ekr/asset_composer.js?key=" + s, n.t = +new Date, a.type = "text/javascript", r.parentNode.insertBefore(a,
-                    r)
-            })(document, "script", "bb7f35c0-88a9-46f8-8807-01dd723665ea"); /*]]>*/
-        </script>
-        <!-- End of poanet Zendesk Widget script -->
-        <style>
-            #launcher {
-                bottom: 90px !important;
-            }
-        </style>
+        <title>TokenBridge UI app</title>
     </head>
 
     <body>

diff --git a/src/components/Disclaimer.js b/src/components/Disclaimer.js
@@ -7,23 +7,24 @@ export const Disclaimer = ({ onConfirmation }) => (
       <img className="disclaimer-icon" src={disclaimerIcon} alt="disclaimer icon"/>
     </div>
     <div className="alert-container">
-      <span className="disclaimer-title">Welcome to <br/> POA Bridge UI App Beta+</span>
+      <span className="disclaimer-title">Welcome to the<br/> TokenBridge UI App Beta+</span>
       <p className="disclaimer-description">
-        We’re launching our POA Bridge and our UI App on a beta-testing basis. While we’ve
+        We’re launching our TokenBridge and our UI App on a beta-testing basis. While we’ve
         worked long and hard to develop the core features of the software, we expect that our
-        users may detect bugs and other issues. Help us improve by submitting tickets to our
-        <a href="https://poanet.zendesk.com/hc/en-us/categories/360000349273-POA-Bridge" target="_blank"
-           rel="noopener noreferrer"> support page</a>.
+        users may detect bugs and other issues. Help us improve by posting any difficulties to our
+        <a href="https://forum.poa.network/c/support/tokenbridge-support" target="_blank"
+          rel="noopener noreferrer"> support page</a>.
         <br/>
         <br/>
-        Use of this app and the POA Bridge is at your own risk. Users may experience
+        Use of this app and the TokenBridge is at your own risk. Users may experience
         unexpected delays, unexpected visual artifacts, unexpected loss of tokens or funds from
         improper app configuration, or other negative outcomes.
         <br/>
         <br/>
-        By hitting the "continue" button, you are representing that you’ve read our <a
-        href="https://poanet.zendesk.com/hc/en-us/articles/360004054794-Terms-and-Conditions-of-The-POA-Bridge"
-        target="_blank" rel="noopener noreferrer">Terms of
+        By hitting the "continue" button, you are representing that you’ve read our
+        <a
+          href="https://forum.poa.network/t/end-user-licensing-agreement-and-terms-of-service/2197"
+          target="_blank" rel="noopener noreferrer">Terms of
         Service</a> in full, and that you agree to be legally bound by them.
       </p>
       <div className="disclaimer-buttons">