From bee401fd8421b91fdf82ceae31b93d081d672a70 Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <jeremy@lbry.io>
Date: Wed, 10 Jul 2019 10:43:55 -0400
Subject: [PATCH 1/2] comment intro

---
 src/ui/component/commentCreate/view.jsx | 77 ++++++++++++-------------
 src/ui/page/file/view.jsx               |  4 +-
 static/locales/en.json                  |  7 ++-
 3 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/src/ui/component/commentCreate/view.jsx b/src/ui/component/commentCreate/view.jsx
index f0da4d393..91d16bda6 100644
--- a/src/ui/component/commentCreate/view.jsx
+++ b/src/ui/component/commentCreate/view.jsx
@@ -36,48 +36,47 @@ export function CommentCreate(props: Props) {
   }
 
   return (
-    <React.Fragment>
+    <section>
       {commentAck !== true && (
-        <section>
-          <div className="card__content">
-            <div className="media__title">About comments..</div>
-          </div>
-          <div className="card__content">
-            <div className="media__subtitle">I acknowledge something.</div>
-          </div>
-          <div className="card__content">
-            <Button button="primary" onClick={handleCommentAck} label={__('Got it!')} />
-          </div>
-        </section>
+        <div className="card__content markdown-preview">
+          <p>A few things to know before participating in the comment alpha:</p>
+          <ul>
+            <li>During the alpha, all comments are sent to a LBRY, Inc. server, not the LBRY network itself.</li>
+            <li>During the alpha, comments are not decentralized or censorship resistant (but we repeat ourselves).</li>
+            <li>
+              When the alpha ends, we will attempt to transition comments, but do not promise to so. Any transition will
+              likely involve publishing previous comments under a single archive handle.
+            </li>
+          </ul>
+          <Button button="primary" onClick={handleCommentAck} label={__('Got it!')} />
+        </div>
       )}
       {commentAck === true && (
-        <section>
-          <Form onSubmit={handleSubmit}>
-            <div className="card__content">
-              <ChannelSection channel={channel} onChannelChange={handleChannelChange} />
-            </div>
-            <div className="card__content">
-              <FormField
-                disabled={channel === CHANNEL_NEW}
-                type="textarea"
-                name="content_description"
-                label={__('Comment')}
-                placeholder={__('Your comment')}
-                value={commentValue}
-                onChange={handleCommentChange}
-              />
-            </div>
-            <div className="card__actions">
-              <Button
-                button="primary"
-                disabled={channel === CHANNEL_NEW || !commentValue.length}
-                type="submit"
-                label={__('Post')}
-              />
-            </div>
-          </Form>
-        </section>
+        <Form onSubmit={handleSubmit}>
+          <div className="card__content">
+            <ChannelSection channel={channel} onChannelChange={handleChannelChange} />
+          </div>
+          <div className="card__content">
+            <FormField
+              disabled={channel === CHANNEL_NEW}
+              type="textarea"
+              name="content_description"
+              label={__('Comment')}
+              placeholder={__('Your comment')}
+              value={commentValue}
+              onChange={handleCommentChange}
+            />
+          </div>
+          <div className="card__actions">
+            <Button
+              button="primary"
+              disabled={channel === CHANNEL_NEW || !commentValue.length}
+              type="submit"
+              label={__('Post')}
+            />
+          </div>
+        </Form>
       )}
-    </React.Fragment>
+    </section>
   );
 }
diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx
index 89df2f8ff..b7af8dfc3 100644
--- a/src/ui/page/file/view.jsx
+++ b/src/ui/page/file/view.jsx
@@ -291,7 +291,9 @@ class FilePage extends React.Component<Props> {
               <ClaimTags uri={uri} type="large" />
               <FileDetails uri={uri} />
 
-              <div className="media__info-title">{__('Comments')}</div>
+              <div className="media__info-title">
+                {__('Comments')} <span className="badge badge--alert">ALPHA</span>
+              </div>
               <CommentCreate uri={uri} />
               <CommentsList uri={uri} />
             </div>
diff --git a/static/locales/en.json b/static/locales/en.json
index 9f01cc257..2ee9a54b5 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -530,5 +530,8 @@
   "Got it": "Got it",
   "View Your Feed": "View Your Feed",
   "View Your Channels": "View Your Channels",
-  "Unfollow": "Unfollow"
-}
+  "Unfollow": "Unfollow",
+  "myChannelName": "myChannelName",
+  "This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.": "This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.",
+  "Create channel": "Create channel"
+}
\ No newline at end of file
-- 
2.45.3


