GITC-657 Update l2 text for multi-sig wallets #9849

ksolo · 2021-12-07T22:10:55Z

Description

Update warnings for L2 based contributions

Refers/Fixes

GITC-657

app/grants/templates/grants/detail/template-grant-details.html

thelostone-mc · 2021-12-14T05:51:37Z

Is this ready for review @ksolo ?

ksolo · 2021-12-14T15:42:21Z

@thelostone-mc It's not I had some questions about requirements and paused this while I jumped on the Cypress PR. The questions have been answered now and I can jump back to this.

Co-authored-by: Graham Dixon <graham@gitcoin.co>

ksolo · 2021-12-14T21:02:19Z

app/app/context.py

+    max_length_offset = abs(
+        ((request.user.profile.created_on if user_is_authenticated_and_valid else timezone.now()) - timezone.now()).days
+    )


result of make fix

ksolo · 2021-12-14T21:02:30Z

app/app/sitemaps.py

-        return Activity.objects.exclude(
-            activities_index__key__isnull=True
-        ).order_by('-pk').cache()
+        return Activity.objects.exclude(activities_index__key__isnull=True).order_by('-pk').cache()


result of make fix

ksolo · 2021-12-14T21:03:21Z

app/avatar/management/commands/fix_broken_avatars.py

@@ -25,7 +25,6 @@ class Command(BaseCommand):

    help = 'fixes avatars whose pngs have failed'

-


result of make fix

ksolo · 2021-12-14T21:03:38Z

app/avatar/views_3d.py

+    new_avatars = [
+        'SSShiine', 'avrilapril', 'eknobl', 'lkh', 'nanshulot', 'wahyu243', 'zak102', 'artipedia', 'azizyano',
+        'hasssan04', 'maystro4', 'riyasoganii', 'writeprovidence', 'petushka1', 'merit-tech', 'hamzaghz',
+        'bruno-tandon', 'KayZou', 'the-hack-god', 'old-monger', 'virtual-face', 'art-maniac', 'vinhbhn', 'masket-bask',
+        'panigale120'
+    ]


ksolo · 2021-12-14T21:03:46Z

