PR cleanup

src/ui/component/rewardTotal/view.jsx

@@ -10,7 +10,8 @@ type Props = {
 function RewardTotal(props: Props) {
   const { rewards } = props;
   const rewardTotal = rewards.reduce((acc, val) => acc + val.reward_amount, 0);
-  const total = useTween(rewardTotal * 40);
+  const modifier = rewardTotal > 500 ? 1 : 15; // used to tweak the reward count speed
+  const total = useTween(rewardTotal * modifier);
   const integer = Math.round(total * rewardTotal);
 
   return (

src/ui/page/file/view.jsx

@@ -272,10 +272,7 @@ class FilePage extends React.Component<Props> {
             </div>
           </div>
 
-          <div
+          <div className="media__actions media__actions--between">
-            className="media__actions media__actions--between"
-            style={{ marginTop: '1rem', paddingTop: '1rem', borderTop: '1px solid #ddd' }}
-          >
             <div className="media__subtext media__subtext--large">
               <DateTime uri={uri} show={DateTime.SHOW_DATE} />
             </div>
@@ -293,8 +290,6 @@ class FilePage extends React.Component<Props> {
 
           <div className="media__info--large">
             <ClaimTags uri={uri} type="large" />
-          </div>
-          <div className="media__info--large">
             <FileDetails uri={uri} />
 
             <div className="media__info-title">{__('Comments')}</div>

src/ui/page/wallet/view.jsx

@@ -8,7 +8,7 @@ import UnsupportedOnWeb from 'component/common/unsupported-on-web';
 
 const WalletPage = () => (
   <Page>
-    {IS_WEB && <UnsupportedOnWeb />}
+    <UnsupportedOnWeb />
     <div className={IS_WEB && 'card--disabled'}>
       <WalletBalance />
       <TransactionListRecent />

src/ui/scss/component/_button.scss

@@ -19,11 +19,6 @@
 }
 
 .button--primary {
-  &:not(:hover) {
-    // fix this in components repo
-    background-color: $lbry-teal-4;
-  }
-
   &:hover {
     background-color: $lbry-teal-3;
   }

src/ui/scss/component/_file-properties.scss

@@ -23,7 +23,7 @@
 .file-properties--large {
   flex-wrap: wrap;
   font-size: 18px;
-  margin: var(--spacing-small) 0;
+  margin: var(--spacing-medium) 0;
 
   & > * {
     margin-top: var(--spacing-small);

src/ui/scss/component/_media.scss

@@ -179,7 +179,7 @@
 }
 
 .media__info--large {
-  // border-top: 1px solid $lbry-gray-1;
+  border-top: 1px solid $lbry-gray-1;
   margin-top: var(--spacing-medium);
 
   html[data-mode='dark'] & {

static/locales/en.json

@@ -292,7 +292,6 @@
   "Comment": "Comment",
   "Your comment": "Your comment",
   "Post": "Post",
-<<<<<<< HEAD
   "No modifier provided after separator %s.": "No modifier provided after separator %s.",
   "Incompatible Daemon": "Incompatible Daemon",
   "Incompatible daemon running": "Incompatible daemon running",
@@ -309,9 +308,6 @@
   "Your version is out of date and may be unreliable or insecure.": "Your version is out of date and may be unreliable or insecure.",
   "Want to know what has changed?": "Want to know what has changed?",
   "release notes": "release notes",
-=======
-  "You haven't downloaded anything from LBRY yet.": "You haven't downloaded anything from LBRY yet.",
->>>>>>> ca0fd40a... add placeholders to claim previews
   "Read the FAQ": "Read the FAQ",
   "Our FAQ answers many common questions.": "Our FAQ answers many common questions.",
   "Get Live Help": "Get Live Help",