diff --git a/app/assets/v2/js/metamask-approval.js b/app/assets/v2/js/metamask-approval.js index 94fef0ef7d4..d66201921ec 100644 --- a/app/assets/v2/js/metamask-approval.js +++ b/app/assets/v2/js/metamask-approval.js @@ -24,6 +24,7 @@ async function metamaskApproval() { _alert('Permission to connect to metamask rejected. Allow gitcoin to connect to metamask.', 'warning'); } } + window.removeEventListener('load', metamaskApproval); ask_metamask_connection(); } @@ -51,15 +52,11 @@ function ask_metamask_connection() { shown_on = [ '/tip/send/2', '/kudos/send', '/ens' ]; var len = page_url.length - 1; - + if (page_url.lastIndexOf('/') === len) { page_url = page_url.substring(0, len); } if ($.inArray(page_url, shown_on) != -1 && !is_metamask_approved) { - _alert('Metamask not connected. ', 'error'); - $('#metamask_connect').css('background', 'none'); - $('#metamask_connect').css('color', 'white'); - $('#metamask_connect').css('border', '2px solid white'); - $('#metamask_connect').css('border-radius', '10px'); + _alert('Metamask not connected. ', 'error'); } } diff --git a/app/dashboard/templates/onepager/base.html b/app/dashboard/templates/onepager/base.html index 15148f1e7e9..599e0ecea10 100644 --- a/app/dashboard/templates/onepager/base.html +++ b/app/dashboard/templates/onepager/base.html @@ -86,7 +86,6 @@ {% include 'shared/rain.html' with class="color" %} - {% include 'shared/footer_scripts.html' with slim=1 %} {% block 'scripts' %}{% endblock %} diff --git a/app/dashboard/templates/onepager/send1.html b/app/dashboard/templates/onepager/send1.html index 27059a911e4..15ebb95b561 100644 --- a/app/dashboard/templates/onepager/send1.html +++ b/app/dashboard/templates/onepager/send1.html @@ -1,46 +1,45 @@ -{% extends 'onepager/base.html' %} -{% 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 . -{% endcomment %} -{% load i18n static %} -{% block 'scripts' %} - - -{% endblock %} - -{% block 'main' %} -
-
- - - - - -

{% trans "Send Tip" %}

-

{% trans "It's Fast. It's Easy. It's Free.️" %}

-

({% trans "Supports any github username or email address" %})

-
- -
- {% trans "Send Tip" %} 💰 -
-{% endblock %} +{% extends 'onepager/base.html' %} +{% 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 . +{% endcomment %} +{% load i18n static %} +{% block 'scripts' %} + +{% endblock %} + +{% block 'main' %} +
+
+ + + + + +

{% trans "Send Tip" %}

+

{% trans "It's Fast. It's Easy. It's Free.️" %}

+

({% trans "Supports any github username or email address" %})

+
+ +
+ {% trans "Send Tip" %} 💰 +
+{% endblock %}