From 339a45f3f14b6a534a2f4743d04a87530e2c399a Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 10 Jul 2019 12:08:01 -0400
Subject: [PATCH 2/2] fix strings and cleanup badge style

---
 src/ui/component/commentCreate/view.jsx | 17 ++++++++++++-----
 src/ui/scss/component/_badge.scss       |  4 ++++
 src/ui/scss/component/_card.scss        |  6 ------
 static/locales/en.json                  |  9 ++++++++-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/ui/component/commentCreate/view.jsx b/src/ui/component/commentCreate/view.jsx
index 91d16bda6..846d371bf 100644
--- a/src/ui/component/commentCreate/view.jsx
+++ b/src/ui/component/commentCreate/view.jsx
@@ -39,13 +39,20 @@ export function CommentCreate(props: Props) {
     <section>
       {commentAck !== true && (
         <div className="card__content markdown-preview">
-          <p>A few things to know before participating in the comment alpha:</p>
+          <p>{__('A few things to know before participating in the comment alpha:')}</p>
           <ul>
-            <li>During the alpha, all comments are sent to a LBRY, Inc. server, not the LBRY network itself.</li>
-            <li>During the alpha, comments are not decentralized or censorship resistant (but we repeat ourselves).</li>
             <li>
-              When the alpha ends, we will attempt to transition comments, but do not promise to so. Any transition will
-              likely involve publishing previous comments under a single archive handle.
+              {__('During the alpha, all comments are sent to a LBRY, Inc. server, not the LBRY network itself.')}
+            </li>
+            <li>
+              {__(
+                'During the alpha, comments are not decentralized or censorship resistant (but we repeat ourselves).'
+              )}
+            </li>
+            <li>
+              {__(
+                'When the alpha ends, we will attempt to transition comments, but do not promise to do so. Any transition will likely involve publishing previous comments under a single archive handle.'
+              )}
             </li>
           </ul>
           <Button button="primary" onClick={handleCommentAck} label={__('Got it!')} />
diff --git a/src/ui/scss/component/_badge.scss b/src/ui/scss/component/_badge.scss
index e320d5daf..51b180243 100644
--- a/src/ui/scss/component/_badge.scss
+++ b/src/ui/scss/component/_badge.scss
@@ -1,5 +1,9 @@
 @import '~@lbry/components/sass/badge/_index.scss';
 
+.badge {
+  vertical-align: middle;
+}
+
 .badge--tag {
   @extend .badge;
   background-color: lighten($lbry-teal-5, 55%);
diff --git a/src/ui/scss/component/_card.scss b/src/ui/scss/component/_card.scss
index 0832d00f4..f20891696 100644
--- a/src/ui/scss/component/_card.scss
+++ b/src/ui/scss/component/_card.scss
@@ -179,12 +179,6 @@
     margin-bottom: var(--spacing-small);
   }
 
-  .badge {
-    bottom: -0.12rem;
-    position: relative;
-    margin-left: 0;
-  }
-
   [data-mode='dark'] & {
     background-color: darken($lbry-gray-5, 20%);
   }
diff --git a/static/locales/en.json b/static/locales/en.json
index 2ee9a54b5..7f95cf6f3 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -533,5 +533,12 @@
   "Unfollow": "Unfollow",
   "myChannelName": "myChannelName",
   "This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.": "This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.",
-  "Create channel": "Create channel"
+  "Create channel": "Create channel",
+  "Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.": "Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.",
+  "If you still have issues, your anti-virus software or firewall may be preventing startup.": "If you still have issues, your anti-virus software or firewall may be preventing startup.",
+  "Reach out to hello@lbry.com for help, or check out": "Reach out to hello@lbry.com for help, or check out",
+  "A few things to know before participating in the comment alpha:": "A few things to know before participating in the comment alpha:",
+  "During the alpha, all comments are sent to a LBRY, Inc. server, not the LBRY network itself.": "During the alpha, all comments are sent to a LBRY, Inc. server, not the LBRY network itself.",
+  "During the alpha, comments are not decentralized or censorship resistant (but we repeat ourselves).": "During the alpha, comments are not decentralized or censorship resistant (but we repeat ourselves).",
+  "When the alpha ends, we will attempt to transition comments, but do not promise to do so. Any transition will likely involve publishing previous comments under a single archive handle.": "When the alpha ends, we will attempt to transition comments, but do not promise to do so. Any transition will likely involve publishing previous comments under a single archive handle."
 }
\ No newline at end of file
-- 
2.45.3