Skip to content

Commit

Permalink
Change wording from "Metamask" to "your web3 wallet" where appropriate
Browse files Browse the repository at this point in the history
  • Loading branch information
@KiChjang
KiChjang committed Feb 16, 2020
1 parent 91a4be9 commit 91a3401
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty/fund.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ <h5 class="text-uppercase h3 font-weight-bold mb-0">{% trans "Total"%}</h5>
You will have to approve
<span class="font-weight-bold">
<span id="confirmation">{% if FEE_PERCENTAGE == 0 %} 1 {% else %} 2 {% endif %}</span>
Metamask confirmations.
web3 wallet confirmations.
</span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty/increase.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ <h5 class="text-uppercase h3 font-weight-bold mb-0">{% trans "Total"%}</h5>
<p class="font-caption mb-0">
You will have to approve
<span id="confirmation" class="font-weight-bold">
{% if FEE_PERCENTAGE == 0 %} 1 Metamask confirmation. {% else %} 2 Metamask confirmations.{% endif %}
{% if FEE_PERCENTAGE == 0 %} 1 web3 wallet confirmation. {% else %} 2 web3 wallet confirmations.{% endif %}
</span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty/process_refund_request.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ <h1 class="text-center">{% trans "Process Refund Fee Request" %} {{obj.pk}}</h1>
<div class="section text-center">
<p id="no_metamask_error" style="display: none;">{% trans "MetaMask Extension Not Detected" %}</p>
<p id="unlock_metamask_error" style="display: none;">{% trans "Please Unlock MetaMask To Continue" %}</p>
<p id="zero_balance_error" style="display: none;">{% trans "MetaMask Active Account Is Empty" %}</p>
<p id="zero_balance_error" style="display: none;">{% trans "Active Web3 Wallet Account Is Empty" %}</p>
</div>

<div class="section">
Expand Down
6 changes: 3 additions & 3 deletions app/dashboard/templates/bulk_payout_bounty.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ <h3>{% trans "Advanced Payout" %}</h3>
<li><strong>Payment Source:</strong>Bounty Funds</li>
<li><strong>Bounty Status after payment:</strong> COMPLETED
<li>If you choose to exceed {{ bounty.value_true }} {{ bounty.token_name }}, the remainder amount would be deducted from your
metamask wallet and paid out using Gitcoin Tips</li>
web3 wallet and paid out using Gitcoin Tips</li>
<li>Bounty will be closed once this mode of payment is chosen</li>
<li class='font-italic'>
Ensure you have enough {{ bounty.token_name }} if you decide to payout
Expand All @@ -136,7 +136,7 @@ <h3>{% trans "Advanced Payout" %}</h3>
<i class="fa fa-info-circle font-caption ml-1 gc-blue-text" data-toggle="tooltip" data-placement="right" data-html="true" title="
<p class='font-body font-weight-bold ml-2 pt-3'>PAY USING WALLET</p>
<ul>
<li><strong>Payment Source:</strong> Your metamask wallet (using Gitcoin Tips)
<li><strong>Payment Source:</strong> Your web3 wallet (using Gitcoin Tips)
<li><strong>Bounty Status after payment:</strong> OPEN (enables multiple payouts at different points in time)
<li><strong>Bounty Funds:</strong> Will not be used as the entire amount would come from your wallet</li>
<li class='font-italic'>Ensure you have enough tokens in your wallet before using this mode</li>
Expand Down Expand Up @@ -216,7 +216,7 @@ <h5 class="font-weight-semibold font-header gc-green-text">{% trans 'Payout Prev
</p>

<p class="my-3 font-weight-bold">
You will have to approve <span id="metamask-txn-count">0</span> Metamask transactions:
You will have to approve <span id="metamask-txn-count">0</span> wallet transactions:
</p>

{% if bounty.additional_funding_summary %}
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/quickstart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h4 class="title text-center">{% trans "Funder Guide" %}</h4>
<li>{% trans "1) Create a Github Issue, you'll need the issue URL" %}</li>
<li>{% trans "2) Select the type of issue to fund" %}</li>
<li>{% trans '3) Complete the form and press "Fund Issue"' %}</li>
<li>{% trans "4) Confirm the transaction in MetaMask" %}</li>
<li>{% trans "4) Confirm the transaction in your web3 wallet" %}</li>
</ol>
<p class="mb-4">
{% trans "Once confirmed on blockchain, your bounty is posted to Gitcoin! Wait for developers across the world to discover your bounty and start working on your issue." %}
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/shared/featured.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="form__flex-group">
<div class="">
<div class="featured_container">
<small class="mb-3 d-block">Note: You will have to approve this transaction separately via MetaMask on submit.</small>
<small class="mb-3 d-block">Note: You will have to approve this transaction separately via your web3 wallet on submit.</small>
<div class="form__checkbox">
<input name='featuredBounty' id='featuredBounty' type="checkbox" value=1 />
<label class="form__label" for='featuredBounty'>{% trans "Yes, I want to feature my bounty." %}
Expand Down
2 changes: 1 addition & 1 deletion app/faucet/templates/process_faucet_request.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h1>{% trans "Process Faucet Request" %} {{obj.pk}}</h1>
</div>
<div id="no_metamask_error" style="display: none;">{% trans "MetaMask Extension Not Detected" %}</div>
<div id="unlock_metamask_error" style="display: none;">{% trans "Please Unlock MetaMask To Continue" %}</div>
<div id="zero_balance_error" style="display: none;">{% trans "MetaMask Active Account Is Empty" %}</div>
<div id="zero_balance_error" style="display: none;">{% trans "Active Web3 Wallet Account Is Empty" %}</div>
<div class="row loading justify-content-center align-items-center loading_img" id="loadingImg" style="display:none;">
<img src='{% static "v2/images/loading_v2.gif" %}' style="width: 6rem;" alt="loading...">
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/grants/templates/grants/cancel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h2 class="font-title-lg my-5">{% trans "Cancel Contribution" %}</h2>
</p>
<p>
<i class="fas fa-circle mr-2"></i>
{% trans " Note: You will have to approve 2 transactions via MetaMask on submit." %}
{% trans " Note: You will have to approve 2 transactions via your web3 wallet on submit." %}
</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/grants/templates/grants/fund.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>

<p>
<i class="fas fa-circle mr-2"></i>
{% trans "Note: You will have to approve 2 transactions via MetaMask on submit." %} <a target="_blank" href="https://github.com/gitcoinco/web/blob/master/docs/GRANTS.md">Read how this works</a>.
{% trans "Note: You will have to approve 2 transactions via your web3 wallet on submit." %} <a target="_blank" href="https://github.com/gitcoinco/web/blob/master/docs/GRANTS.md">Read how this works</a>.
</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/pricing/subscribe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
</p>
<p>
<i class="fas fa-circle mr-2"></i>
{% trans "Note: You will have to approve 2 transactions via MetaMask on submit." %} <a target="_blank" href="https://github.com/gitcoinco/web/blob/master/docs/GRANTS.md">Read how this works</a>.
{% trans "Note: You will have to approve 2 transactions via your web3 wallet on submit." %} <a target="_blank" href="https://github.com/gitcoinco/web/blob/master/docs/GRANTS.md">Read how this works</a>.
</p>
</div>

Expand Down

0 comments on commit 91a3401

Please sign in to comment.