diff --git a/app/assets/v2/js/metamask-approval.js b/app/assets/v2/js/metamask-approval.js index 55a58b0aa31..967d27d0712 100644 --- a/app/assets/v2/js/metamask-approval.js +++ b/app/assets/v2/js/metamask-approval.js @@ -50,7 +50,7 @@ async function approve_metamask() { function ask_metamask_connection() { var page_url = $(location).attr('pathname'); - shown_on = [ '/tip/send/2', '/kudos/send']; + shown_on = [ '/tip/send/2', '/kudos/send' ]; var len = page_url.length - 1; if (page_url.lastIndexOf('/') === len) { diff --git a/app/grants/management/commands/sent_cart_reminder.py b/app/grants/management/commands/sent_cart_reminder.py index ffdef57fa7e..0cb97a31f69 100644 --- a/app/grants/management/commands/sent_cart_reminder.py +++ b/app/grants/management/commands/sent_cart_reminder.py @@ -21,14 +21,14 @@ from django.conf import settings from django.core.management.base import BaseCommand -from django.db.models import Max, F +from django.db.models import F, Max from django.utils import timezone from dashboard.utils import get_tx_status, has_tx_mined from grants.clr import predict_clr -from grants.models import Contribution, Grant, CartActivity, Subscription -from grants.views import clr_active, round_end, next_round_start -from marketing.mails import warn_subscription_failed, remember_your_cart +from grants.models import CartActivity, Contribution, Grant, Subscription +from grants.views import clr_active, next_round_start, round_end +from marketing.mails import remember_your_cart, warn_subscription_failed from townsquare.models import MatchRound @@ -100,4 +100,3 @@ def handle(self, *args, **options): print(e) print(f'\n\nSent {count} emails of {last_activity_by_user.count()} carts') - diff --git a/app/marketing/mails.py b/app/marketing/mails.py index 1280e579e8e..dd1a0af4f5a 100644 --- a/app/marketing/mails.py +++ b/app/marketing/mails.py @@ -40,12 +40,12 @@ render_grant_update, render_kudos_email, render_match_distribution, render_match_email, render_mention, render_new_bounty, render_new_bounty_acceptance, render_new_bounty_rejection, render_new_bounty_roundup, render_new_grant_email, render_new_supporter_email, render_new_work_submission, render_no_applicant_reminder, - render_nth_day_email_campaign, render_quarterly_stats, render_request_amount_email, render_reserved_issue, - render_share_bounty, render_start_work_applicant_about_to_expire, render_start_work_applicant_expired, - render_start_work_approved, render_start_work_new_applicant, render_start_work_rejected, - render_subscription_terminated_email, render_successful_contribution_email, render_support_cancellation_email, - render_tax_report, render_thank_you_for_supporting_email, render_tip_email, - render_unread_notification_email_weekly_roundup, render_wallpost, render_weekly_recap, render_remember_your_cart, + render_nth_day_email_campaign, render_quarterly_stats, render_remember_your_cart, render_request_amount_email, + render_reserved_issue, render_share_bounty, render_start_work_applicant_about_to_expire, + render_start_work_applicant_expired, render_start_work_approved, render_start_work_new_applicant, + render_start_work_rejected, render_subscription_terminated_email, render_successful_contribution_email, + render_support_cancellation_email, render_tax_report, render_thank_you_for_supporting_email, render_tip_email, + render_unread_notification_email_weekly_roundup, render_wallpost, render_weekly_recap, ) from sendgrid.helpers.mail import Attachment, Content, Email, Mail, Personalization from sendgrid.helpers.stats import Category