From 800cc4318a71387767fb53f6a85a89d8cccc3c80 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Sun, 10 Dec 2017 13:26:21 -0500
Subject: [PATCH 1/4] add @icon to subscribe button

---
 src/renderer/component/link/view.jsx            | 4 +++-
 src/renderer/component/subscribeButton/view.jsx | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/component/link/view.jsx b/src/renderer/component/link/view.jsx
index c9355f84d..cfb2a731b 100644
--- a/src/renderer/component/link/view.jsx
+++ b/src/renderer/component/link/view.jsx
@@ -8,6 +8,7 @@ const Link = props => {
     style,
     label,
     icon,
+    iconRight,
     button,
     disabled,
     children,
@@ -36,8 +37,9 @@ const Link = props => {
   } else {
     content = (
       <span {...("button" in props ? { className: "button__content" } : {})}>
-        {"icon" in props ? <Icon icon={icon} fixed={true} /> : null}
+        {icon ? <Icon icon={icon} fixed={true} /> : null}
         {label ? <span className="link-label">{label}</span> : null}
+        {iconRight ? <Icon icon={iconRight} fixed={true} /> : null}
       </span>
     );
   }
diff --git a/src/renderer/component/subscribeButton/view.jsx b/src/renderer/component/subscribeButton/view.jsx
index 4f8e1a72a..c4c08628c 100644
--- a/src/renderer/component/subscribeButton/view.jsx
+++ b/src/renderer/component/subscribeButton/view.jsx
@@ -23,6 +23,7 @@ export default ({
   return channelName && uri ? (
     <div className="card__actions">
       <Link
+        iconRight={isSubscribed ? "" : "at"}
         button={isSubscribed ? "alt" : "primary"}
         label={subscriptionLabel}
         onClick={() => subscriptionHandler({

From 343961679d0cb567df86ad2df45dfffc918b1ea8 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Sun, 10 Dec 2017 13:32:05 -0500
Subject: [PATCH 2/4] add link style to channel on subscriptions page

---
 src/renderer/page/discover/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/page/discover/view.jsx b/src/renderer/page/discover/view.jsx
index 0277d92d0..47919e542 100644
--- a/src/renderer/page/discover/view.jsx
+++ b/src/renderer/page/discover/view.jsx
@@ -182,7 +182,7 @@ export class FeaturedCategory extends React.PureComponent {
         <h3 className="card-row__header">
           {categoryLink ? (
             <Link
-              className="no-underline"
+              className="button-text no-underline"
               label={category}
               navigate="/show"
               navigateParams={{ uri: categoryLink }}

From 4f82fd77af7c0444f41e5e86ce8efc31b28a25bf Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Sun, 10 Dec 2017 13:33:14 -0500
Subject: [PATCH 3/4] don't touch you

---
 src/renderer/modal/modalEmailCollection/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/modal/modalEmailCollection/view.jsx b/src/renderer/modal/modalEmailCollection/view.jsx
index 8c0c40555..422c4c080 100644
--- a/src/renderer/modal/modalEmailCollection/view.jsx
+++ b/src/renderer/modal/modalEmailCollection/view.jsx
@@ -33,7 +33,7 @@ class ModalEmailCollection extends React.PureComponent {
       <Modal type="custom" isOpen={true} contentLabel="Email">
         <section>
           <h3 className="modal__header">
-            Can We <strike>Touch You</strike> Stay In Touch?
+            Can We Stay In Touch?
           </h3>
           {this.renderInner()}
         </section>

From 206b2794e8986bb3c605e7558b4b42a2c1996930 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Sun, 10 Dec 2017 13:56:34 -0500
Subject: [PATCH 4/4] fix height for shapeshift tx info

---
 src/renderer/scss/component/_shapeshift.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/scss/component/_shapeshift.scss b/src/renderer/scss/component/_shapeshift.scss
index cb69676a7..6e12a0522 100644
--- a/src/renderer/scss/component/_shapeshift.scss
+++ b/src/renderer/scss/component/_shapeshift.scss
@@ -13,7 +13,7 @@
 }
 
 .shapeshift__tx-info {
-  min-height: 55px;
+  min-height: 63px;
 }
 
 .shapeshift__deposit-address-wrapper {