From ad575973a6026bcb58f7657479e8ef8ec0b81ef9 Mon Sep 17 00:00:00 2001
From: Aditya Anand <aditya.anandmc@gmail.com>
Date: Thu, 23 May 2019 14:02:31 +0530
Subject: [PATCH 1/4] users: enable invite button by default

if user has no bounties to invite hunter -> they are encouraged
to create bounty
---
 app/dashboard/templates/dashboard/users.html | 44 +++++++++++++-------
 app/dashboard/views.py                       |  4 +-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/dashboard/templates/dashboard/users.html b/app/dashboard/templates/dashboard/users.html
index 2502397a115..f305c81fa80 100644
--- a/app/dashboard/templates/dashboard/users.html
+++ b/app/dashboard/templates/dashboard/users.html
@@ -111,6 +111,12 @@
                 <input v-model="params.organisation" data-placeholder="e.g. Gitcoin" data-tags="true" class="form-control">
               </div>
             </div>
+            <div class="g-multiselect pb-4 border-bottom form-group">
+              <label for="contributors" class="font-weight-bold">Contributor</label>
+              <div class="font-smaller">
+                <input v-model="params.contributor" data-placeholder="e.g. owocki" data-tags="true" class="form-control">
+              </div>
+            </div>
             <button class="btn blue" @click="params = {}; searchUsers()">Reset Filters</button>
           </nav>
         </transition>
@@ -178,7 +184,8 @@ <h5 class="text-center card-user_name">
                     <b>[[ user.work_done ]]</b> bounties completed
                   </div>
                   <div class="text-center mt-2">
-                    <button v-if="funderBounties.length" data-toggle="modal" data-target="#userModal" class="btn btn-sm btn-gc-blue" @click="openBounties(user)">Invite to Bounty</button>
+                    <!-- <button v-if="funderBounties.length" data-toggle="modal" data-target="#userModal" class="btn btn-sm btn-gc-blue" @click="openBounties(user)">Invite to Bounty</button> -->
+                    <button data-toggle="modal" data-target="#userModal" class="btn btn-sm btn-gc-blue" @click="openBounties(user)">Invite to Bounty</button>
                   </div>
                 </div>
               </div>
@@ -192,36 +199,45 @@ <h5 class="text-center card-user_name">
           <div class="d-flex flex-column align-items-center">
             <h6 class="font-weight-bold mb-3">Invite User to Bounty</h6>
             <img class="rounded-circle mx-auto mb-3" width="64" height="64" :src="`/dynamic/avatar/${ userSelected.handle }`"/>
-            <span>[[ userSelected.data.name || userSelected.handle ]]</span>
+            <span>[[ userSelected.data.name ]]</span>
             <a :href="`/profile/${ userSelected.handle }`" class="text-center d-block" target="_blank">
               [[ userSelected.handle ]]
             </a>
           </div>
         </div>
         <div slot="body">
-          <b>Select a bounty</b>
-          <div class="bounties-box">
-            <div v-for="bounty in funderBounties" :key="bounty.id" @click="bountySelected = bounty" v-bind:class="{ 'btn-gc-blue': bountySelected && bounty.id === bountySelected.id }" class="bounty-select py-2 px-3 border-bottom d-flex align-items-center">
-              <img :src="`/dynamic/avatar/${ bounty.funding_organisation || bounty.bounty_owner_github_username }`" class="rounded-circle flex-shrink-0" width="30" height="30">
-              <p class="line-clamp font-smaller-2 my-0 mx-2">
-                [[ bounty.title ]]
-              </p>
-              <div class="ml-auto flex-shrink-0">
-                <span class="tag token">[[ bounty.value_true ]] [[ bounty.token_name ]]</span>
-                <span class="tag usd">[[ bounty.value_in_usdt_now ]] USD</span>
+          <div v-if="funderBounties.length">
+            <b>Select a bounty</b>
+            <div class="bounties-box">
+              <div v-for="bounty in funderBounties" :key="bounty.id" @click="bountySelected = bounty" v-bind:class="{ 'btn-gc-blue': bountySelected && bounty.id === bountySelected.id }" class="bounty-select py-2 px-3 border-bottom d-flex align-items-center">
+                <img :src="`/dynamic/avatar/${ bounty.funding_organisation || bounty.bounty_owner_github_username }`" class="rounded-circle flex-shrink-0" width="30" height="30">
+                <p class="line-clamp font-smaller-2 my-0 mx-2">
+                  [[ bounty.title ]]
+                </p>
+                <div class="ml-auto flex-shrink-0">
+                  <span class="tag token">[[ bounty.value_true ]] [[ bounty.token_name ]]</span>
+                  <span class="tag usd">[[ bounty.value_in_usdt_now ]] USD</span>
+                </div>
               </div>
             </div>
           </div>
