removed extraneous modal, added prop to publish modal to toggle text (edit or new)

src/ui/constants/modal_types.js

@@ -22,7 +22,6 @@ export const FIRST_SUBSCRIPTION = 'firstSubscription';
 export const SEND_TIP = 'send_tip';
 export const SOCIAL_SHARE = 'social_share';
 export const PUBLISH = 'publish';
-export const PUBLISH_UPDATE = 'publish_update';
 export const SEARCH = 'search';
 export const CONFIRM_TRANSACTION = 'confirm_transaction';
 export const CONFIRM_THUMBNAIL_UPLOAD = 'confirm_thumbnail_upload';

src/ui/modal/modalPublish/view.jsx

@@ -7,17 +7,24 @@ type Props = {
   clearPublish: () => void,
   navigate: string => void,
   uri: string,
+  isEdit: boolean,
 };
 
 class ModalPublishSuccess extends React.PureComponent<Props> {
   render() {
-    const { closeModal, clearPublish, navigate, uri } = this.props;
+    const { closeModal, clearPublish, navigate, uri, isEdit } = this.props;
+
+    const contentLabel = isEdit ? 'Updates published' : 'File published';
+
+    const publishMessage = isEdit ? 'updates have been' : 'file has been';
+
+    const publishType = isEdit ? 'updates' : 'file';
 
     return (
       <Modal
         isOpen
         title={__('Success')}
-        contentLabel={__('File published')}
+        contentLabel={__(contentLabel)}
         onConfirmed={() => {
           clearPublish();
           navigate('/$/published');
@@ -25,11 +32,11 @@ class ModalPublishSuccess extends React.PureComponent<Props> {
         }}
       >
         <section className="card__content">
-          <p>{__('Your file has been published to LBRY at the address')}</p>
+          <p>{__(`Your ${publishMessage} published to LBRY at the address`)}</p>
           <blockquote>{uri}</blockquote>
           <p>
             {__(
-              'The file will take a few minutes to appear for other LBRY users. Until then it will be listed as "pending" under your published files.'
+              `The ${publishType} will take a few minutes to appear for other LBRY users. Until then it will be listed as "pending" under your published files.`
             )}
           </p>
         </section>

src/ui/modal/modalPublishUpdate/index.js

@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { doHideModal } from 'redux/actions/app';
-import ModalPublishUpdateSuccess from './view';
-import { doClearPublish } from 'redux/actions/publish';
-import { push } from 'connected-react-router';
-
-const perform = dispatch => ({
-  closeModal: () => dispatch(doHideModal()),
-  clearPublish: () => dispatch(doClearPublish()),
-  navigate: path => dispatch(push(path)),
-});
-
-export default connect(
-  null,
-  perform
-)(ModalPublishUpdateSuccess);

src/ui/modal/modalPublishUpdate/view.jsx

@@ -1,41 +0,0 @@
-// @flow
-import React from 'react';
-import { Modal } from 'modal/modal';
-
-type Props = {
-  closeModal: () => void,
-  clearPublish: () => void,
-  navigate: string => void,
-  uri: string,
-};
-
-class ModalPublishUpdateSuccess extends React.PureComponent<Props> {
-  render() {
-    const { closeModal, clearPublish, navigate, uri } = this.props;
-
-    return (
-      <Modal
-        isOpen
-        title={__('Success')}
-        contentLabel={__('Updates published')}
-        onConfirmed={() => {
-          clearPublish();
-          navigate('/$/published');
-          closeModal();
-        }}
-      >
-        <section className="card__content">
-          <p>{__('Your updates have been published to LBRY at the address')}</p>
-          <blockquote>{uri}</blockquote>
-          <p>
-            {__(
-              'The updates will take a few minutes to appear for other LBRY users. Until then your file will be listed as "pending" under your published files.'
-            )}
-          </p>
-        </section>
-      </Modal>
-    );
-  }
-}
-
-export default ModalPublishUpdateSuccess;

src/ui/modal/modalRouter/view.jsx

@@ -22,7 +22,6 @@ import ModalConfirmTransaction from 'modal/modalConfirmTransaction';
 import ModalSocialShare from 'modal/modalSocialShare';
 import ModalSendTip from 'modal/modalSendTip';
 import ModalPublish from 'modal/modalPublish';
-import ModalPublishUpdate from 'modal/modalPublishUpdate';
 import ModalOpenExternalResource from 'modal/modalOpenExternalResource';
 import ModalConfirmThumbnailUpload from 'modal/modalConfirmThumbnailUpload';
 import ModalWalletEncrypt from 'modal/modalWalletEncrypt';
@@ -89,8 +88,6 @@ function ModalRouter(props: Props) {
       return <ModalSocialShare {...modalProps} />;
     case MODALS.PUBLISH:
       return <ModalPublish {...modalProps} />;
-    case MODALS.PUBLISH_UPDATE:
-      return <ModalPublishUpdate {...modalProps} />;
     case MODALS.CONFIRM_EXTERNAL_RESOURCE:
       return <ModalOpenExternalResource {...modalProps} />;
     case MODALS.CONFIRM_TRANSACTION:

src/ui/redux/actions/publish.js

@@ -309,14 +309,12 @@ export const doPublish = (params: PublishParams) => (dispatch: Dispatch, getStat
     const isMatch = claim => claim.claim_id === pendingClaim.claim_id;
     const isEdit = myClaims.some(isMatch);
 
-    const publishModal = isEdit ? MODALS.PUBLISH_UPDATE : MODALS.PUBLISH;
-
-    actions.push(doOpenModal(publishModal, { uri }));
-
     const myNewClaims = isEdit
       ? myClaims.map(claim => (isMatch(claim) ? pendingClaim : claim))
       : myClaims.concat(pendingClaim);
 
+    actions.push(doOpenModal(MODALS.PUBLISH, { uri, isEdit }));
+
     actions.push({
       type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
       data: {