gitcoinco · thelostone-mc · Mar 31, 2021 · Mar 29, 2021 · Mar 30, 2021 · Mar 30, 2021
diff --git a/app/assets/v2/js/pages/fulfill_bounty/index.js b/app/assets/v2/js/pages/fulfill_bounty/index.js
@@ -59,5 +59,4 @@ window. {
       }
     }
   });
-};
-
+};
diff --git a/app/assets/v2/js/pages/fulfill_bounty/token.js b/app/assets/v2/js/pages/fulfill_bounty/token.js
@@ -17,6 +17,18 @@ fulfillBounty = data => {
     _alert({ message: gettext('Add valid address you would want the bounty to be sent to') }, 'error');
     unloading_button($('.js-submit'));
     return;
+  } else if (!is_valid_address(data.payoutAddress)) {
+    $('#payoutAddress-container input').removeClass('valid');
+    $('#payoutAddress-container input').addClass('invalid');
+    $('#payoutAddress-container').addClass('invalid');
+    $('#payoutAddress-container .text-danger').removeClass('hidden');
+    unloading_button($('.js-submit'));
+    return;
+  } else {
+    $('#payoutAddress-container input').addClass('valid');
+    $('#payoutAddress-container input').removeClass('invalid');
+    $('#payoutAddress-container').removeClass('invalid')
+    $('#payoutAddress-container .text-danger').addClass('hidden');
   }
 
   const url = '/api/v1/bounty/fulfill';
@@ -68,3 +80,61 @@ fulfillBounty = data => {
     }
   });
 };
+
+
+const is_valid_address = (address) => {
+  switch (web3_type) {
+
+    // etc
+    // celo
+    // rsk
+    // binance
+
+    case 'harmony_ext':
+      if (!address.toLowerCase().startsWith('one')) {
+        return false;
+      }
+      return true;
+
+
+    case 'polkadot_ext':
+      if (address.toLowerCase().startsWith('0x')) {
+        return false;
+      }
+      return true;
+
+
+    case 'xinfin_ext':
+      if (!address.toLowerCase().startsWith('xdc')) {
+        return false;
+      }
+      return true;
+
+    case 'qr':
+
+      if (token_name == 'BTC') {
+        if (address.toLowerCase().startsWith('0x')) {
+          return false;
+        }
+        return true;
+      }
+
+      if (token_name == 'FIL') {
+        if (!address.toLowerCase().startsWith('fil')) {
+          return false;
+        }
+        return true;
+      }
+
+      if (token_name == 'ZIL') {
+        if (!address.toLowerCase().startsWith('zil')) {
+          return false;
+        }
+        return true;
+      }
+
+    default:
+      return true;
+  }
+
+}
diff --git a/app/dashboard/templates/bounty/fulfill.html b/app/dashboard/templates/bounty/fulfill.html
@@ -120,7 +120,7 @@ <h4 class="text-center mb-4">{% trans "Submit Work" %}</h4>
                       </div>
                     {% else %}
 
-                      <div class="mt-2">
+                      <div id="payoutAddress-container" class="mt-2">
                         <label class="form__label" for="payoutAddress">{% trans "Payout Address" %}</label>
                         {% if is_bounties_network or bounty.web3_type == 'web3_modal' %}
                           <span class="font-weight-semibold"  style="cursor: pointer; color: grey; font-size: 10px;">
@@ -130,11 +130,11 @@ <h4 class="text-center mb-4">{% trans "Submit Work" %}</h4>
                         <i class='fa fa-info-circle font-smaller-4' data-toggle="tooltip" data-placement="top"
                           title="Address to which bounty will be sent upon being accepted">
                         </i>
-                        {% if bounty.metadata.chain_id == '58' %}
-                          <input name='payoutAddress' id='payoutAddress' class="form__input font-body" type="text" placeholder="Polkadot Wallet Address" data-rule-pattern="^(([0-9a-zA-Z]{47})|([0-9a-zA-Z]{48}))"/>
-                        {% else %}
-                          <input name='payoutAddress' id='payoutAddress' class="form__input font-body" type="text" placeholder="0x0000000000000"/>
-                        {% endif %}
+                        <input name='payoutAddress' id='payoutAddress' class="form__input font-body" type="text" placeholder="Enter {{ bounty.token_name }} Wallet Address"/>
+
+                        <div class="text-danger hidden">
+                          Enter a valid {{ bounty.token_name }} address
+                        </div>
                       </div>
                     {% endif %}
 
@@ -196,6 +196,7 @@ <h4 class="text-center mb-4">{% trans "Submit Work" %}</h4>
 
       <script>
         const web3_type = '{{ bounty.web3_type }}';
+        const token_name = '{{ bounty.token_name }}';
         const is_bounties_network = {% if is_bounties_network|lower == 'false' %} false {% else %} true {% endif %};
       </script>
       {% include 'shared/analytics.html' %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,5 +59,4 @@ window. { @@
           }
         }
       });
-    };
+    };