rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/main

shrike
Claire 2023-03-26 15:47:12 +02:00
parent 81e85782d1 6e8711ff91
commit 14b0311029
145 changed files with 441 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.eslintrc.js
View File

@ -32,10 +32,14 @@ module.exports = {
parserOptions: {
sourceType: 'module',
ecmaFeatures: {
experimentalObjectRestSpread: true,
jsx: true,
},
ecmaVersion: 2021,
requireConfigFile: false,
babelOptions: {
configFile: false,
presets: ['@babel/react', '@babel/env'],
},
},
settings: {
@ -214,4 +218,22 @@ module.exports = {
'promise/no-nesting': 'off',
'promise/no-promise-in-callback': 'off',
},
overrides: [
{
files: [
'*.config.js',
'.*rc.js',
'ide-helper.js',
],
env: {
commonjs: true,
},
parserOptions: {
sourceType: 'script',
},
},
],
};

2
.github/workflows/test-ruby.yml vendored
View File

@ -40,7 +40,7 @@ jobs:
ruby-version: .ruby-version
bundler-cache: true
- run: yarn install --frozen-lockfile
- run: yarn --frozen-lockfile --production
- name: Precompile assets
# Previously had set this, but it's not supported
# export NODE_OPTIONS=--openssl-legacy-provider

41
.rubocop.yml
View File

@ -59,10 +59,49 @@ Metrics/BlockNesting:
Exclude:
- 'lib/mastodon/*_cli.rb'
# Reason: Some Excluded files would be candidates for refactoring but not currently addressed
# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsclasslength
Metrics/ClassLength:
CountAsOne: [array, heredoc]
CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
Exclude:
- 'lib/mastodon/*_cli.rb'
- 'app/controllers/admin/accounts_controller.rb'
- 'app/controllers/api/base_controller.rb'
- 'app/controllers/api/v1/admin/accounts_controller.rb'
- 'app/controllers/application_controller.rb'
- 'app/controllers/auth/registrations_controller.rb'
- 'app/controllers/auth/sessions_controller.rb'
- 'app/lib/activitypub/activity.rb'
- 'app/lib/activitypub/activity/create.rb'
- 'app/lib/activitypub/tag_manager.rb'
- 'app/lib/feed_manager.rb'
- 'app/lib/link_details_extractor.rb'
- 'app/lib/request.rb'
- 'app/lib/text_formatter.rb'
- 'app/lib/user_settings_decorator.rb'
- 'app/mailers/user_mailer.rb'
- 'app/models/account.rb'
- 'app/models/admin/account_action.rb'
- 'app/models/form/account_batch.rb'
- 'app/models/media_attachment.rb'
- 'app/models/status.rb'
- 'app/models/tag.rb'
- 'app/models/user.rb'
- 'app/serializers/activitypub/actor_serializer.rb'
- 'app/serializers/activitypub/note_serializer.rb'
- 'app/serializers/rest/status_serializer.rb'
- 'app/services/account_search_service.rb'
- 'app/services/activitypub/process_account_service.rb'
- 'app/services/activitypub/process_status_update_service.rb'
- 'app/services/backup_service.rb'
- 'app/services/delete_account_service.rb'
- 'app/services/fan_out_on_write_service.rb'
- 'app/services/fetch_link_card_service.rb'
- 'app/services/import_service.rb'
- 'app/services/notify_service.rb'
- 'app/services/post_status_service.rb'
- 'app/services/update_status_service.rb'
- 'lib/paperclip/color_extractor.rb'
Metrics/CyclomaticComplexity:
Exclude:

4
.rubocop_todo.yml
View File

@ -243,10 +243,6 @@ Metrics/BlockNesting:
Exclude:
- 'lib/tasks/mastodon.rake'
# Configuration parameters: CountComments, CountAsOne.
Metrics/ClassLength:
Max: 375
# Configuration parameters: AllowedMethods, AllowedPatterns.
Metrics/CyclomaticComplexity:
Max: 25

2
Dockerfile
View File

@ -37,7 +37,7 @@ RUN apt-get update && \
bundle config set --local without 'development test' && \
bundle config set silence_root_warning true && \
bundle install -j"$(nproc)" && \
yarn install --pure-lockfile --network-timeout 600000 && \
yarn install --pure-lockfile --production --network-timeout 600000 && \
yarn cache clean
FROM node:${NODE_VERSION}

5
app/javascript/mastodon/base_polyfills.js
View File

@ -4,7 +4,6 @@ import 'es6-symbol/implement';
import includes from 'array-includes';
import assign from 'object-assign';
import values from 'object.values';
import isNaN from 'is-nan';
import { decode as decodeBase64 } from './utils/base64';
import promiseFinally from 'promise.prototype.finally';
@ -20,10 +19,6 @@ if (!Object.values) {
values.shim();
}
if (!Number.isNaN) {
Number.isNaN = isNaN;
}
promiseFinally.shim();
if (!HTMLCanvasElement.prototype.toBlob) {

3
app/javascript/mastodon/components/account.jsx
View File

@ -23,7 +23,6 @@ const messages = defineMessages({
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
});
export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@ -155,3 +154,5 @@ class Account extends ImmutablePureComponent {
}
}
export default injectIntl(Account);

3
app/javascript/mastodon/components/admin/ReportReasonSelector.jsx
View File

@ -84,7 +84,6 @@ class Rule extends React.PureComponent {
}
export default @injectIntl
class ReportReasonSelector extends React.PureComponent {
static propTypes = {
@ -157,3 +156,5 @@ class ReportReasonSelector extends React.PureComponent {
}
}
export default injectIntl(ReportReasonSelector);

3
app/javascript/mastodon/components/column_header.jsx
View File

@ -12,7 +12,6 @@ const messages = defineMessages({
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
});
export default @injectIntl
class ColumnHeader extends React.PureComponent {
static contextTypes = {
@ -209,3 +208,5 @@ class ColumnHeader extends React.PureComponent {
}
}
export default injectIntl(ColumnHeader);

3
app/javascript/mastodon/components/dismissable_banner.jsx
View File

@ -8,7 +8,6 @@ const messages = defineMessages({
dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
});
export default @injectIntl
class DismissableBanner extends React.PureComponent {
static propTypes = {
@ -49,3 +48,5 @@ class DismissableBanner extends React.PureComponent {
}
}
export default injectIntl(DismissableBanner);

3
app/javascript/mastodon/components/domain.jsx
View File

@ -8,7 +8,6 @@ const messages = defineMessages({
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
});
export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@ -40,3 +39,5 @@ class Account extends ImmutablePureComponent {
}
}
export default injectIntl(Account);

4
app/javascript/mastodon/components/edited_timestamp/index.jsx
View File

@ -16,8 +16,6 @@ const mapDispatchToProps = (dispatch, { statusId }) => ({
});
export default @connect(null, mapDispatchToProps)
@injectIntl
class EditedTimestamp extends React.PureComponent {
static propTypes = {
@ -68,3 +66,5 @@ class EditedTimestamp extends React.PureComponent {
}
}
export default connect(null, mapDispatchToProps)(injectIntl(EditedTimestamp));

3
app/javascript/mastodon/components/inline_account.jsx
View File

@ -14,7 +14,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
class InlineAccount extends React.PureComponent {
static propTypes = {
@ -32,3 +31,5 @@ class InlineAccount extends React.PureComponent {
}
}
export default connect(makeMapStateToProps)(InlineAccount);

3
app/javascript/mastodon/components/load_gap.jsx
View File

@ -7,7 +7,6 @@ const messages = defineMessages({
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
});
export default @injectIntl
class LoadGap extends React.PureComponent {
static propTypes = {
@ -32,3 +31,5 @@ class LoadGap extends React.PureComponent {
}
}
export default injectIntl(LoadGap);

3
app/javascript/mastodon/components/media_gallery.jsx
View File

@ -223,7 +223,6 @@ class Item extends React.PureComponent {
}
export default @injectIntl
class MediaGallery extends React.PureComponent {
static propTypes = {
@ -369,3 +368,5 @@ class MediaGallery extends React.PureComponent {
}
}
export default injectIntl(MediaGallery);

2
app/javascript/mastodon/components/navigation_portal.jsx
View File

@ -15,7 +15,6 @@ const DefaultNavigation = () => (
</>
);
export default @withRouter
class NavigationPortal extends React.PureComponent {
render () {
@ -33,3 +32,4 @@ class NavigationPortal extends React.PureComponent {
}
}
export default withRouter(NavigationPortal);

3
app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
View File

@ -6,7 +6,6 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import { FormattedMessage } from 'react-intl';
export default @connect()
class PictureInPicturePlaceholder extends React.PureComponent {
static propTypes = {
@ -67,3 +66,5 @@ class PictureInPicturePlaceholder extends React.PureComponent {
}
}
export default connect()(PictureInPicturePlaceholder);

3
app/javascript/mastodon/components/poll.jsx
View File

@ -31,7 +31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
return obj;
}, {});
export default @injectIntl
class Poll extends ImmutablePureComponent {
static contextTypes = {
@ -234,3 +233,5 @@ class Poll extends ImmutablePureComponent {
}
}
export default injectIntl(Poll);

3
app/javascript/mastodon/components/relative_timestamp.jsx
View File

@ -121,7 +121,6 @@ const timeRemainingString = (intl, date, now, timeGiven = true) => {
return relativeTime;
};
export default @injectIntl
class RelativeTimestamp extends React.Component {
static propTypes = {
@ -197,3 +196,5 @@ class RelativeTimestamp extends React.Component {
}
}
export default injectIntl(RelativeTimestamp);

3
app/javascript/mastodon/components/scrollable_list.jsx
View File

@ -20,7 +20,6 @@ const mapStateToProps = (state, { scrollKey }) => {
};
};
export default @connect(mapStateToProps, null, null, { forwardRef: true })
class ScrollableList extends PureComponent {
static contextTypes = {
@ -365,3 +364,5 @@ class ScrollableList extends PureComponent {
}
}
export default connect(mapStateToProps, null, null, { forwardRef: true })(ScrollableList);

4
app/javascript/mastodon/components/server_banner.jsx
View File

@ -18,8 +18,6 @@ const mapStateToProps = state => ({
server: state.getIn(['server', 'server']),
});
export default @connect(mapStateToProps)
@injectIntl
class ServerBanner extends React.PureComponent {
static propTypes = {
@ -91,3 +89,5 @@ class ServerBanner extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(ServerBanner));

3
app/javascript/mastodon/components/status.jsx
View File

@ -59,7 +59,6 @@ const messages = defineMessages({
edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
});
export default @injectIntl
class Status extends ImmutablePureComponent {
static contextTypes = {
@ -549,3 +548,5 @@ class Status extends ImmutablePureComponent {
}
}
export default injectIntl(Status);

4
app/javascript/mastodon/components/status_action_bar.jsx
View File

@ -53,8 +53,6 @@ const mapStateToProps = (state, { status }) => ({
relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
});
export default @connect(mapStateToProps)
@injectIntl
class StatusActionBar extends ImmutablePureComponent {
static contextTypes = {
@ -385,3 +383,5 @@ class StatusActionBar extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(StatusActionBar));

4
app/javascript/mastodon/components/status_content.jsx
View File

@ -52,8 +52,6 @@ const mapStateToProps = state => ({
languages: state.getIn(['server', 'translationLanguages', 'items']),
});
export default @connect(mapStateToProps)
@injectIntl
class StatusContent extends React.PureComponent {
static contextTypes = {
@ -311,3 +309,5 @@ class StatusContent extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(StatusContent));

4
app/javascript/mastodon/features/about/index.jsx
View File

@ -80,8 +80,6 @@ class Section extends React.PureComponent {
}
export default @connect(mapStateToProps)
@injectIntl
class About extends React.PureComponent {
static propTypes = {
@ -217,3 +215,5 @@ class About extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(About));

3
app/javascript/mastodon/features/account/components/account_note.jsx
View File

@ -43,7 +43,6 @@ class InlineAlert extends React.PureComponent {
}
export default @injectIntl
class AccountNote extends ImmutablePureComponent {
static propTypes = {
@ -168,3 +167,5 @@ class AccountNote extends ImmutablePureComponent {
}
}
export default injectIntl(AccountNote);

3
app/javascript/mastodon/features/account/components/featured_tags.jsx
View File

@ -10,7 +10,6 @@ const messages = defineMessages({
empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
});
export default @injectIntl
class FeaturedTags extends ImmutablePureComponent {
static contextTypes = {
@ -50,3 +49,5 @@ class FeaturedTags extends ImmutablePureComponent {
}
}
export default injectIntl(FeaturedTags);

3
app/javascript/mastodon/features/account/components/header.jsx
View File

@ -76,7 +76,6 @@ const dateFormatOptions = {
minute: '2-digit',
};
export default @injectIntl
class Header extends ImmutablePureComponent {
static contextTypes = {
@ -419,3 +418,5 @@ class Header extends ImmutablePureComponent {
}
}
export default injectIntl(Header);

3
app/javascript/mastodon/features/account/navigation.jsx
View File

@ -19,7 +19,6 @@ const mapStateToProps = (state, { match: { params: { acct } } }) => {
};
};
export default @connect(mapStateToProps)
class AccountNavigation extends React.PureComponent {
static propTypes = {
@ -50,3 +49,5 @@ class AccountNavigation extends React.PureComponent {
}
}
export default connect(mapStateToProps)(AccountNavigation);

2
app/javascript/mastodon/features/account_gallery/components/media_item.jsx
View File

@ -74,7 +74,7 @@ export default class MediaItem extends ImmutablePureComponent {
if (['audio', 'video'].includes(attachment.get('type'))) {
content = (
<img
src={attachment.get('preview_url') || attachment.getIn(['account', 'avatar_static'])}
src={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
alt={attachment.get('description')}
lang={status.get('language')}
onLoad={this.handleImageLoad}

3
app/javascript/mastodon/features/account_gallery/index.jsx
View File

@ -60,7 +60,6 @@ class LoadMoreMedia extends ImmutablePureComponent {
}
export default @connect(mapStateToProps)
class AccountGallery extends ImmutablePureComponent {
static propTypes = {
@ -226,3 +225,5 @@ class AccountGallery extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(AccountGallery);

3
app/javascript/mastodon/features/account_timeline/components/limited_account_hint.jsx
View File

@ -14,7 +14,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
export default @connect(() => {}, mapDispatchToProps)
class LimitedAccountHint extends React.PureComponent {
static propTypes = {
@ -34,3 +33,5 @@ class LimitedAccountHint extends React.PureComponent {
}
}
export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);

3
app/javascript/mastodon/features/account_timeline/index.jsx
View File

@ -64,7 +64,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
export default @connect(mapStateToProps)
class AccountTimeline extends ImmutablePureComponent {
static propTypes = {
@ -206,3 +205,5 @@ class AccountTimeline extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(AccountTimeline);

3
app/javascript/mastodon/features/audio/index.jsx
View File

@ -22,7 +22,6 @@ const messages = defineMessages({
const TICK_SIZE = 10;
const PADDING = 180;
export default @injectIntl
class Audio extends React.PureComponent {
static propTypes = {
@ -569,3 +568,5 @@ class Audio extends React.PureComponent {
}
}
export default injectIntl(Audio);

4
app/javascript/mastodon/features/blocks/index.jsx
View File

@ -22,8 +22,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'blocks', 'isLoading'], true),
});
export default @connect(mapStateToProps)
@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@ -77,3 +75,5 @@ class Blocks extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Blocks));

4
app/javascript/mastodon/features/bookmarked_statuses/index.jsx
View File

@ -22,8 +22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
});
export default @connect(mapStateToProps)
@injectIntl
class Bookmarks extends ImmutablePureComponent {
static propTypes = {
@ -106,3 +104,5 @@ class Bookmarks extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Bookmarks));

3
app/javascript/mastodon/features/closed_registrations_modal/index.jsx
View File

@ -9,7 +9,6 @@ const mapStateToProps = state => ({
message: state.getIn(['server', 'server', 'registrations', 'message']),
});
export default @connect(mapStateToProps)
class ClosedRegistrationsModal extends ImmutablePureComponent {
componentDidMount () {
@ -73,3 +72,5 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(ClosedRegistrationsModal);

3
app/javascript/mastodon/features/community_timeline/components/column_settings.jsx
View File

@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage } from 'react-intl';
import SettingToggle from '../../notifications/components/setting_toggle';
export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@ -27,3 +26,5 @@ class ColumnSettings extends React.PureComponent {
}
}
export default injectIntl(ColumnSettings);

4
app/javascript/mastodon/features/community_timeline/index.jsx
View File

@ -30,8 +30,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
export default @connect(mapStateToProps)
@injectIntl
class CommunityTimeline extends React.PureComponent {
static contextTypes = {
@ -158,3 +156,5 @@ class CommunityTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(CommunityTimeline));

3
app/javascript/mastodon/features/compose/components/action_bar.jsx
View File

@ -20,7 +20,6 @@ const messages = defineMessages({
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
});
export default @injectIntl
class ActionBar extends React.PureComponent {
static propTypes = {
@ -65,3 +64,5 @@ class ActionBar extends React.PureComponent {
}
}
export default injectIntl(ActionBar);

3
app/javascript/mastodon/features/compose/components/compose_form.jsx
View File

@ -32,7 +32,6 @@ const messages = defineMessages({
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
});
export default @injectIntl
class ComposeForm extends ImmutablePureComponent {
static contextTypes = {
@ -300,3 +299,5 @@ class ComposeForm extends ImmutablePureComponent {
}
}
export default injectIntl(ComposeForm);

8
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
View File

@ -144,8 +144,7 @@ class ModifierPicker extends React.PureComponent {
}
@injectIntl
class EmojiPickerMenu extends React.PureComponent {
class EmojiPickerMenuImpl extends React.PureComponent {
static propTypes = {
custom_emojis: ImmutablePropTypes.list,
@ -305,7 +304,8 @@ class EmojiPickerMenu extends React.PureComponent {
}
export default @injectIntl
const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
class EmojiPickerDropdown extends React.PureComponent {
static propTypes = {
@ -409,3 +409,5 @@ class EmojiPickerDropdown extends React.PureComponent {
}
}
export default injectIntl(EmojiPickerDropdown);

3
app/javascript/mastodon/features/compose/components/language_dropdown.jsx
View File

@ -237,7 +237,6 @@ class LanguageDropdownMenu extends React.PureComponent {
}
export default @injectIntl
class LanguageDropdown extends React.PureComponent {
static propTypes = {
@ -325,3 +324,5 @@ class LanguageDropdown extends React.PureComponent {
}
}
export default injectIntl(LanguageDropdown);

4
app/javascript/mastodon/features/compose/components/poll_button.jsx
View File

@ -13,8 +13,6 @@ const iconStyle = {
lineHeight: '27px',
};
export default
@injectIntl
class PollButton extends React.PureComponent {
static propTypes = {
@ -53,3 +51,5 @@ class PollButton extends React.PureComponent {
}
}
export default injectIntl(PollButton);

9
app/javascript/mastodon/features/compose/components/poll_form.jsx
View File

@ -20,8 +20,7 @@ const messages = defineMessages({
days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
});
@injectIntl
class Option extends React.PureComponent {
class OptionIntl extends React.PureComponent {
static propTypes = {
title: PropTypes.string.isRequired,
@ -113,8 +112,8 @@ class Option extends React.PureComponent {
}
export default
@injectIntl
const Option = injectIntl(OptionIntl);
class PollForm extends ImmutablePureComponent {
static propTypes = {
@ -180,3 +179,5 @@ class PollForm extends ImmutablePureComponent {
}
}
export default injectIntl(PollForm);

3
app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
View File

@ -132,7 +132,6 @@ class PrivacyDropdownMenu extends React.PureComponent {
}
export default @injectIntl
class PrivacyDropdown extends React.PureComponent {
static propTypes = {
@ -285,3 +284,5 @@ class PrivacyDropdown extends React.PureComponent {
}
}
export default injectIntl(PrivacyDropdown);

3
app/javascript/mastodon/features/compose/components/reply_indicator.jsx
View File

@ -12,7 +12,6 @@ const messages = defineMessages({
cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
});
export default @injectIntl
class ReplyIndicator extends ImmutablePureComponent {
static contextTypes = {
@ -69,3 +68,5 @@ class ReplyIndicator extends ImmutablePureComponent {
}
}
export default injectIntl(ReplyIndicator);

3
app/javascript/mastodon/features/compose/components/search.jsx
View File

@ -32,7 +32,6 @@ class SearchPopout extends React.PureComponent {
}
export default @injectIntl
class Search extends React.PureComponent {
static contextTypes = {
@ -145,3 +144,5 @@ class Search extends React.PureComponent {
}
}
export default injectIntl(Search);

3
app/javascript/mastodon/features/compose/components/search_results.jsx
View File

@ -14,7 +14,6 @@ const messages = defineMessages({
dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
});
export default @injectIntl
class SearchResults extends ImmutablePureComponent {
static propTypes = {
@ -138,3 +137,5 @@ class SearchResults extends ImmutablePureComponent {
}
}
export default injectIntl(SearchResults);

4
app/javascript/mastodon/features/compose/components/upload_button.jsx
View File

@ -23,8 +23,6 @@ const iconStyle = {
lineHeight: '27px',
};
export default @connect(makeMapStateToProps)
@injectIntl
class UploadButton extends ImmutablePureComponent {
static propTypes = {
@ -81,3 +79,5 @@ class UploadButton extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(UploadButton));

4
app/javascript/mastodon/features/compose/index.jsx
View File

@ -38,8 +38,6 @@ const mapStateToProps = (state, ownProps) => ({
showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
});
export default @connect(mapStateToProps)
@injectIntl
class Compose extends React.PureComponent {
static propTypes = {
@ -148,3 +146,5 @@ class Compose extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Compose));

3
app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
View File

@ -24,7 +24,6 @@ const messages = defineMessages({
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
});
export default @injectIntl
class Conversation extends ImmutablePureComponent {
static contextTypes = {
@ -198,3 +197,5 @@ class Conversation extends ImmutablePureComponent {
}
}
export default injectIntl(Conversation);

4
app/javascript/mastodon/features/direct_timeline/index.jsx
View File

@ -14,8 +14,6 @@ const messages = defineMessages({
title: { id: 'column.direct', defaultMessage: 'Direct messages' },
});
export default @connect()
@injectIntl
class DirectTimeline extends React.PureComponent {
static propTypes = {
@ -105,3 +103,5 @@ class DirectTimeline extends React.PureComponent {
}
}
export default connect()(injectIntl(DirectTimeline));

5
app/javascript/mastodon/features/directory/components/account_card.jsx
View File

@ -91,9 +91,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
});
export default
@injectIntl
@connect(makeMapStateToProps, mapDispatchToProps)
class AccountCard extends ImmutablePureComponent {
static propTypes = {
@ -233,3 +230,5 @@ class AccountCard extends ImmutablePureComponent {
}
}
export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));

4
app/javascript/mastodon/features/directory/index.jsx
View File

@ -29,8 +29,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
export default @connect(mapStateToProps)
@injectIntl
class Directory extends React.PureComponent {
static contextTypes = {
@ -176,3 +174,5 @@ class Directory extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Directory));

4
app/javascript/mastodon/features/domain_blocks/index.jsx
View File

@ -23,8 +23,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
});
export default @connect(mapStateToProps)
@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@ -81,3 +79,5 @@ class Blocks extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Blocks));

4
app/javascript/mastodon/features/explore/index.jsx
View File

@ -24,8 +24,6 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
});
export default @connect(mapStateToProps)
@injectIntl
class Explore extends React.PureComponent {
static contextTypes = {
@ -105,3 +103,5 @@ class Explore extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Explore));

3
app/javascript/mastodon/features/explore/links.jsx
View File

@ -13,7 +13,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['trends', 'links', 'isLoading']),
});
export default @connect(mapStateToProps)
class Links extends React.PureComponent {
static propTypes = {
@ -68,3 +67,5 @@ class Links extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Links);

4
app/javascript/mastodon/features/explore/results.jsx
View File

@ -42,8 +42,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
<Status key={`status-${item}`} id={item} />
)), onLoadMore);
export default @connect(mapStateToProps)
@injectIntl
class Results extends React.PureComponent {
static propTypes = {
@ -124,3 +122,5 @@ class Results extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Results));

3
app/javascript/mastodon/features/explore/statuses.jsx
View File

@ -14,7 +14,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
});
export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@ -62,3 +61,5 @@ class Statuses extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Statuses);

3
app/javascript/mastodon/features/explore/suggestions.jsx
View File

@ -12,7 +12,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
export default @connect(mapStateToProps)
class Suggestions extends React.PureComponent {
static propTypes = {
@ -49,3 +48,5 @@ class Suggestions extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Suggestions);

3
app/javascript/mastodon/features/explore/tags.jsx
View File

@ -13,7 +13,6 @@ const mapStateToProps = state => ({
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
});
export default @connect(mapStateToProps)
class Tags extends React.PureComponent {
static propTypes = {
@ -60,3 +59,5 @@ class Tags extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Tags);

4
app/javascript/mastodon/features/favourited_statuses/index.jsx
View File

@ -22,8 +22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
});
export default @connect(mapStateToProps)
@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
@ -106,3 +104,5 @@ class Favourites extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Favourites));

4
app/javascript/mastodon/features/favourites/index.jsx
View File

@ -21,8 +21,6 @@ const mapStateToProps = (state, props) => ({
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
});
export default @connect(mapStateToProps)
@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
@ -90,3 +88,5 @@ class Favourites extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Favourites));

3
app/javascript/mastodon/features/filters/added_to_filter.jsx
View File

@ -10,7 +10,6 @@ const mapStateToProps = (state, { filterId }) => ({
filter: state.getIn(['filters', filterId]),
});
export default @connect(mapStateToProps)
class AddedToFilter extends React.PureComponent {
static propTypes = {
@ -100,3 +99,5 @@ class AddedToFilter extends React.PureComponent {
}
}
export default connect(mapStateToProps)(AddedToFilter);

4
app/javascript/mastodon/features/filters/select_filter.jsx
View File

@ -22,8 +22,6 @@ const mapStateToProps = (state, { contextType }) => ({
]),
});
export default @connect(mapStateToProps)
@injectIntl
class SelectFilter extends React.PureComponent {
static propTypes = {
@ -190,3 +188,5 @@ class SelectFilter extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(SelectFilter));

4
app/javascript/mastodon/features/follow_recommendations/components/account.jsx
View File

@ -32,8 +32,6 @@ const getFirstSentence = str => {
return arr[0];
};
export default @connect(makeMapStateToProps)
@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@ -83,3 +81,5 @@ class Account extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Account));

3
app/javascript/mastodon/features/follow_recommendations/index.jsx
View File

@ -19,7 +19,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
export default @connect(mapStateToProps)
class FollowRecommendations extends ImmutablePureComponent {
static contextTypes = {
@ -114,3 +113,5 @@ class FollowRecommendations extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(FollowRecommendations);

3
app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
View File

@ -13,7 +13,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
export default @injectIntl
class AccountAuthorize extends ImmutablePureComponent {
static propTypes = {
@ -47,3 +46,5 @@ class AccountAuthorize extends ImmutablePureComponent {
}
}
export default injectIntl(AccountAuthorize);

4
app/javascript/mastodon/features/follow_requests/index.jsx
View File

@ -25,8 +25,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
export default @connect(mapStateToProps)
@injectIntl
class FollowRequests extends ImmutablePureComponent {
static propTypes = {
@ -89,3 +87,5 @@ class FollowRequests extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(FollowRequests));

4
app/javascript/mastodon/features/followed_tags/index.jsx
View File

@ -22,8 +22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['followed_tags', 'next']),
});
export default @connect(mapStateToProps)
@injectIntl
class FollowedTags extends ImmutablePureComponent {
static propTypes = {
@ -87,3 +85,5 @@ class FollowedTags extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(FollowedTags));

3
app/javascript/mastodon/features/followers/index.jsx
View File

@ -54,7 +54,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
export default @connect(mapStateToProps)
class Followers extends ImmutablePureComponent {
static propTypes = {
@ -168,3 +167,5 @@ class Followers extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(Followers);

3
app/javascript/mastodon/features/following/index.jsx
View File

@ -54,7 +54,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
export default @connect(mapStateToProps)
class Following extends ImmutablePureComponent {
static propTypes = {
@ -168,3 +167,5 @@ class Following extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(Following);

3
app/javascript/mastodon/features/getting_started/components/announcements.jsx
View File

@ -355,7 +355,6 @@ class Announcement extends ImmutablePureComponent {
}
export default @injectIntl
class Announcements extends ImmutablePureComponent {
static propTypes = {
@ -447,3 +446,5 @@ class Announcements extends ImmutablePureComponent {
}
}
export default injectIntl(Announcements);

4
app/javascript/mastodon/features/getting_started/index.jsx
View File

@ -58,8 +58,6 @@ const badgeDisplay = (number, limit) => {
}
};
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class GettingStarted extends ImmutablePureComponent {
static contextTypes = {
@ -153,3 +151,5 @@ class GettingStarted extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));

3
app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx
View File

@ -12,7 +12,6 @@ const messages = defineMessages({
noOptions: { id: 'hashtag.column_settings.select.no_options_message', defaultMessage: 'No suggestions found' },
});
export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@ -131,3 +130,5 @@ class ColumnSettings extends React.PureComponent {
}
}
export default injectIntl(ColumnSettings);

4
app/javascript/mastodon/features/hashtag_timeline/index.jsx
View File

@ -26,8 +26,6 @@ const mapStateToProps = (state, props) => ({
tag: state.getIn(['tags', props.params.id]),
});
export default @connect(mapStateToProps)
@injectIntl
class HashtagTimeline extends React.PureComponent {
disconnects = [];
@ -235,3 +233,5 @@ class HashtagTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(HashtagTimeline));

3
app/javascript/mastodon/features/home_timeline/components/column_settings.jsx
View File

@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage } from 'react-intl';
import SettingToggle from '../../notifications/components/setting_toggle';
export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@ -32,3 +31,5 @@ class ColumnSettings extends React.PureComponent {
}
}
export default injectIntl(ColumnSettings);

4
app/javascript/mastodon/features/home_timeline/index.jsx
View File

@ -30,8 +30,6 @@ const mapStateToProps = state => ({
showAnnouncements: state.getIn(['announcements', 'show']),
});
export default @connect(mapStateToProps)
@injectIntl
class HomeTimeline extends React.PureComponent {
static contextTypes = {
@ -174,3 +172,5 @@ class HomeTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(HomeTimeline));

3
app/javascript/mastodon/features/interaction_modal/index.jsx
View File

@ -74,7 +74,6 @@ class Copypaste extends React.PureComponent {
}
export default @connect(mapStateToProps, mapDispatchToProps)
class InteractionModal extends React.PureComponent {
static propTypes = {
@ -159,3 +158,5 @@ class InteractionModal extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(InteractionModal);

3
app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
View File

@ -10,7 +10,6 @@ const messages = defineMessages({
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
});
export default @injectIntl
class KeyboardShortcuts extends ImmutablePureComponent {
static propTypes = {
@ -174,3 +173,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
}
}
export default injectIntl(KeyboardShortcuts);

5
app/javascript/mastodon/features/list_adder/components/account.jsx
View File

@ -17,9 +17,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@ -41,3 +38,5 @@ class Account extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Account));

4
app/javascript/mastodon/features/list_adder/components/list.jsx
View File

@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { listId }) => ({
onAdd: () => dispatch(addToListAdder(listId)),
});
export default @connect(MapStateToProps, mapDispatchToProps)
@injectIntl
class List extends ImmutablePureComponent {
static propTypes = {
@ -67,3 +65,5 @@ class List extends ImmutablePureComponent {
}
}
export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(List));

4
app/javascript/mastodon/features/list_adder/index.jsx
View File

@ -28,8 +28,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListAdder()),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class ListAdder extends ImmutablePureComponent {
static propTypes = {
@ -71,3 +69,5 @@ class ListAdder extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListAdder));

4
app/javascript/mastodon/features/list_editor/components/account.jsx
View File

@ -31,8 +31,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
onAdd: () => dispatch(addToListEditor(accountId)),
});
export default @connect(makeMapStateToProps, mapDispatchToProps)
@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@ -75,3 +73,5 @@ class Account extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(Account));

4
app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
View File

@ -19,8 +19,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(false)),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class ListForm extends React.PureComponent {
static propTypes = {
@ -68,3 +66,5 @@ class ListForm extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListForm));

4
app/javascript/mastodon/features/list_editor/components/search.jsx
View File

@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
onChange: value => dispatch(changeListSuggestions(value)),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class Search extends React.PureComponent {
static propTypes = {
@ -74,3 +72,5 @@ class Search extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Search));

4
app/javascript/mastodon/features/list_editor/index.jsx
View File

@ -22,8 +22,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListEditor()),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class ListEditor extends ImmutablePureComponent {
static propTypes = {
@ -77,3 +75,5 @@ class ListEditor extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListEditor));

4
app/javascript/mastodon/features/list_timeline/index.jsx
View File

@ -31,8 +31,6 @@ const mapStateToProps = (state, props) => ({
hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
});
export default @connect(mapStateToProps)
@injectIntl
class ListTimeline extends React.PureComponent {
static contextTypes = {
@ -219,3 +217,5 @@ class ListTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(ListTimeline));

4
app/javascript/mastodon/features/lists/components/new_list_form.jsx
View File

@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(true)),
});
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class NewListForm extends React.PureComponent {
static propTypes = {
@ -75,3 +73,5 @@ class NewListForm extends React.PureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewListForm));

4
app/javascript/mastodon/features/lists/index.jsx
View File

@ -32,8 +32,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
export default @connect(mapStateToProps)
@injectIntl
class Lists extends ImmutablePureComponent {
static propTypes = {
@ -87,3 +85,5 @@ class Lists extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Lists));

4
app/javascript/mastodon/features/mutes/index.jsx
View File

@ -23,8 +23,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
});
export default @connect(mapStateToProps)
@injectIntl
class Mutes extends ImmutablePureComponent {
static propTypes = {
@ -82,3 +80,5 @@ class Mutes extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Mutes));

3
app/javascript/mastodon/features/notifications/components/filter_bar.jsx
View File

@ -12,7 +12,6 @@ const tooltips = defineMessages({
statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
});
export default @injectIntl
class FilterBar extends React.PureComponent {
static propTypes = {
@ -108,3 +107,5 @@ class FilterBar extends React.PureComponent {
}
}
export default injectIntl(FilterBar);

9
app/javascript/mastodon/features/notifications/components/follow_request.jsx
View File

@ -1,4 +1,4 @@
import React, { Fragment } from 'react';
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import Avatar from 'mastodon/components/avatar';
@ -13,7 +13,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
export default @injectIntl
class FollowRequest extends ImmutablePureComponent {
static propTypes = {
@ -32,10 +31,10 @@ class FollowRequest extends ImmutablePureComponent {
if (hidden) {
return (
<Fragment>
<React.Fragment>
{account.get('display_name')}
{account.get('username')}
</Fragment>
</React.Fragment>
);
}
@ -57,3 +56,5 @@ class FollowRequest extends ImmutablePureComponent {
}
}
export default injectIntl(FollowRequest);

3
app/javascript/mastodon/features/notifications/components/notification.jsx
View File

@ -33,7 +33,6 @@ const notificationForScreenReader = (intl, message, timestamp) => {
return output.join(', ');
};
export default @injectIntl
class Notification extends ImmutablePureComponent {
static contextTypes = {
@ -447,3 +446,5 @@ class Notification extends ImmutablePureComponent {
}
}
export default injectIntl(Notification);

4
app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
View File

@ -12,8 +12,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
export default @connect()
@injectIntl
class NotificationsPermissionBanner extends React.PureComponent {
static propTypes = {
@ -46,3 +44,5 @@ class NotificationsPermissionBanner extends React.PureComponent {
}
}
export default connect()(injectIntl(NotificationsPermissionBanner));

3
app/javascript/mastodon/features/notifications/components/report.jsx
View File

@ -13,7 +13,6 @@ const messages = defineMessages({
violation: { id: 'report_notification.categories.violation', defaultMessage: 'Rule violation' },
});
export default @injectIntl
class Report extends ImmutablePureComponent {
static propTypes = {
@ -60,3 +59,5 @@ class Report extends ImmutablePureComponent {
}
}
export default injectIntl(Report);

4
app/javascript/mastodon/features/notifications/index.jsx
View File

@ -67,8 +67,6 @@ const mapStateToProps = state => ({
needsNotificationPermission: state.getIn(['settings', 'notifications', 'alerts']).includes(true) && state.getIn(['notifications', 'browserSupport']) && state.getIn(['notifications', 'browserPermission']) === 'default' && !state.getIn(['settings', 'notifications', 'dismissPermissionBanner']),
});
export default @connect(mapStateToProps)
@injectIntl
class Notifications extends React.PureComponent {
static contextTypes = {
@ -288,3 +286,5 @@ class Notifications extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Notifications));

4
app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
View File

@ -37,8 +37,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class Footer extends ImmutablePureComponent {
static contextTypes = {
@ -190,3 +188,5 @@ class Footer extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Footer));

4
app/javascript/mastodon/features/picture_in_picture/components/header.jsx
View File

@ -17,8 +17,6 @@ const mapStateToProps = (state, { accountId }) => ({
account: state.getIn(['accounts', accountId]),
});
export default @connect(mapStateToProps)
@injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@ -45,3 +43,5 @@ class Header extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Header));

Some files were not shown because too many files have changed in this diff Show More