cleanup

src/ui/component/channelContent/view.jsx

@@ -38,7 +38,7 @@ function ChannelContent(props: Props) {
       {hasContent && <ClaimList header={false} uris={claimsInChannel.map(claim => claim.permanent_url)} />}
 
       <Paginate
-        onPageChange={page => fetchClaims(uri, page)}
+        onPageChange={page => console.log('fetch') || fetchClaims(uri, page)}
         totalPages={totalPages}
         loading={fetching && !hasContent}
       />

src/ui/component/userEmailVerify/view.jsx

@@ -1,9 +1,9 @@
 // @flow
 import * as React from 'react';
 import Button from 'component/button';
+import cookie from 'cookie';
 
 type Props = {
-  cancelButton: React.Node,
   email: string,
   resendVerificationEmail: string => void,
   checkEmailVerified: () => void,
@@ -47,7 +47,19 @@ class UserEmailVerify extends React.PureComponent<Props> {
   emailVerifyCheckInterval: ?IntervalID;
 
   render() {
-    const { cancelButton, email } = this.props;
+    const { email } = this.props;
+
+    // Below is duplicated in UserEmail
+    // This should just be a UserEmailResetButton component
+    const buttonProps = IS_WEB
+      ? {
+          onClick: () => {
+            clearInterval(this.emailVerifyCheckInterval);
+            document.cookie = cookie.serialize('auth_token', '');
+            window.location.reload();
+          },
+        }
+      : { href: 'https://lbry.com/faq/how-to-change-email' };
 
     return (
       <React.Fragment>
@@ -67,7 +79,8 @@ class UserEmailVerify extends React.PureComponent<Props> {
               label={__('Resend verification email')}
               onClick={this.handleResendVerificationEmail}
             />
-            {cancelButton}
+
+            <Button button="link" label={__('Reset')} {...buttonProps} />
           </div>
 
           <p className="help">

src/ui/page/channel/view.jsx

@@ -60,6 +60,7 @@ function ChannelPage(props: Props) {
 
   return (
     <Page>
+      {window.location.href}
       <div className="card">
         <header className="channel-cover">
           {!editing && cover && <img className="channel-cover__custom" src={cover} />}

src/ui/redux/actions/publish.js

@@ -232,7 +232,6 @@ export const doPublish = () => (dispatch: Dispatch, getState: () => {}) => {
     contentIsFree,
     fee,
     uri,
-    nsfw,
     tags,
     locations,
   } = publishData;
@@ -287,17 +286,6 @@ export const doPublish = () => (dispatch: Dispatch, getState: () => {}) => {
     publishPayload.release_time = Number(myClaimForUri.value.release_time);
   }
 
-  if (nsfw) {
-    if (!publishPayload.tags.includes('mature')) {
-      publishPayload.tags.push('mature');
-    }
-  } else {
-    const indexToRemove = publishPayload.tags.indexOf('mature');
-    if (indexToRemove > -1) {
-      publishPayload.tags.splice(indexToRemove, 1);
-    }
-  }
-
   if (channelId) {
     publishPayload.channel_id = channelId;
   }

src/ui/scss/component/_main.scss

@@ -11,6 +11,8 @@
   max-width: 1200px;
   margin-left: auto;
   margin-right: auto;
+  padding-left: var(--spacing-large);
+  padding-right: var(--spacing-large);
   padding-bottom: var(--spacing-main-padding);
 }
 

yarn.lock

@@ -6653,9 +6653,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-lbry-redux@lbryio/lbry-redux#122acf2266f6ef554d797e107fd06fb02bccd750:
+lbry-redux@lbryio/lbry-redux#85ade7e57ce0bc4195524fa2c3055aa8cd986af8:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/122acf2266f6ef554d797e107fd06fb02bccd750"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/85ade7e57ce0bc4195524fa2c3055aa8cd986af8"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"