diff --git a/app/dashboard/templates/onepager/send2.html b/app/dashboard/templates/onepager/send2.html
index f23a1b85a55..af720b53742 100644
--- a/app/dashboard/templates/onepager/send2.html
+++ b/app/dashboard/templates/onepager/send2.html
@@ -83,10 +83,12 @@
-
+
diff --git a/app/dashboard/templates/request_payment.html b/app/dashboard/templates/request_payment.html
index eda87706883..ae97a116279 100644
--- a/app/dashboard/templates/request_payment.html
+++ b/app/dashboard/templates/request_payment.html
@@ -107,6 +107,7 @@
{% trans "Request money." %}
diff --git a/app/dashboard/templates/shared/pricing.html b/app/dashboard/templates/shared/pricing.html
index 6eddf554a79..f78df68a8cc 100644
--- a/app/dashboard/templates/shared/pricing.html
+++ b/app/dashboard/templates/shared/pricing.html
@@ -21,7 +21,9 @@
-
+
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index 9d2937c75e5..c535536acad 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -145,7 +145,9 @@
{% if direction == '-' %} Negative {%endif%} {%
{% if grant_has_no_token %}
-
+
{% else %}
{{ grant.token_symbol }}
diff --git a/app/grants/templates/grants/new.html b/app/grants/templates/grants/new.html
index c284d595210..2cdf27cb657 100644
--- a/app/grants/templates/grants/new.html
+++ b/app/grants/templates/grants/new.html
@@ -138,7 +138,9 @@
Funding Information
-
+
diff --git a/app/retail/templates/settings/tokens.html b/app/retail/templates/settings/tokens.html
index 509964eb415..da014e3ff50 100644
--- a/app/retail/templates/settings/tokens.html
+++ b/app/retail/templates/settings/tokens.html
@@ -39,6 +39,7 @@
{% trans "Tokens" %}
diff --git a/app/retail/templates/tokens_js.txt b/app/retail/templates/tokens_js.txt
index f86fab25780..5d7140cdb29 100644
--- a/app/retail/templates/tokens_js.txt
+++ b/app/retail/templates/tokens_js.txt
@@ -1,14 +1,17 @@
var tokens = function(network_id) {
var _tokens = null;
-
if (network_id == 'mainnet') {
_tokens = [{% for token in mainnet_tokens %}{{token.to_json | safe}},{%endfor%}];
+ $(".loading_tokens").remove();
} else if (network_id == 'ropsten') { // ropsten
_tokens = [{% for token in ropsten_tokens %}{{token.to_json | safe}},{%endfor%}];
- } else if (network_id == 'rinkeby') { // ropsten
+ $(".loading_tokens").remove();
+ } else if (network_id == 'rinkeby') { // rinkeby
_tokens = [{% for token in rinkeby_tokens %}{{token.to_json | safe}},{%endfor%}];
+ $(".loading_tokens").remove();
} else if (network_id == 'custom network') { // testrpc
_tokens = [{% for token in custom_tokens %}{{token.to_json | safe}},{%endfor%}];
+ $(".loading_tokens").remove();
} else {
_tokens = [{% for token in unknown_tokens %}{{token.to_json | safe}},{%endfor%}];
}
diff --git a/scripts/debug/check_approval_amount.js b/scripts/debug/check_approval_amount.js
index d6df0c70ef5..547b6fa4170 100644
--- a/scripts/debug/check_approval_amount.js
+++ b/scripts/debug/check_approval_amount.js
@@ -1,6 +1,6 @@
// on settings/token page
-var from = '0x0583858adfe7d1d3DC7F8447301cf7B7b056d638';
+var from = '0x7d96b5c4279e20bab1ca0043a65f2bb156b0c6eb';
var token_address = '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359';// DAI
var to = '0x2af47a65da8cd66729b4209c22017d6a5c2d2400'; //stdbounties
var token_contract = web3.eth.contract(token_abi).at(token_address);