Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: only set initialData with demo initialHtml example if initialData not set #2705

Merged
merged 1 commit into from
Oct 12, 2020

Conversation

mzorz
Copy link
Contributor

@mzorz mzorz commented Oct 10, 2020

Fixes a problem first observed by @jd-alexander in wordpress-mobile/WordPress-Android#12939 (comment), produced by the changes introduced in #2690

To test:
demo app:

  1. Run npm run start:reset from the gutenberg-mobile folder
  2. Run npm run core ios or npm run core android to open the demo app
  3. Expect to see Jetpack blocks followed by core blocks

WPAndroid/WPiOS apps:

  1. opening an existing gutenberg Post should not show the demo content but the actual Post's content

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

@mzorz mzorz added [Type] Bug Something isn't working bugfix labels Oct 10, 2020
@mzorz mzorz requested review from ceyhun, guarani and mchowning October 10, 2020 14:22
@mzorz mzorz changed the title Fix: only set initialData with demo initialHtml example if initialData not… Fix: only set initialData with demo initialHtml example if initialData not set Oct 10, 2020
@chipsnyder
Copy link
Contributor

Thanks for taking care of this!
Once this merges we can close #2702

@mzorz
Copy link
Contributor Author

mzorz commented Oct 10, 2020

Thanks for tying that issue @chipsnyder !

@guarani
Copy link
Contributor

guarani commented Oct 12, 2020

Thanks for fixing! I overlook this during #2690.

Checking now and will approve in a sec.

Copy link
Contributor

@chipsnyder chipsnyder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good! Tested on the demo apps and main apps for each platform. :shipit:

@guarani
Copy link
Contributor

guarani commented Oct 12, 2020

I think this can be merged, I haven't had a chance to test but don't want to delay it.

@mzorz
Copy link
Contributor Author

mzorz commented Oct 12, 2020

Thank you both @chipsnyder @guarani ! 🙇

@mzorz mzorz merged commit cc9d4a3 into develop Oct 12, 2020
@mzorz mzorz deleted the fix/demo-initial-html branch October 12, 2020 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix [Type] Bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants