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

Issue/13268 remote site #13450

Merged
merged 6 commits into from
Nov 26, 2020
Merged

Issue/13268 remote site #13450

merged 6 commits into from
Nov 26, 2020

Conversation

malinajirka
Copy link
Contributor

Partially fixes #13268

Merge instructions

  1. Make sure Error handling on Activity Type filter screen #13440 is merged
  2. Remove "Not ready for merge" label
  3. Merge this PR

Small PR in which the "remote site id" is passed to the ActivityLogTypeFilterViewModel. Since the upcoming PR is related just to the UI itself, I thought it'd be better to create a separate PR.

To test:
There is nothing to test yet. If you really want to test it, you can put a breakpoint here and check the the id is not null. However, we'll test this before we remove the feature flag so it's not necessary.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Nov 23, 2020

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Nov 23, 2020

You can test the changes on this Pull Request by downloading the APK here.

@malinajirka malinajirka mentioned this pull request Nov 24, 2020
3 tasks
Base automatically changed from issue/13268-error-handling to develop November 25, 2020 10:52
Copy link
Contributor

@ashiagr ashiagr left a comment

Choose a reason for hiding this comment

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

LGTM 👍, just left one minor comment.

@ashiagr
Copy link
Contributor

ashiagr commented Nov 26, 2020

LGTM 👍.
Please feel free to merge after resolving the conflict.

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
@malinajirka malinajirka merged commit 7478dd5 into develop Nov 26, 2020
@malinajirka malinajirka deleted the issue/13268-remote-site-id branch November 26, 2020 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Jetpack Section: Activity Log
2 participants