diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
index be238cd660..4c938c6438 100644
--- a/.github/workflows/atomicdex-desktop-ci.yml
+++ b/.github/workflows/atomicdex-desktop-ci.yml
@@ -6,7 +6,7 @@ on:
- nogeo
env:
- DEX_API: "mm2"
+ DEX_API: "mm2_kmd"
DEX_RPCPORT: 7762
DEX_RPC: "http://127.0.0.1:7762"
DEX_PROJECT_NAME: "komodo-wallet"
diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml
index 6fc3ea22c3..90af1235f5 100644
--- a/atomic_defi_design/Dex/Settings/SettingModal.qml
+++ b/atomic_defi_design/Dex/Settings/SettingModal.qml
@@ -650,7 +650,7 @@ Qaterial.Dialog
{
anchors.fill: parent
topPadding: 10
- spacing: 15
+ spacing: 12
ModalLoader
{
@@ -721,15 +721,15 @@ Qaterial.Dialog
{
Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true
- text: qsTr("Qt version")
+ text: qsTr("RPC Port")
}
DexCopyableLabel
{
Layout.alignment: Qt.AlignVCenter
- text: qtversion
- onCopyNotificationTitle: qsTr("Qt Version")
- onCopyNotificationMsg: qsTr("Qt Version copied to clipboard.")
+ text: API.app.settings_pg.get_rpcport()
+ onCopyNotificationTitle: qsTr("RPC Port")
+ onCopyNotificationMsg: qsTr("RPC Port copied to clipboard.")
}
}
@@ -755,6 +755,27 @@ Qaterial.Dialog
}
}
+ RowLayout
+ {
+ width: parent.width - 30
+ anchors.horizontalCenter: parent.horizontalCenter
+ height: 60
+
+ DexLabel
+ {
+ Layout.alignment: Qt.AlignVCenter
+ Layout.fillWidth: true
+ text: qsTr("Qt version")
+ }
+
+ DexCopyableLabel
+ {
+ Layout.alignment: Qt.AlignVCenter
+ text: qtversion
+ onCopyNotificationTitle: qsTr("Qt Version")
+ onCopyNotificationMsg: qsTr("Qt Version copied to clipboard.")
+ }
+ }
}
}
}
@@ -777,7 +798,7 @@ Qaterial.Dialog
DexAppButton
{
- text: qsTr("Search Update")
+ text: qsTr("Search for Update")
height: 48
radius: 20
leftPadding: 20
diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts
index 090de3cdca..0348200972 100644
--- a/atomic_defi_design/assets/languages/atomic_defi_de.ts
+++ b/atomic_defi_design/assets/languages/atomic_defi_de.ts
@@ -311,12 +311,12 @@
Quelle
-
+
-
+
Preisanbieter ist: %1
@@ -661,29 +661,29 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456
CoinMenu
-
+
TICKER
%1 deaktivieren
-
+
TICKER
%1 deaktivieren und löschen
-
+
Alle %1 Assets deaktivieren
-
+
Alle Assets deaktivieren
-
+
Alle Assets mit der Balance 0 deaktivieren
@@ -1515,67 +1515,67 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456
-
+
-
+
Mindesthandelsbetrag
-
+
WALLETNAME
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -1874,117 +1874,117 @@ They will be removed from the orderbook until you log in again.
Main
-
+
Preis
-
+
24h Veränderung
-
+
Vertragsadresse
-
+
Senden
-
+
%1 aktivieren?
-
+
Ja
-
+
Nein
-
+
Empfangen
-
+
Tausch
-
+
Portfolio
-
+
nur Brieftasche (kein DEX möglich)
-
+
Belohnungen
-
+
Faucet
-
-
-
+
+
+
Öffentlicher Schlüssel
-
+
In die Zwischenablage kopiert
-
+
+
+
+
+
+
Laden von Marktdaten
-
+
Für diesen Ticker liegen noch keine Chartdaten vor
-
+
Transaktionen werden abgerufen...
-
-
+
+
-
-
+
+
-
-
- Keine Transaktionen verfügbar
-
-
-
-
- Klicken Sie hier, um Ihre Adresse im %1 (%2) Block-Explorer anzuzeigen
+
+
+
@@ -2150,63 +2150,63 @@ They will be removed from the orderbook until you log in again.
NewUpdateModal
-
-
-
+
+
+
Suche nach neuen Updates
-
+
Abrufen…
-
-
-
-
+
+
+
+
Schließen
-
+
Neue Updates konnten aus folgendem Grund nicht überprüft werden: %1
-
+
Neue Version gefunden
-
+
+
+
+
+
+
Zwingend notwendige Version gefunden
-
+
%1 %2 ist verfügbar !
-
+
Dieses Update ist zwingend erforderlich, um die Anwendung weiterhin verwenden zu können
-
+
Dex schließen
-
-
- Ihre Anwendung ist auf dem neuesten Stand.
-
-
-
+
Herunterladen
@@ -2513,92 +2513,92 @@ They will be removed from the orderbook until you log in again.
OrderForm
-
+
Preis
-
+
-
+
-
+
-
+
Senden
-
+
Empfangen
-
+
Max
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Mindestvolumen:
-
+
Benutzerdefinierten Mindesthandelsbetrag verwenden
@@ -2959,7 +2959,7 @@ Bitte wählen Sie eine neue Order aus.
QObject
-
+
Der Endpunkt kann nicht erreicht werden:
@@ -4563,7 +4563,7 @@ This might take a few minutes...
atomic_dex::settings_page
-
+
diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts
index cf7cf4185c..7b6367813e 100644
--- a/atomic_defi_design/assets/languages/atomic_defi_en.ts
+++ b/atomic_defi_design/assets/languages/atomic_defi_en.ts
@@ -311,12 +311,12 @@
-
+
-
+
@@ -660,29 +660,29 @@
CoinMenu
-
+
TICKER
-
+
TICKER
-
+
-
+
-
+
@@ -1514,67 +1514,67 @@
-
+
-
+
-
+
WALLETNAME
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -1873,116 +1873,116 @@ They will be removed from the orderbook until you log in again.
Main
-
+
-
+
-
+
-
+
-
+
-
+
Yes
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -2149,63 +2149,63 @@ They will be removed from the orderbook until you log in again.
NewUpdateModal
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
@@ -2512,92 +2512,92 @@ They will be removed from the orderbook until you log in again.
OrderForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2957,7 +2957,7 @@ Please select a new order.
QObject
-
+
@@ -4553,7 +4553,7 @@ This might take a few minutes...
atomic_dex::settings_page
-
+
diff --git a/atomic_defi_design/assets/languages/atomic_defi_es.ts b/atomic_defi_design/assets/languages/atomic_defi_es.ts
index dd40bbec99..ece7e6033c 100644
--- a/atomic_defi_design/assets/languages/atomic_defi_es.ts
+++ b/atomic_defi_design/assets/languages/atomic_defi_es.ts
@@ -311,12 +311,12 @@
Fuente
-
+
Activando:
-
+
El proveedor de precios es: %1
@@ -660,29 +660,29 @@
CoinMenu
-
+
TICKER
Deshabilitar %1
-
+
TICKER
Deshabilitar y eliminar %1
-
+
Deshabilitar todos los activos de %1
-
+
Deshabilitar todos los activos
-
+
Deshabilitar 0 balancear activos
@@ -1514,67 +1514,67 @@
-
+
-
+
Cantidad Mínima de Intercambio
-
+
WALLETNAME
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -1876,118 +1876,118 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.
Main
-
+
Precio
-
+
Cambio
-
+
Dirección del Contrato
-
+
Enviar
-
+
¿Habilitar %1?
-
+
Sí
-
+
No
-
+
Recibir
-
+
Intercambiar
-
+
Cartera
-
+
es solo billetera
-
+
Recompensas
-
+
Grifo
-
-
-
+
+
+
Clave Pública
-
+
Copiada en el Portapapeles
-
+
+
+
+
+
+
Cargando datos de mercado
-
+
No hay datos de gráficos para este ticker aún
-
+
Obteniendo transacciones...
-
+
+
+
+
+
+
Por favor espera %1 es %2
-
+
% activado...
-
-
-
- No hay transacciones disponibles
-
-
-
-
- Haga clic para ver su dirección en %1 (%2) explorador de bloques
-
@@ -2152,63 +2152,63 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.
NewUpdateModal
-
-
-
+
+
+
Buscando nuevas actualizaciones
-
+
Buscando...
-
-
-
-
+
+
+
+
Cerrar
-
+
No se pudieron comprobar las nuevas actualizaciones por el siguiente motivo: %1
-
+
Nueva versión encontrada
-
+
+
+
+
+
+
Versión obligatoria encontrada
-
+
%1 ¡%2 está disponible!
-
+
Esta actualización es obligatoria para seguir usando la aplicación
-
+
Cerrar Dex
-
-
- Tu aplicación está actualizada.
-
-
-
+
Descargar
@@ -2515,92 +2515,92 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.
OrderForm
-
+
Precio
-
+
Reducción del 1% en relación con el precio de mercado CEX.
-
+
Utilice el precio de mercado CEX.
-
+
Aumento del 1% en relación con el precio de mercado de CEX.
-
+
Enviar
-
+
Recibir
-
+
Max
-
+
Usar el 25% de su saldo comercial.
-
+
Usar el 50% de su saldo comercial.
-
+
Usar el 100% de su saldo comercial.
-
+
Volumen Mínimo
-
+
Cantidad mínima para vender
-
+
Cantidad mínimo para recibir
-
+
El comercio mínimo aceptado es igual al 10% del volumen del pedido.
-
+
El comercio mínimo aceptado es igual al 25% del volumen del pedido.
-
+
El comercio mínimo aceptado es igual al 50% del volumen del pedido.
-
+
Volumen mínimo:
-
+
Utilizar una cantidad personalizada de intercambio mínima
@@ -2961,7 +2961,7 @@ Seleccione un nuevo pedido.
QObject
-
+
No se puede llegar al punto final:
@@ -4566,7 +4566,7 @@ Esto puede tardar unos minutos...
atomic_dex::settings_page
-
+
Se ha producido un error.
diff --git a/atomic_defi_design/assets/languages/atomic_defi_fr.ts b/atomic_defi_design/assets/languages/atomic_defi_fr.ts
index a53a7d640b..2fd93a2b52 100644
--- a/atomic_defi_design/assets/languages/atomic_defi_fr.ts
+++ b/atomic_defi_design/assets/languages/atomic_defi_fr.ts
@@ -311,12 +311,12 @@
Source
-
+
-
+
Fournisseur de prix : %1
@@ -660,29 +660,29 @@
CoinMenu
-
+
TICKER
Désactiver %1
-
+
TICKER
Désactiver et Supprimer %1
-
+
Désactiver tous les actifs %1
-
+
Désactiver tous les actifs
-
+
@@ -1514,67 +1514,67 @@
-
+
-
+
Montant de trading minimum
-
+
WALLETNAME
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -1873,116 +1873,116 @@ They will be removed from the orderbook until you log in again.
Main
-
+
Prix
-
+
-
+
-
+
Envoyez
-
+
Activer %1 ?
-
+
Oui
-
+
Non
-
+
Recevoir
-
+
Échange
-
+
Portfolio
-
+
-
+
Récompenses
-
+
Robinet
-
-
-
+
+
+
-
+
Copier dans le presse-papier
-
+
+
+
+
+
+
Chargement des données de marché
-
+
Il n'y a pas encore de données graphiques pour ce ticker
-
+
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
@@ -2149,63 +2149,63 @@ They will be removed from the orderbook until you log in again.
NewUpdateModal
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
Fermer
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
Téléchargement
@@ -2512,92 +2512,92 @@ They will be removed from the orderbook until you log in again.
OrderForm
-
+
Envoyez
-
+
Recevoir
-
+
Max
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Min volume :
-
+
Utiliser le montant d'échange minimum personnalisé
-
+
Prix
-
+
-
+
-
+
@@ -2957,7 +2957,7 @@ Please select a new order.
QObject
-
+
@@ -4553,7 +4553,7 @@ This might take a few minutes...
atomic_dex::settings_page
-
+
diff --git a/atomic_defi_design/assets/languages/atomic_defi_ru.ts b/atomic_defi_design/assets/languages/atomic_defi_ru.ts
index a74d0fd4bb..a8d02cf8e8 100644
--- a/atomic_defi_design/assets/languages/atomic_defi_ru.ts
+++ b/atomic_defi_design/assets/languages/atomic_defi_ru.ts
@@ -311,12 +311,12 @@
Источник
-
+
-
+
Провайдер цены: %1
@@ -660,29 +660,29 @@
CoinMenu
-
+
TICKER
Удалить %1
-
+
TICKER
Удалить токен %1 из AtomicDex
-
+
Отключить все %1 ассеты
-
+
Отключить все ассеты
-
+
@@ -1520,67 +1520,67 @@
-
+
-
+
Минимальный торговый объем
-
+
WALLETNAME
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -1879,116 +1879,116 @@ They will be removed from the orderbook until you log in again.
Main
-
+
Цена
-
+
-
+
-
+
Отправить
-
+
Активировать %1 ?
-
+
Да
-
+
Нет
-
+
Получить
-
+
Обменять
-
+
Портфолио
-
+
-
+
Награды
-
+
Фаусет
-
-
-
+
+
+
-
+
Скопировано в буфер обмена
-
+
+
+
+
+
+
Загрузка рыночных данных
-
+
Для данного актива пока еще нет графиков данных
-
+
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
@@ -2155,63 +2155,63 @@ They will be removed from the orderbook until you log in again.
NewUpdateModal
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
Закрыть
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
Скачать
@@ -2518,92 +2518,92 @@ They will be removed from the orderbook until you log in again.
OrderForm
-
+
Цена
-
+
-
+
-
+
-
+
Отправить
-
+
Получить
-
+
Макс
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Мин. объем:
-
+
Задать минимальный объем сделки
@@ -2963,7 +2963,7 @@ Please select a new order.
QObject
-
+
@@ -4559,7 +4559,7 @@ This might take a few minutes...
atomic_dex::settings_page
-
+
diff --git a/atomic_defi_design/assets/languages/atomic_defi_tr.ts b/atomic_defi_design/assets/languages/atomic_defi_tr.ts
index 5708dea400..49f3e80d63 100644
--- a/atomic_defi_design/assets/languages/atomic_defi_tr.ts
+++ b/atomic_defi_design/assets/languages/atomic_defi_tr.ts
@@ -311,12 +311,12 @@
-
+
-
+
@@ -660,29 +660,29 @@
CoinMenu
-
+
TICKER
%1'i Etkisizleştir
-
+
TICKER
%1'i Etkisizleştir ve Sil
-
+
Tüm %1 türü varlıkları etkisizleştir
-
+
Tüm varlıkları etkisizleştir
-
+
@@ -1508,67 +1508,67 @@
-
+
-
+
Minimum Takas Tutarı
-
+
WALLETNAME
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -1867,116 +1867,116 @@ They will be removed from the orderbook until you log in again.
Main
-
+
Fiyat
-
+
-
+
-
+
Gönder
-
+
%1 Etkinleştirilsin mi ?
-
+
Evet
-
+
Hayır
-
+
Al
-
+
Takasla
-
+
-
+
-
+
-
+
Musluk
-
-
-
+
+
+
-
+
Panoya Kopyalandı
-
+
+
+
+
+
+
Piyasa bilgisi yükleniyor
-
+
Henüz bu hisse senedi için grafik verisi yok
-
+
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
@@ -2143,63 +2143,63 @@ They will be removed from the orderbook until you log in again.
NewUpdateModal
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
Kapat
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
İndir
@@ -2506,92 +2506,92 @@ They will be removed from the orderbook until you log in again.
OrderForm
-
+
Gönder
-
+
Al
-
+
Maks
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Fiyat
-
+
-
+
-
+
@@ -2951,7 +2951,7 @@ Please select a new order.
QObject
-
+
@@ -4547,7 +4547,7 @@ This might take a few minutes...
atomic_dex::settings_page
-
+
diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake
index ccd0464851..303c204bc2 100644
--- a/cmake/project.metadata.cmake
+++ b/cmake/project.metadata.cmake
@@ -1,5 +1,5 @@
# Default project values
-set(DEX_API "mm2")
+set(DEX_API "mm2_kmd")
set(DEX_RPCPORT 7762)
set(DEX_RPC "http://127.0.0.1:7762")
set(DEX_PROJECT_NAME "komodo-wallet")
diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp
index d1aea10aeb..4145591125 100644
--- a/src/core/atomicdex/pages/qt.settings.page.cpp
+++ b/src/core/atomicdex/pages/qt.settings.page.cpp
@@ -25,6 +25,7 @@
#include
// Project Headers
+#include "atomicdex/constants/dex.constants.hpp"
#include "atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.hpp"
#include "atomicdex/config/enable.cfg.hpp"
#include "atomicdex/events/events.hpp"
@@ -763,6 +764,11 @@ namespace atomic_dex
return QString::fromStdString(mm2::rpc_version());
}
+ QString settings_page::get_rpcport()
+ {
+ return QString::fromStdString(std::to_string(atomic_dex::g_dex_rpcport));
+ }
+
QString settings_page::get_peerid()
{
return QString::fromStdString(mm2::peer_id());
diff --git a/src/core/atomicdex/pages/qt.settings.page.hpp b/src/core/atomicdex/pages/qt.settings.page.hpp
index 6d98178989..5ce98412a7 100644
--- a/src/core/atomicdex/pages/qt.settings.page.hpp
+++ b/src/core/atomicdex/pages/qt.settings.page.hpp
@@ -126,6 +126,7 @@ namespace atomic_dex
Q_INVOKABLE QStringList retrieve_seed(const QString& wallet_name, const QString& password);
Q_INVOKABLE static QString get_mm2_version();
Q_INVOKABLE static QString get_peerid();
+ Q_INVOKABLE static QString get_rpcport();
Q_INVOKABLE static QString get_log_folder();
Q_INVOKABLE static QString get_export_folder();
Q_INVOKABLE static QString get_version();