From 39f0f97be0b057ee2af1268ed02dc799dfd9846d Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 23 Oct 2019 14:59:33 -0400
Subject: [PATCH] hide proper things on lbry.tv

---
 src/ui/component/button/view.jsx              |  3 +
 .../common/form-components/form-field.jsx     |  1 -
 src/ui/component/transactionList/view.jsx     | 79 +++++++++----------
 .../transactionRefreshButton/view.jsx         |  2 +-
 src/ui/index.jsx                              |  2 +-
 src/ui/page/channels/view.jsx                 |  2 -
 src/ui/page/rewards/view.jsx                  |  3 +-
 src/ui/page/settings/view.jsx                 |  4 +-
 src/ui/scss/component/_form-field.scss        |  6 +-
 src/ui/scss/component/_table.scss             |  1 -
 10 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/src/ui/component/button/view.jsx b/src/ui/component/button/view.jsx
index 0182f1566..4220c2ef7 100644
--- a/src/ui/component/button/view.jsx
+++ b/src/ui/component/button/view.jsx
@@ -119,6 +119,9 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
       <NavLink
         ref={ref}
         exact
+        onClick={e => {
+          e.stopPropagation();
+        }}
         to={`/$/${PAGES.AUTH}?redirect=${pathname}`}
         title={title}
         disabled={disabled}
