diff --git a/imports/plugins/core/accounts/client/components/login.js b/imports/plugins/core/accounts/client/components/login.js index b9021bc4030..8c440aa1d32 100644 --- a/imports/plugins/core/accounts/client/components/login.js +++ b/imports/plugins/core/accounts/client/components/login.js @@ -60,7 +60,8 @@ class Login extends Component { const currentRoute = Router.current().route; const isOauthFlow = currentRoute.options && currentRoute.options.meta && currentRoute.options.meta.oauthLoginFlow; const idpFormClass = isOauthFlow ? "idp-form" : ""; - if (this.state.currentView === "loginFormSignInView" || this.state.currentView === "loginFormSignUpView" || this.state.currentView === "loginFormUpdatePasswordView") { + const { currentView } = this.state; + if (currentView === "loginFormSignInView" || currentView === "loginFormSignUpView" || currentView === "loginFormUpdatePasswordView") { if (isOauthFlow) { return ( ); - } else if (this.state.currentView === "loginFormResetPasswordView") { + } else if (currentView === "loginFormResetPasswordView") { return (
); } + + return null; } } diff --git a/imports/plugins/core/dashboard/client/components/OperatorLanding.js b/imports/plugins/core/dashboard/client/components/OperatorLanding.js index b37dae17070..95a8ad88b30 100644 --- a/imports/plugins/core/dashboard/client/components/OperatorLanding.js +++ b/imports/plugins/core/dashboard/client/components/OperatorLanding.js @@ -28,7 +28,8 @@ function OperatorLanding() { - Use the Operator UI to manage Orders, Products, Tags, Accounts, and Navigation, or change shop settings. + {/* eslint-disable-next-line max-len */} + Use the Operator UI to manage Orders, Products, Tags, Accounts, and Navigation, or change shop settings. diff --git a/imports/plugins/core/dashboard/client/components/ShopLogoUrls.js b/imports/plugins/core/dashboard/client/components/ShopLogoUrls.js index 5967b4abe12..abe120c561d 100644 --- a/imports/plugins/core/dashboard/client/components/ShopLogoUrls.js +++ b/imports/plugins/core/dashboard/client/components/ShopLogoUrls.js @@ -108,7 +108,12 @@ class ShopLogoUrls extends Component { diff --git a/imports/plugins/core/navigation/client/components/NavigationItemForm.js b/imports/plugins/core/navigation/client/components/NavigationItemForm.js index a199160dfe9..fad9945caa0 100644 --- a/imports/plugins/core/navigation/client/components/NavigationItemForm.js +++ b/imports/plugins/core/navigation/client/components/NavigationItemForm.js @@ -223,7 +223,9 @@ class NavigationItemForm extends Component { )} - + diff --git a/imports/plugins/core/orders/client/components/orderCardHeader.js b/imports/plugins/core/orders/client/components/orderCardHeader.js index 6e8b9a75e08..47c173478e0 100644 --- a/imports/plugins/core/orders/client/components/orderCardHeader.js +++ b/imports/plugins/core/orders/client/components/orderCardHeader.js @@ -102,7 +102,9 @@ class OrderCardHeader extends Component { - {i18next.t("orderCard.orderSummary.showOrderSummary", "Show order summary")} + + {i18next.t("orderCard.orderSummary.showOrderSummary", "Show order summary")} + diff --git a/imports/plugins/core/taxes/client/components/GeneralTaxSettings.js b/imports/plugins/core/taxes/client/components/GeneralTaxSettings.js index 4d17b943082..99a89d7d34f 100644 --- a/imports/plugins/core/taxes/client/components/GeneralTaxSettings.js +++ b/imports/plugins/core/taxes/client/components/GeneralTaxSettings.js @@ -61,7 +61,12 @@ export default class GeneralTaxSettings extends Component {
{ this.form = formRef; }} onSubmit={onSubmit} validator={validator} value={settingsDoc}> - diff --git a/imports/plugins/included/email-templates/server/templates/accounts/inviteNewShopMember.js b/imports/plugins/included/email-templates/server/templates/accounts/inviteNewShopMember.js index f1271a72cfe..445a0eaab46 100644 --- a/imports/plugins/included/email-templates/server/templates/accounts/inviteNewShopMember.js +++ b/imports/plugins/included/email-templates/server/templates/accounts/inviteNewShopMember.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/accounts/inviteShopMember.js b/imports/plugins/included/email-templates/server/templates/accounts/inviteShopMember.js index bce4f32194f..d74077a5f69 100644 --- a/imports/plugins/included/email-templates/server/templates/accounts/inviteShopMember.js +++ b/imports/plugins/included/email-templates/server/templates/accounts/inviteShopMember.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/accounts/inviteShopOwner.js b/imports/plugins/included/email-templates/server/templates/accounts/inviteShopOwner.js index 91c6232c27a..0f4ddf5056f 100644 --- a/imports/plugins/included/email-templates/server/templates/accounts/inviteShopOwner.js +++ b/imports/plugins/included/email-templates/server/templates/accounts/inviteShopOwner.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/accounts/resetPassword.js b/imports/plugins/included/email-templates/server/templates/accounts/resetPassword.js index ee32f97a861..2b0282980b0 100644 --- a/imports/plugins/included/email-templates/server/templates/accounts/resetPassword.js +++ b/imports/plugins/included/email-templates/server/templates/accounts/resetPassword.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/accounts/sendWelcomeEmail.js b/imports/plugins/included/email-templates/server/templates/accounts/sendWelcomeEmail.js index 8c3d611fad4..31119d4c9c0 100644 --- a/imports/plugins/included/email-templates/server/templates/accounts/sendWelcomeEmail.js +++ b/imports/plugins/included/email-templates/server/templates/accounts/sendWelcomeEmail.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/accounts/verifyEmail.js b/imports/plugins/included/email-templates/server/templates/accounts/verifyEmail.js index ba5c5576ffb..e2055857e35 100644 --- a/imports/plugins/included/email-templates/server/templates/accounts/verifyEmail.js +++ b/imports/plugins/included/email-templates/server/templates/accounts/verifyEmail.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/accounts/verifyUpdatedEmail.js b/imports/plugins/included/email-templates/server/templates/accounts/verifyUpdatedEmail.js index 5c74414b1ce..0223f913c9a 100644 --- a/imports/plugins/included/email-templates/server/templates/accounts/verifyUpdatedEmail.js +++ b/imports/plugins/included/email-templates/server/templates/accounts/verifyUpdatedEmail.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/orders/itemRefund.js b/imports/plugins/included/email-templates/server/templates/orders/itemRefund.js index b500ebc374f..bb9eede6244 100644 --- a/imports/plugins/included/email-templates/server/templates/orders/itemRefund.js +++ b/imports/plugins/included/email-templates/server/templates/orders/itemRefund.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/orders/new.js b/imports/plugins/included/email-templates/server/templates/orders/new.js index 211f4fe2c17..5cb676b1c13 100644 --- a/imports/plugins/included/email-templates/server/templates/orders/new.js +++ b/imports/plugins/included/email-templates/server/templates/orders/new.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/orders/refunded.js b/imports/plugins/included/email-templates/server/templates/orders/refunded.js index 575e1a98677..d6fac1b794a 100644 --- a/imports/plugins/included/email-templates/server/templates/orders/refunded.js +++ b/imports/plugins/included/email-templates/server/templates/orders/refunded.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/email-templates/server/templates/orders/shipped.js b/imports/plugins/included/email-templates/server/templates/orders/shipped.js index e88e187d356..440b723abe0 100644 --- a/imports/plugins/included/email-templates/server/templates/orders/shipped.js +++ b/imports/plugins/included/email-templates/server/templates/orders/shipped.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ export default ` diff --git a/imports/plugins/included/surcharges/server/no-meteor/resolvers/AppliedSurcharge/index.js b/imports/plugins/included/surcharges/server/no-meteor/resolvers/AppliedSurcharge/index.js index 268a3ab4da7..4e8b29c7bbc 100644 --- a/imports/plugins/included/surcharges/server/no-meteor/resolvers/AppliedSurcharge/index.js +++ b/imports/plugins/included/surcharges/server/no-meteor/resolvers/AppliedSurcharge/index.js @@ -5,5 +5,7 @@ import getSurchargeMessageForLanguage from "../../util/getSurchargeMessageForLan export default { _id: (node) => encodeSurchargeOpaqueId(node._id), amount: (node, _, context) => node.amount && xformSurchargeAmount(context, node.shopId, node.amount), - message: (node, { language }) => node.messagesByLanguage && node.messagesByLanguage.length && getSurchargeMessageForLanguage(language, node.messagesByLanguage) + message: (node, { language }) => node.messagesByLanguage && + node.messagesByLanguage.length && + getSurchargeMessageForLanguage(language, node.messagesByLanguage) }; diff --git a/imports/plugins/included/surcharges/server/no-meteor/resolvers/Surcharge/index.js b/imports/plugins/included/surcharges/server/no-meteor/resolvers/Surcharge/index.js index da120f37957..74719819920 100644 --- a/imports/plugins/included/surcharges/server/no-meteor/resolvers/Surcharge/index.js +++ b/imports/plugins/included/surcharges/server/no-meteor/resolvers/Surcharge/index.js @@ -8,6 +8,8 @@ export default { _id: (node) => encodeSurchargeOpaqueId(node._id), shopId: (node) => encodeShopOpaqueId(node.shopId), amount: (node, _, context) => node.amount && xformSurchargeAmount(context, node.shopId, node.amount), - message: (node, { language }) => node.messagesByLanguage && node.messagesByLanguage.length && getSurchargeMessageForLanguage(language, node.messagesByLanguage), + message: (node, { language }) => node.messagesByLanguage && + node.messagesByLanguage.length && + getSurchargeMessageForLanguage(language, node.messagesByLanguage), methodIds: (node) => node.methodIds.map(encodeFulfillmentMethodOpaqueId) };