Either of those would be correct in both 1 and 2. There is just the nuanced difference in time, with a more past feel to the past verb and more of an immediacy to the time period in question to the perfect tense.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.