Progress

app/javascript/gabsocial/components/modal/block_account_modal.js

@@ -17,13 +17,11 @@ const mapStateToProps = (state, { accountId }) => {
   }
 }
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      dispatch(blockAccount(account.get('id')))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(account) {
+    dispatch(blockAccount(account.get('id')))
+  },
+})
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)

app/javascript/gabsocial/components/modal/block_domain_modal.js

@@ -9,13 +9,11 @@ const messages = defineMessages({
   cancel: { id: 'confirmation_modal.cancel', defaultMessage: 'Cancel' },
 })
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(domain) {
-      dispatch(blockDomain(domain))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(domain) {
+    dispatch(blockDomain(domain))
+  },
+})
 
 export default
 @connect(null, mapDispatchToProps)

app/javascript/gabsocial/components/modal/community_timeline_settings_modal.js

@@ -14,7 +14,7 @@ const messages = defineMessages({
   showInSidebar: { id: 'show_in_sidebar', defaultMessage: 'Show in Sidebar' },
 })
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   settings: state.getIn(['settings', 'community']),
 })
 

app/javascript/gabsocial/components/modal/compose_modal.js

@@ -10,11 +10,9 @@ const messages = defineMessages({
   title: { id: 'navigation_bar.compose', defaultMessage: 'Compose new gab' },
 })
 
-const mapStateToProps = state => {
-  return {
-    composeText: state.getIn(['compose', 'text']),
-  };
-}
+const mapStateToProps = (state) => ({
+  composeText: state.getIn(['compose', 'text']),
+})
 
 export default
 @connect(mapStateToProps)

app/javascript/gabsocial/components/modal/group_delete_modal.js

@@ -9,13 +9,11 @@ const messages = defineMessages({
   delete: { id: 'delete', defaultMessage: 'Delete' },
 })
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      // dispatch(blockAccount(account.get('id')))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(account) {
+    // dispatch(blockAccount(account.get('id')))
+  },
+})
 
 export default
 @connect(null, mapDispatchToProps)

app/javascript/gabsocial/components/modal/group_editor_modal.js

@@ -7,20 +7,16 @@ const messages = defineMessages({
   confirm: { id: 'confirmations.mute.confirm', defaultMessage: 'Mute' },
 })
 
-const mapStateToProps = state => {
-  return {
-    isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
-    account: state.getIn(['mutes', 'new', 'account']),
-  }
-}
+const mapStateToProps = (state) => ({
+  isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
+  account: state.getIn(['mutes', 'new', 'account']),
+})
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications) {
-      dispatch(muteAccount(account.get('id'), notifications))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(account, notifications) {
+    dispatch(muteAccount(account.get('id'), notifications))
+  },
+})
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)

app/javascript/gabsocial/components/modal/hashtag_timeline_settings_modal.js

@@ -14,7 +14,7 @@ const messages = defineMessages({
   showInSidebar: { id: 'show_in_sidebar', defaultMessage: 'Show in Sidebar' },
 })
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   settings: state.getIn(['settings', 'community']),
 })
 

app/javascript/gabsocial/components/modal/home_timeline_settings_modal.js

@@ -17,7 +17,7 @@ const messages = defineMessages({
   showReplies: { id: 'home.column_settings.show_replies', defaultMessage: 'Show replies' },
 })
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   settings: state.getIn(['settings', 'home']),
 })
 

app/javascript/gabsocial/components/modal/list_delete_modal.js

@@ -9,13 +9,11 @@ const messages = defineMessages({
   delete: { id: 'delete', defaultMessage: 'Delete' },
 })
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account) {
-      // dispatch(blockAccount(account.get('id')))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(account) {
+    // dispatch(blockAccount(account.get('id')))
+  },
+})
 
 export default
 @connect(null, mapDispatchToProps)

app/javascript/gabsocial/components/modal/list_editor_modal.js

@@ -7,20 +7,16 @@ const messages = defineMessages({
   confirm: { id: 'confirmations.mute.confirm', defaultMessage: 'Mute' },
 })
 