+          <div v-else class="text-center font-subheader mt-4">
+            <p class="font-weight-semibold">You've got NO open bounties</p>
+            <p class="font-body">
+              <a href="/funder/new">Create a bounty</a>
+              to invite [[ userSelected.handle ]]
+            </p>
+          </div>
         </div>
         <div slot="footer" class="d-flex align-items-center flex-fill">
           <a v-if="bountySelected" :href="bountySelected.url" target="_blank" class="mr-5">view bounty</a>
           <div class="ml-auto">
             <button class="btn btn-outline-gc-blue" data-dismiss="modal">Cancel</button>
-            <button class="btn btn-gc-blue" :disabled="!bountySelected" @click="sendInvite(bountySelected, userSelected.id)">Invite</button>
+            <button  v-if="funderBounties.length" class="btn btn-gc-blue" :disabled="!bountySelected" @click="sendInvite(bountySelected, userSelected.id)">Invite</button>
           </div>
         </div>
       </modal>
-    </div>
+    </div></div>
     <template id="modal-template">
       <div class="vue-modal modal fade" id="userModal" tabindex="-1" role="dialog" aria-labelledby="userModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered" :class="size" role="document">
diff --git a/app/dashboard/views.py b/app/dashboard/views.py
index cb02dbc24f0..4f37ffb0913 100644
--- a/app/dashboard/views.py
+++ b/app/dashboard/views.py
@@ -732,13 +732,11 @@ def onboard(request, flow):
     return TemplateResponse(request, 'ftux/onboard.html', params)
 
 
+@login_required
 def users_directory(request):
     """Handle displaying users directory page."""
     from retail.utils import programming_languages, programming_languages_full
 
