Toggle ethereum wallet address

app/dashboard/migrations/0069_profile_hide_wallet_address.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-12-27 00:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0068_auto_20191211_1458'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='hide_wallet_address',
+            field=models.BooleanField(default=True, help_text='If this option is chosen, we will remove your wallet information from the grants page'),
+        ),
+    ]

app/dashboard/migrations/0070_auto_20191227_0219.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-12-27 02:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0069_profile_hide_wallet_address'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='hide_wallet_address',
+            field=models.BooleanField(default=True, help_text='If this option is chosen, we will remove your wallet information all together'),
+        ),
+    ]

app/dashboard/models.py

@@ -2330,6 +2330,10 @@ class Profile(SuperModel):
         default=True,
         help_text='If this option is chosen, we will remove your profile information all_together',
     )
+    hide_wallet_address = models.BooleanField(
+        default=True,
+        help_text='If this option is chosen, we will remove your wallet information all together',
+    )
     trust_profile = models.BooleanField(
         default=False,
         help_text='If this option is chosen, the user is able to submit a faucet/ens domain registration even if they are new to github',

app/dashboard/templates/profiles/header_details.html

@@ -64,26 +64,32 @@ <h1 class="profile-header__handle">
   <button class="btn btn-gc-blue btn-sm" data-jointribe="{{profile.handle}}">Join Tribe</button>
 {% endif %}
 
-
-{% if 0 %}
-TODO: Re-enable this when we have proper privacy in place a la https://github.com/gitcoinco/web/issues/5654
+{% if not profile.hide_wallet_address %}
 {% if profile.preferred_payout_address %}
-  <div class="my-2">
-    <svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" class="mr-2 mb-1"><path fill="#000" fill-rule="nonzero" d="M10 8.113L5.002 11 0 8.113 5.002 0 10 8.113zm-5 3.821L0 9l5 7 5-7-5 2.934z"/></svg>
-    <span id="preferred-address" data-truncatehash title="{{ profile.preferred_payout_address }}">{{ profile.preferred_payout_address }}</span>
-    {% if is_my_profile %}
-      <a href="/settings/account" class=""><i class="fas fa-plus-circle"></i> Update preferred address</a>
-    {% endif %}
-  </div>
+<div class="my-2">
+  <svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" class="mr-2 mb-1"><path fill="#000" fill-rule="nonzero" d="M10 8.113L5.002 11 0 8.113 5.002 0 10 8.113zm-5 3.821L0 9l5 7 5-7-5 2.934z"/></svg>
+  <span id="preferred-address" data-truncatehash title="{{ profile.preferred_payout_address }}">{{ profile.preferred_payout_address }}</span>
+  {% if is_my_profile %}
+    <a href="/settings/account" class=""><i class="fas fa-plus-circle"></i> Update preferred address</a>
+  {% endif %}
+</div>
 {% else %}
-  <div class="my-2" id="preferred-address">
-    {% if is_my_profile %}
-      <a href="/settings/account" class=""><i class="fas fa-plus-circle"></i> Add a preferred address</a>
-    {% elif not profile.is_org %}
-      No preferred address
-    {% endif %}
-  </div>
+<div class="my-2" id="preferred-address">
+  {% if is_my_profile %}
+    <a href="/settings/account" class=""><i class="fas fa-plus-circle"></i> Add a preferred address</a>
+  {% elif not profile.is_org %}
+    No preferred address
+  {% endif %}
+</div>
 {% endif %}
+{% elif user.has_done_business_with %}
+<div class="my-2">
+  <svg xmlns="http://www.w3.org/2000/svg" width="10" height="16" class="mr-2 mb-1"><path fill="#000" fill-rule="nonzero" d="M10 8.113L5.002 11 0 8.113 5.002 0 10 8.113zm-5 3.821L0 9l5 7 5-7-5 2.934z"/></svg>
+  <span id="preferred-address" data-truncatehash title="{{ profile.preferred_payout_address }}">{{ profile.preferred_payout_address }}</span>
+  {% if is_my_profile %}
+    <a href="/settings/account" class=""><i class="fas fa-plus-circle"></i> Update preferred address</a>
+  {% endif %}
+</div>
 {% endif %}
 {% if not profile.is_org %}
   <div class="static-stars my-3">

app/grants/templates/grants/activity.html

@@ -78,13 +78,23 @@
                   {% if not transaction.success %} (Failed) {% endif %}
                 </div>
               </div>
-              <div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
-                <a class="tx_link" href="https://etherscan.io/tx/{{ transaction.tx_id }}" target="_blank" rel="noopener noreferrer">
-                  {% if transaction.tx_id %}
-                  View Etherscan
-                  {%endif%}
-                </a>
-              </div>
+              {% if not profile.hide_wallet_address %}
+                <div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
+                  <a class="tx_link" href="https://etherscan.io/tx/{{ transaction.tx_id }}" target="_blank" rel="noopener noreferrer">
+                    {% if transaction.tx_id %}
+                    View Etherscan
+                    {%endif%}
+                  </a>
+                </div>
+              {% elif subscription.contributor_profile.has_done_business_with %}
+                <div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
+                  <a class="tx_link" href="https://etherscan.io/tx/{{ transaction.tx_id }}" target="_blank" rel="noopener noreferrer">
+                    {% if transaction.tx_id %}
+                    View Etherscan
+                    {%endif%}
+                  </a>
+                </div>
+              {% endif %}
               <div class="offset-lg-1 col-4 col-md-2 my-auto tags font-caption">
                 <div class="tag tag-lg token">
                   <p>
@@ -135,7 +145,8 @@
                 {{subscription.num_tx_approved|floatformat}} time{{ subscription.num_tx_approved|pluralize }}
               </div>
             </div>
-            <div class="d-none d-md-block col-md-2 my-auto font-body">
+            {% if not profile.hide_wallet_address %}
+              <div class="d-none d-md-block col-md-2 my-auto font-body">
               {% if subscription.cancel_tx_id != '0x0' %}
                 <a class="cancel_tx_link" href="https://etherscan.io/tx/{{ subscription.cancel_tx_id }}" target="_blank" rel="noopener noreferrer">
                   {% if transaction.cancel_tx_id %}
@@ -144,6 +155,15 @@
                 </a>
               {% endif %}
             </div>
+            {% elif subscription.contributor_profile.has_done_business_with %}
+                <div class="d-none d-md-block col-md-2 font-body my-auto txn-link">
+                  <a class="tx_link" href="https://etherscan.io/tx/{{ transaction.tx_id }}" target="_blank" rel="noopener noreferrer">
+                    {% if transaction.tx_id %}
+                    View Etherscan
+                    {%endif%}
+                  </a>
+                </div>
+              {% endif %}
             <div class="col-4 col-md-2 offset-lg-1 my-auto tags font-caption">
               <div class="tag tag-lg token">
                 <p>

app/grants/templates/grants/fund.html

@@ -189,7 +189,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
                     </div>
                   </div>
 
-                  <div id="gitcoin-grant-section" class="form__group-horizontal my-5">
+                  <div id="gitcoin-grant-section" class="form__group-horizontal mt-5 mb-2">
                     <div class="row">
                       <div class="col-12 mb-3">
                         <h2 class="font-subheader font-weight-semibold">{% trans "Support Gitcoin" %}</h2>
@@ -229,6 +229,12 @@ <h2 class="font-subheader font-weight-semibold">{% trans "Support Gitcoin" %}</h
                       </div>
                     </div>
                   </div>
+                  <div class="mb-4">
+                    <input type="checkbox" name="hide_wallet_address" id=hide_wallet_address {% if profile.hide_wallet_address %} checked="checked" {% endif %} >
+                    <label class="form__label" for="hide_wallet_address">{% trans "Hide my wallet address" %}</label>
+                    <br>
+                    <small id="hide_wallet_address_help" class="form__input-help">{% trans "If this option is chosen, your wallet addres will be hidden" %}</small>
+                  </div>
 
                   <div id="gas-section" class="form__group-horizontal">
                     <div class="row">

app/grants/views.py

@@ -609,6 +609,10 @@ def grant_fund(request, grant_id, grant_slug):
             return JsonResponse({
                 'success': True,
             })
+
+        if 'hide_wallet_address' in request.POST:
+            profile.hide_wallet_address = bool(request.POST.get('hide_wallet_address', False))
+            profile.save()
 
         if 'signature' in request.POST:
             sub_new_approve_tx_id = request.POST.get('sub_new_approve_tx_id', '')
@@ -660,6 +664,7 @@ def grant_fund(request, grant_id, grant_slug):
         is_phantom_funding_this_grant = not is_phantom_funding_this_grant
 
     params = {
+        'profile': profile,
         'active': 'fund_grant',
         'title': _('Fund Grant'),
         'card_desc': _('Provide sustainable funding for Open Source with Gitcoin Grants'),

app/marketing/views.py

@@ -153,6 +153,7 @@ def privacy_settings(request):
         if profile:
             profile.suppress_leaderboard = bool(request.POST.get('suppress_leaderboard', False))
             profile.hide_profile = bool(request.POST.get('hide_profile', False))
+            profile.hide_wallet_address = bool(request.POST.get('hide_wallet_address', False))
             profile = record_form_submission(request, profile, 'privacy')
             if profile.alumni and profile.alumni.exists():
                 alumni = profile.alumni.first()

app/retail/templates/settings/privacy.html

@@ -17,6 +17,12 @@ <h5>{% trans "Privacy Preferences" %}</h5>
           <br>
           <small id="hide_profile_help" class="form__input-help">{% trans "If this option is chosen, we will remove your profile altogether" %}</small>
       </div>
+      <div>
+        <input type="checkbox" name="hide_wallet_address" id=hide_wallet_address {% if profile.hide_wallet_address %} checked="checked" {% endif %} {% if not is_logged_in %} disabled {% endif %} >
+        <label class="form__label" for="hide_wallet_address">{% trans "Hide my wallet address" %}</label>
+        <br>
+        <small id="hide_wallet_address_help" class="form__input-help">{% trans "If this option is chosen, we will remove your wallet address" %}</small>
+      </div>
       {% if profile.alumni.exists %}
         <div>
           <input type="checkbox" name="hide_alumni" id=hide_alumni value="1" {% if not profile.alumni.first.public %} checked="checked" {% endif %} {% if not is_logged_in %} disabled {% endif %} >