Skip to content

Issue/13326 here to help#13937

Merged
zwarm merged 6 commits intoissue/13326-scan-fixing-in-builderfrom
issue/13326-here-to-help
Feb 3, 2021
Merged

Issue/13326 here to help#13937
zwarm merged 6 commits intoissue/13326-scan-fixing-in-builderfrom
issue/13326-here-to-help

Conversation

@ashiagr
Copy link
Copy Markdown
Contributor

@ashiagr ashiagr commented Feb 2, 2021 •
edited
Loading

Parent #13326

This PR adds support for clickable "here to help" text in the scan state having threats.

here_to_help.mov

To test

Prerequisites:

  • A threat is added to the testing site. In case you run out of threats, re-install bad calendar plugin and re-run scan.
  • Scan feature flag is enabled
  1. Open Scan screen
  2. Start scan
  3. Notice that description on the top includes a clickable "here to help" text
  4. Click on "here to help"
  5. Notice that help screen is shown

Merge Instructions:

  1. Make sure PR Issue/13326 scan fixing in builder #13940 is merged to develop
  2. Remove "Not Ready for Merge" label
  3. Merge this PR

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.

@ashiagr ashiagr added this to the 16.7 milestone Feb 2, 2021
@ashiagr ashiagr self-assigned this Feb 2, 2021
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Feb 2, 2021 •
edited
Loading

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

@ashiagr ashiagr requested a review from zwarm February 2, 2021 10:37
@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Feb 2, 2021 •
edited
Loading

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

zwarm
zwarm approved these changes Feb 2, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@zwarm zwarm left a comment

Choose a reason for hiding this comment

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

Looks good so far 👍 All works as expected. Tapping the 'here to help' link takes me to help & support and returns correctly.
There are a couple of conflicting files, so I will leave those for you.
❓ Is there a companion WordPress-Utils-Android PR for HtmlMessageUtils?

@ashiagr
Merge branch 'issue/13326-scan-fixing-in-builder' into issue/13326-he…
5c2539d 
…re-to-help

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilder.kt
#	WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilderTest.kt
@ashiagr
Copy link
Copy Markdown
Contributor Author

ashiagr commented Feb 3, 2021

Thanks @zwarm! I've resolved merge conflicts.

❓ Is there a companion WordPress-Utils-Android PR for HtmlMessageUtils?

HtmlMessageUtils is currently available only in WordPress-Android.

This was referenced Feb 3, 2021
Closed
Merged
@ashiagr ashiagr marked this pull request as ready for review February 3, 2021 10:58
@zwarm
Copy link
Copy Markdown
Contributor

zwarm commented Feb 3, 2021

Thanks @zwarm! I've resolved merge conflicts.

❓ Is there a companion WordPress-Utils-Android PR for HtmlMessageUtils?

HtmlMessageUtils is currently available only in WordPress-Android.

I thought of that at 2AM this morning. Thanks for setting me straight. I've reviewed again and all is good for merge. Thanks

@zwarm zwarm merged commit 794058d into issue/13326-scan-fixing-in-builder Feb 3, 2021
@zwarm zwarm deleted the issue/13326-here-to-help branch February 3, 2021 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zwarm zwarm zwarm approved these changes

Assignees

@ashiagr ashiagr

Labels

[Type] Task

Projects

None yet

Milestone

16.7

Development

Successfully merging this pull request may close these issues.

2 participants

@ashiagr @zwarm