From ac0094f000b46cef6a55079ad0518200d269ada7 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 5 Jan 2022 13:07:01 +0200 Subject: [PATCH 01/17] Add comment about REACT_APP prefix --- .env-template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.env-template b/.env-template index 7ab796c35..179fc74d0 100644 --- a/.env-template +++ b/.env-template @@ -1,3 +1,6 @@ +# Environment variables for the client app. +# Note that variables, that start with "REACT_APP" prefix, are exposed to the public web. +# https://create-react-app.dev/docs/adding-custom-environment-variables # Mandatory configuration # From 56a377f0443d0636a6df3b1a3e1881a195bc0c2c Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 7 Feb 2022 16:56:24 +0200 Subject: [PATCH 02/17] Update changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af74662e4..d2d2d9516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,10 @@ way to update this template, but currently, we follow a pattern: --- -## Upcoming version 2021-XX-XX +## Upcoming version 2022-XX-XX + +- [add] Code comment about "REACT_APP" prefix in environment variables. + [#1492](https://github.com/sharetribe/ftw-daily/pull/1492) ## [v8.4.0] 2021-12-02 From d21a43b8468276960795eea07b9fabc5b5eda381 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 15:04:18 +0000 Subject: [PATCH 03/17] Bump follow-redirects from 1.13.0 to 1.14.7 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.7. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.7) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 419c3688f..be70074e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6720,15 +6720,10 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" - integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== - -follow-redirects@^1.14.0: - version "1.14.5" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" - integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== +follow-redirects@^1.0.0, follow-redirects@^1.14.0: + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== for-in@^1.0.2: version "1.0.2" From b308c1fd3b8a112cc6f78e5f623422322f6b8e60 Mon Sep 17 00:00:00 2001 From: shareoc <89124964+shareoc@users.noreply.github.com> Date: Fri, 31 Dec 2021 15:51:16 +0200 Subject: [PATCH 04/17] Update README.md Windows users commonly report the following error message when running yarn run dev or dev-server: RangeError [ERR_SOCKET_BAD_PORT]: options.port should be >= 0 and < 65536 Setting multiple environment variables in Windows requires using the set command before each individual variable. Updated the 'for windows users' section in documentation. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 158dfa3d6..b748ad669 100644 --- a/README.md +++ b/README.md @@ -43,11 +43,11 @@ Change `export` to `set` in the package.json file if you're using Windows/DOS. Y change to "dev" and "dev-sever" commands. ``` -"dev": "yarn run config-check&&set NODE_ENV=development REACT_APP_DEV_API_SERVER_PORT=3500&&concurrently --kill-others \"yarn run dev-frontend\" \"yarn run dev-backend\"" +"dev": "yarn run config-check&&set NODE_ENV=development&& set REACT_APP_DEV_API_SERVER_PORT=3500&&concurrently --kill-others \"yarn run dev-frontend\" \"yarn run dev-backend\"" ``` ``` -"dev-server": "set NODE_ENV=development PORT=4000 REACT_APP_CANONICAL_ROOT_URL=http://localhost:4000&&yarn run build&&nodemon --watch server server/index.js" +"dev-server": "set NODE_ENV=development&& set PORT=4000&& set REACT_APP_CANONICAL_ROOT_URL=http://localhost:4000&&yarn run build&&nodemon --watch server server/index.js" ``` We strongly recommend installing From 7a3332e87d70fa822de010dcaab66aa2d41f01d0 Mon Sep 17 00:00:00 2001 From: Aleksi O'Connor Date: Thu, 3 Feb 2022 15:46:18 +0200 Subject: [PATCH 05/17] Added entry to changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2d2d9516..7c2086f2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2022-XX-XX +- [fix] Setting multiple environment variables in Windows requires using the set command before each + individual variable. Updated the 'for windows users' section in documentation. + [#1491](https://github.com/sharetribe/ftw-daily/pull/1491) - [add] Code comment about "REACT_APP" prefix in environment variables. [#1492](https://github.com/sharetribe/ftw-daily/pull/1492) From 91a2ca4f780ffaa7605a1e03de71fdf2f2e90603 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 15:30:04 +0000 Subject: [PATCH 06/17] Bump nanoid from 3.1.16 to 3.2.0 Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.16 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.16...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index be70074e1..277e9c432 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9625,9 +9625,9 @@ nan@^2.12.1: integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== nanoid@^3.1.15: - version "3.1.16" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz#b21f0a7d031196faf75314d7c65d36352beeef64" - integrity sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w== + version "3.2.0" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== nanomatch@^1.2.9: version "1.2.13" From 8f5696b5022bc75ef42da4aec7b38b5c618dc683 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Feb 2022 12:35:42 +0000 Subject: [PATCH 07/17] Bump follow-redirects from 1.14.7 to 1.14.8 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 277e9c432..78d83159b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6721,9 +6721,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0, follow-redirects@^1.14.0: - version "1.14.7" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" - integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== + version "1.14.8" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== for-in@^1.0.2: version "1.0.2" From beae2ffd6294989649b469a73783be881c9a8b35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Feb 2022 10:09:31 +0000 Subject: [PATCH 08/17] Bump url-parse from 1.5.3 to 1.5.10 Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.10. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.10) --- updated-dependencies: - dependency-name: url-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 277e9c432..470de4d8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14209,9 +14209,9 @@ url-parse-lax@^3.0.0: prepend-http "^2.0.0" url-parse@^1.4.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" - integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" From 38766cb71bdd36cc88afc28456137802fe94b202 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 15 Mar 2022 17:23:41 +0200 Subject: [PATCH 09/17] Modal: portal could use hack for 100vh to have correct height --- src/components/Modal/Modal.js | 23 +++++++++++++++--- src/components/Modal/Modal.module.css | 35 +++++++++++++++++++++------ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/components/Modal/Modal.js b/src/components/Modal/Modal.js index 9f1eed666..39f8ad8c9 100644 --- a/src/components/Modal/Modal.js +++ b/src/components/Modal/Modal.js @@ -51,8 +51,10 @@ export class ModalComponent extends Component { super(props); this.handleBodyKeyUp = this.handleBodyKeyUp.bind(this); this.handleClose = this.handleClose.bind(this); + this.handleResize = this.handleResize.bind(this); this.refDiv = React.createRef(); + this.vh = null; this.state = { portalRoot: null, @@ -62,7 +64,15 @@ export class ModalComponent extends Component { componentDidMount() { const { id, isOpen, onManageDisableScrolling } = this.props; onManageDisableScrolling(id, isOpen); - document.body.addEventListener('keyup', this.handleBodyKeyUp); + window.document.body.addEventListener('keyup', this.handleBodyKeyUp); + + // A hack to update container height for mobile Safari, + // when resizing happens due to scroll. + // css.isOpenInPortal has "height: calc(var(--vh, 1vh) * 100)" + this.vh = window.innerHeight * 0.01; + window.document.documentElement.style.setProperty('--vh', `${this.vh}px`); + window.addEventListener('resize', this.handleResize); + this.setState({ portalRoot: document.getElementById('portal-root'), }); @@ -83,7 +93,8 @@ export class ModalComponent extends Component { componentWillUnmount() { const { id, onManageDisableScrolling } = this.props; - document.body.removeEventListener('keyup', this.handleBodyKeyUp); + window.document.body.removeEventListener('keyup', this.handleBodyKeyUp); + window.document.body.removeEventListener('resize', this.handleResize); onManageDisableScrolling(id, false); } @@ -100,6 +111,11 @@ export class ModalComponent extends Component { onClose(event); } + handleResize() { + this.vh = window.innerHeight * 0.01; + window.document.documentElement.style.setProperty('--vh', `${this.vh}px`); + } + render() { const { children, @@ -136,7 +152,8 @@ export class ModalComponent extends Component { // If props doesn't contain isClosedClassName, styles default to css.isClosed // This makes it possible to create ModalInMobile on top of Modal where style modes are: // visible, hidden, or none (ModalInMobile's children are always visible on desktop layout.) - const modalClass = isOpen ? css.isOpen : isClosedClassName; + const isOpenClass = usePortal ? css.isOpenInPortal : css.isOpenInPlace; + const modalClass = isOpen ? isOpenClass : isClosedClassName; const classes = classNames(modalClass, className); const scrollLayerClasses = scrollLayerClassName || css.scrollLayer; const containerClasses = containerClassName || css.container; diff --git a/src/components/Modal/Modal.module.css b/src/components/Modal/Modal.module.css index 67dc0122f..e4ab613e5 100644 --- a/src/components/Modal/Modal.module.css +++ b/src/components/Modal/Modal.module.css @@ -2,13 +2,6 @@ /* Content is visible as modal layer */ .isOpen { - display: flex; - flex-direction: column; - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; width: 100%; z-index: 100; @@ -45,6 +38,34 @@ } } +.isOpenInPlace { + composes: isOpen; + display: flex; + flex-direction: column; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; +} + +.isOpenInPortal { + composes: isOpen; + display: block; + height: calc(var(--vh, 1vh) * 100); + position: absolute; + + @media (--viewportMedium) { + display: flex; + flex-direction: column; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + } +} + .content { } From 2acb2ce31b618b6f6550a45fe039c15bfd347e9c Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 15 Mar 2022 19:58:35 +0200 Subject: [PATCH 10/17] DateRangeInput: input font-size must be min 16px --- src/components/FieldDateRangeInput/DateRangeInput.module.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/FieldDateRangeInput/DateRangeInput.module.css b/src/components/FieldDateRangeInput/DateRangeInput.module.css index 4d20c8c36..57f3693db 100644 --- a/src/components/FieldDateRangeInput/DateRangeInput.module.css +++ b/src/components/FieldDateRangeInput/DateRangeInput.module.css @@ -29,6 +29,7 @@ & :global(.DateInput_input) { @apply --marketplaceH4FontStyles; + font-size: 16px; padding: 0; margin: 0; border: 0; From 10a2977299b79feb84da4c80f6251f39c157d881 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 15 Mar 2022 20:12:20 +0200 Subject: [PATCH 11/17] BookingPanel: unset height for medium viewport. --- src/components/BookingPanel/BookingPanel.module.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/BookingPanel/BookingPanel.module.css b/src/components/BookingPanel/BookingPanel.module.css index 0f1104183..8420c3ed6 100644 --- a/src/components/BookingPanel/BookingPanel.module.css +++ b/src/components/BookingPanel/BookingPanel.module.css @@ -9,7 +9,7 @@ @media (--viewportMedium) { flex-basis: 576px; - height: 100%; + height: unset; padding: var(--modalPaddingMedium); background-color: var(--matterColorLight); margin-top: 12.5vh; @@ -98,10 +98,10 @@ flex-grow: 1; display: flex; flex-direction: column; - margin: 0 0 84px 0; + padding: 0; @media (--viewportMedium) { - margin: 0; + padding: 0; min-height: 400px; } From f1cb7df98a37f18688b49173c4112461190f472a Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 16 Mar 2022 15:11:07 +0200 Subject: [PATCH 12/17] BookingDatesForm: adjust margins --- src/forms/BookingDatesForm/BookingDatesForm.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forms/BookingDatesForm/BookingDatesForm.module.css b/src/forms/BookingDatesForm/BookingDatesForm.module.css index af80614b8..c827a5985 100644 --- a/src/forms/BookingDatesForm/BookingDatesForm.module.css +++ b/src/forms/BookingDatesForm/BookingDatesForm.module.css @@ -15,7 +15,7 @@ .priceBreakdownContainer { padding: 0 24px; - margin-bottom: 40px; + margin-bottom: 24px; @media (--viewportMedium) { padding: 0; From c9757980a54df6d56753bf91c04d7b42ddcbdda1 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 15 Mar 2022 17:27:03 +0200 Subject: [PATCH 13/17] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2086f2a..1fed292b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2022-XX-XX +- [fix] Portal version of Modals couldn't use 100vh on mobile Safari. Safari changes the window's + height based on if the location bar is squeezed or not (and that depends on scroll-effect). + [#1501](https://github.com/sharetribe/ftw-daily/pull/1501) - [fix] Setting multiple environment variables in Windows requires using the set command before each individual variable. Updated the 'for windows users' section in documentation. [#1491](https://github.com/sharetribe/ftw-daily/pull/1491) From c15c86b8b31a4cdbc53e0b10b5ccbefc7e021d44 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 16 Mar 2022 18:30:35 +0200 Subject: [PATCH 14/17] New release v8.4.1 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fed292b3..d108e750a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ way to update this template, but currently, we follow a pattern: ## Upcoming version 2022-XX-XX +## [v8.4.1] 2022-03-16 + - [fix] Portal version of Modals couldn't use 100vh on mobile Safari. Safari changes the window's height based on if the location bar is squeezed or not (and that depends on scroll-effect). [#1501](https://github.com/sharetribe/ftw-daily/pull/1501) @@ -23,6 +25,8 @@ way to update this template, but currently, we follow a pattern: - [add] Code comment about "REACT_APP" prefix in environment variables. [#1492](https://github.com/sharetribe/ftw-daily/pull/1492) + [v8.4.1]: https://github.com/sharetribe/ftw-daily/compare/v8.4.0...v8.4.1 + ## [v8.4.0] 2021-12-02 - [fix] Mobile safari zooms if input-related elements have smaller font-size than 16px. This updates diff --git a/package.json b/package.json index e341500ac..aa4f5b4f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "8.4.0", + "version": "8.4.1", "private": true, "license": "Apache-2.0", "dependencies": { From ad771f1251dd34afde4a0635b2926e01b090d801 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 16 Mar 2022 18:54:15 +0200 Subject: [PATCH 15/17] DateInput: input font-size must be min 16px for mobile --- src/components/FieldDateInput/DateInput.module.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/FieldDateInput/DateInput.module.css b/src/components/FieldDateInput/DateInput.module.css index e0c6a3cc4..893585941 100644 --- a/src/components/FieldDateInput/DateInput.module.css +++ b/src/components/FieldDateInput/DateInput.module.css @@ -27,6 +27,7 @@ & :global(.DateInput_input) { @apply --marketplaceDefaultFontStyles; @apply --marketplaceInputStyles; + font-size: 16px; border-bottom-style: solid; border-bottom-width: 2px; border-bottom-color: var(--attentionColor); From c00c9561357e60e0543047f081662aaa89f9218c Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 16 Mar 2022 19:26:18 +0200 Subject: [PATCH 16/17] EditListingPage.duck: fix image upload (dublicate images shown) --- src/containers/EditListingPage/EditListingPage.duck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/EditListingPage/EditListingPage.duck.js b/src/containers/EditListingPage/EditListingPage.duck.js index b8ba5bce6..160485d35 100644 --- a/src/containers/EditListingPage/EditListingPage.duck.js +++ b/src/containers/EditListingPage/EditListingPage.duck.js @@ -167,7 +167,7 @@ export default function reducer(state = initialState, action = {}) { case SHOW_LISTINGS_REQUEST: return { ...state, showListingsError: null }; case SHOW_LISTINGS_SUCCESS: - return state; + return { ...state, images: {}, imageOrder: [], removedImageIds: [] }; case SHOW_LISTINGS_ERROR: // eslint-disable-next-line no-console From e77b0d2f78edf5cb883e304a2d6a4c2dc14b3f0a Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Wed, 16 Mar 2022 18:58:24 +0200 Subject: [PATCH 17/17] Update changelog --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88dc66592..1fa31217e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,12 @@ https://github.com/sharetribe/flex-template-web/ ## Upcoming version 2022-XX-XX -## [v8.4.1] 2022-03-16 +## [v10.4.1] 2022-03-16 + +- [fix] FieldDateInput: input font-size must be min 16px for mobile. EditListingPage.duck: fix image + upload (dublicate images shown). [#186](https://github.com/sharetribe/ftw-daily/pull/186) + +### Updates from upstream (FTW-daily v8.4.1) - [fix] Portal version of Modals couldn't use 100vh on mobile Safari. Safari changes the window's height based on if the location bar is squeezed or not (and that depends on scroll-effect). @@ -28,7 +33,7 @@ https://github.com/sharetribe/flex-template-web/ - [add] Code comment about "REACT_APP" prefix in environment variables. [#1492](https://github.com/sharetribe/ftw-daily/pull/1492) - [v8.4.1]: https://github.com/sharetribe/ftw-daily/compare/v8.4.0...v8.4.1 + [v10.4.1]: https://github.com/sharetribe/ftw-hourly/compare/v10.4.0...v10.4.1 ## [v10.4.0] 2021-12-02