diff --git a/src/ui/component/common/form-components/form-field.jsx b/src/ui/component/common/form-components/form-field.jsx
index 9e8887113..38e390a6a 100644
--- a/src/ui/component/common/form-components/form-field.jsx
+++ b/src/ui/component/common/form-components/form-field.jsx
@@ -23,7 +23,6 @@ type Props = {
   children?: React$Node,
   stretch?: boolean,
   affixClass?: string, // class applied to prefix/postfix label
-  firstInList?: boolean, // at the top of a list, no padding top
   autoFocus?: boolean,
   labelOnLeft: boolean,
   inputProps?: {
diff --git a/src/ui/component/transactionList/view.jsx b/src/ui/component/transactionList/view.jsx
index e072cb501..4a65bcce4 100644
--- a/src/ui/component/transactionList/view.jsx
+++ b/src/ui/component/transactionList/view.jsx
@@ -8,7 +8,6 @@ import { TRANSACTIONS, TX_LIST } from 'lbry-redux';
 import * as PAGES from 'constants/pages';
 import TransactionListTable from 'component/transactionListTable';
 import RefreshTransactionButton from 'component/transactionRefreshButton';
-import Spinner from 'component/spinner';
 import Paginate from 'component/common/paginate';
 
 type Props = {
@@ -44,54 +43,50 @@ function TransactionList(props: Props) {
     <React.Fragment>
       <header className="table__header">
         <h2 className="card__title--between">
-          <span>
-            {title}
-            {loading && <Spinner type="small" />}
-          </span>
+          {title}
           <div className="card__actions--inline">
+            {/* @if TARGET='app' */}
+            {!slim && (
+              <FileExporter
+                data={transactions}
+                label={__('Export')}
+                title={__('Export Transactions')}
+                filters={['nout']}
+                defaultPath={__('lbry-transactions-history')}
+                disabled={!transactions.length}
+              />
+            )}
+            {/* @endif */}
             <RefreshTransactionButton />
+            {!slim && (
+              <FormField
+                type="select"
+                name="file-sort"
+                value={filterSetting || TRANSACTIONS.ALL}
+                onChange={handleFilterChanged}
+                postfix={
+                  <Button
+                    button="link"
+                    icon={icons.HELP}
+                    href="https://lbry.com/faq/transaction-types"
+                    title={__('Help')}
+                  />
+                }
+              >
+                {transactionTypes.map(tt => (
+                  <option key={tt} value={tt}>
+                    {__(`${capitalize(tt)}`)}
+                  </option>
+                ))}
+              </FormField>
+            )}
             {slim && <Button button="primary" navigate={`/$/${PAGES.TRANSACTIONS}`} label={__('Full History')} />}
           </div>
         </h2>
       </header>
-      {!slim && (
-        <header className="table__header">
-          <div className="card__actions--between">
-            <FileExporter
-              data={transactions}
-              label={__('Export')}
-              title={__('Export Transactions')}
-              filters={['nout']}
-              defaultPath={__('lbry-transactions-history')}
-              disabled={!transactions.length}
-            />
-            <FormField
-              type="select"
-              name="file-sort"
-              value={filterSetting || TRANSACTIONS.ALL}
-              onChange={handleFilterChanged}
-              label={__('Show')}
-              postfix={
-                <Button
-                  button="link"
-                  icon={icons.HELP}
-                  href="https://lbry.com/faq/transaction-types"
-                  title={__('Help')}
-                />
-              }
-            >
-              {transactionTypes.map(tt => (
-                <option key={tt} value={tt}>
-                  {__(`${capitalize(tt)}`)}
-                </option>
-              ))}
-            </FormField>
-          </div>
-        </header>
-      )}
 
-      {!loading && !transactions.length && (
-        <h2 className="main--empty empty">{emptyMessage || __('No transactions.')}</h2>
+      {((loading && !transactions.length) || !transactions.length) && (
+        <h2 className="main--empty empty">{loading ? __('Loading') : emptyMessage || __('No transactions.')}</h2>
       )}
 
       {!!transactions && !!transactions.length && <TransactionListTable transactionList={transactions} />}
diff --git a/src/ui/component/transactionRefreshButton/view.jsx b/src/ui/component/transactionRefreshButton/view.jsx
index 4110552d1..c8bc539ad 100644
--- a/src/ui/component/transactionRefreshButton/view.jsx
+++ b/src/ui/component/transactionRefreshButton/view.jsx
@@ -38,7 +38,7 @@ class TransactionRefreshButton extends PureComponent<Props, State> {
     const { fetchingTransactions } = this.props;
     const { label, disabled } = this.state;
     return (
-      <Button button="inverse" label={label} onClick={this.handleClick} disabled={disabled || fetchingTransactions} />
+      <Button button="link" label={label} onClick={this.handleClick} disabled={disabled || fetchingTransactions} />
     );
   }
 }
diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index 5a9bd6920..8aad15f27 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -72,7 +72,7 @@ Lbryio.setOverride(
         {
           auth_token: '',
           language: 'en',
-          app_id: status.installation_id,
+          // app_id: status.installation_id,
         },
         'post'
       ).then(response => {
diff --git a/src/ui/page/channels/view.jsx b/src/ui/page/channels/view.jsx
index e56f1e448..df04d1c23 100644
--- a/src/ui/page/channels/view.jsx
+++ b/src/ui/page/channels/view.jsx
@@ -34,9 +34,7 @@ export default function ChannelsPage(props: Props) {
 
   return (
     <Page>
-      {/* @if TARGET='app' */}
       {hasYoutubeChannels && <YoutubeTransferStatus hideChannelLink />}
-      {/* @endif */}
 
       {channels && channels.length ? (
         <div className="card">
diff --git a/src/ui/page/rewards/view.jsx b/src/ui/page/rewards/view.jsx
index 1238472a9..79e7d17b4 100644
--- a/src/ui/page/rewards/view.jsx
+++ b/src/ui/page/rewards/view.jsx
@@ -33,8 +33,9 @@ class RewardsPage extends PureComponent<Props> {
   }
   renderPageHeader() {
     const { user, daemonSettings, fetchUser } = this.props;
+    const rewardsEnabled = IS_WEB || (daemonSettings && daemonSettings.share_usage_data);
 
-    if (user && !user.is_reward_approved && daemonSettings && daemonSettings.share_usage_data) {
+    if (user && !user.is_reward_approved && rewardsEnabled) {
       if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) {
         return (
           !IS_WEB && (
diff --git a/src/ui/page/settings/view.jsx b/src/ui/page/settings/view.jsx
index 8c182d663..bbc49c463 100644
--- a/src/ui/page/settings/view.jsx
+++ b/src/ui/page/settings/view.jsx
@@ -5,6 +5,7 @@
 import * as SETTINGS from 'constants/settings';
 import * as PAGES from 'constants/pages';
 import * as React from 'react';
+
 import { FormField, FormFieldPrice } from 'component/common/form';
 import Button from 'component/button';
 import I18nMessage from 'component/i18nMessage';
@@ -14,7 +15,6 @@ import FileSelector from 'component/common/file-selector';
 import SyncToggle from 'component/syncToggle';
 import Card from 'component/common/card';
 import { getSavedPassword } from 'util/saved-passwords';
-
 type Price = {
   currency: string,
   amount: number,
@@ -216,6 +216,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
         ) : (
           <div>
             <Card title={__('Language')} actions={<SettingLanguage />} />
+            {/* @if TARGET='app' */}
             <Card
               title={__('Sync')}
               subtitle={
@@ -225,7 +226,6 @@ class SettingsPage extends React.PureComponent<Props, State> {
               }
               actions={<SyncToggle disabled={walletEncrypted && !storedPassword} />}
             />
-            {/* @if TARGET='app' */}
             <Card
               title={__('Download Directory')}
               actions={
diff --git a/src/ui/scss/component/_form-field.scss b/src/ui/scss/component/_form-field.scss
index 454e9663a..d0234d337 100644
--- a/src/ui/scss/component/_form-field.scss
+++ b/src/ui/scss/component/_form-field.scss
@@ -63,7 +63,11 @@ checkbox-element input[type='checkbox'] + label {
 }
 
 fieldset-section {
-  margin-bottom: var(--spacing-small);
+  margin: 0;
+
+  &:not(:first-of-type) {
+    margin-top: var(--spacing-small);
+  }
 
   input,
   select,
diff --git a/src/ui/scss/component/_table.scss b/src/ui/scss/component/_table.scss
index f0a3e515d..5b6d160e2 100644
--- a/src/ui/scss/component/_table.scss
+++ b/src/ui/scss/component/_table.scss
@@ -23,7 +23,6 @@ td {
 
 .table__header {
   margin: var(--spacing-large);
-  margin-bottom: 0;
 }
 
 .table__item--actionable {