app/avatar/views_3d.py

    for _key in new_avatars:
        avatar_attrs[_key] = {
-            'preview_viewbox': {
-            },
+            'preview_viewbox': {},


ksolo · 2021-12-14T21:04:00Z

app/dataviz/d3_views.py

@@ -111,6 +111,7 @@ def data_viz_helper_get_data_responses(request, visual_type):

    return data_dict

+


ksolo · 2021-12-14T21:04:12Z

app/git/admin.py

@@ -18,8 +18,10 @@

 """
 from django.contrib import admin
+


ksolo · 2021-12-14T21:04:21Z

app/git/admin.py

 from git.models import GitCache

+


ksolo · 2021-12-14T21:04:37Z

app/git/tests/factories/git_cache_factory.py

@@ -16,4 +16,3 @@ class Meta:

    # Generate binary data depending on n
    data = factory.Sequence(lambda n: ("{n}" * 100).encode("utf-8"))
-


ksolo · 2021-12-14T21:04:52Z

app/git/tests/models/test_git_cache.py

@@ -1,6 +1,6 @@
-from git.tests.factories.git_cache_factory import GitCacheFactory


ksolo · 2021-12-14T21:04:59Z

app/git/tests/models/test_git_cache.py

 import pytest
 from git.models import GitCache
+from git.tests.factories.git_cache_factory import GitCacheFactory


ksolo · 2021-12-14T21:05:54Z

app/git/tests/test_utils.py

+from faker import Faker
+from git.models import GitCache
+from git.tests.factories.git_cache_factory import GitCacheFactory
 from git.utils import (
-    HEADERS, TOKEN_URL, build_auth_dict, delete_issue_comment, get_github_emails, get_github_primary_email,
+    HEADERS, TOKEN_URL, _get_user, build_auth_dict, delete_issue_comment, get_github_emails, get_github_primary_email,
    get_issue_comments, get_issue_timeline_events, github_connect, is_github_token_valid, org_name, patch_issue_comment,
-    post_issue_comment, post_issue_comment_reaction, repo_url, reset_token, revoke_token, _get_user
+    post_issue_comment, post_issue_comment_reaction, repo_url, reset_token, revoke_token,
 )
+from github import NamedUser


ksolo · 2021-12-14T21:06:06Z

app/git/tests/test_utils.py

-from urllib.parse import quote_plus, urlencode
 from unittest.mock import MagicMock, patch
-from github import NamedUser
+from urllib.parse import quote_plus, urlencode

 from django.conf import settings
 from django.test.utils import override_settings
 from django.utils import timezone
-from git.models import GitCache
-from git.tests.factories.git_cache_factory import GitCacheFactory
-from faker import Faker


ksolo · 2021-12-14T21:06:13Z

app/git/tests/test_utils.py

ksolo · 2021-12-14T21:06:26Z

app/git/utils.py

+from io import BytesIO
 from urllib.parse import quote_plus, urlencode

 from django.conf import settings
-from io import BytesIO
 from django.utils import timezone

 import dateutil.parser
 import requests
-from .models import GitCache
 from github import Github
 from github.GithubException import BadCredentialsException, GithubException, UnknownObjectException
 from requests.exceptions import ConnectionError
 from rest_framework.reverse import reverse

+from .models import GitCache
+


ksolo · 2021-12-14T21:06:36Z

app/grants/templates/grants/detail/template-grant-details.html

@@ -649,7 +655,7 @@ <h5 class="font-weight-bold mb-3">Verify Grant Ownership with Twitter</h5>
          <label class="font-subheader letter-spacing text-grey-500 mb-0 mr-3" for="title">Logo background color</label>
          <input type="color" v-model="logoBackground" @input="changeColor">
        </div>
-        
+


ksolo · 2021-12-14T21:06:44Z

app/marketing/utils.py

@@ -28,7 +28,7 @@
 from django.utils.translation import gettext_lazy as _

 from mailchimp3 import MailChimp
-from marketing.models import AccountDeletionRequest, EmailSupressionList, LeaderboardRank, EmailSubscriber
+from marketing.models import AccountDeletionRequest, EmailSubscriber, EmailSupressionList, LeaderboardRank


ksolo · 2021-12-14T21:06:55Z

app/marketing/views.py

@@ -48,7 +48,7 @@
 from marketing.country_codes import COUNTRY_CODES, COUNTRY_NAMES, FLAG_API_LINK, FLAG_ERR_MSG, FLAG_SIZE, FLAG_STYLE
 from marketing.mails import new_feedback
 from marketing.models import AccountDeletionRequest, EmailSubscriber, Keyword, LeaderboardRank, UpcomingDate
-from marketing.utils import get_or_save_email_subscriber, validate_slack_integration, delete_email_subscription
+from marketing.utils import delete_email_subscription, get_or_save_email_subscriber, validate_slack_integration


ksolo · 2021-12-14T21:08:21Z

I labeled the files that were updated from the make fix command so that reviewers can safely ignore them.

nutrina · 2021-12-15T09:23:25Z

There are quite a number of changes introduced by make fix.
@ksolo @thelostone-mc @gdixon do you think it would make sense to use something like pre-commit: https://pre-commit.com

This would run a validation script on the changed files before every commit, and would ensure a common styling.
I must however admit, it can be annoying sometimes.

nutrina

Looks good to me.

frankchen07 · 2021-12-15T23:00:05Z

LGTM

Apdlrcjafg19

Avance

gdixon reviewed Dec 9, 2021

View reviewed changes

app/grants/templates/grants/detail/template-grant-details.html Outdated Show resolved Hide resolved

Kevin Solorio and others added 3 commits December 14, 2021 13:43

update l2 text for multisig wallets

64f7232

Update app/grants/templates/grants/detail/template-grant-details.html

319f592

Co-authored-by: Graham Dixon <graham@gitcoin.co>

conditionally show more information when grant is contract

5d55afc

ksolo force-pushed the gitc-657/l2-grant-contract-wallets-messaging branch from 43fc65a to 5d55afc Compare December 14, 2021 19:43

ksolo marked this pull request as ready for review December 14, 2021 19:44

ksolo requested review from chibie, frankchen07, nutrina, PixelantDesign and thelostone-mc as code owners December 14, 2021 19:44

Kevin Solorio added 2 commits December 14, 2021 14:39

make fix updates

d921a8b

additional make fix files

c8d1553

ksolo commented Dec 14, 2021

View reviewed changes

app/git/admin.py

@@ -18,8 +18,10 @@

"""

from django.contrib import admin

Copy link

Contributor Author

ksolo Dec 14, 2021

Choose a reason for hiding this comment

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

make fix

ksolo commented Dec 14, 2021

View reviewed changes

app/git/admin.py

from git.models import GitCache

Copy link

Contributor Author

ksolo Dec 14, 2021

Choose a reason for hiding this comment

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

make fix

ksolo commented Dec 14, 2021

View reviewed changes

app/git/tests/test_utils.py

assert loaded_user == gh_user

Copy link

Contributor Author

ksolo Dec 14, 2021

Choose a reason for hiding this comment

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

make fix

ksolo commented Dec 14, 2021

View reviewed changes

nutrina approved these changes Dec 15, 2021

View reviewed changes

thelostone-mc merged commit aee06a6 into master Dec 15, 2021

Apdlrcjafg19 reviewed Oct 4, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GITC-657 Update l2 text for multi-sig wallets #9849

GITC-657 Update l2 text for multi-sig wallets #9849

ksolo commented Dec 7, 2021

thelostone-mc commented Dec 14, 2021

ksolo commented Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo Dec 14, 2021

ksolo commented Dec 14, 2021

nutrina commented Dec 15, 2021

nutrina left a comment

frankchen07 commented Dec 15, 2021

Apdlrcjafg19 left a comment

		@@ -25,7 +25,6 @@ class Command(BaseCommand):

		help = 'fixes avatars whose pngs have failed'

		@@ -111,6 +111,7 @@ def data_viz_helper_get_data_responses(request, visual_type):

		return data_dict

		@@ -16,4 +16,3 @@ class Meta:

		# Generate binary data depending on n
		data = factory.Sequence(lambda n: ("{n}" * 100).encode("utf-8"))

		@@ -1,6 +1,6 @@
		from git.tests.factories.git_cache_factory import GitCacheFactory

GITC-657 Update l2 text for multi-sig wallets #9849

GITC-657 Update l2 text for multi-sig wallets #9849

Conversation

ksolo commented Dec 7, 2021

Description

Refers/Fixes

thelostone-mc commented Dec 14, 2021

ksolo commented Dec 14, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ksolo commented Dec 14, 2021

nutrina commented Dec 15, 2021

nutrina left a comment

Choose a reason for hiding this comment

frankchen07 commented Dec 15, 2021

Apdlrcjafg19 left a comment

Choose a reason for hiding this comment