From e56c21fd22d73afa4be1922e5404545c005a25f8 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Tue, 22 May 2018 23:48:22 -0400
Subject: [PATCH] use color prop for icon color instead of relying on type of
 icon and tooltip cleanup

---
 src/renderer/component/button/view.jsx        |  6 +++--
 src/renderer/component/categoryList/view.jsx  |  1 -
 src/renderer/component/common/icon.jsx        | 23 ++++++++++++++-----
 src/renderer/component/common/tooltip.jsx     |  9 +++-----
 src/renderer/component/fileActions/view.jsx   |  1 +
 src/renderer/component/fileCard/view.jsx      |  2 +-
 .../component/fileDownloadLink/view.jsx       |  9 +++++++-
 .../component/subscribeButton/view.jsx        |  3 ++-
 src/renderer/page/file/view.jsx               |  4 ++--
 src/renderer/scss/component/_file-list.scss   |  4 ++++
 10 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/renderer/component/button/view.jsx b/src/renderer/component/button/view.jsx
index f622ff28a..8b496ea12 100644
--- a/src/renderer/component/button/view.jsx
+++ b/src/renderer/component/button/view.jsx
@@ -22,6 +22,7 @@ type Props = {
   button: ?string, // primary, secondary, alt, link
   noPadding: ?boolean, // to remove padding and allow circular buttons
   uppercase: ?boolean,
+  iconColor: ?string,
 };
 
 class Button extends React.PureComponent<Props> {
@@ -48,6 +49,7 @@ class Button extends React.PureComponent<Props> {
       type,
       noPadding,
       uppercase,
+      iconColor,
       ...otherProps
     } = this.props;
 
@@ -82,10 +84,10 @@ class Button extends React.PureComponent<Props> {
 
     const content = (
       <span className="btn__content">
-        {icon && <Icon icon={icon} />}
+        {icon && <Icon icon={icon} iconColor={iconColor} />}
         {label && <span className="btn__label">{label}</span>}
         {children && children}
-        {iconRight && <Icon icon={iconRight} />}
+        {iconRight && <Icon icon={iconRight} iconColor={iconColor} />}
       </span>
     );
 
diff --git a/src/renderer/component/categoryList/view.jsx b/src/renderer/component/categoryList/view.jsx
index 56c69f4c9..0afa57940 100644
--- a/src/renderer/component/categoryList/view.jsx
+++ b/src/renderer/component/categoryList/view.jsx
@@ -223,7 +223,6 @@ class CategoryList extends React.PureComponent<Props, State> {
             {category &&
               category.match(/^community/i) && (
                 <ToolTip
-                  direction="bottom"
                   label={__("What's this?")}
                   body={__(
                     'Community Content is a public space where anyone can share content with the rest of the LBRY community. Bid on the names "one," "two," "three," "four" and "five" to put your content here!'
diff --git a/src/renderer/component/common/icon.jsx b/src/renderer/component/common/icon.jsx
index a5a0c03e4..36810b721 100644
--- a/src/renderer/component/common/icon.jsx
+++ b/src/renderer/component/common/icon.jsx
@@ -9,7 +9,8 @@ const PURPLE_COLOR = '#8165b0';
 
 type Props = {
   icon: string,
-  tooltip: ?string, // tooltip direction
+  tooltip?: string, // tooltip direction
+  iconColor?: string,
 };
 
 class IconComponent extends React.PureComponent<Props> {
@@ -23,8 +24,20 @@ class IconComponent extends React.PureComponent<Props> {
         return null;
     }
   };
+
+  getIconColor = (color: string) => {
+    switch (color) {
+      case 'red':
+        return RED_COLOR;
+      case 'purple':
+        return PURPLE_COLOR;
+      default:
+        return null;
+    }
+  };
+
   render() {
-    const { icon, tooltip } = this.props;
+    const { icon, tooltip, iconColor } = this.props;
     const Icon = FeatherIcons[icon];
 
     if (!Icon) {
@@ -32,10 +45,8 @@ class IconComponent extends React.PureComponent<Props> {
     }
 
     let color;
-    if (icon === icons.TRASH || icon === icons.FEATURED) {
-      color = RED_COLOR;
-    } else if (icon === icons.OPEN) {
-      color = PURPLE_COLOR;
+    if (iconColor) {
+      color = this.getIconColor(iconColor);
     }
 
     let size = 14;
diff --git a/src/renderer/component/common/tooltip.jsx b/src/renderer/component/common/tooltip.jsx
index f1c5ca893..4bd264516 100644
--- a/src/renderer/component/common/tooltip.jsx
+++ b/src/renderer/component/common/tooltip.jsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import classnames from 'classnames';
 
 type Props = {
-  body: ?string,
+  body: string,
   label?: string,
   children: ?React.Node,
   icon: ?boolean,
@@ -12,7 +12,7 @@ type Props = {
 
 class ToolTip extends React.PureComponent<Props> {
   static defaultProps = {
-    direction: 'top',
+    direction: 'bottom',
   };
 
   render() {
@@ -32,10 +32,7 @@ class ToolTip extends React.PureComponent<Props> {
         })}
       >
         {tooltipContent}
-        {body && (
-          // body may be undefined for some icons until we add messages for them
-          <span className="tooltip__body">{body}</span>
-        )}
+        <span className="tooltip__body">{body}</span>
       </span>
     );
   }
diff --git a/src/renderer/component/fileActions/view.jsx b/src/renderer/component/fileActions/view.jsx
index a485cc90e..4ab110fca 100644
--- a/src/renderer/component/fileActions/view.jsx
+++ b/src/renderer/component/fileActions/view.jsx
@@ -30,6 +30,7 @@ class FileActions extends React.PureComponent<Props> {
           <Button
             button="alt"
             icon={icons.TRASH}
+            iconColor="red"
             label={__('Delete')}
             onClick={() => openModal({ id: MODALS.CONFIRM_FILE_REMOVE }, { uri })}
           />
diff --git a/src/renderer/component/fileCard/view.jsx b/src/renderer/component/fileCard/view.jsx
index 460006f70..eae87deaa 100644
--- a/src/renderer/component/fileCard/view.jsx
+++ b/src/renderer/component/fileCard/view.jsx
@@ -105,7 +105,7 @@ class FileCard extends React.PureComponent<Props> {
                 <React.Fragment>
                   <UriIndicator uri={uri} link />
                   <div>
-                    {isRewardContent && <Icon icon={icons.FEATURED} />}
+                    {isRewardContent && <Icon iconColor="red" icon={icons.FEATURED} />}
                     {fileInfo && <Icon icon={icons.LOCAL} />}
                   </div>
                 </React.Fragment>
diff --git a/src/renderer/component/fileDownloadLink/view.jsx b/src/renderer/component/fileDownloadLink/view.jsx
index 8acc17db3..8d96624f8 100644
--- a/src/renderer/component/fileDownloadLink/view.jsx
+++ b/src/renderer/component/fileDownloadLink/view.jsx
@@ -76,6 +76,7 @@ class FileDownloadLink extends React.PureComponent<Props> {
           button="alt"
           label={__('Download')}
           icon={icons.DOWNLOAD}
+          iconColor="purple"
           onClick={() => {
             purchaseUri(uri);
           }}
@@ -83,7 +84,13 @@ class FileDownloadLink extends React.PureComponent<Props> {
       );
     } else if (fileInfo && fileInfo.download_path) {
       return (
-        <Button button="alt" label={__('Open File')} icon={icons.OPEN} onClick={() => openFile()} />
+        <Button
+          button="alt"
+          iconColor="purple"
+          label={__('Open File')}
+          icon={icons.OPEN}
+          onClick={() => openFile()}
+        />
       );
     }
 
diff --git a/src/renderer/component/subscribeButton/view.jsx b/src/renderer/component/subscribeButton/view.jsx
index 5366d107a..a29b8bb4a 100644
--- a/src/renderer/component/subscribeButton/view.jsx
+++ b/src/renderer/component/subscribeButton/view.jsx
@@ -37,8 +37,9 @@ export default (props: Props) => {
 
   return channelName && uri ? (
     <Button
+      iconColor="red"
       icon={isSubscribed ? undefined : icons.HEART}
-      button={isSubscribed ? 'alt' : 'secondary'}
+      button="alt"
       label={subscriptionLabel}
       onClick={() => {
         if (!subscriptions.length) {
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index 55a85904a..4071e9125 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -41,7 +41,7 @@ type Props = {
   openModal: ({ id: string }, { uri: string }) => void,
   fetchFileInfo: string => void,
   fetchCostInfo: string => void,
-  prepareEdit: ({}) => void,
+  prepareEdit: ({}, string) => void,
   setClientSetting: (string, boolean | string) => void,
   checkSubscription: ({ channelName: string, uri: string }) => void,
   subscriptions: Array<Subscription>,
@@ -158,7 +158,7 @@ class FilePage extends React.Component<Props> {
                 <h1 className="card__title card__title--file">{title}</h1>
                 <div className="card__title-identity-icons">
                   <FilePrice uri={normalizeURI(uri)} />
-                  {isRewardContent && <Icon tooltip="bottom" icon={icons.FEATURED} />}
+                  {isRewardContent && <Icon iconColor="red" tooltip="bottom" icon={icons.FEATURED} />}
                 </div>
               </div>
               <span className="card__subtitle card__subtitle--file">
diff --git a/src/renderer/scss/component/_file-list.scss b/src/renderer/scss/component/_file-list.scss
index 72cee988f..30b2de303 100644
--- a/src/renderer/scss/component/_file-list.scss
+++ b/src/renderer/scss/component/_file-list.scss
@@ -14,6 +14,10 @@
 .file-list__header {
   margin-top: $spacing-vertical * 4/3;
   font-size: 18px;
+
+  .tooltip {
+    margin-left: 5px;
+  }
 }
 
 .file-tile {