From f01957203f77fce8b65d5e034a8acd68f1e0ae2e Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sun, 9 Dec 2018 01:01:12 +0100 Subject: Upgrade to react 16 TODO: add componentDidCatch --- src/components/settings/services/EditServiceForm.js | 14 +++++++------- .../settings/services/ServicesDashboard.js | 20 +++++++++----------- 2 files changed, 16 insertions(+), 18 deletions(-) (limited to 'src/components/settings/services') diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 0c869c16d..a7c656acd 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { Link } from 'react-router'; @@ -271,14 +271,14 @@ export default @observer class EditServiceForm extends Component { {recipe.hasCustomUrl && ( {user.isPremium || recipe.author.find(a => a.email === user.email) ? ( -
+ {form.error === 'url-validation-error' && (

{intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}

)} -
+ ) : (

{intl.formatMessage(messages.customUrlPremiumInfo)}

@@ -308,12 +308,12 @@ export default @observer class EditServiceForm extends Component {

{intl.formatMessage(messages.headlineBadges)}

{recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( -
+

{intl.formatMessage(messages.indirectMessageInfo)}

-
+ )}
@@ -349,7 +349,7 @@ export default @observer class EditServiceForm extends Component { {form.$('proxy.isEnabled').value && ( -
+ {intl.formatMessage(messages.proxyInfo)}

-
+ )} diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index e7dfaf106..a12df7372 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js @@ -101,17 +101,15 @@ export default @observer class ServicesDashboard extends Component { /> )} {!isLoading && servicesRequestFailed && ( -
- - {intl.formatMessage(messages.servicesRequestFailed)} - -
+ + {intl.formatMessage(messages.servicesRequestFailed)} + )} {status.length > 0 && status.includes('updated') && ( -- cgit v1.2.3-70-g09d2