midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-05 10:28:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #312 from tecnovert/ui

Browse Source 
ui: Combine bid sent and received fields.
This commit is contained in:
tecnovert
2025-06-08 18:31:47 +00:00
committed by GitHub
parent d08e09061f df4a6af6a0
commit b57ff3497a
6 changed files with 75 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
basicswap/static/js/new_offer.js
View File

@@ -329,7 +329,9 @@ const SwapTypeManager = {
} else { } else {
swapTypeElement.disabled = false; swapTypeElement.disabled = false;
swapTypeElement.classList.remove('select-disabled'); swapTypeElement.classList.remove('select-disabled');
swapTypeElement.value = 'xmr_swap'; if (['xmr_swap', 'seller_first'].includes(swapTypeElement.value) == false) {
swapTypeElement.value = 'xmr_swap';
}
} }
let swapTypeHidden = DOM.get('swap_type_hidden'); let swapTypeHidden = DOM.get('swap_type_hidden');
@@ -353,10 +355,6 @@ const SwapTypeManager = {
} }
}; };
function set_swap_type_enabled(coinFrom, coinTo, swapTypeElement) {
SwapTypeManager.setSwapTypeEnabled(coinFrom, coinTo, swapTypeElement);
}
const UIEnhancer = { const UIEnhancer = {
handleErrorHighlighting: () => { handleErrorHighlighting: () => {
const errMsgs = document.querySelectorAll('p.error_msg'); const errMsgs = document.querySelectorAll('p.error_msg');

36
basicswap/templates/bid.html
View File

@@ -35,7 +35,7 @@
<p class="font-normal text-coolGray-200 dark:text-white"><span class="bold">BID ID:</span> {{ bid_id }}</p> <p class="font-normal text-coolGray-200 dark:text-white"><span class="bold">BID ID:</span> {{ bid_id }}</p>
</div> </div>
<div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto"> <div class="w-full md:w-1/2 p-3 p-6 container flex flex-wrap items-center justify-end items-center mx-auto">
{% if refresh %} {% if refresh %}
<a id="refresh" href="/bid/{{ bid_id }}" class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none"> <a id="refresh" href="/bid/{{ bid_id }}" class="rounded-full flex flex-wrap justify-center px-5 py-3 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border dark:bg-gray-500 dark:hover:bg-gray-700 border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
{{ circular_arrows_svg | safe }} {{ circular_arrows_svg | safe }}
<span>Refresh {{ refresh }} seconds</span> <span>Refresh {{ refresh }} seconds</span>
@@ -76,7 +76,7 @@
</th> </th>
</tr> </tr>
</thead> </thead>
{% if data.was_sent == 'True' %} {% if data.was_sent %}
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">Swap</td> <td class="py-3 px-6 bold">Swap</td>
<td class="py-3 px-6"> <td class="py-3 px-6">
@@ -103,7 +103,7 @@
<td class="py-3 px-6 bold">Bid Rate</td> <td class="py-3 px-6 bold">Bid Rate</td>
<td class="py-3 px-6">{{ data.bid_rate }}</td> <td class="py-3 px-6">{{ data.bid_rate }}</td>
</tr> </tr>
{% if data.was_sent == 'True' %} {% if data.was_sent %}
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">You Send</td> <td class="py-3 px-6 bold">You Send</td>
<td class="py-3 px-6"> <td class="py-3 px-6">
@@ -183,12 +183,8 @@
<td class="py-3 px-6">{{ data.expired_at }}</td> <td class="py-3 px-6">{{ data.expired_at }}</td>
</tr> </tr>
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">Sent</td> <td class="py-3 px-6 bold">Bid Type</td>
<td class="py-3 px-6">{{ data.was_sent }}</td> <td class="py-3 px-6" id="bidtype">{% if data.was_sent and data.was_received %}Self Bid{% elif data.was_sent %}Sent{% elif data.was_received %}Received{% endif %}</td>
</tr>
<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 bold">Received</td>
<td class="py-3 px-6">{{ data.was_received }}</td>
</tr> </tr>
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">Initiate Tx</td> <td class="py-3 px-6 bold">Initiate Tx</td>
@@ -543,7 +539,7 @@
<button name="abandon_bid" type="submit" value="Abandon Bid" onclick="return confirmPopup();" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white hover:text-red border border-red-500 hover:border-red-500 hover:bg-red-600 bg-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Abandon Bid</button> <button name="abandon_bid" type="submit" value="Abandon Bid" onclick="return confirmPopup();" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white hover:text-red border border-red-500 hover:border-red-500 hover:bg-red-600 bg-red-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Abandon Bid</button>
</div> </div>
{% endif %} {% endif %}
{% if data.was_received == 'True' and not edit_bid and data.can_accept_bid %} {% if data.was_received and not edit_bid and data.can_accept_bid %}
<div class="w-full md:w-auto p-1.5"> <div class="w-full md:w-auto p-1.5">
<button name="accept_bid" value="Accept Bid" type="submit" onclick='return confirmPopup("Accept");' class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Accept Bid</button> <button name="accept_bid" value="Accept Bid" type="submit" onclick='return confirmPopup("Accept");' class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">Accept Bid</button>
</div> </div>
@@ -565,7 +561,7 @@
<h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-4" id="confirmTitle">Confirm Action</h2> <h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-4" id="confirmTitle">Confirm Action</h2>
<p class="text-gray-600 dark:text-gray-200 mb-6 whitespace-pre-line" id="confirmMessage">Are you sure?</p> <p class="text-gray-600 dark:text-gray-200 mb-6 whitespace-pre-line" id="confirmMessage">Are you sure?</p>
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<button type="button" id="confirmYes" <button type="button" id="confirmYes"
class="px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none"> class="px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
Confirm Confirm
</button> </button>
@@ -588,16 +584,16 @@
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
let confirmCallback = null; let confirmCallback = null;
let triggerElement = null; let triggerElement = null;
document.getElementById('confirmYes').addEventListener('click', function() { document.getElementById('confirmYes').addEventListener('click', function() {
if (typeof confirmCallback === 'function') { if (typeof confirmCallback === 'function') {
confirmCallback(); confirmCallback();
} }
hideConfirmDialog(); hideConfirmDialog();
}); });
document.getElementById('confirmNo').addEventListener('click', hideConfirmDialog); document.getElementById('confirmNo').addEventListener('click', hideConfirmDialog);
function showConfirmDialog(title, message, callback) { function showConfirmDialog(title, message, callback) {
confirmCallback = callback; confirmCallback = callback;
document.getElementById('confirmTitle').textContent = title; document.getElementById('confirmTitle').textContent = title;
@@ -608,7 +604,7 @@ document.addEventListener('DOMContentLoaded', function() {
} }
return false; return false;
} }
function hideConfirmDialog() { function hideConfirmDialog() {
const modal = document.getElementById('confirmModal'); const modal = document.getElementById('confirmModal');
if (modal) { if (modal) {
@@ -617,12 +613,12 @@ document.addEventListener('DOMContentLoaded', function() {
confirmCallback = null; confirmCallback = null;
return false; return false;
} }
window.confirmPopup = function(action = 'Abandon') { window.confirmPopup = function(action = 'Abandon') {
triggerElement = document.activeElement; triggerElement = document.activeElement;
const title = `Confirm ${action} Bid`; const title = `Confirm ${action} Bid`;
const message = `Are you sure you want to ${action.toLowerCase()} this bid?`; const message = `Are you sure you want to ${action.toLowerCase()} this bid?`;
return showConfirmDialog(title, message, function() { return showConfirmDialog(title, message, function() {
if (triggerElement) { if (triggerElement) {
const form = triggerElement.form; const form = triggerElement.form;
@@ -635,7 +631,7 @@ document.addEventListener('DOMContentLoaded', function() {
} }
}); });
}; };
const overrideButtonConfirm = function(button, action) { const overrideButtonConfirm = function(button, action) {
if (button) { if (button) {
button.removeAttribute('onclick'); button.removeAttribute('onclick');
@@ -646,10 +642,10 @@ document.addEventListener('DOMContentLoaded', function() {
}); });
} }
}; };
const abandonBidBtn = document.querySelector('button[name="abandon_bid"]'); const abandonBidBtn = document.querySelector('button[name="abandon_bid"]');
overrideButtonConfirm(abandonBidBtn, 'Abandon'); overrideButtonConfirm(abandonBidBtn, 'Abandon');
const acceptBidBtn = document.querySelector('button[name="accept_bid"]'); const acceptBidBtn = document.querySelector('button[name="accept_bid"]');
overrideButtonConfirm(acceptBidBtn, 'Accept'); overrideButtonConfirm(acceptBidBtn, 'Accept');
}); });

14
basicswap/templates/bid_xmr.html
View File

@@ -76,7 +76,7 @@
</th> </th>
</tr> </tr>
</thead> </thead>
{% if data.was_sent == 'True' %} {% if data.was_sent %}
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">Swap</td> <td class="py-3 px-6 bold">Swap</td>
<td class="py-3 px-6"> <td class="py-3 px-6">
@@ -103,7 +103,7 @@
<td class="py-3 px-6 bold">Bid Rate</td> <td class="py-3 px-6 bold">Bid Rate</td>
<td class="py-3 px-6">{{ data.bid_rate }}</td> <td class="py-3 px-6">{{ data.bid_rate }}</td>
</tr> </tr>
{% if data.was_sent == 'True' %} {% if data.was_sent %}
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">You Send</td> <td class="py-3 px-6 bold">You Send</td>
<td class="py-3 px-6"> <td class="py-3 px-6">
@@ -188,12 +188,8 @@
<td class="py-3 px-6">{{ data.expired_at }}</td> <td class="py-3 px-6">{{ data.expired_at }}</td>
</tr> </tr>
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">Sent</td> <td class="py-3 px-6 bold">Bid Type</td>
<td class="py-3 px-6">{{ data.was_sent }}</td> <td class="py-3 px-6" id="bidtype">{% if data.was_sent and data.was_received %}Self Bid{% elif data.was_sent %}Sent{% elif data.was_received %}Received{% endif %}{% if data.reverse_bid %} (Transposed){% endif %}</td>
</tr>
<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 bold">Received</td>
<td class="py-3 px-6">{{ data.was_received }}</td>
</tr> </tr>
{% if data.coin_a_lock_refund_tx_est_final != 'None' %} {% if data.coin_a_lock_refund_tx_est_final != 'None' %}
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600">
@@ -819,7 +815,7 @@
<button name="abandon_bid" type="submit" value="Abandon Bid" onclick="return confirmPopup();" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white hover:text-red border border-red-500 hover:border-red-500 hover:bg-red-600 bg-red-500 rounded-md focus:ring-0 focus:outline-none">Abandon Bid</button> <button name="abandon_bid" type="submit" value="Abandon Bid" onclick="return confirmPopup();" class="flex flex-wrap justify-center w-full px-4 py-2.5 font-medium text-sm text-white hover:text-red border border-red-500 hover:border-red-500 hover:bg-red-600 bg-red-500 rounded-md focus:ring-0 focus:outline-none">Abandon Bid</button>
</div> </div>
{% endif %} {% endif %}
{% if data.was_received == 'True' and not edit_bid and data.can_accept_bid %} {% if data.was_received and not edit_bid and data.can_accept_bid %}
<div class="w-full md:w-auto p-1.5"> <div class="w-full md:w-auto p-1.5">
<button name="accept_bid" value="Accept Bid" type="submit" onclick='return confirmPopup("Accept");' class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md focus:ring-0 focus:outline-none">Accept Bid</button> <button name="accept_bid" value="Accept Bid" type="submit" onclick='return confirmPopup("Accept");' class="flex flex-wrap justify-center w-full px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md focus:ring-0 focus:outline-none">Accept Bid</button>
</div> </div>

82
basicswap/templates/offer.html
View File

@@ -68,7 +68,7 @@
<li class="font-semibold text-sm text-green-500 error_msg"><span class="bold">INFO:</span></li> <li class="font-semibold text-sm text-green-500 error_msg"><span class="bold">INFO:</span></li>
<li class="font-medium text-sm text-green-500 infomsg">Sent Bid {{ sent_bid_id }}</li> <li class="font-medium text-sm text-green-500 infomsg">Sent Bid {{ sent_bid_id }}</li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="w-auto p-2"> <div class="w-auto p-2">
<button type="button" class="ms-auto bg-green-50 text-green-500 rounded-lg focus:ring-0 focus:ring-green-400 p-1.5 hover:bg-green-200 inline-flex items-center justify-center h-8 w-8 focus:outline-none dark:bg-gray-800 dark:text-green-400 dark:hover:bg-gray-700" data-dismiss-target="#messages_send_bid_id" aria-label="Close"><span class="sr-only">Close</span> <button type="button" class="ms-auto bg-green-50 text-green-500 rounded-lg focus:ring-0 focus:ring-green-400 p-1.5 hover:bg-green-200 inline-flex items-center justify-center h-8 w-8 focus:outline-none dark:bg-gray-800 dark:text-green-400 dark:hover:bg-gray-700" data-dismiss-target="#messages_send_bid_id" aria-label="Close"><span class="sr-only">Close</span>
@@ -110,7 +110,7 @@
</tr> </tr>
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">Swap Type</td> <td class="py-3 px-6 bold">Swap Type</td>
<td class="py-3 px-6">{{ data.swap_type }}{% if data.reverse == true %} (Reversed){% endif %}</td> <td class="py-3 px-6">{{ data.swap_type }}{% if data.reverse == true %} (Transposed){% endif %}</td>
</tr> </tr>
<tr class="opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600"> <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 bold">{% if data.sent %}You Send{% else %}You Get{% endif %}</td> <td class="py-3 px-6 bold">{% if data.sent %}You Send{% else %}You Get{% endif %}</td>
@@ -418,7 +418,7 @@
function handleBidsPageAddress() { function handleBidsPageAddress() {
const selectElement = document.querySelector('select[name="addr_from"]'); const selectElement = document.querySelector('select[name="addr_from"]');
const STORAGE_KEY = 'lastUsedAddressBids'; const STORAGE_KEY = 'lastUsedAddressBids';
if (!selectElement) return; if (!selectElement) return;
function loadInitialAddress() { function loadInitialAddress() {
@@ -476,8 +476,8 @@ if (document.readyState === 'loading') {
</td> </td>
<td class="py-3 px-6"> <td class="py-3 px-6">
<div class="relative"> <div class="relative">
<input type="text" <input type="text"
class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0"
id="bid_amount_send" id="bid_amount_send"
autocomplete="off" autocomplete="off"
name="bid_amount_send" name="bid_amount_send"
@@ -499,12 +499,12 @@ if (document.readyState === 'loading') {
</td> </td>
<td class="py-3 px-6"> <td class="py-3 px-6">
<div class="relative"> <div class="relative">
<input type="text" <input type="text"
class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0"
id="bid_amount" id="bid_amount"
autocomplete="off" autocomplete="off"
name="bid_amount" name="bid_amount"
value="" value=""
max="{{ data.amt_from }}" max="{{ data.amt_from }}"
onchange="validateMaxAmount(this, parseFloat('{{ data.amt_from }}')); updateBidParams('receiving');"> onchange="validateMaxAmount(this, parseFloat('{{ data.amt_from }}')); updateBidParams('receiving');">
<div class="absolute inset-y-0 right-3 flex items-center pointer-events-none text-gray-400 dark:text-gray-300 text-sm"> <div class="absolute inset-y-0 right-3 flex items-center pointer-events-none text-gray-400 dark:text-gray-300 text-sm">
@@ -528,9 +528,9 @@ if (document.readyState === 'loading') {
</td> </td>
<td class="py-3 px-6"> <td class="py-3 px-6">
<div class="relative"> <div class="relative">
<input type="text" <input type="text"
class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0 cursor-not-allowed" class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0 cursor-not-allowed"
id="bid_amount_send" id="bid_amount_send"
autocomplete="off" autocomplete="off"
name="bid_amount_send" name="bid_amount_send"
value="{{ data.amt_to }}" value="{{ data.amt_to }}"
@@ -552,12 +552,12 @@ if (document.readyState === 'loading') {
</td> </td>
<td class="py-3 px-6"> <td class="py-3 px-6">
<div class="relative"> <div class="relative">
<input type="text" <input type="text"
class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0 cursor-not-allowed" class="bg-gray-50 text-gray-900 appearance-none pr-28 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0 cursor-not-allowed"
id="bid_amount" id="bid_amount"
autocomplete="off" autocomplete="off"
name="bid_amount" name="bid_amount"
value="{{ data.bid_amount }}" value="{{ data.bid_amount }}"
max="{{ data.amt_from }}" max="{{ data.amt_from }}"
disabled> disabled>
<div class="absolute inset-y-0 right-3 flex items-center pointer-events-none text-gray-400 dark:text-gray-300 text-sm"> <div class="absolute inset-y-0 right-3 flex items-center pointer-events-none text-gray-400 dark:text-gray-300 text-sm">
@@ -576,18 +576,18 @@ if (document.readyState === 'loading') {
<td class="py-3 px-6 bold">Rate </td> <td class="py-3 px-6 bold">Rate </td>
<td class="py-3 px-6"> <td class="py-3 px-6">
{% if data.rate_negotiable == true %} {% if data.rate_negotiable == true %}
<input type="text" <input type="text"
class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0" class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0"
id="bid_rate" id="bid_rate"
name="bid_rate" name="bid_rate"
value="{{ data.bid_rate }}" value="{{ data.bid_rate }}"
placeholder="Current rate: {{ data.rate }}" placeholder="Current rate: {{ data.rate }}"
onchange="updateBidParams('rate')"> onchange="updateBidParams('rate')">
{% else %} {% else %}
<input type="text" <input type="text"
class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0 cursor-not-allowed" class="bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-gray-50 text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0 cursor-not-allowed"
id="bid_rate" id="bid_rate"
name="bid_rate" name="bid_rate"
value="{{ data.rate }}" value="{{ data.rate }}"
title="Rate is not negotiable" title="Rate is not negotiable"
disabled> disabled>
@@ -662,7 +662,7 @@ if (document.readyState === 'loading') {
<div class="bg-gray-50 dark:bg-gray-600 rounded-lg p-4"> <div class="bg-gray-50 dark:bg-gray-600 rounded-lg p-4">
<div class="text-sm text-gray-600 dark:text-gray-400 mb-1">Amount you will get:</div> <div class="text-sm text-gray-600 dark:text-gray-400 mb-1">Amount you will get:</div>
<div class="font-medium text-gray-900 dark:text-white text-lg"> <div class="font-medium text-gray-900 dark:text-white text-lg">
<span id="modal-amt-receive"></span> <span id="modal-amt-receive"></span>
<span id="modal-receive-currency"></span> <span id="modal-receive-currency"></span>
<div class="text-sm text-gray-500 dark:text-gray-400 mt-1" id="modal-fee-info"></div> <div class="text-sm text-gray-500 dark:text-gray-400 mt-1" id="modal-fee-info"></div>
</div> </div>
@@ -686,7 +686,7 @@ if (document.readyState === 'loading') {
</div> </div>
</div> </div>
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<button type="submit" name="sendbid" value="confirm" <button type="submit" name="sendbid" value="confirm"
class="px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none"> class="px-4 py-2.5 bg-blue-500 hover:bg-blue-600 font-medium text-sm text-white border border-blue-500 rounded-md shadow-button focus:ring-0 focus:outline-none">
Confirm Confirm
</button> </button>
@@ -727,17 +727,17 @@ xhr_bid_params.onload = () => {
function lookup_rates() { function lookup_rates() {
const coin_from = document.getElementById('coin_from')?.value; const coin_from = document.getElementById('coin_from')?.value;
const coin_to = document.getElementById('coin_to')?.value; const coin_to = document.getElementById('coin_to')?.value;
if (!coin_from || !coin_to || coin_from === '-1' || coin_to === '-1') { if (!coin_from || !coin_to || coin_from === '-1' || coin_to === '-1') {
alert('Coins from and to must be set first.'); alert('Coins from and to must be set first.');
return; return;
} }
const ratesDisplay = document.getElementById('rates_display'); const ratesDisplay = document.getElementById('rates_display');
if (ratesDisplay) { if (ratesDisplay) {
ratesDisplay.innerHTML = '<h4>Rates</h4><p>Updating...</p>'; ratesDisplay.innerHTML = '<h4>Rates</h4><p>Updating...</p>';
} }
xhr_rates.open('POST', '/json/rates'); xhr_rates.open('POST', '/json/rates');
xhr_rates.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); xhr_rates.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhr_rates.send(`coin_from=${coin_from}&coin_to=${coin_to}`); xhr_rates.send(`coin_from=${coin_from}&coin_to=${coin_to}`);
@@ -785,11 +785,11 @@ function updateBidParams(value_changed) {
const amountFromInput = document.getElementById('amount_from'); const amountFromInput = document.getElementById('amount_from');
const bidRateInput = document.getElementById('bid_rate'); const bidRateInput = document.getElementById('bid_rate');
const offerRateInput = document.getElementById('offer_rate'); const offerRateInput = document.getElementById('offer_rate');
if (!coin_from || !coin_to || !amt_var || !rate_var) return; if (!coin_from || !coin_to || !amt_var || !rate_var) return;
const rate = rate_var === 'True' && bidRateInput ? const rate = rate_var === 'True' && bidRateInput ?
parseFloat(bidRateInput.value) || 0 : parseFloat(bidRateInput.value) || 0 :
parseFloat(offerRateInput?.value || '0'); parseFloat(offerRateInput?.value || '0');
if (!rate) return; if (!rate) return;
@@ -826,7 +826,7 @@ function updateBidParams(value_changed) {
function validateAmountsAfterChange() { function validateAmountsAfterChange() {
const bidAmountSendInput = document.getElementById('bid_amount_send'); const bidAmountSendInput = document.getElementById('bid_amount_send');
const bidAmountInput = document.getElementById('bid_amount'); const bidAmountInput = document.getElementById('bid_amount');
if (bidAmountSendInput) { if (bidAmountSendInput) {
const maxSend = parseFloat(bidAmountSendInput.getAttribute('max')); const maxSend = parseFloat(bidAmountSendInput.getAttribute('max'));
validateMaxAmount(bidAmountSendInput, maxSend); validateMaxAmount(bidAmountSendInput, maxSend);
@@ -871,7 +871,7 @@ function updateModalValues() {
if (modalAmtReceive) { if (modalAmtReceive) {
modalAmtReceive.textContent = bidAmountInput.value; modalAmtReceive.textContent = bidAmountInput.value;
} }
const modalReceiveCurrency = document.getElementById('modal-receive-currency'); const modalReceiveCurrency = document.getElementById('modal-receive-currency');
if (modalReceiveCurrency) { if (modalReceiveCurrency) {
modalReceiveCurrency.textContent = ' {{ data.tla_from }}'; modalReceiveCurrency.textContent = ' {{ data.tla_from }}';
@@ -883,7 +883,7 @@ function updateModalValues() {
if (modalAmtSend) { if (modalAmtSend) {
modalAmtSend.textContent = bidAmountSendInput.value; modalAmtSend.textContent = bidAmountSendInput.value;
} }
const modalSendCurrency = document.getElementById('modal-send-currency'); const modalSendCurrency = document.getElementById('modal-send-currency');
if (modalSendCurrency) { if (modalSendCurrency) {
modalSendCurrency.textContent = ' {{ data.tla_to }}'; modalSendCurrency.textContent = ' {{ data.tla_to }}';
@@ -921,7 +921,7 @@ function updateModalValues() {
function handleBidsPageAddress() { function handleBidsPageAddress() {
const selectElement = document.querySelector('select[name="addr_from"]'); const selectElement = document.querySelector('select[name="addr_from"]');
const STORAGE_KEY = 'lastUsedAddressBids'; const STORAGE_KEY = 'lastUsedAddressBids';
if (!selectElement) return; if (!selectElement) return;
function loadInitialAddress() { function loadInitialAddress() {
@@ -1003,7 +1003,7 @@ document.addEventListener('DOMContentLoaded', function() {
if (validMinsInput) { if (validMinsInput) {
validMinsInput.addEventListener('input', updateModalValues); validMinsInput.addEventListener('input', updateModalValues);
} }
const addrFromSelect = document.querySelector('select[name="addr_from"]'); const addrFromSelect = document.querySelector('select[name="addr_from"]');
if (addrFromSelect) { if (addrFromSelect) {
addrFromSelect.addEventListener('change', updateModalValues); addrFromSelect.addEventListener('change', updateModalValues);

4
basicswap/ui/util.py
View File

@@ -348,8 +348,8 @@ def describeBid(
if for_api if for_api
else format_timestamp(bid.expire_at, with_seconds=True) else format_timestamp(bid.expire_at, with_seconds=True)
), ),
"was_sent": "True" if bid.was_sent else "False", "was_sent": bid.was_sent,
"was_received": "True" if bid.was_received else "False", "was_received": bid.was_received,
"initiate_tx": getTxIdHex(bid, TxTypes.ITX, " " + ci_leader.ticker()), "initiate_tx": getTxIdHex(bid, TxTypes.ITX, " " + ci_leader.ticker()),
"initiate_conf": ( "initiate_conf": (
"None" "None"

24
tests/basicswap/selenium/test_swap_direction.py
View File

@@ -239,10 +239,8 @@ def test_swap_dir(driver):
assert num_found >= 2 assert num_found >= 2
driver.get(f"{node1_url}/bid/{bid_1_id}") driver.get(f"{node1_url}/bid/{bid_1_id}")
td_sent = driver.find_element( td_dir = driver.find_element(By.ID, "bidtype")
"xpath", "//td[contains(text(), 'Sent')]/following-sibling::td" assert "Received" == td_dir.get_attribute("innerHTML")
)
assert "False" in td_sent.get_attribute("innerHTML")
td_ys = driver.find_element( td_ys = driver.find_element(
"xpath", "//td[contains(text(), 'You Send')]/following-sibling::td" "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
) )
@@ -253,10 +251,8 @@ def test_swap_dir(driver):
assert "Monero" in td_yg.get_attribute("innerHTML") assert "Monero" in td_yg.get_attribute("innerHTML")
driver.get(f"{node2_url}/bid/{bid_1_id}") driver.get(f"{node2_url}/bid/{bid_1_id}")
td_sent = driver.find_element( td_dir = driver.find_element(By.ID, "bidtype")
"xpath", "//td[contains(text(), 'Sent')]/following-sibling::td" assert "Sent" == td_dir.get_attribute("innerHTML")
)
assert "True" in td_sent.get_attribute("innerHTML")
td_ys = driver.find_element( td_ys = driver.find_element(
"xpath", "//td[contains(text(), 'You Send')]/following-sibling::td" "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
) )
@@ -267,10 +263,8 @@ def test_swap_dir(driver):
assert "Particl" in td_yg.get_attribute("innerHTML") assert "Particl" in td_yg.get_attribute("innerHTML")
driver.get(f"{node1_url}/bid/{bid_3_id}") driver.get(f"{node1_url}/bid/{bid_3_id}")
td_sent = driver.find_element( td_dir = driver.find_element(By.ID, "bidtype")
"xpath", "//td[contains(text(), 'Sent')]/following-sibling::td" assert "Sent (Transposed)" == td_dir.get_attribute("innerHTML")
)
assert "True" in td_sent.get_attribute("innerHTML")
td_ys = driver.find_element( td_ys = driver.find_element(
"xpath", "//td[contains(text(), 'You Send')]/following-sibling::td" "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
) )
@@ -281,10 +275,8 @@ def test_swap_dir(driver):
assert "Monero" in td_yg.get_attribute("innerHTML") assert "Monero" in td_yg.get_attribute("innerHTML")
driver.get(f"{node2_url}/bid/{bid_3_id}") driver.get(f"{node2_url}/bid/{bid_3_id}")
td_sent = driver.find_element( td_dir = driver.find_element(By.ID, "bidtype")
"xpath", "//td[contains(text(), 'Sent')]/following-sibling::td" assert "Received (Transposed)" == td_dir.get_attribute("innerHTML")
)
assert "False" in td_sent.get_attribute("innerHTML")
td_ys = driver.find_element( td_ys = driver.find_element(
"xpath", "//td[contains(text(), 'You Send')]/following-sibling::td" "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
) )