From 500e36b2055722345ab518b25b9f4749e53056b2 Mon Sep 17 00:00:00 2001
From: nutrina <nutrina9@gmail.com>
Date: Thu, 9 Jun 2022 16:45:05 +0300
Subject: [PATCH] Fixes for bounties: (#10671)

- layout for contact details (avoid overlapping, wrap the line with contact details)
   - editing bounty that was not reserved was not working

Co-authored-by: Gerald Iakobinyi-Pich <gerald@gitcoin.co>
---
 app/assets/v2/js/pages/change_bounty.js              |  4 ++--
 app/dashboard/templates/bounty/details2.html         | 12 ++++++------
 .../templates/bounty/new_bounty_step_5.html          | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/assets/v2/js/pages/change_bounty.js b/app/assets/v2/js/pages/change_bounty.js
index b7a85a12d8d..0f3141f33e0 100644
--- a/app/assets/v2/js/pages/change_bounty.js
+++ b/app/assets/v2/js/pages/change_bounty.js
@@ -1235,10 +1235,10 @@ if (document.getElementById('gc-hackathon-new-bounty')) {
           project_length: bounty.project_length,
           experience_level: bounty.experience_level,
           never_expires: bounty.never_expires,
-          reserved_for_user: {
+          reserved_for_user: bounty.bounty_reserved_for_user ? {
             text: bounty.bounty_reserved_for_user.handle,
             avatar_url: bounty.bounty_reserved_for_user.avatar_url
-          },
+          } : { text: '', avatar_url: ''},
           richDescriptionContent: bounty.custom_issue_description ? JSON.parse(bounty.custom_issue_description) : null,
           richDescriptionText: bounty.custom_issue_description ? bounty.custom_issue_description : ''
         },
diff --git a/app/dashboard/templates/bounty/details2.html b/app/dashboard/templates/bounty/details2.html
index 3434e7c21e6..b17a16cf3d5 100644
--- a/app/dashboard/templates/bounty/details2.html
+++ b/app/dashboard/templates/bounty/details2.html
@@ -202,14 +202,14 @@ <h4 id="title" class="font-title p-0 text-center text-lg-left">[[ bounty.title ]
               </div>
             </div>
 
-            <div v-if="bounty.contact_details && bounty.contact_details.length > 0" class="mt-3">
+            <div v-if="bounty.contact_details && bounty.contact_details.length > 0" class="row mt-3">
               <span class="bounty-info-heading">{% trans "Contacts" %}</span>
 
-              <div id="bounty-info-row" class="row font-body bounty-info">
-                <div class="col-12 col-sm-4 col-md-2 d-flex mt-1 text-nowrap" v-for="contact in bounty.contact_details">                
-                  <span v-if="contact.type=='Discord'"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
-                  <span v-if="contact.type=='Email'"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
-                  <span v-if="contact.type=='Telegram'"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
+              <div id="bounty-info-row" class="d-flex flex-wrap font-body bounty-info">
+                <div class="d-flex mt-1 text-nowrap" v-for="contact in bounty.contact_details">                
+                  <span v-if="contact.type=='Discord'" class="mr-2"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
+                  <span v-if="contact.type=='Email'" class="mr-2"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
+                  <span v-if="contact.type=='Telegram'" class="mr-2"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
                 </div>              
               </div>
             </div>
diff --git a/app/dashboard/templates/bounty/new_bounty_step_5.html b/app/dashboard/templates/bounty/new_bounty_step_5.html
index a216349322c..e2658c896dc 100644
--- a/app/dashboard/templates/bounty/new_bounty_step_5.html
+++ b/app/dashboard/templates/bounty/new_bounty_step_5.html
@@ -140,11 +140,11 @@ <h4 id="title" class="font-title p-0 text-center text-lg-left">[[ form.title ]]<
     <div v-if="nonEmptyContactDetails && nonEmptyContactDetails.length > 0" class="mt-3">
       <span class="bounty-info-heading">{% trans "Contacts" %}</span>
 
-      <div id="bounty-info-row" class="row font-body bounty-info">
-        <div class="col-12 col-sm-4 col-md-2 d-flex mt-1 text-nowrap" v-for="contact in nonEmptyContactDetails">                
-          <span v-if="contact.type=='Discord'"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
-          <span v-if="contact.type=='Email'"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
-          <span v-if="contact.type=='Telegram'"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
+      <div id="bounty-info-row" class="d-flex flex-wrap font-body bounty-info">
+        <div class="d-flex mt-1 text-nowrap" v-for="contact in nonEmptyContactDetails">                
+          <span v-if="contact.type=='Discord'" class="mr-2"><i class="fab fa-discord mr-1"></i>[[contact.value]]</span>
+          <span v-if="contact.type=='Email'" class="mr-2"><i class="fal fa-envelope mr-1"></i>[[contact.value]]</span>
+          <span v-if="contact.type=='Telegram'" class="mr-2"><i class="fab fa-telegram-plane mr-1"></i>[[contact.value]]</span>
         </div>              
       </div>
     </div>