-    if not request.user.is_authenticated:
-        return redirect('/login/github?next=' + request.get_full_path())
-
     keywords = programming_languages + programming_languages_full
 
     params = {

From a579ddbafd91e3ffec4bc0f769f8e4e104c84b81 Mon Sep 17 00:00:00 2001
From: Aditya Anand <aditya.anandmc@gmail.com>
Date: Thu, 23 May 2019 14:03:13 +0530
Subject: [PATCH 2/4] users: updated view

- added button (auto-trigger) when invite param is passed in /user
---
 app/assets/v2/js/users.js                    | 31 ++++++++++++++++++--
 app/dashboard/templates/dashboard/users.html |  8 +++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/assets/v2/js/users.js b/app/assets/v2/js/users.js
index 3d307178217..e8564e272c2 100644
--- a/app/assets/v2/js/users.js
+++ b/app/assets/v2/js/users.js
@@ -101,7 +101,6 @@ Vue.mixin({
       console.log(user);
       vm.userSelected = user;
       vm.showModal = true;
-
     },
     sendInvite: function(bounty, user) {
       let vm = this;
@@ -129,6 +128,21 @@ Vue.mixin({
     },
     closeModal() {
       this.$refs['user-modal'].closeModal();
+    },
+    inviteOnMount: function() {
+      let vm = this;
+      let contributor = getURLParams('invite');
+
+      if (contributor) {
+        let api = `/api/v0.1/users_fetch/?search=${contributor}`;
+        let getUsers = fetchData (api, 'GET');
+
+        $.when(getUsers).then(function(response) {
+          if (response && response.data) {
+            vm.reinviteUser = response.data[0];
+          }
+        });
+      }
     }
   }
 
@@ -156,10 +170,12 @@ if (document.getElementById('gc-users-directory')) {
       skills: document.keywords,
       selectedSkills: [],
       noResults: false,
-      isLoading: true
+      isLoading: true,
+      reinviteUser: ''
     },
     mounted() {
       this.fetchUsers();
+      this.inviteOnMount();
       this.$watch('params', function(newVal, oldVal) {
         this.searchUsers();
       }, {
@@ -182,3 +198,14 @@ if (document.getElementById('gc-users-directory')) {
   });
 }
 
+if (getURLParams('invite')) {
+  let timer = setInterval(function() {
+    if ($('#reinvite-user').length) {
+      $('#reinvite-user').trigger('click');
+      setTimeout(function() {
+        $('#reinvite-user').trigger('click');
+      }, 200);
+      clearInterval(timer);
+    }
+  }, 500);
+}
\ No newline at end of file
diff --git a/app/dashboard/templates/dashboard/users.html b/app/dashboard/templates/dashboard/users.html
index f305c81fa80..c1d870bd787 100644
--- a/app/dashboard/templates/dashboard/users.html
+++ b/app/dashboard/templates/dashboard/users.html
@@ -48,6 +48,11 @@
                 <!-- <button class="btn btn-outline-success my-2 my-sm-0" @click.prevent="searchUsers()">Search</button> -->
               </div>
             </form>
+
+            <div v-if="reinviteUser" class="hidden">
+              <button id="reinvite-user" data-toggle="modal" data-target="#userModal" @click="openBounties(reinviteUser)">THIS IS HIDDEN and SHOULD AUTO TRIGGER</button>
+            </div>
+
           </div>
         </nav>
       </div>
@@ -184,7 +189,6 @@ <h5 class="text-center card-user_name">
                     <b>[[ user.work_done ]]</b> bounties completed
                   </div>
                   <div class="text-center mt-2">
-                    <!-- <button v-if="funderBounties.length" data-toggle="modal" data-target="#userModal" class="btn btn-sm btn-gc-blue" @click="openBounties(user)">Invite to Bounty</button> -->
                     <button data-toggle="modal" data-target="#userModal" class="btn btn-sm btn-gc-blue" @click="openBounties(user)">Invite to Bounty</button>
                   </div>
                 </div>
@@ -237,7 +241,7 @@ <h6 class="font-weight-bold mb-3">Invite User to Bounty</h6>
           </div>
         </div>
       </modal>
-    </div></div>
+    </div>
     <template id="modal-template">
       <div class="vue-modal modal fade" id="userModal" tabindex="-1" role="dialog" aria-labelledby="userModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered" :class="size" role="document">

From 026cc74450943b0c3e8c5efdbf5f44e70bc6a14c Mon Sep 17 00:00:00 2001
From: Aditya Anand <aditya.anandmc@gmail.com>
Date: Thu, 23 May 2019 18:48:20 +0530
Subject: [PATCH 3/4] detail: indent + refactor

---
 app/assets/v2/js/pages/bounty_details.js |  1 -
 app/assets/v2/js/shared.js               | 25 +++++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js
index 29fd9881746..62878dddf15 100644
--- a/app/assets/v2/js/pages/bounty_details.js
+++ b/app/assets/v2/js/pages/bounty_details.js
@@ -501,7 +501,6 @@ var showWarningMessage = function(txid) {
 
   $('.left-rails').hide();
   $('#bounty_details').hide();
-  $('#bounty_detail').hide();
 
   waitingStateActive();
 };
diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js
index 6a860d36fee..6cae8f3a9f0 100644
--- a/app/assets/v2/js/shared.js
+++ b/app/assets/v2/js/shared.js
@@ -281,20 +281,17 @@ var waitingStateActive = function() {
 };
 
 const notify_funder = (network, std_bounties_id, data) => {
-	  var request_url = '/actions/bounty/' + network + '/' + std_bounties_id + '/notify/funder_payout_reminder/';
-
-	   showBusyOverlay();
-	  $.post(request_url, data).then(result => {
-		      hideBusyOverlay();
-
-		       _alert({message: gettext('Sent payout reminder')}, 'success');
-		      $('#notifyFunder a').addClass('disabled');
-		      return true;
-		    }).fail(result => {
-			        hideBusyOverlay();
-
-			         _alert({ message: gettext('got an error. please try again, or contact support@gitcoin.co') }, 'error');
-			      });
+  var request_url = '/actions/bounty/' + network + '/' + std_bounties_id + '/notify/funder_payout_reminder/';
+  showBusyOverlay();
+  $.post(request_url, data).then(() => {
+    hideBusyOverlay();
+    _alert({message: gettext('Sent payout reminder')}, 'success');
+    $('#notifyFunder a').addClass('disabled');
+    return true;
+  }).fail(() => {
+    hideBusyOverlay();
+    _alert({ message: gettext('got an error. please try again, or contact support@gitcoin.co') }, 'error');
+  });
 };
 
 /** Add the current profile to the interested profiles list. */

From f2368422773579ae01e8ac99da9d88e5abe6b5ed Mon Sep 17 00:00:00 2001
From: Aditya Anand <aditya.anandmc@gmail.com>
Date: Fri, 24 May 2019 19:36:34 +0530
Subject: [PATCH 4/4] - refactored waiting state styles + text - bounty waiting
 state shows invite user based on sessionStorage - fixed linting issues +
 added documentation

---
 app/assets/v2/css/bounty.css                  | 60 ++++++++++--------
 app/assets/v2/js/pages/bounty_details.js      | 62 +++++++++++++++++++
 app/assets/v2/js/pages/bulk_payout.js         | 14 +++++
 app/assets/v2/js/shared.js                    |  1 +
 app/dashboard/templates/bounty/details.html   | 13 +---
 app/dashboard/templates/process_bounty.html   |  9 +++
 .../templates/shared/waiting_state.html       | 36 +++++++++++
 .../grants/shared/waiting_state.html          |  8 +--
 .../templates/shared/bulk_payout_form.html    |  8 +--
 9 files changed, 164 insertions(+), 47 deletions(-)
 create mode 100644 app/dashboard/templates/shared/waiting_state.html

diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css
index 0b0a4243b21..ddc329feb07 100644
--- a/app/assets/v2/css/bounty.css
+++ b/app/assets/v2/css/bounty.css
@@ -58,6 +58,33 @@ body {
   padding-top: 3em;
 }
 
+.invite-user .avatar {
+  width: 5.5rem;
+  height: 5.5rem;
+}
+
+.quote-container {
+  width: 55%;
+  z-index: 2;
+}
+
+.quote-container img {
+  top: 3rem;
+  left: -2rem;
+  position: relative;
+}
+
+.quote-container .quote_text {
+  font-size: 1.1rem;
+  color: #4A4A4A;
+}
+
+.quote-container .quote_author {
+  color: #4A4A4A;
+  font-size: 1rem;
+  font-style: italic;
+}
+
 .bounty_details .avatar {
   width: 50px;
   height: 50px;
@@ -65,6 +92,7 @@ body {
   border-radius: 50px;
   margin-top: 0px;
 }
+
 .bounty_details .avatar.Azure-Samples {
   border-radius: 0px;
 }
@@ -478,7 +506,10 @@ a.btn {
   font-weight: 600;
 }
 
-.username, .contributor-position, .in-progress, .current_status {
+.contributor-position,
+.username,
+.current_status,
+.in-progress {
   color: #0D0764;
 }
 
@@ -487,11 +518,13 @@ a.btn {
   font-size: 10px;
   line-height: 11px;
 }
+
 .completed-bounties {
   color: #05B66A;
 }
 
-.abandoned-bounties, .removed-bounties {
+.abandoned-bounties,
+.removed-bounties {
   color: #F5A623;
 }
 
@@ -682,7 +715,6 @@ a.btn {
   width: auto;
 }
 
-
 .btn-interested,
 .btn-extend,
 .btn-cancel {
@@ -727,28 +759,6 @@ a.btn {
   text-align: center;
 }
 
-.bounty_details .quote-container,
-.grant_waiting .quote-container {
-  width: 55%;
-  margin: 4rem auto;
-  font-weight: 700;
-  z-index: 2;
-}
-
-.bounty_details .quote_text,
-.grant_waiting .quote_text {
-  margin-top: 50px;
-  font-size: 1.1rem;
-  color: #4A4A4A;
-}
-
-.bounty_details .quote_author,
-.grant_waiting .quote_author {
-  color: #4A4A4A;
-  margin: 1rem auto;
-  font-size: 1rem;
-}
-
 .ethereum-issue {
   width:100%;
   color: #ffffff;
diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js
index 62878dddf15..c0cfddcd0dd 100644
--- a/app/assets/v2/js/pages/bounty_details.js
+++ b/app/assets/v2/js/pages/bounty_details.js
@@ -503,6 +503,7 @@ var showWarningMessage = function(txid) {
   $('#bounty_details').hide();
 
   waitingStateActive();
+  show_invite_users();
 };
 
 // refresh page if metamask changes
@@ -1563,6 +1564,67 @@ const is_bounty_expired = function(bounty) {
   return now.getTime() >= expires_date.getTime();
 };
 
+/**
+ * Checks sessionStorage to toggle to show the quote
+ * container vs showing the list of fulfilled users to be
+ * invite.
+ */
+const show_invite_users = () => {
+
+  if (sessionStorage['fulfillers']) {
+    const users = sessionStorage['fulfillers'].split(',');
+
+    if (users.length == 1) {
+
+      let user = users[0];
+      const title = `Work with <b>${user}</b> again on your next bounty ?`;
+      const invite = `
+        <div class="invite-user">
+          <img class="avatar" src="/dynamic/avatar/${users}" />
+          <p class="mt-4">
+            <a target="_blank" class="btn btn-gc-blue shadow-none py-2 px-4" href="/users?invite=${user}">
+              Yes, invite to one of my bounties
+            </a>
+          </p>
+        </div>`;
+
+      $('#invite-header').html(title);
+      $('#invite-users').html(invite);
+    } else {
+
+      let invites = [];
+      const title = 'Work with these contributors again on your next bounty?';
+
+      users.forEach(user => {
+        const invite = `
+          <div class="invite-user mx-3">
+            <img class="avatar" src="/dynamic/avatar/${user}"/>
+            <p class="my-2">
+              <a target="_blank" class="font-subheader blue" href="/profile/${user}">
+                ${user}
+              </a>
+            </p>
+            <a target="_blank" class="btn btn-gc-blue shadow-none px-4 font-body font-weight-semibold" href="/users?invite=${user}">
+              Invite
+            </a>
+          </div>`;
+
+        invites.push(invite);
+      });
+
+      $('#invite-users').addClass('d-flex justify-content-center');
+      $('#invite-header').html(title);
+      $('#invite-users').html(invites);
+    }
+    delete sessionStorage['fulfillers'];
+    $('.invite-user-container').removeClass('hidden');
+    $('.quote-container').addClass('hidden');
+  } else {
+    $('.invite-user-container').addClass('hidden');
+    $('.quote-container').removeClass('hidden');
+  }
+};
+
 var main = function() {
   const moderatorAndAdminActions = $('#moderator-admin-actions');
   const scrollHeight = 150;
diff --git a/app/assets/v2/js/pages/bulk_payout.js b/app/assets/v2/js/pages/bulk_payout.js
index d751c06b55c..5178a5611e1 100644
--- a/app/assets/v2/js/pages/bulk_payout.js
+++ b/app/assets/v2/js/pages/bulk_payout.js
@@ -134,6 +134,7 @@ $(document).ready(function($) {
 
   $('#acceptBounty').on('click', function(e) {
     e.preventDefault();
+    getFulfillers();
     update_registry();
 
     if (!$('#terms').is(':checked')) {
@@ -346,6 +347,19 @@ var update_registry = function(coinbase) {
   document.transactions = transactions;
 };
 
+/**
+ * stores fulfillers in sessionStorage on
+ * triggering advanced payout
+ */
+const getFulfillers = () => {
+  let fulfillers = [];
+  const users = $('.new-user option');
+
+  for (let i = 0; i < users.length; i++) {
+    fulfillers.push($('.new-user option')[i].innerHTML);
+  }
+  sessionStorage['fulfillers'] = fulfillers;
+};
 
 $(document).on('click', '.user-fulfiller', function(event) {
   let elem = $('.username-search');
diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js
index 6cae8f3a9f0..feb76c316b4 100644
--- a/app/assets/v2/js/shared.js
+++ b/app/assets/v2/js/shared.js
@@ -282,6 +282,7 @@ var waitingStateActive = function() {
 
 const notify_funder = (network, std_bounties_id, data) => {
   var request_url = '/actions/bounty/' + network + '/' + std_bounties_id + '/notify/funder_payout_reminder/';
+
   showBusyOverlay();
   $.post(request_url, data).then(() => {
     hideBusyOverlay();
diff --git a/app/dashboard/templates/bounty/details.html b/app/dashboard/templates/bounty/details.html
index 92fe509a6d4..701015566c8 100644
--- a/app/dashboard/templates/bounty/details.html
+++ b/app/dashboard/templates/bounty/details.html
@@ -30,7 +30,8 @@
       </div>
 
       <div class="col-12 offset-md-1 col-md-10 offset-lg-1 col-lg-8 body">
-        {% include 'shared/bounty_waiting_state.html' with can_close=True %}
+        {% include 'shared/waiting_state.html' %}
+
         <div class="row nonefound" style="display:none;">
           <img src="{% static "v2/images/shrug_bot.png" %}">
           <h3>{% trans "No funded issue found." %}</h3>
@@ -40,16 +41,6 @@ <h6>{% trans "Be the OSS Funding you wish to see in the world." %}</h6>
           <p id='submitsolicitation'>{% url 'new_funding' as new_fundingurl %}{% blocktrans %} Looking to fund some work?  You can submit a new Funded Issue <a href="{{ new_fundingurl }}">here</a>.{% endblocktrans %}</p>
         </div>
 
-        <div class="row ml-2 mr-2 pl-4 pr-4 waiting_room_entertainment" style="display: none;">
-          {% include 'shared/rain.html' with class="color" %}
-          <div class="quote-container">
-            <img src="{% static "v2/images/quotes.png" %}" style="float: left; max-width: 22px;" />
-            <div class="quote_text"></div>
-            <div class="quote_author"></div>
-            <input id="quoteRefresh" class="button button--primary" name="refresh" type='submit' onclick='javascript:waitingRoomEntertainment()' value="Refresh Quote" >
-          </div>
-        </div>
-
         <div class="col-12" id="moderator-admin-actions"></div>
         <div class="col-12" id="bounty_details">
           <div class="row font-body">
diff --git a/app/dashboard/templates/process_bounty.html b/app/dashboard/templates/process_bounty.html
index 038c188e869..f87cb761043 100644
--- a/app/dashboard/templates/process_bounty.html
+++ b/app/dashboard/templates/process_bounty.html
@@ -143,6 +143,15 @@ <h3 class="font-bigger-1 mb-0">Suggested Kudos</h3>
     document.bounty_amount_whole = {{bounty.get_value_true}};
     document.bounty_amount_wei = {{bounty.value_in_token}};
     document.token_address = '{{bounty.token_address}}';
+    {% if open_fulfillments %}
+      let fulfillers= [];
+
+      {% for fulfillment in open_fulfillments %}
+        fulfillers.push('{{ fulfillment.fulfiller_github_username }}');
+
+      {% endfor %}
+      sessionStorage['fulfillers'] = fulfillers;
+    {% endif %}
   </script>
 
   <!-- jQuery -->
diff --git a/app/dashboard/templates/shared/waiting_state.html b/app/dashboard/templates/shared/waiting_state.html
new file mode 100644
index 00000000000..238eacc356b
--- /dev/null
+++ b/app/dashboard/templates/shared/waiting_state.html
@@ -0,0 +1,36 @@
+{% 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 static i18n %}
+
+{% include 'shared/bounty_waiting_state.html' with can_close=True %}
+<div class="row ml-2 mr-2 pl-4 pr-4 waiting_room_entertainment" style="display: none;">
+  {% include 'shared/rain.html' with class="color" %}
+  <div class="quote-container font-weight-semibold my-5 mx-auto">
+    <img src="{% static "v2/images/quotes.png" %}" style="float: left; max-width: 22px;" />
+    <div class="quote_text mt-5"></div>
+    <div class="quote_author mt-2 mx-auto"></div>
+    <input id="quoteRefresh" class="mt-4 btn btn-gc-blue shadow-none py-2" name="refresh" type='submit' onclick='javascript:waitingRoomEntertainment()' value="Refresh Quote" >
+  </div>
+
+  <div class="invite-user-container col-12 mt-5 pt-5 hidden">
+    <h2 id="invite-header" class="font-title mb-4">
+      Work with <b>${user}</b> again on your next bounty ?
+    </h2>
+    <div id="invite-users" class="text-center"></div>
+  </div>
+
+</div>
\ No newline at end of file
diff --git a/app/grants/templates/grants/shared/waiting_state.html b/app/grants/templates/grants/shared/waiting_state.html
index e9aa34799c0..b7fd7969373 100644
--- a/app/grants/templates/grants/shared/waiting_state.html
+++ b/app/grants/templates/grants/shared/waiting_state.html
@@ -20,11 +20,11 @@
     {% include 'shared/bounty_waiting_state.html' with can_close=False %}
     <div class="row ml-2 mr-2 pl-4 pr-4 waiting_room_entertainment" style="display: none; text-align: center">
       {% include 'shared/rain.html' with class="color" %}
-      <div class="quote-container">
+      <div class="quote-container font-weight-semibold my-5 mx-auto">
         <img src="{% static "v2/images/quotes.png" %}" style="float: left; max-width: 22px;" />
-        <div class="quote_text"></div>
-        <div class="quote_author"></div>
-        <input id="quoteRefresh" class="button button--primary" name="refresh" type='submit' onclick='javascript:waitingRoomEntertainment()' value="Refresh Quote" >
+        <div class="quote_text mt-5"></div>
+        <div class="quote_author mt-2 mx-auto"></div>
+        <input id="quoteRefresh" class="mt-4 btn btn-gc-blue shadow-none py-2" name="refresh" type='submit' onclick='javascript:waitingRoomEntertainment()' value="Refresh Quote" >
       </div>
     </div>
   </div>
diff --git a/app/retail/templates/shared/bulk_payout_form.html b/app/retail/templates/shared/bulk_payout_form.html
index 041c2206f86..0ab87579cb2 100644
--- a/app/retail/templates/shared/bulk_payout_form.html
+++ b/app/retail/templates/shared/bulk_payout_form.html
@@ -54,10 +54,4 @@
     </div>
     <input type="submit" class="button button--primary button__small add_another" value="Add (+)" />
   </div>
-</div>
-
-
-
-
-
-
+</div>
\ No newline at end of file