From fa99b4b18a53660d942049dd7d2b9e9118fc4fb5 Mon Sep 17 00:00:00 2001
From: Anish-Agnihotri <contact@anishagnihotri.com>
Date: Fri, 9 Nov 2018 21:39:03 -0500
Subject: [PATCH 1/3] Remove full name entry + hide in form.

---
 app/assets/v2/js/pages/bounty_details.js | 13 +------------
 app/dashboard/templates/bounty/new.html  |  1 -
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js
index 01275728ae4..804b244eeb2 100644
--- a/app/assets/v2/js/pages/bounty_details.js
+++ b/app/assets/v2/js/pages/bounty_details.js
@@ -160,18 +160,7 @@ var callbacks = {
   'bounty_type': unknown_if_empty,
   'bounty_owner_github_username': gitcoin_ize,
   'bounty_owner_name': function(key, val, result) {
-    if (result.bounty_owner_name == 'Anonymous') {
-      $('#bounty_owner_github_username').hide();
-      $('#bounty_owner_email').hide();
-      $('#bounty_owner_email_label').hide();
-      $('#bounty_owner_github_username_label').hide();
-    } else {
-      $('#bounty_owner_github_username').show();
-      $('#bounty_owner_email').show();
-      $('#bounty_owner_email_label').show();
-      $('#bounty_owner_github_username_label').show();
-    }
-    return [ 'bounty_owner_name', result.bounty_owner_name ];
+    return [ 'bounty_owner_name', result.bounty_owner_github_username ];
   },
   'funding_organisation': function(key, val, result) {
     return [ 'funding_organisation', result.funding_organisation ];
diff --git a/app/dashboard/templates/bounty/new.html b/app/dashboard/templates/bounty/new.html
index d7049929a3d..94a2e3a1112 100644
--- a/app/dashboard/templates/bounty/new.html
+++ b/app/dashboard/templates/bounty/new.html
@@ -103,7 +103,6 @@ <h5 class="font-subheader">{% trans "About" %}</h5>
                   <h5 class="font-subheader">{% trans "Contact" %}</h5>
                   {% include 'shared/github_username.html' %}
                   {% include 'shared/notification_email.html' with show_information_publicly_checkbox=1 %}
-                  {% include 'shared/name.html' %}
                   <div id="advanced_container"></div>
                   <hr class="mt-4">
                 </div>

From d533bcd6a162e4c22c9114cf4d7307bf884950bd Mon Sep 17 00:00:00 2001
From: Anish-Agnihotri <contact@anishagnihotri.com>
Date: Sat, 10 Nov 2018 20:18:03 -0500
Subject: [PATCH 2/3] Remove merge conflict.

---
 app/assets/v2/js/pages/bounty_details.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js
index 804b244eeb2..01275728ae4 100644
--- a/app/assets/v2/js/pages/bounty_details.js
+++ b/app/assets/v2/js/pages/bounty_details.js
@@ -160,7 +160,18 @@ var callbacks = {
   'bounty_type': unknown_if_empty,
   'bounty_owner_github_username': gitcoin_ize,
   'bounty_owner_name': function(key, val, result) {
-    return [ 'bounty_owner_name', result.bounty_owner_github_username ];
+    if (result.bounty_owner_name == 'Anonymous') {
+      $('#bounty_owner_github_username').hide();
+      $('#bounty_owner_email').hide();
+      $('#bounty_owner_email_label').hide();
+      $('#bounty_owner_github_username_label').hide();
+    } else {
+      $('#bounty_owner_github_username').show();
+      $('#bounty_owner_email').show();
+      $('#bounty_owner_email_label').show();
+      $('#bounty_owner_github_username_label').show();
+    }
+    return [ 'bounty_owner_name', result.bounty_owner_name ];
   },
   'funding_organisation': function(key, val, result) {
     return [ 'funding_organisation', result.funding_organisation ];

From 5aa0ed11a977dfa420a641c9a878ceb671bdcaf7 Mon Sep 17 00:00:00 2001
From: Aditya Anand <aditya.anandmc@gmail.com>
Date: Mon, 12 Nov 2018 21:15:32 +0530
Subject: [PATCH 3/3] remove unused template

---
 app/dashboard/templates/shared/name.html | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 app/dashboard/templates/shared/name.html

diff --git a/app/dashboard/templates/shared/name.html b/app/dashboard/templates/shared/name.html
deleted file mode 100644
index 387d0f1c606..00000000000
--- a/app/dashboard/templates/shared/name.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% comment %}
-  Copyright (C) 2018 Gitcoin Core
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Affero General Public License as published
-  by the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
-{% endcomment %}
-{% load i18n %}
-<div class="w-100 mt-2">
-  <label class="form__label" for="fullName">{% trans "Full Name" %}</label>
-  <input name='fullName' id='fullName' class="w-100 form__input" type="text" placeholder="John Smith (optional)" value="{% if name %}{{ name }}{% endif %}" />
-  {% include "shared/show_information_publicly.html" with id="show_name_publicly" %}
-</div>