-const mapStateToProps = state => {
-  return {
-    isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
-    account: state.getIn(['mutes', 'new', 'account']),
-  }
-}
+const mapStateToProps = (state) => ({
+  isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
+  account: state.getIn(['mutes', 'new', 'account']),
+})
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications) {
-      dispatch(muteAccount(account.get('id'), notifications))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(account, notifications) {
+    dispatch(muteAccount(account.get('id'), notifications))
+  },
+})
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)

app/javascript/gabsocial/components/modal/list_timeline_settings_modal.js

@@ -17,7 +17,7 @@ const messages = defineMessages({
   showReplies: { id: 'home.column_settings.show_replies', defaultMessage: 'Show replies' },
 })
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   settings: state.getIn(['settings', 'list']),
 })
 

app/javascript/gabsocial/components/modal/modal_base.js

@@ -9,7 +9,7 @@ const messages = defineMessages({
   delete: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
 })
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   composeId: state.getIn(['compose', 'id']),
   composeText: state.getIn(['compose', 'text']),
 })

app/javascript/gabsocial/components/modal/modal_root.js

@@ -68,7 +68,7 @@ const MODAL_COMPONENTS = {
   VIDEO: () => Promise.resolve({ default: VideoModal }),
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   type: state.getIn(['modal', 'modalType']),
   props: state.getIn(['modal', 'modalProps'], {}),
 })

app/javascript/gabsocial/components/modal/mute_modal.js

@@ -17,13 +17,11 @@ const mapStateToProps = (state, { accountId }) => {
   }
 }
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications) {
-      dispatch(muteAccount(account.get('id'), notifications))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(account, notifications) {
+    dispatch(muteAccount(account.get('id'), notifications))
+  },
+})
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)

app/javascript/gabsocial/components/modal/report_modal.js

@@ -25,7 +25,7 @@ const messages = defineMessages({
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount()
 
-  const mapStateToProps = state => {
+  const mapStateToProps = (state) => {
     const accountId = state.getIn(['reports', 'new', 'account_id'])
 
     return {
@@ -125,14 +125,14 @@ class ReportModal extends ImmutablePureComponent {
               />
             </div>
 
-            {
+            { /** : todo : */
               domain &&
               <div>
                 <Text color='secondary' size='small'>
                   {intl.formatMessage(messages.forwardHint)}
                 </Text>
 
-                <div className='setting-toggle'>
+                <div>
                   <Switch 
                     id='report-forward'
                     checked={forward}

app/javascript/gabsocial/components/modal/status_revisions_modal.js

@@ -2,7 +2,6 @@ import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePropTypes from 'react-immutable-proptypes'
 import ImmutablePureComponent from 'react-immutable-pure-component'
 import classNames from 'classnames/bind'
-// import StatusRevisionListContainer from '../../containers/status_revisions_list_container'
 import { loadStatusRevisions } from '../../actions/status_revisions'
 import ModalLayout from './modal_layout'
 import RelativeTimestamp from '../relative_timestamp'
@@ -15,13 +14,13 @@ const messages = defineMessages({
   title: { id: 'status_revisions.heading', defaultMessage: 'Revision History' },
 })
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   loading: state.getIn(['status_revisions', 'loading']),
   error: state.getIn(['status_revisions', 'error']),
   revisions: state.getIn(['status_revisions', 'revisions']),
 })
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   onLoadStatusRevisions(statusId) {
     dispatch(loadStatusRevisions(statusId))
   },

app/javascript/gabsocial/components/modal/unfollow_modal.js

@@ -7,20 +7,16 @@ const messages = defineMessages({
   confirm: { id: 'confirmations.mute.confirm', defaultMessage: 'Mute' },
 })
 
-const mapStateToProps = state => {
-  return {
-    isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
-    account: state.getIn(['mutes', 'new', 'account']),
-  }
-}
+const mapStateToProps = (state) => ({
+  isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
+  account: state.getIn(['mutes', 'new', 'account']),
+})
 
-const mapDispatchToProps = dispatch => {
-  return {
-    onConfirm(account, notifications) {
-      dispatch(muteAccount(account.get('id'), notifications))
-    },
-  }
-}
+const mapDispatchToProps = (dispatch) => ({
+  onConfirm(account, notifications) {
+    dispatch(muteAccount(account.get('id'), notifications))
+  },
+})
 
 export default
 @connect(mapStateToProps, mapDispatchToProps)