[Affected versions]: - Nightly v65.0a1, Build ID 20181030224027 - Beta 64.0b5, Build ID 20181029164536 - Release 63.0.1, Build ID 20181030165643 [Affected Platforms]: - All Windows - All Mac - All Linux [Prerequisites]: - The "browser.search.region" is set to "US" on a clean new profile. [Steps to reproduce]: 1. Open the browser with the profile from prerequisites and open a new tab. 2. Click the "Customize your New Tab page" button. 3. Click the "Recommended by Pocket" dropdown and select "2 rows". 4. Open a new tab and observe the "Recommended by Pocket" section. [Expected results]: - A single Sponsored card is displayed in the 3rd position. [Actual results]: - An extra Sponsored card is displayed in the 1st position of the 2nd row. [Regression range]: 12:26.39 INFO: Last good revision: bda9ea2048f218d2e051a0ae6171a455dd346cbf 12:26.39 INFO: First bad revision: 8dde92f89a249c7d4aa86d4964eb464d1d110f34 12:26.39 INFO: Pushlog: https://hg.mozilla.org/integration/autoland/pushloghtml?fromchange=bda9ea2048f218d2e051a0ae6171a455dd346cbf&tochange=8dde92f89a249c7d4aa86d4964eb464d1d110f34 [Notes]: - The issue is still reproducible after refreshing the page or the browser restarted. - The issue is also reproducible if the number of rows is set to 3 or 4. - Dismissing a card or Top Site will make the 2nd spoc disappear, but a new one will appear after the page is refreshed. - Attached a screen recording of the issue: https://drive.google.com/open?id=1a_eoHDh4MqsweVV3x5DX38kEsL1Bsdte

@scott could you please take a look at this?

I think I have a fix that I'm momentarily putting into review... (it's a one liner) This patch would be needed for a shield study we were planning on doing before the year ends. If there is a potential ride along happening, is that something this could get on? (I'm adding 63 tracking in case that's true :), but never done a ride along before so not sure how to request one if that is at all possible, If I'm totally out of line here I can remove the 63 request)

Commit pushed to master at https://github.com/mozilla/activity-stream https://github.com/mozilla/activity-stream/commit/2b4610af92b53831fd2af26e8010e1b75d50d7ea Fixes bug 1504165 - Two Sponsored cards are wrongly displayed after increasing the number of Pocket recommendation rows

I have verified that the issue is no longer reproducible on the latest Nightly build (65.0a1, Build ID 20181107220128) on Windows 10 x64, Mac 10.13.3, and Arch Linux x64. A single card is displayed when adding more Recommended by Pocket rows.

Comment on attachment 9023694 [details] fixes bug 1504165 - Two Sponsored cards are wrongly displayed after increasing the number of Pocket recommendations [Beta/Release Uplift Approval Request] Feature/Bug causing the regression: Bug 1490734 User impact if declined: It's blocking a shield study 1504077 Is this code covered by automated tests?: Yes Has the fix been verified in Nightly?: Yes Needs manual test from QE?: Yes If yes, steps to reproduce: 1. Fresh profile 2. Update topstories pref to ``` {"api_key_pref":"extensions.pocket.oAuthConsumerKey","hidden":false,"provider_icon":"pocket","provider_name":"Pocket","read_more_endpoint":"https://getpocket.com/explore/trending?src=fx_new_tab","stories_endpoint":"https://gist.githubusercontent.com/ScottDowne/164995d9535b4203846048bdee29d169/raw/bcc07bf4f3016eedbd3974bb65679f9de0d66ca3/spoc.json","stories_referrer":"https://getpocket.com/recommendations","topics_endpoint":"https://getpocket.cdn.mozilla.net/v3/firefox/trending-topics?version=2&consumer_key=$apiKey&locale_lang=en-US","show_spocs":true,"personalized":true} ``` 3. In the pocket section config change it to "2 rows" (or update the pref) 4. Load a new tab There are also similar steps in the bug's initial comment, either should work. List of other uplifts needed: None Risk to taking this patch: Low Why is the change risky/not risky? (and alternatives if risky): It's one line, has tests, and is verified on nightly. String changes made/needed: none

Comment on attachment 9023783 [details] fixes bug 1504165 - Two Sponsored cards are wrongly displayed after increasing the number of Pocket recommendations [Beta/Release Uplift Approval Request] Feature/Bug causing the regression: Bug 1490734 User impact if declined: It's blocking a shield study 1504077 I'm hoping to attach this bug as a ride along to bug 1502410 Is this code covered by automated tests?: Yes Has the fix been verified in Nightly?: Yes Needs manual test from QE?: Yes If yes, steps to reproduce: 1. Fresh profile 2. Update topstories pref to ``` {"api_key_pref":"extensions.pocket.oAuthConsumerKey","hidden":false,"provider_icon":"pocket","provider_name":"Pocket","read_more_endpoint":"https://getpocket.com/explore/trending?src=fx_new_tab","stories_endpoint":"https://gist.githubusercontent.com/ScottDowne/164995d9535b4203846048bdee29d169/raw/bcc07bf4f3016eedbd3974bb65679f9de0d66ca3/spoc.json","stories_referrer":"https://getpocket.com/recommendations","topics_endpoint":"https://getpocket.cdn.mozilla.net/v3/firefox/trending-topics?version=2&consumer_key=$apiKey&locale_lang=en-US","show_spocs":true,"personalized":true} ``` 3. In the pocket section config change it to "2 rows" (or update the pref) 4. Load a new tab List of other uplifts needed: None Risk to taking this patch: Low Why is the change risky/not risky? (and alternatives if risky): It's one line, has tests, and is verified on nightly. String changes made/needed: none

Comment on attachment 9023694 [details] fixes bug 1504165 - Two Sponsored cards are wrongly displayed after increasing the number of Pocket recommendations activity streams bug fix, approved for 64.0b9

Scott, please request an uplift to mozilla-release as well, thanks. Setting qe-verify+ flag as I would like this uplift to be verified on Beta as well before evaluation a potential uplift in our next dot release.

I have verified that the issue is no longer reproducible on the latest Firefox 64 Beta 9 (Build ID 20181112164519) on Windows 10 x64, Mac 10.13.3, and Arch Linux 4.14.3 x64.

Comment on attachment 9023783 [details] fixes bug 1504165 - Two Sponsored cards are wrongly displayed after increasing the number of Pocket recommendations Regression fixed and verified on Beta, approved for our nexgt 63.0.3 release, thanks.

@pascalc I think I did create a request for mozilla-release, unless I misunderstood how and didn't do it correctly?

(In reply to Scott [:thecount] Downe from comment #18) > @pascalc I think I did create a request for mozilla-release, unless I > misunderstood how and didn't do it correctly? yes you did fine, I missed it initially :)

I have verified that the issue is no longer reproducible on the latest Firefox 63.0.3 Release (Build ID 20181114214635) on Windows 10 x64, Mac 10.13.6, and Arch Linux 4.16.