Merge remote-tracking branch 'origin/develop' into account-endorsements

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

app/soapbox/utils/__tests__/accounts-test.js

@@ -1,3 +1,5 @@
+import { fromJS } from 'immutable';
+
 import {
   getDomain,
   acctFull,
@@ -5,7 +7,6 @@ import {
   isAdmin,
   isModerator,
 } from '../accounts';
-import { fromJS } from 'immutable';
 
 describe('getDomain', () => {
   const account = fromJS({

app/soapbox/utils/__tests__/config_db-test.js

@@ -1,7 +1,9 @@
-import { ConfigDB } from '../config_db';
-import config_db from 'soapbox/__fixtures__/config_db.json';
 import { fromJS } from 'immutable';
 
+import config_db from 'soapbox/__fixtures__/config_db.json';
+
+import { ConfigDB } from '../config_db';
+
 test('find', () => {
   const configs = fromJS(config_db).get('configs');
   expect(ConfigDB.find(configs, ':phoenix', ':json_library')).toEqual(fromJS({

app/soapbox/utils/__tests__/emoji_reacts-test.js

@@ -1,3 +1,5 @@
+import { fromJS } from 'immutable';
+
 import {
   sortEmoji,
   mergeEmojiFavourites,
@@ -8,7 +10,6 @@ import {
   simulateEmojiReact,
   simulateUnEmojiReact,
 } from '../emoji_reacts';
-import { fromJS } from 'immutable';
 
 const ALLOWED_EMOJI = [
   '👍',

app/soapbox/utils/__tests__/features-test.js

@@ -1,8 +1,9 @@
+import { Map as ImmutableMap } from 'immutable';
+
 import {
   parseVersion,
   getFeatures,
 } from '../features';
-import { Map as ImmutableMap } from 'immutable';
 
 describe('parseVersion', () => {
   it('with Pleroma version string', () => {

app/soapbox/utils/__tests__/timelines-test.js

@@ -1,6 +1,7 @@
-import { shouldFilter } from '../timelines';
 import { fromJS } from 'immutable';
 
+import { shouldFilter } from '../timelines';
+
 describe('shouldFilter', () => {
   it('returns false under normal circumstances', () => {
     const columnSettings = fromJS({});

app/soapbox/utils/code.js

@@ -1,7 +1,8 @@
 // @preval
-const pkg = require('../../../package.json');
 const { execSync } = require('child_process');
 
+const pkg = require('../../../package.json');
+
 const shortRepoName = url => new URL(url).pathname.substring(1);
 const trimHash = hash => hash.substring(0, 7);
 

app/soapbox/utils/features.js

@@ -1,8 +1,8 @@
 // Detect backend features to conditionally render elements
-import gte from 'semver/functions/gte';
-import lt from 'semver/functions/lt';
 import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
 import { createSelector } from 'reselect';
+import gte from 'semver/functions/gte';
+import lt from 'semver/functions/lt';
 
 const any = arr => arr.some(Boolean);
 

app/soapbox/utils/state.js

@@ -4,10 +4,10 @@
  */
 
 import { getSoapboxConfig } from'soapbox/actions/soapbox';
-import { isPrerendered } from 'soapbox/precheck';
-import { isURL } from 'soapbox/utils/auth';
-import { getBaseURL as getAccountBaseURL } from 'soapbox/utils/accounts';
 import { BACKEND_URL } from 'soapbox/build_config';
+import { isPrerendered } from 'soapbox/precheck';
+import { getBaseURL as getAccountBaseURL } from 'soapbox/utils/accounts';
+import { isURL } from 'soapbox/utils/auth';
 
 export const displayFqn = state => {
   const soapbox = getSoapboxConfig(state);

app/soapbox/utils/static.js

@@ -4,6 +4,7 @@
  */
 
 import { join } from 'path';
+
 import { FE_SUBDIRECTORY } from 'soapbox/build_config';
 
 export const joinPublicPath = (...paths) => {