From 0c98157fb3553f2ff053b0f50d0649ba79fbbe0c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 19 Apr 2022 15:24:12 -0500 Subject: [PATCH] Delete WelcomeButton, remove TruthSocial remnants --- .../compose/components/compose_form.js | 2 +- app/soapbox/features/preferences/index.tsx | 2 +- .../features/ui/components/boost_modal.js | 2 +- .../features/ui/components/welcome_button.js | 62 ------------------- 4 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 app/soapbox/features/ui/components/welcome_button.js diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index 2f054836f..4fe153bbe 100644 --- a/app/soapbox/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -39,7 +39,7 @@ const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u20 const messages = defineMessages({ placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What\'s on your mind?' }, spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' }, - publish: { id: 'compose_form.publish', defaultMessage: 'Truth' }, + publish: { id: 'compose_form.publish', defaultMessage: 'Post' }, publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' }, message: { id: 'compose_form.message', defaultMessage: 'Message' }, schedule: { id: 'compose_form.schedule', defaultMessage: 'Schedule' }, diff --git a/app/soapbox/features/preferences/index.tsx b/app/soapbox/features/preferences/index.tsx index df0d20639..54d8e4171 100644 --- a/app/soapbox/features/preferences/index.tsx +++ b/app/soapbox/features/preferences/index.tsx @@ -112,7 +112,7 @@ const Preferences = () => {
} + label={} hint={} > diff --git a/app/soapbox/features/ui/components/boost_modal.js b/app/soapbox/features/ui/components/boost_modal.js index 8a3862b35..faf648b12 100644 --- a/app/soapbox/features/ui/components/boost_modal.js +++ b/app/soapbox/features/ui/components/boost_modal.js @@ -52,7 +52,7 @@ class BoostModal extends ImmutablePureComponent { return ( diff --git a/app/soapbox/features/ui/components/welcome_button.js b/app/soapbox/features/ui/components/welcome_button.js deleted file mode 100644 index c9c8fe386..000000000 --- a/app/soapbox/features/ui/components/welcome_button.js +++ /dev/null @@ -1,62 +0,0 @@ -import PropTypes from 'prop-types'; -import React from 'react'; -import ImmutablePropTypes from 'react-immutable-proptypes'; -import ImmutablePureComponent from 'react-immutable-pure-component'; -import { defineMessages, injectIntl } from 'react-intl'; -import { connect } from 'react-redux'; - -import { openComposeWithText } from 'soapbox/actions/compose'; -import { Button } from 'soapbox/components/ui'; -import emojify from 'soapbox/features/emoji/emoji'; - -const buildWelcomeMessage = account => ( - `Yo @${account.get('acct')} nice to have you on TRUTH! - -Here's the lay of the land... - -Got suggestions? Post a TRUTH (<- this is what we call a post) & tag the @suggestions account. - -Come across a bug? Feel free to let us know by tagging the @Bug account in a TRUTH! Screenshots encouraged! - -Also, if you want to just chat about the product... feel free to drop some 💥 TRUTH 💣 on me! Tag @Billy! - -Finally, make sure to invite only your favorite peeps by hitting Invites in the sidebar.` -); - -const messages = defineMessages({ - welcome: { id: 'account.welcome', defaultMessage: 'Welcome' }, -}); - -const mapDispatchToProps = (dispatch) => ({ - onClick(account) { - const text = buildWelcomeMessage(account); - dispatch(openComposeWithText(text)); - }, -}); - -export default @connect(undefined, mapDispatchToProps) -@injectIntl -class WelcomeButton extends ImmutablePureComponent { - - static propTypes = { - intl: PropTypes.object.isRequired, - account: ImmutablePropTypes.record.isRequired, - onClick: PropTypes.func.isRequired, - }; - - handleClick = () => { - this.props.onClick(this.props.account); - } - - render() { - const { intl } = this.props; - - return ( - - ); - } - -}