From 456bda21fa14e6214b7a88f37fec1e7a30ade182 Mon Sep 17 00:00:00 2001
From: Steve Jain <mfiver@gmail.com>
Date: Tue, 17 Sep 2019 19:48:30 -0400
Subject: [PATCH] Update fee structure on faq page

---
 css/styles.scss | 34 ++++++++++++++++++++++++++-
 faq.html        | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/css/styles.scss b/css/styles.scss
index 3ea8e270..576c0b2d 100644
--- a/css/styles.scss
+++ b/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;
     }
 
diff --git a/faq.html b/faq.html
index 5620e857..3e674ec6 100644
--- a/faq.html
+++ b/faq.html
@@ -167,7 +167,66 @@ <h6 class="accordion-toggle border-top pt-3 pb-2 green" id="cost-to-trade">How m
     <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. Fees paid with BSQ can be as much as 90% lower.</p>
+    <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 colspan="1"></th>
+                    <th colspan="1">BTC fees</th>
+                    <th colspan="1">Fee as % of 1 BTC trade size</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td colspan="1">Maker fee</td>
+                    <td colspan="1">0.002 BTC</td>
+                    <td colspan="1">0.20%</td>
+                </tr>
+                <tr>
+                    <td colspan="1">Taker fee</td>
+                    <td colspan="1">0.006 BTC</td>
+                    <td colspan="1">0.60%</td>
+                </tr>
+
+            </tbody>
+        </table>
+
+        <p class="note">BSQ trading fees, per 1 BTC traded:</p>
+
+        <table>
+            <thead>
+                <tr>
+                    <th colspan="1"></th>
+                    <th colspan="1">BSQ fees</th>
+                    <th colspan="1">Fee as % of 1 BTC trade size</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td colspan="1">Maker fee</td>
+                    <td colspan="1">13 BSQ</td>
+                    <td colspan="1">0.13%</td>
+                </tr>
+                <tr>
+                    <td colspan="1">Taker fee</td>
+                    <td colspan="1">38 BSQ</td>
+                    <td colspan="1">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