Merge pull request #1589 from OpenBazaar/pr/1588

Pr/1588

Author: jjeffryes

js/templates/buyWizard.html

@@ -288,6 +288,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
                         </div>
                         <% _.each(ob.vendor_offer.listing.moderators, function(moderator, i) { %>
                           <% if(moderator.guid != ob.user.guid){ %>
+                            <% moderator.numFee = moderator.fee.replace(/[^\d.-]/g, ''); %>
                             <div class="flexRow">
                               <div class="">
                                 <label for="buyWizardModeratorRadio<%= i %>" class="textOpacity1 clickable">
@@ -312,7 +313,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
                                             <% if(moderator.handle){ %><%= moderator.handle %><% } else { %><%= moderator.guid %><% } %>
                                             </div>
                                           </div>
-                                          <div class="floatRight textOpacity75"><%= moderator.fee %></div>
+                                          <div class="floatRight textOpacity75"><%= ob.intlNumFormat(moderator.numFee) %></div>
                                         </div>
                                       </div>
                                     </div>

js/templates/transactionModal.html

@@ -817,18 +817,18 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
               <% if( ob.displayModerator) { %>
                 <%= polyglot.t('transactions.ModeratedTransaction') %>
                 <% if(ob.displayTotalPrice){ %>
-                <strong><span class="noWrap"><%= ob.buyer_order.order.payment.amount %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
+                <strong><span class="noWrap"><%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
                 <% } else if(ob.buyer_order.order.payment.amount){ %>
-                <strong><%= ob.buyer_order.order.payment.amount %> BTC</strong>
+                <strong><%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</strong>
                 <% } else { %>
                 <strong><%= polyglot.t('Free') %></strong>
                 <% } %>
               <% } else { %>
                 <%= polyglot.t('transactions.DirectTransaction') %>
                 <% if(ob.displayTotalPrice){ %>
-                <strong><span class="noWrap"><%= ob.buyer_order.order.payment.amount %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
+                <strong><span class="noWrap"><%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
                 <% } else if(ob.buyer_order.order.payment.amount){ %>
-                <strong><%= ob.buyer_order.order.payment.amount %> BTC</strong>
+                <strong><%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</strong>
                 <% } else { %>
                 <strong><%= polyglot.t('Free') %></strong>
                 <% } %>
@@ -885,9 +885,9 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
               </div>
               <div class="fontSize13 noOverflow textOpacity75">
                 <% if(ob.displayTotalPrice){ %>
-                <strong>+<span class="noWrap"><%= ob.buyer_order.order.payment.amount %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
+                <strong>+<span class="noWrap"><%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
                 <% } else if(ob.buyer_order.order.payment.amount){ %>
-                <strong>+<%= ob.buyer_order.order.payment.amount %> BTC</strong>
+                <strong>+<%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</strong>
                 <% } else { %>
                 <strong><%= polyglot.t('Free') %></strong>
                 <% } %>
@@ -919,9 +919,9 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
               </div>
               <div class="fontSize13 noOverflow textOpacity75">
                 <% if(ob.displayTotalPrice){ %>
-                <strong>-<span class="noWrap"><%= ob.buyer_order.order.payment.amount %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
+                <strong>-<span class="noWrap"><%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</span> (<%= ob.displayTotalPrice %>)</strong>
                 <% } else if(ob.buyer_order.order.payment.amount){ %>
-                <strong>-<%= ob.buyer_order.order.payment.amount %> BTC</strong>
+                <strong>-<%= ob.intlNumFormat(ob.buyer_order.order.payment.amount, 8) %> BTC</strong>
                 <% } else { %>
                 <strong><%= polyglot.t('Free') %></strong>
                 <% } %>