Merge pull request #2087 from lbryio/tos

Remove ToS checkbox

CHANGELOG.md

@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  * Limit file type can be uploaded as thumbnail for publishing ([#2034](https://github.com/lbryio/lbry-desktop/pull/2034))
  * Change snackbar notification position to bottom-left ([#2040](https://github.com/lbryio/lbry-desktop/pull/2040))
  * Use shared colors from lbryio/color project ([#2045](https://github.com/lbryio/lbry-desktop/pull/2045))
+ * Remove ToS checkbox ([#2087](https://github.com/lbryio/lbry-desktop/pull/2087))
 
 ### Fixed
  * Fixed transactions filter menu collides with transaction table ([#2005](https://github.com/lbryio/lbry-desktop/pull/2005))

src/renderer/component/publishForm/view.jsx

@@ -35,7 +35,6 @@ type Props = {
   },
   channel: string,
   name: ?string,
-  tosAccepted: boolean,
   updatePublishForm: UpdatePublishFormData => void,
   nameError: ?string,
   isResolvingUri: boolean,
@@ -248,7 +247,6 @@ class PublishForm extends React.PureComponent<Props> {
       title,
       bid,
       bidError,
-      tosAccepted,
       editingURI,
       isStillEditing,
       filePath,
@@ -262,7 +260,6 @@ class PublishForm extends React.PureComponent<Props> {
       title &&
       bid &&
       !bidError &&
-      tosAccepted &&
       !(uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS);
     return editingURI && !filePath ? isStillEditing && formValidLessFile : formValidLessFile;
   }
@@ -274,7 +271,6 @@ class PublishForm extends React.PureComponent<Props> {
       title,
       bid,
       bidError,
-      tosAccepted,
       editingURI,
       filePath,
       isStillEditing,
@@ -296,7 +292,6 @@ class PublishForm extends React.PureComponent<Props> {
           {uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS && (
             <div>{__('Please wait for thumbnail to finish uploading')}</div>
           )}
-          {!tosAccepted && <div>{__('You must agree to the terms of service')}</div>}
           {!!editingURI &&
             !isStillEditing &&
             !filePath && <div>{__('You need to reselect a file after changing the LBRY URL')}</div>}
@@ -319,7 +314,6 @@ class PublishForm extends React.PureComponent<Props> {
       price,
       channel,
       name,
-      tosAccepted,
       updatePublishForm,
       bid,
       nameError,
@@ -593,28 +587,6 @@ class PublishForm extends React.PureComponent<Props> {
             />
           </section>
 
-          <section className="card card--section">
-            <div className="card__title">{__('Terms of Service')}</div>
-            <div className="card__content">
-              <FormField
-                name="lbry_tos"
-                type="checkbox"
-                checked={tosAccepted}
-                postfix={
-                  <span>
-                    {__('I agree to the')}{' '}
-                    <Button
-                      button="link"
-                      href="https://www.lbry.io/termsofservice"
-                      label={__('LBRY terms of service')}
-                    />
-                  </span>
-                }
-                onChange={event => updatePublishForm({ tosAccepted: event.target.checked })}
-              />
-            </div>
-          </section>
-
           <div className="card__actions">
             <Submit
               label={submitLabel}
@@ -626,6 +598,14 @@ class PublishForm extends React.PureComponent<Props> {
             />
             <Button button="alt" onClick={this.handleCancelPublish} label={__('Cancel')} />
           </div>
+          <div className="card__subtitle">
+            {__('By continuing, you accept the')}{' '}
+            <Button
+              button="link"
+              href="https://www.lbry.io/termsofservice"
+              label={__('LBRY terms of service')}
+            />.
+          </div>
           {!formDisabled && !formValid && this.renderFormErrors()}
         </div>
       </Form>

src/renderer/redux/reducers/publish.js

@@ -20,7 +20,6 @@ type PublishState = {
   uploadThumbnailStatus: string,
   description: string,
   language: string,
-  tosAccepted: boolean,
   channel: string,
   channelId: ?string,
   name: string,
@@ -44,7 +43,6 @@ export type UpdatePublishFormData = {
   thumbnailPath?: string,
   description?: string,
   language?: string,
-  tosAccepted?: boolean,
   channel?: string,
   channelId?: string,
   name?: string,
@@ -103,7 +101,6 @@ const defaultState: PublishState = {
   nsfw: false,
   channel: CHANNEL_ANONYMOUS,
   channelId: '',
-  tosAccepted: false,
   name: '',
   nameError: undefined,
   bid: 0.1,