cleanup style

package.json

@@ -128,8 +128,8 @@
     "husky": "^0.14.3",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#7316ee4646803aefbd4b74a7858ba4b2a102e60d",
-    "lbryinc": "lbryio/lbryinc#fb2e73ab31c2b9f80a53f082843a01e3f213ca45",
+    "lbry-redux": "lbryio/lbry-redux#4aa1f6f379061becf4485380416ec00faed3be6c",
+    "lbryinc": "lbryio/lbryinc#061c782ff44b359b04aeaecf8b86431fabb069e0",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
     "lodash-es": "^4.17.14",

src/platforms/web/api-setup.js

@@ -2,7 +2,7 @@ import { Lbry } from 'lbry-redux';
 import apiPublishCallViaWeb from './publish';
 import { X_LBRY_AUTH_TOKEN } from 'constants/token';
 
-export const SDK_API_URL = process.env.SDK_API_URL || 'https://api.lbry.tv/api/v1/proxy';
+export const SDK_API_URL = `${process.env.SDK_API_URL}/api/v1/proxy` || 'https://api.lbry.tv/api/v1/proxy';
 Lbry.setDaemonConnectionString(SDK_API_URL);
 
 Lbry.setOverride(

src/ui/component/app/view.jsx

@@ -207,7 +207,7 @@ function App(props: Props) {
   }, [syncError, pathname]);
 
   if (!user) {
-    return null;
+    // return null;
   }
 
   return (

src/ui/component/webUploadList/internal/web-upload-item.jsx

@@ -12,7 +12,7 @@ export default function WebUploadItem(props: Props) {
   const { params, progress, xhr } = props;
 
   return (
-    <li className={'claim-preview'}>
+    <li className={'claim-preview card--inline'}>
       <CardMedia thumbnail={params.thumbnail_url} />
       <div className={'claim-preview-metadata'}>
         <div className="claim-preview-info">
@@ -20,17 +20,17 @@ export default function WebUploadItem(props: Props) {
           {xhr && (
             <div className="card__actions--inline">
               <Button
-                button={'primary'}
+                button="link"
                 onClick={() => {
                   xhr.abort();
                 }}
-                label={'abort'}
+                label={__('Cancel')}
               />
             </div>
           )}
         </div>
-        <h2>{params.name}</h2>
-        <div className={'claim-upload__progress--outer'}>
+        <h2>lbry://{params.name}</h2>
+        <div className={'claim-upload__progress--outer card--inline'}>
           <div className={'claim-upload__progress--inner'} style={{ width: `${progress}%` }}>
             Uploading...
           </div>

src/ui/component/webUploadList/view.jsx

@@ -22,9 +22,14 @@ export default function WebUploadList(props: Props) {
       <div>
         <Card
           title={__('Currently Uploading')}
-          subtitle={<span>{__('You are currently uploading one or more files for publish.')}</span>}
+          subtitle={
+            uploadCount > 1
+              ? __('You files are currently uploading. This will update automatically.')
+              : __('Your file is currently uploading. This will update automatically.')
+          }
           body={
             <section>
+              {/* $FlowFixMe */}
               {Object.values(currentUploads).map(({ progress, params, xhr }) => (
                 <WebUploadItem key={`upload${params.name}`} progress={progress} params={params} xhr={xhr} />
               ))}

src/ui/index.jsx

@@ -36,13 +36,13 @@ import { getAuthToken, setAuthToken } from 'util/saved-passwords';
 // and loaded dynamically in the component that consumes it
 import 'scss/all.scss';
 
-const startTime = Date.now();
-analytics.startupEvent();
-
 // @if TARGET='web'
 import 'src/platforms/web/api-setup';
 // @endif
 
+const startTime = Date.now();
+analytics.startupEvent();
+
 const APPPAGEURL = 'lbry://?';
 // @if TARGET='app'
 const { autoUpdater } = remote.require('electron-updater');
@@ -64,7 +64,7 @@ if (process.env.SEARCH_API_URL) {
 let authToken;
 Lbryio.setOverride(
   'setAuthToken',
-  status =>
+  () =>
     new Promise(resolve => {
       Lbryio.call(
         'user',
@@ -72,7 +72,7 @@ Lbryio.setOverride(
         {
           auth_token: '',
           language: 'en',
-          app_id: status.installation_id,
+          // app_id: status.installation_id,
         },
         'post'
       ).then(response => {

src/ui/redux/actions/app.js

@@ -8,7 +8,6 @@ import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
 import * as PAGES from 'constants/pages';
 import { X_LBRY_AUTH_TOKEN } from 'constants/token';
-import * as SETTINGS from 'constants/settings';
 import {
   Lbry,
   doBalanceSubscribe,
@@ -18,7 +17,6 @@ import {
   makeSelectClaimIsMine,
   doPopulateSharedUserState,
   doFetchChannelListMine,
-  HEADERS,
   doClearPublish,
   doPreferenceGet,
   doToast,
@@ -439,7 +437,7 @@ export function doAnalyticsView(uri, timeToStart) {
 export function doSignIn() {
   return (dispatch, getState) => {
     // @if TARGET='web'
-    const { auth_token: authToken } = cookie.parse(document.cookie);
+    const authToken = getAuthToken();
     Lbry.setApiHeader(X_LBRY_AUTH_TOKEN, authToken);
 
     dispatch(doBalanceSubscribe());

src/ui/scss/component/_claim-list.scss

@@ -224,7 +224,7 @@ $border-color--dark: var(--dm-color-04);
 
 .claim-upload__progress--inner {
   background: $lbry-teal-1;
-  color: $lbry-gray-1;
+  padding: var(--spacing-miniscule);
 
   [data-mode='dark'] & {
     background: $lbry-teal-4;

yarn.lock

@@ -6848,17 +6848,17 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-lbry-redux@lbryio/lbry-redux#7316ee4646803aefbd4b74a7858ba4b2a102e60d:
+lbry-redux@lbryio/lbry-redux#4aa1f6f379061becf4485380416ec00faed3be6c:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/7316ee4646803aefbd4b74a7858ba4b2a102e60d"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/4aa1f6f379061becf4485380416ec00faed3be6c"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"
     uuid "^3.3.2"
 
-lbryinc@lbryio/lbryinc#fb2e73ab31c2b9f80a53f082843a01e3f213ca45:
+lbryinc@lbryio/lbryinc#061c782ff44b359b04aeaecf8b86431fabb069e0:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/fb2e73ab31c2b9f80a53f082843a01e3f213ca45"
+  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/061c782ff44b359b04aeaecf8b86431fabb069e0"
   dependencies:
     reselect "^3.0.0"