From 72d98a59127d79af144ff7445b4d8ebc79905a01 Mon Sep 17 00:00:00 2001 From: Jenni Nurmi Date: Mon, 26 Aug 2019 10:39:27 +0300 Subject: [PATCH 1/2] Update prettier --- package.json | 2 +- src/containers/PaymentMethodsPage/PaymentMethodsPage.js | 4 +--- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 78eb8167..2ccb5fe4 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "enzyme-to-json": "^3.3.5", "inquirer": "^6.5.0", "nodemon": "^1.17.2", - "prettier": "^1.15.3" + "prettier": "^1.18.2" }, "resolutions": { "react-test-renderer": "^16.8.6" diff --git a/src/containers/PaymentMethodsPage/PaymentMethodsPage.js b/src/containers/PaymentMethodsPage/PaymentMethodsPage.js index 2c9e3386..4f50334c 100644 --- a/src/containers/PaymentMethodsPage/PaymentMethodsPage.js +++ b/src/containers/PaymentMethodsPage/PaymentMethodsPage.js @@ -133,9 +133,7 @@ const PaymentMethodsPageComponent = props => { // Get first and last name of the current user and use it in the StripePaymentForm to autofill the name field const userName = currentUserLoaded - ? `${ensuredCurrentUser.attributes.profile.firstName} ${ - ensuredCurrentUser.attributes.profile.lastName - }` + ? `${ensuredCurrentUser.attributes.profile.firstName} ${ensuredCurrentUser.attributes.profile.lastName}` : null; const initalValuesForStripePayment = { name: userName }; diff --git a/yarn.lock b/yarn.lock index 9221c4ca..b9c9c3a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8774,10 +8774,10 @@ prepend-http@^1.0.1: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@^1.15.3: - version "1.17.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.0.tgz#53b303676eed22cc14a9f0cec09b477b3026c008" - integrity sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw== +prettier@^1.18.2: + version "1.18.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" + integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== pretty-bytes@^5.1.0: version "5.3.0" From 3f5c983e4440d584986e6405f7e1d55a7589939d Mon Sep 17 00:00:00 2001 From: Jenni Nurmi Date: Mon, 26 Aug 2019 10:41:37 +0300 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c455c5af..6f04dd03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,11 +14,13 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2019-XX-XX +- [change] Update Prettier to v1.18.2 + [#1170](https://github.com/sharetribe/flex-template-web/pull/1170) - [change] Update `path-to-regexp` to v3.0.0 [#1169](https://github.com/sharetribe/flex-template-web/pull/1169) - [change] Update `sharetribe-scripts` to v3.1.1 [#1167](https://github.com/sharetribe/flex-template-web/pull/1167) -- [fix] Small change to remove card text on `SavedCardDetails` modal. +- [fix] Small change to remove card tect on `SavedCardDetails` modal. [#1166](https://github.com/sharetribe/flex-template-web/pull/1166) - [change] Update Sentry (@sentry/browser / @sentry/node) from v4.5.1 to v5.6.2 [#1164](https://github.com/sharetribe/flex-template-web/pull/1164)