Merge remote-tracking branch 'crz/master'

basicswap/templates/active.html

@@ -46,7 +46,7 @@
          <path data-color="color-2" d="M12,21c-1.989,0-3.873-0.65-5.43-1.833l3.604-3.393l-9.167-0.983L1.438,24l3.655-3.442 C7.043,22.138,9.455,23,12,23c6.065,0,11-4.935,11-11h-2C21,16.963,16.963,21,12,21z"></path>
         </g>
        </svg>
-       <span>Refresh {{ refresh }} seconds</span>
+       <span>Refresh 30 seconds</span>
       </a>
       {% else %}
       <a id="refresh" href="/active" class="flex flex-wrap justify-center px-5 py-4 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white borderdark:text-white dark:hover:text-white dark:bg-gray-600 dark:hover:bg-gray-700 dark:border-gray-600 dark:hover:border-gray-600 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
@@ -106,10 +106,10 @@
            {% for s in active_swaps %}
            <tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
             <td class="py-3 px-6 monospace">
-             <a href=/bid/{{ s[0] }}>{{ s[0] }}</a>
+             <a href=/bid/{{ s[0] }}>{{ s[0]|truncate(50,true,'...',0) }}</a>
             </td>
             <td class="py-3 px-6 monospace">
-             <a href=/offer/{{ s[1] }}>{{ s[1] }}</a>
+             <a href=/offer/{{ s[1] }}>{{ s[1]|truncate(50,true,'...',0) }}</a>
             </td>
             <td class="py-3 px-6 w-52 whitespace-normal break-words">{{ s[2] }}</td>
             <td class="py-3 px-6">{{ s[3] }}</td>

basicswap/templates/offers.html

@@ -791,7 +791,7 @@ const chart = new Chart(ctx, {
               </td>           
               {% endif %}
               <td class="py-3 px-6 text-xs">
-                <div class="coinname-value" data-coinname="{{ o[3] }}">{{ o[5]|truncate(8,true,'',0) }}</div>
+                <div class="coinname-value" data-coinname="{{ o[3] }}">{{ o[6]|truncate(8,true,'',0) }}</div>
                 <div class="usd-value"></div>
               </td>
               <!--  <td class="py-4 px-6">{{ o[10] }}</td>-->