From 1557cf497ea5c64d5d3c42a190ea5073ce69c744 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Mon, 20 Jul 2020 21:28:31 +0900
Subject: [PATCH 1/3] allow matic grant creation w/o web3

---
 app/assets/v2/js/grants/new.js                | 31 ++++++++++++-------
 .../templates/grants/new-whitelabel.html      | 15 ---------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js
index 6ff77cbcb51..96b6cbb9dee 100644
--- a/app/assets/v2/js/grants/new.js
+++ b/app/assets/v2/js/grants/new.js
@@ -64,6 +64,7 @@ const init = () => {
     e.preventDefault();
   }).validate({
     submitHandler: function(form) {
+      console.log('validating');
       let data = {};
 
       var recipient_addr = $('#input-admin_address').val();
@@ -79,8 +80,10 @@ const init = () => {
         data[this.name] = this.value;
       });
 
-      $('#token_symbol').val($('#js-token option:selected').text());
-      $('#token_address').val($('#js-token option:selected').val());
+      if ($('#token_address').length) {
+        $('#token_symbol').val($('#js-token option:selected').text());
+        $('#token_address').val($('#js-token option:selected').val());
+      }
 
       if (document.web3network) {
         $('#network').val(document.web3network);
@@ -120,8 +123,13 @@ const init = () => {
       formData.append('reference_url', $('#input-url').val());
       formData.append('admin_address', $('#input-admin_address').val());
       formData.append('contract_owner_address', $('#contract_owner_address').val());
-      formData.append('token_address', $('#token_address').val());
-      formData.append('token_symbol', $('#token_symbol').val());
+      if ($('#token_address').length) {
+        formData.append('token_address', $('#token_address').val());
+        formData.append('token_symbol', $('#token_symbol').val());
+      } else {
+        formData.append('token_address', '0x0000000000000000000000000000000000000000');
+        formData.append('token_symbol', 'Any Token');
+      }
       formData.append('contract_version', $('#contract_version').val());
       formData.append('transaction_hash', $('#transaction_hash').val());
       formData.append('network', $('#network').val());
@@ -151,14 +159,11 @@ const init = () => {
   });
 };
 
-window.addEventListener('dataWalletReady', function(e) {
-  init();
-}, false);
-
 $(document).ready(function() {
 
   $('.select2-selection__choice').removeAttr('title');
-
+  init();
+  changeTokens();
 });
 
 function saveGrant(grantData, isFinal) {
@@ -194,8 +199,10 @@ function saveGrant(grantData, isFinal) {
 
 
 $('#new_button').on('click', function(e) {
-  if (!provider) {
-    e.preventDefault();
-    return onConnect().then(() => init());
+  if (!provider && $('#token_address').length != 0) {
+    {
+      e.preventDefault();
+      return onConnect().then(() => init());
+    }
   }
 });
diff --git a/app/grants/templates/grants/new-whitelabel.html b/app/grants/templates/grants/new-whitelabel.html
index 3d46a181307..e7d9decc44f 100644
--- a/app/grants/templates/grants/new-whitelabel.html
+++ b/app/grants/templates/grants/new-whitelabel.html
@@ -122,19 +122,6 @@ <h5 class="mt-4">Project Information</h5>
 
                 <h5 class="mt-4">Funding Information</h5>
                 <hr>
-                <div class="form__group-horizontal pb-3">
-                  <div class="row">
-                    <div class="col-12 col-md-12">
-                      <label class="font-body">{% trans "Accepted Tokens" %}</label>
-                      <div class="form__select2">
-                        <select class='js-select2' name='denomination' id='js-token'>
-                          <option value="" disabled="disabled" class="loading_tokens">(Loading Tokens from Web3 Wallet)</option>
-                        </select>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
                 <div class="form__group-horizontal pb-3">
                   <label class="font-body" for="input-admin_address">{% trans "Funding Recipient Wallet Address" %}</label>
                   <input type="text" class="form__input form__input-lg " id="input-admin_address" value="" name="admin_address" required placeholder="0x00... or domain.eth"/>
@@ -156,8 +143,6 @@ <h3 class="text-center">
                   <input type="hidden" id="contract_address" name="contract_address" />
                   <input type="hidden" id="contract_owner_address" name="contract_owner_address">
                   <input type="hidden" id="contract_version" name="contract_version" value="2">
-                  <input type="hidden" id="token_address" name="token_address" value="">
-                  <input type="hidden" id="token_symbol" name="token_symbol" value="">
                   <input type="hidden" id="category" name="category" value="">
                   <input type="hidden" id="network" name="network">
                   <input type="hidden" id="trusted_relayer" name="trusted_relayer" value="{{ trusted_relayer }}">

From 688a3a9c96c82050e19778ebad2c2b34af1b7a10 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Mon, 20 Jul 2020 21:30:18 +0900
Subject: [PATCH 2/3] remove consolelog

---
 app/assets/v2/js/grants/new.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js
index 96b6cbb9dee..849644c7ecc 100644
--- a/app/assets/v2/js/grants/new.js
+++ b/app/assets/v2/js/grants/new.js
@@ -64,7 +64,6 @@ const init = () => {
     e.preventDefault();
   }).validate({
     submitHandler: function(form) {
-      console.log('validating');
       let data = {};
 
       var recipient_addr = $('#input-admin_address').val();

From 7bc5d1d435118c3a8708cbc051c2c2c2cbe7ab43 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Mon, 20 Jul 2020 22:18:47 +0900
Subject: [PATCH 3/3] fix lint

---
 app/assets/v2/js/grants/new.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/v2/js/grants/new.js b/app/assets/v2/js/grants/new.js
index 849644c7ecc..a50e72949e3 100644
--- a/app/assets/v2/js/grants/new.js
+++ b/app/assets/v2/js/grants/new.js
@@ -199,9 +199,7 @@ function saveGrant(grantData, isFinal) {
 
 $('#new_button').on('click', function(e) {
   if (!provider && $('#token_address').length != 0) {
-    {
-      e.preventDefault();
-      return onConnect().then(() => init());
-    }
+    e.preventDefault();
+    return onConnect().then(() => init());
   }
 });