Progress

app/javascript/gabsocial/pages/community_page.js

@@ -1,11 +1,8 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
 import { defineMessages, injectIntl } from 'react-intl'
-import { openModal } from '../actions/modal'
 import PageTitle from '../features/ui/util/page_title'
 import DefaultLayout from '../layouts/default_layout'
-import { MODAL_COMMUNITY_TIMELINE_SETTINGS } from '../constants'
 import {
   LinkFooter,
   GroupsPanel,
@@ -16,10 +13,6 @@ import {
 
 class CommunityPage extends React.PureComponent {
 
-  onOpenCommunityPageSettingsModal = () => {
-    this.props.dispatch(openModal(MODAL_COMMUNITY_TIMELINE_SETTINGS))
-  }
-
   render() {
     const { children, intl } = this.props
 
@@ -29,12 +22,6 @@ class CommunityPage extends React.PureComponent {
       <DefaultLayout
         title={title}
         page='community'
-        actions={[
-          {
-            icon: 'ellipsis',
-            onClick: this.onOpenCommunityPageSettingsModal,
-          },
-        ]}
         layout={[
           ProgressPanel,
           TrendsBreakingPanel,
@@ -60,4 +47,4 @@ CommunityPage.propTypes = {
   intl: PropTypes.object.isRequired,
 }
 
-export default injectIntl(connect()(CommunityPage))
+export default injectIntl(CommunityPage)

app/javascript/gabsocial/pages/hashtag_page.js

@@ -1,12 +1,9 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
-import { openModal } from '../actions/modal'
 import { defineMessages, injectIntl } from 'react-intl'
 import isObject from 'lodash.isobject'
 import PageTitle from '../features/ui/util/page_title'
 import DefaultLayout from '../layouts/default_layout'
-import { MODAL_HASHTAG_TIMELINE_SETTINGS } from '../constants'
 import {
   LinkFooter,
   ProgressPanel,
@@ -16,17 +13,6 @@ import {
 
 class HashtagPage extends React.PureComponent {
 
-  onOpenHashtagPageSettingsModal = () => {
-    const { params } = this.props
-
-    const hashtag = isObject(params) ? params.id : ''
-    if (!hashtag) return
-
-    this.props.dispatch(openModal(MODAL_HASHTAG_TIMELINE_SETTINGS, {
-      hashtag,
-    }))
-  }
-
   render() {
     const {
       children,
@@ -41,12 +27,6 @@ class HashtagPage extends React.PureComponent {
         showBackBtn
         title={intl.formatMessage(messages.hashtagTimeline)}
         page={`hashtag.${hashtag}`}
-        actions={[
-          {
-            icon: 'ellipsis',
-            onClick: this.onOpenHashtagPageSettingsModal,
-          },
-        ]}
         layout={[
           ProgressPanel,
           TrendsBreakingPanel,
@@ -73,4 +53,4 @@ HashtagPage.propTypes = {
   params: PropTypes.object.isRequired,
 }
 
-export default injectIntl(connect()(HashtagPage))
+export default injectIntl(HashtagPage)