rebase with stable

[thelostone-mc]

Description

Current master branch merged against stable to ensure all commits in stable are present in master

cc @gitcoinco/engineer @owocki

[codecov]

Codecov Report

Merging #4286 into master will decrease coverage by <.01%.
The diff coverage is 20.37%.

@@            Coverage Diff             @@
##           master    #4286      +/-   ##
==========================================
- Coverage   30.13%   30.12%   -0.01%     
==========================================
  Files         209      209              
  Lines       16694    16725      +31     
  Branches     2230     2237       +7     
==========================================
+ Hits         5031     5039       +8     
- Misses      11482    11505      +23     
  Partials      181      181

Impacted Files	Coverage Δ
app/app/urls.py	90% <ø> (ø)	⬆️
app/retail/utils.py	10.48% <0%> (ø)	⬆️
app/kudos/utils.py	20.37% <0%> (-0.72%)	⬇️
app/retail/emails.py	21.52% <0%> (ø)	⬆️
app/app/settings.py	78.92% <100%> (+0.08%)	⬆️
app/dashboard/views.py	13.59% <25%> (-0.04%)	⬇️
app/grants/views.py	14.87% <50%> (+0.63%)	⬆️
app/kudos/models.py	56.93% <50%> (ø)	⬆️
app/avatar/utils.py	13.19% <8.69%> (-0.25%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 61163c0...1f75864. Read the comment docs.