Merge branch 'master' into feat/bulk-export-pages-for-merge

# Conflicts:
#	resource/locales/en-US/translation.json
#	resource/locales/ja/translation.json
#	src/client/js/services/AppContainer.js

src/client/js/components/OutsideShareLinkModal.jsx

@@ -7,7 +7,7 @@ import {
 
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from './UnstatedUtils';
+import { withUnstatedContainers } from './UnstatedUtils';
 
 import AppContainer from '../services/AppContainer';
 import PageContainer from '../services/PageContainer';
@@ -44,10 +44,7 @@ const OutsideShareLinkModal = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const ModalControlWrapper = (props) => {
-  return createSubscribedElement(OutsideShareLinkModal, props, [AppContainer, PageContainer]);
-};
-
+const ModalControlWrapper = withUnstatedContainers(OutsideShareLinkModal, [AppContainer, PageContainer]);
 
 OutsideShareLinkModal.propTypes = {
   t: PropTypes.func.isRequired, //  i18next

src/client/js/components/Page/PageShareManagement.jsx

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { UncontrolledTooltip } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from '../UnstatedUtils';
+import { withUnstatedContainers } from '../UnstatedUtils';
+
 import AppContainer from '../../services/AppContainer';
 import PageContainer from '../../services/PageContainer';
 import OutsideShareLinkModal from '../OutsideShareLinkModal';
@@ -114,9 +115,7 @@ const PageShareManagement = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const PageShareManagementWrapper = (props) => {
-  return createSubscribedElement(PageShareManagement, props, [AppContainer, PageContainer]);
-};
+const PageShareManagementWrapper = withUnstatedContainers(PageShareManagement, [AppContainer, PageContainer]);
 
 
 PageShareManagement.propTypes = {

src/client/js/components/ShareLinkForm.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from './UnstatedUtils';
+import { withUnstatedContainers } from './UnstatedUtils';
 
 
 import AppContainer from '../services/AppContainer';
@@ -60,8 +60,9 @@ const ShareLinkForm = (props) => {
   );
 };
 
-const ShareLinkFormWrapper = (props) => {
-  return createSubscribedElement(ShareLinkForm, props, [AppContainer, PageContainer]);
-};
+/**
+ * Wrapper component for using unstated
+ */
+const ShareLinkFormWrapper = withUnstatedContainers(ShareLinkForm, [AppContainer, PageContainer]);
 
 export default withTranslation()(ShareLinkFormWrapper);

src/client/js/components/ShareLinkList.jsx

@@ -3,7 +3,7 @@ import * as toastr from 'toastr';
 
 import { withTranslation } from 'react-i18next';
 
-import { createSubscribedElement } from './UnstatedUtils';
+import { withUnstatedContainers } from './UnstatedUtils';
 
 import AppContainer from '../services/AppContainer';
 
@@ -77,8 +77,9 @@ const ShareLinkList = (props) => {
   );
 };
 
-const ShareLinkListWrapper = (props) => {
-  return createSubscribedElement(ShareLinkList, props, [AppContainer]);
-};
+/**
+ * Wrapper component for using unstated
+ */
+const ShareLinkListWrapper = withUnstatedContainers(ShareLinkList, [AppContainer]);
 
 export default withTranslation()(ShareLinkListWrapper);