Merge pull request #248 from m52go/update-fees-faqs

Update fee structure on faq page

_data/en.yml

@@ -217,9 +217,14 @@ faq:
     </ul>
   hTradeCost: "How much does it cost to trade on Bisq?"
   pTradeCost: >
-    <p>To trade on Bisq, users pay (1) trading fees to Bisq and (2) mining fees to miners.</p> <strong>Trading fees</strong> <p>Offer makers pay 0.1% of the trade amount, and offer takers pay 0.3% of the trade amount. The minimum in both cases is 0.00005 BTC to avoid dust limits.</p>
+    <p>To trade on Bisq, users pay (1) trading fees to Bisq and (2) mining fees to miners.</p>
 
-    <strong>Mining fees</strong> <p>An offer maker only pays mining fees for the trade fee transaction. An offer taker pays mining fees for the trade fee transaction, deposit transaction, and payout transaction. This is because mining fees fluctuate and it's impossible for the offer maker to know what mining fees will be at the time their offer is taken.</p> <p>Bisq uses <a href="https://bitcoinfees.earn.com/api/v1/fees/list" target="_blank">this service</a> to estimate fees. Users can see actual mining fees after they've created or taken an offer.</p>
+    <strong>Trading fees</strong> <p>Trading fees are payable in BTC or BSQ. BSQ is colored bitcoin that Bisq uses to fund and govern itself. It's optional to use, but there are <a href="https://docs.bisq.network/getting-started-dao-traders.html" target="_blank">significant benefits</a>.</p> <div id="faq-tables"> <p class="note">BTC trading fees, per 1 BTC traded:</p> <table> <thead> <tr> <th></th> <th>BTC fees</th> <th>Fee as % of 1 BTC trade size</th> </tr> </thead> <tbody> <tr> <td>Maker fee</td> <td>0.002 BTC</td> <td>0.20%</td> </tr> <tr> <td>Taker fee</td> <td>0.006 BTC</td> <td>0.60%</td> </tr> </tbody> </table> <p class="note">BSQ trading fees, per 1 BTC traded:</p> <table> <thead> <tr> <th></th> <th>BSQ fees</th> <th>Fee as % of 1 BTC trade size</th> </tr> </thead> <tbody> <tr> <td>Maker fee</td> <td>13 BSQ</td> <td>0.13%</td> </tr> <tr> <td>Taker fee</td> <td>38 BSQ</td> <td>0.38%</td> </tr> </tbody> </table> </div> <p>BSQ fee percentages above assume a 0.00001 BSQ/BTC rate.</p> <p>Nominal BTC and BSQ fees are adjusted periodically by DAO voting to accommodate for market fluctuations.</p> <p>The minimum trading fees are set at 0.00005 BTC and 0.03 BSQ to avoid dust limits.</p>
+
+    <strong>Mining fees</strong>
+    <p>An offer maker only pays mining fees for the trade fee transaction. An offer taker pays mining fees for the trade fee transaction, deposit transaction, and payout transaction. This is because mining fees fluctuate and it's impossible for the offer
+      maker to know what mining fees will be at the time their offer is taken.</p>
+    <p>Bisq uses <a href="https://bitcoinfees.earn.com/api/v1/fees/list" target="_blank">this service</a> to estimate fees. Users can see actual mining fees after they've created or taken an offer.</p>
   hOpenOffer: "Why do I need to keep my application online when I have an open offer?"
   pOpenOffer: >
     <p>If you have published an offer, your Bisq application needs to stay online so it can react when another trader wants to take your offer (the multisig deposit transaction is created in the take-offer process). Be sure you have deactivated your computer's standby mode so your Bisq application can stay online (monitor standby is not a problem).</p> <p>If your Bisq application does go offline, your offer will get removed from the distributed offerbook. It will be re-published the next time you start your Bisq application.</p> <p>After an offer has been taken and the trade process has started, neither trader needs to be online continuously, but each trader will need to be online periodically to check if any action is needed on their side (e.g. sending fiat/altcoin, confirming payment receipt, etc).</p>

css/styles.scss

@@ -51,6 +51,10 @@ strong {
   background: #f3f3f3
 }
 
+.note {
+    font-style: italic;
+}
+
 
 .dark-grey a,
 .darker-grey a {
@@ -871,8 +875,36 @@ front page
     margin-bottom: 0;
 }
 
+
+/*****************
+faq page
+*****************/
+
+#faq-tables {
+    margin-bottom: 25px;
+}
+
+#faq-tables table {
+    margin-bottom: 25px;
+    width: 100%;
+}
+
+#faq-tables th {
+    font-weight: 400;
+    font-size: 0.8em;
+    color: #ccc;
+    text-transform: uppercase;
+}
+
+#faq-tables tr {
+    border-bottom: #ececec 1px solid;
+    margin: 20px 0;
+}
+
+
 /****************/
 
+
 @media (max-width: 991px) {
 
     .accordion-toggle {
@@ -954,7 +986,7 @@ front page
     }
 
     td {
-      padding: 0.6rem 0.5rem 0.6rem 0;
+      padding: 0.6rem 1rem 0.6rem 0;
       vertical-align: text-top;
     }
 

de/faq.html

@@ -5,7 +5,7 @@
 lang: de
 flag: 🇩🇪
 language: Deutsch
-outdated_translation: false
+outdated_translation: true
 ---
 {% assign item = site.data[page.lang].faq %}
 <h1>{{ item.hFAQ }}</h1>

es/faq.html

@@ -5,7 +5,7 @@
 lang: es
 flag: 🇪🇸
 language: Español
-outdated_translation: false
+outdated_translation: true
 ---
 {% assign item = site.data[page.lang].faq %}
 <h1>{{ item.hFAQ }}</h1>

faq.html

@@ -53,6 +53,7 @@ <h6 class="accordion-toggle border-top pt-3 pb-2 green" id="trade-periods">{{ it
 
   <h6 class="accordion-toggle border-top pt-3 pb-2 green" id="cost-to-trade">{{ item.hTradeCost }}</h6>
   <div class="accordion-content pb-5 col-sm-12 col-md-8 ml-0 pl-sm-0 pl-md-0 px-0">
+
     {{ item.pTradeCost }}
 
   </div>

fr/faq.html

@@ -5,7 +5,7 @@
 lang: fr
 flag: 🇫🇷
 language: Français
-outdated_translation: false
+outdated_translation: true
 ---
 {% assign item = site.data[page.lang].faq %}
 <h1>{{ item.hFAQ }}</h1>

ja/faq.html

@@ -5,7 +5,7 @@
 lang: ja
 flag: 🇯🇵
 language: 日本語
-outdated_translation: false
+outdated_translation: true
 ---
 {% assign item = site.data[page.lang].faq %}
 <h1>{{ item.hFAQ }}</h1>

pt-PT/faq.html

@@ -5,7 +5,7 @@
 lang: pt-PT
 flag: 🇵🇹
 language: Português
-outdated_translation: false
+outdated_translation: true
 ---
 {% assign item = site.data[page.lang].faq %}
 <h1>{{ item.hFAQ }}</h1>

zh-CN/faq.html

@@ -5,7 +5,7 @@
 lang: zh-CN
 flag: 🇨🇳
 language: 简体中文
-outdated_translation: false
+outdated_translation: true
 ---
 {% assign item = site.data[page.lang].faq %}
 <h1>{{ item.hFAQ }}</h1>