diff --git a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml index 13fc57e43..9922e7c01 100644 --- a/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml +++ b/atomic_defi_design/Dex/Addressbook/AddAddressForm.qml @@ -134,7 +134,7 @@ Dex.Rectangle Layout.fillHeight: true Layout.leftMargin: 4 } - Dex.DefaultText { + Dex.DexLabel { Layout.minimumWidth: 120 Layout.maximumWidth: 120 text: qsTr("Use standard network address") diff --git a/atomic_defi_design/Dex/App.qml b/atomic_defi_design/Dex/App.qml index 47b9735d4..f974b3e4c 100644 --- a/atomic_defi_design/Dex/App.qml +++ b/atomic_defi_design/Dex/App.qml @@ -140,6 +140,7 @@ DexRectangle function showError(title, content) { if (content === undefined || content === null) return + console.log("Opening error_log_modal for " + title) error_log_modal.open() error_log_modal.item.header = title error_log_modal.item.field.text = content diff --git a/atomic_defi_design/Dex/Components/Blank.qml b/atomic_defi_design/Dex/Components/Blank.qml index 0f01f2f37..9908b11ca 100644 --- a/atomic_defi_design/Dex/Components/Blank.qml +++ b/atomic_defi_design/Dex/Components/Blank.qml @@ -66,7 +66,7 @@ Item { anchors.fill: bBox2 source: bBox2 radius: 32 - DefaultText { + DexLabel { anchors.centerIn: parent text: "Jemm" } diff --git a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml index dad42aa5a..dc137cc0e 100644 --- a/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml +++ b/atomic_defi_design/Dex/Components/CannotEnableCoinModal.qml @@ -13,7 +13,7 @@ MultipageModal MultipageModalContent { titleText: qsTr("Failed to enable %1").arg(coin_to_enable_ticker) - DefaultText + DexLabel { Layout.fillWidth: true text: qsTr("Enabling %1 did not succeed. Limit of enabled coins might have been reached.") diff --git a/atomic_defi_design/Dex/Components/CexInfoModal.qml b/atomic_defi_design/Dex/Components/CexInfoModal.qml index cc7c3725a..04f4f4889 100644 --- a/atomic_defi_design/Dex/Components/CexInfoModal.qml +++ b/atomic_defi_design/Dex/Components/CexInfoModal.qml @@ -13,7 +13,7 @@ MultipageModal { MultipageModalContent { titleText: General.cex_icon + " " + qsTr("Market Data") - DefaultText { + DexLabel { Layout.preferredHeight: 200 Layout.fillWidth: true diff --git a/atomic_defi_design/Dex/Components/CheckEye.qml b/atomic_defi_design/Dex/Components/CheckEye.qml index e3bb0bca6..a565a86ca 100644 --- a/atomic_defi_design/Dex/Components/CheckEye.qml +++ b/atomic_defi_design/Dex/Components/CheckEye.qml @@ -32,7 +32,7 @@ Item iconSize: 17 } - DefaultText + DexLabel { id: _label font.pixelSize: 15 diff --git a/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml b/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml index bbd86393f..7bbf1ae99 100644 --- a/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml +++ b/atomic_defi_design/Dex/Components/ComboBoxWithSearchBar.qml @@ -96,7 +96,7 @@ ComboBox width: control.width highlighted: control.highlightedIndex === index - contentItem: DefaultText + contentItem: DexLabel { width: control.width font: DexTypo.subtitle2 diff --git a/atomic_defi_design/Dex/Components/DatePicker.qml b/atomic_defi_design/Dex/Components/DatePicker.qml index c0ce19742..bb4826829 100644 --- a/atomic_defi_design/Dex/Components/DatePicker.qml +++ b/atomic_defi_design/Dex/Components/DatePicker.qml @@ -27,7 +27,7 @@ DefaultMouseArea id: column width: parent.width - DefaultText + DexLabel { id: title text: qsTr("Date") @@ -39,7 +39,7 @@ DefaultMouseArea { width: parent.width - DefaultText + DexLabel { id: label text: selectedDate.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd") diff --git a/atomic_defi_design/Dex/Components/DefaultCalendar.qml b/atomic_defi_design/Dex/Components/DefaultCalendar.qml index 54c708c02..31482b6c6 100644 --- a/atomic_defi_design/Dex/Components/DefaultCalendar.qml +++ b/atomic_defi_design/Dex/Components/DefaultCalendar.qml @@ -51,7 +51,7 @@ Calendar onClicked: control.showPreviousMonth() } - DefaultText + DexLabel { id: dateText text: styleData.title @@ -113,7 +113,7 @@ Calendar readonly property color selectedDateTextColor: Dex.CurrentTheme.foregroundColor readonly property color differentMonthDateTextColor: Dex.CurrentTheme.foregroundColor3 readonly property color invalidDateColor: Dex.CurrentTheme.textDisabledColor - DefaultText + DexLabel { id: dayDelegateText text: styleData.hasOwnProperty('date') ? styleData.date.getDate() : "" diff --git a/atomic_defi_design/Dex/Components/DefaultRangeSlider.qml b/atomic_defi_design/Dex/Components/DefaultRangeSlider.qml index 390e62c0f..e6ada9dc1 100644 --- a/atomic_defi_design/Dex/Components/DefaultRangeSlider.qml +++ b/atomic_defi_design/Dex/Components/DefaultRangeSlider.qml @@ -99,7 +99,7 @@ RangeSlider } } - DefaultText + DexLabel { id: _left_item anchors.left: parent.left @@ -107,7 +107,7 @@ RangeSlider text_value: qsTr("Min") } - DefaultText + DexLabel { id: _right_item anchors.right: parent.right diff --git a/atomic_defi_design/Dex/Components/DefaultSwitch.qml b/atomic_defi_design/Dex/Components/DefaultSwitch.qml deleted file mode 100644 index 0f6010adf..000000000 --- a/atomic_defi_design/Dex/Components/DefaultSwitch.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.Universal 2.15 -import "../Constants" -import App 1.0 - -DexSwitch { - -} diff --git a/atomic_defi_design/Dex/Components/DefaultText.qml b/atomic_defi_design/Dex/Components/DefaultText.qml deleted file mode 100644 index d5ea6215e..000000000 --- a/atomic_defi_design/Dex/Components/DefaultText.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.15 -import "../Constants" -import App 1.0 - -DexLabel { - -} diff --git a/atomic_defi_design/Dex/Components/DefaultTextArea.qml b/atomic_defi_design/Dex/Components/DefaultTextArea.qml deleted file mode 100644 index 3a86a18c8..000000000 --- a/atomic_defi_design/Dex/Components/DefaultTextArea.qml +++ /dev/null @@ -1,52 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import "../Constants" -import App 1.0 - -TextArea -{ - id: text_field - - font.family: Style.font_family - - placeholderTextColor: DexTheme.textPlaceHolderColor - selectedTextColor: DexTheme.textSelectedColor - selectionColor: DexTheme.textSelectionColor - color: DexTheme.foregroundColor - - Behavior on color { ColorAnimation { duration: Style.animationDuration } } - Behavior on placeholderTextColor { ColorAnimation { duration: Style.animationDuration } } - - property bool remove_newline: true - wrapMode: TextEdit.Wrap - - Keys.onBacktabPressed: nextItemInFocusChain(false).forceActiveFocus(Qt.TabFocusReason) - Keys.onTabPressed: nextItemInFocusChain().forceActiveFocus(Qt.TabFocusReason) - - Keys.onPressed: { - if(event.key === Qt.Key_Return) { - if(onReturn !== undefined) { - onReturn() - } - - // Ignore \n \r stuff - if(remove_newline) event.accepted = true - } - } - - onTextChanged: { - if(remove_newline) { - if(text.indexOf('\r') !== -1 || text.indexOf('\n') !== -1) { - text = text.replace(/[\r\n]/, '') - } - } - } - - // Right click Context Menu - selectByMouse: true - persistentSelection: true - - background: InnerBackground { } - - RightClickMenu { } -} diff --git a/atomic_defi_design/Dex/Components/DexCheckBox.qml b/atomic_defi_design/Dex/Components/DexCheckBox.qml index 344df181a..9f25649c5 100644 --- a/atomic_defi_design/Dex/Components/DexCheckBox.qml +++ b/atomic_defi_design/Dex/Components/DexCheckBox.qml @@ -74,7 +74,7 @@ CheckBox height: _label.height spacing: 0 - DefaultText + DexLabel { id: _label text: control.text diff --git a/atomic_defi_design/Dex/Components/DexComboBox.qml b/atomic_defi_design/Dex/Components/DexComboBox.qml index 38245425d..560d3c6fd 100644 --- a/atomic_defi_design/Dex/Components/DexComboBox.qml +++ b/atomic_defi_design/Dex/Components/DexComboBox.qml @@ -30,7 +30,7 @@ ComboBox // Main, selected text contentItem: Item { - DefaultText + DexLabel { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left @@ -108,7 +108,7 @@ ComboBox width: control.width highlighted: control.highlightedIndex === index - contentItem: DefaultText + contentItem: DexLabel { width: control.width font: DexTypo.subtitle2 diff --git a/atomic_defi_design/Dex/Components/DexItemBox.qml b/atomic_defi_design/Dex/Components/DexItemBox.qml index eaec5d467..a1befac2d 100644 --- a/atomic_defi_design/Dex/Components/DexItemBox.qml +++ b/atomic_defi_design/Dex/Components/DexItemBox.qml @@ -145,7 +145,7 @@ InnerBackground { anchors.fill: parent Layout.rightMargin: 10 Layout.leftMargin: 10 - DefaultText { + DexLabel { id: _texto leftPadding: 10 Layout.alignment: Qt.AlignVCenter @@ -239,7 +239,7 @@ InnerBackground { radius: parent.parent.height < 41 ? parent.parent.radius : 0 color: DexTheme.backgroundDarkColor6 visible: !isVertical && hidden - DefaultText { + DexLabel { id: _texto2 leftPadding: 10 Layout.alignment: Qt.AlignVCenter diff --git a/atomic_defi_design/Dex/Components/DexLabel.qml b/atomic_defi_design/Dex/Components/DexLabel.qml index 77d8bc4d0..603cd5abd 100644 --- a/atomic_defi_design/Dex/Components/DexLabel.qml +++ b/atomic_defi_design/Dex/Components/DexLabel.qml @@ -20,10 +20,14 @@ Text } } - text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value - font: monospace ? Dex.DexTypo.monoSmall : Dex.DexTypo.body2 color: enabled ? Dex.CurrentTheme.foregroundColor : Dex.CurrentTheme.textDisabledColor + font: monospace ? Dex.DexTypo.monoSmall : Dex.DexTypo.body2 + text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value wrapMode: Text.WordWrap + onLinkActivated: Qt.openUrlExternally(link) linkColor: color } + +// 90% similar to DexText.qml +// This could be refactored down. diff --git a/atomic_defi_design/Dex/Components/DexRangeSlider.qml b/atomic_defi_design/Dex/Components/DexRangeSlider.qml index b138b4ce8..fad094516 100644 --- a/atomic_defi_design/Dex/Components/DexRangeSlider.qml +++ b/atomic_defi_design/Dex/Components/DexRangeSlider.qml @@ -83,7 +83,7 @@ RangeSlider { //border.color: "#bdbebf" } - DefaultText { + DexLabel { id: secondTooltip visible: parent.second.pressed anchors.horizontalCenter: parent.second.handle.horizontalCenter @@ -92,7 +92,7 @@ RangeSlider { text_value: parent.second.value font.pixelSize: Constants.Style.textSizeSmall1 } - DefaultText { + DexLabel { id: firstTooltip visible: parent.first.pressed anchors.horizontalCenter: parent.first.handle.horizontalCenter @@ -101,21 +101,21 @@ RangeSlider { text_value: parent.first.value font.pixelSize: Constants.Style.textSizeSmall1 } - DefaultText { + DexLabel { id: _left_item anchors.left: parent.left anchors.top: parent.bottom text_value: qsTr("Min") } - DefaultText { + DexLabel { id: _half_item anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.bottom text_value: qsTr("Half") } - DefaultText { + DexLabel { id: _right_item anchors.right: parent.right anchors.top: parent.bottom diff --git a/atomic_defi_design/Dex/Components/DexSweetComboBox.qml b/atomic_defi_design/Dex/Components/DexSweetComboBox.qml index cacef269b..fb818032c 100644 --- a/atomic_defi_design/Dex/Components/DexSweetComboBox.qml +++ b/atomic_defi_design/Dex/Components/DexSweetComboBox.qml @@ -172,7 +172,7 @@ ComboBox { width: control.width + 50 highlighted: control.highlightedIndex === index - contentItem: DefaultText + contentItem: DexLabel { text_value: "" + ticker + "" + " %1".arg(General.coinName(ticker)) } diff --git a/atomic_defi_design/Dex/Components/DexSwitch.qml b/atomic_defi_design/Dex/Components/DexSwitch.qml index 10fd5a609..9333bd37f 100644 --- a/atomic_defi_design/Dex/Components/DexSwitch.qml +++ b/atomic_defi_design/Dex/Components/DexSwitch.qml @@ -29,9 +29,9 @@ Switch indicator: DefaultRectangle { id: _indicator - width: 52 - height: 28 - radius: 13 + width: 42 + height: 24 + radius: 12 anchors.verticalCenter: control.verticalCenter gradient: Gradient @@ -108,7 +108,7 @@ Switch visible: _label.text != '' - DefaultText + DexLabel { id: _label Layout.fillHeight: true @@ -122,7 +122,7 @@ Switch wrapMode: Label.Wrap } - DefaultText + DexLabel { id: _label2 Layout.fillHeight: true diff --git a/atomic_defi_design/Dex/Components/DexText.qml b/atomic_defi_design/Dex/Components/DexText.qml index 456b18b01..d85ff72da 100644 --- a/atomic_defi_design/Dex/Components/DexText.qml +++ b/atomic_defi_design/Dex/Components/DexText.qml @@ -1,20 +1,28 @@ +//! Qt Imports. import QtQuick 2.15 -import "../Constants" + +//! Project Imports import App 1.0 +import "../Constants" as Dex +import Dex.Themes 1.0 as Dex Text { property string text_value property bool privacy: false + property bool monospace: false - Behavior on color { - ColorAnimation { + Behavior on color + { + ColorAnimation + { duration: Style.animationDuration } } - font: DexTypo.body1 + color: DexTheme.foregroundColor - text: privacy && General.privacy_mode ? General.privacy_text : text_value + font: DexTypo.body1 + text: privacy && Dex.General.privacy_mode ? Dex.General.privacy_text : text_value wrapMode: Text.WordWrap onLinkActivated: Qt.openUrlExternally(link) @@ -25,4 +33,7 @@ Text { cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor acceptedButtons: Qt.NoButton } -} \ No newline at end of file +} + +// 90% similar to DexLabel.qml +// This could be refactored down. diff --git a/atomic_defi_design/Dex/Components/DexTextArea.qml b/atomic_defi_design/Dex/Components/DexTextArea.qml index 80cf2133b..47c46d2ab 100644 --- a/atomic_defi_design/Dex/Components/DexTextArea.qml +++ b/atomic_defi_design/Dex/Components/DexTextArea.qml @@ -2,15 +2,17 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import "../Constants" import App 1.0 +import Dex.Themes 1.0 as Dex TextArea { id: text_field font.family: Style.font_family - placeholderTextColor: Style.colorPlaceholderText - selectedTextColor: Style.colorSelectedText - selectionColor: Style.colorSelection + color: Dex.CurrentTheme.foregroundColor + placeholderTextColor: Dex.CurrentTheme.colorPlaceholderText + selectedTextColor: Dex.CurrentTheme.colorSelectedText + selectionColor: Dex.CurrentTheme.colorSelection Behavior on color { ColorAnimation { @@ -52,9 +54,7 @@ TextArea { selectByMouse: true persistentSelection: true - background: InnerBackground { - auto_set_size: false - } + background: InnerBackground {} RightClickMenu {} } \ No newline at end of file diff --git a/atomic_defi_design/Dex/Components/DexTradeBox.qml b/atomic_defi_design/Dex/Components/DexTradeBox.qml index baadc04fc..fdfcfe9f8 100644 --- a/atomic_defi_design/Dex/Components/DexTradeBox.qml +++ b/atomic_defi_design/Dex/Components/DexTradeBox.qml @@ -272,7 +272,7 @@ Rectangle { height: parent.height anchors.right: parent.right visible: !isVertical && hidden - DefaultText + DexLabel { id: _texto2 leftPadding: 10 diff --git a/atomic_defi_design/Dex/Components/ElidableText.qml b/atomic_defi_design/Dex/Components/ElidableText.qml index a3e3682c2..ab5643934 100644 --- a/atomic_defi_design/Dex/Components/ElidableText.qml +++ b/atomic_defi_design/Dex/Components/ElidableText.qml @@ -1,6 +1,6 @@ import QtQuick 2.12 -DefaultText +DexLabel { elide: Text.ElideRight } diff --git a/atomic_defi_design/Dex/Components/EulaModal.qml b/atomic_defi_design/Dex/Components/EulaModal.qml index ad71f04fa..b09740a73 100644 --- a/atomic_defi_design/Dex/Components/EulaModal.qml +++ b/atomic_defi_design/Dex/Components/EulaModal.qml @@ -41,7 +41,7 @@ MultipageModal contentWidth: eula_text.width - 10 contentHeight: eula_text.height - DefaultText + DexLabel { id: eula_text font: DexTypo.body1 diff --git a/atomic_defi_design/Dex/Components/GasInfoModal.qml b/atomic_defi_design/Dex/Components/GasInfoModal.qml index be86f0dd5..fdb90c0e0 100644 --- a/atomic_defi_design/Dex/Components/GasInfoModal.qml +++ b/atomic_defi_design/Dex/Components/GasInfoModal.qml @@ -13,27 +13,27 @@ MultipageModal { MultipageModalContent { titleText: General.cex_icon + " " + qsTr("How do I calculate gas?") - DefaultText { + DexLabel { Layout.fillWidth: true text: qsTr('Gas is measured in gwei. Gwei is just a unit of Ether, and is equal to 0.000000001 ETH (or the equivalent platform coin such as AVAX or BNB). The gas price varies over time depending on network congestion.') } - DefaultText { + DexLabel { Layout.fillWidth: true text: qsTr('The gas limit is how many units of gas (maximum) you allocate to pay for a transaction. The gas required depending on the size of the transaction & data being transmitted.') } - DefaultText { + DexLabel { Layout.fillWidth: true text: qsTr('A standard transaction not involving contracts uses 21,000 gas units, with any of the limit remaining returned to the source address.') } - DefaultText { + DexLabel { Layout.fillWidth: true text: qsTr('Transactions involving contracts may result in the whole limit being consumed, so be careful not to set it too high.') } - DefaultText { + DexLabel { Layout.fillWidth: true text: qsTr('For more information, read the article at https://support.mycrypto.com/how-to/sending/how-to-know-what-gas-limit-to-use') diff --git a/atomic_defi_design/Dex/Components/LogoutModal.qml b/atomic_defi_design/Dex/Components/LogoutModal.qml index 029a275a1..a068c504d 100644 --- a/atomic_defi_design/Dex/Components/LogoutModal.qml +++ b/atomic_defi_design/Dex/Components/LogoutModal.qml @@ -18,7 +18,7 @@ MultipageModal { titleText: qsTr("Exit %1 or go to login menu?").arg(API.app_name) // Swap in progress warning - DefaultText + DexLabel { visible: orders font.pixelSize: 14 diff --git a/atomic_defi_design/Dex/Components/MinTradeModal.qml b/atomic_defi_design/Dex/Components/MinTradeModal.qml index b81d0a56c..38de90025 100644 --- a/atomic_defi_design/Dex/Components/MinTradeModal.qml +++ b/atomic_defi_design/Dex/Components/MinTradeModal.qml @@ -13,7 +13,7 @@ MultipageModal { MultipageModalContent { titleText: General.cex_icon + " " + qsTr("Minimum Trading Amount") - DefaultText { + DexLabel { //Layout.preferredHeight: 200 Layout.fillWidth: true wrapMode: Text.Wrap diff --git a/atomic_defi_design/Dex/Components/ModalHeader.qml b/atomic_defi_design/Dex/Components/ModalHeader.qml index 73d178ca7..d146a7a46 100644 --- a/atomic_defi_design/Dex/Components/ModalHeader.qml +++ b/atomic_defi_design/Dex/Components/ModalHeader.qml @@ -7,7 +7,7 @@ ColumnLayout { property alias title: title.text // Title - DefaultText { + DexLabel { id: title font: DexTypo.head6 } diff --git a/atomic_defi_design/Dex/Components/MultipageModalContent.qml b/atomic_defi_design/Dex/Components/MultipageModalContent.qml index fa900230f..73eb6f430 100644 --- a/atomic_defi_design/Dex/Components/MultipageModalContent.qml +++ b/atomic_defi_design/Dex/Components/MultipageModalContent.qml @@ -30,7 +30,7 @@ ColumnLayout Layout.fillHeight: false Layout.maximumHeight: window.height - 50 - DefaultText + DexLabel { id: _title Layout.topMargin: root.titleTopMargin @@ -39,7 +39,7 @@ ColumnLayout visible: text != '' } - DefaultText + DexLabel { id: _subtitle Layout.topMargin: 5 diff --git a/atomic_defi_design/Dex/Components/Pagination.qml b/atomic_defi_design/Dex/Components/Pagination.qml index 7017d7ce8..b4ffb3212 100644 --- a/atomic_defi_design/Dex/Components/Pagination.qml +++ b/atomic_defi_design/Dex/Components/Pagination.qml @@ -72,7 +72,7 @@ RowLayout popupBackgroundColor: Dex.CurrentTheme.backgroundColor } - DefaultText { + DexLabel { Layout.alignment: Qt.AlignCenter font.pixelSize: 11 text_value: qsTr("items per page") diff --git a/atomic_defi_design/Dex/Components/PasswordField.qml b/atomic_defi_design/Dex/Components/PasswordField.qml index 6e7301354..1f5f581dd 100644 --- a/atomic_defi_design/Dex/Components/PasswordField.qml +++ b/atomic_defi_design/Dex/Components/PasswordField.qml @@ -68,36 +68,36 @@ ColumnLayout { visible: !hide_hint Layout.fillWidth: true - DefaultText { + DexLabel { visible: high_security font.pixelSize: Style.textSizeSmall3 text_value: hintPrefix(hasEnoughLowercaseCharacters()) + qsTr("At least 1 lowercase alphabetical character") color: hintColor(hasEnoughLowercaseCharacters()) } - DefaultText { + DexLabel { visible: high_security font.pixelSize: Style.textSizeSmall3 text_value: hintPrefix(hasEnoughUppercaseCharacters()) + qsTr("At least 1 uppercase alphabetical character") color: hintColor(hasEnoughUppercaseCharacters()) } - DefaultText { + DexLabel { visible: high_security font.pixelSize: Style.textSizeSmall3 text_value: hintPrefix(hasEnoughNumericCharacters()) + qsTr("At least 1 numeric character") color: hintColor(hasEnoughNumericCharacters()) } - DefaultText { + DexLabel { visible: high_security font.pixelSize: Style.textSizeSmall3 text_value: hintPrefix(hasEnoughSpecialCharacters()) + qsTr("At least 1 special character (eg. !@#$%)") color: hintColor(hasEnoughSpecialCharacters()) } - DefaultText { + DexLabel { font.pixelSize: Style.textSizeSmall3 text_value: hintPrefix(hasEnoughCharacters()) + qsTr("Between %1 and %2 character(s)").arg(high_security ? 16 : 1).arg(max_pw_len) color: hintColor(hasEnoughCharacters()) } - DefaultText { + DexLabel { font.pixelSize: Style.textSizeSmall3 text_value: hintPrefix(passwordsDoMatch()) + qsTr(high_security ? "Password and Confirm Password have to be same" : "Password suffix and confirm password suffix must be the same") color: hintColor(passwordsDoMatch()) diff --git a/atomic_defi_design/Dex/Components/RoundComboBox.qml b/atomic_defi_design/Dex/Components/RoundComboBox.qml index 247073ec5..5801d503b 100644 --- a/atomic_defi_design/Dex/Components/RoundComboBox.qml +++ b/atomic_defi_design/Dex/Components/RoundComboBox.qml @@ -35,7 +35,7 @@ ComboBox contentItem: Item { anchors.fill: parent - DefaultText + DexLabel { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left diff --git a/atomic_defi_design/Dex/Components/TextAreaWithTitle.qml b/atomic_defi_design/Dex/Components/TextAreaWithTitle.qml index 38d85520e..359556f03 100644 --- a/atomic_defi_design/Dex/Components/TextAreaWithTitle.qml +++ b/atomic_defi_design/Dex/Components/TextAreaWithTitle.qml @@ -66,7 +66,7 @@ ColumnLayout Item { Layout.fillWidth: true Layout.preferredHeight: input_field.height + 5 - DefaultTextArea { + DexTextArea { id: input_field enabled: !saveable width: parent.width - 6 diff --git a/atomic_defi_design/Dex/Components/TextEditWithTitle.qml b/atomic_defi_design/Dex/Components/TextEditWithTitle.qml index 93a0eba3c..5049c2019 100644 --- a/atomic_defi_design/Dex/Components/TextEditWithTitle.qml +++ b/atomic_defi_design/Dex/Components/TextEditWithTitle.qml @@ -25,7 +25,7 @@ ComponentWithTitle { Layout.fillWidth: true - DefaultText + DexLabel { id: _text diff --git a/atomic_defi_design/Dex/Components/TextFieldWithTitle.qml b/atomic_defi_design/Dex/Components/TextFieldWithTitle.qml index 4d74cd8f3..dafd1bffe 100644 --- a/atomic_defi_design/Dex/Components/TextFieldWithTitle.qml +++ b/atomic_defi_design/Dex/Components/TextFieldWithTitle.qml @@ -42,7 +42,7 @@ ColumnLayout visible: text !== '' } - DefaultText + DexLabel { visible: required && input_field.text === '' font.pixelSize: Style.textSizeSmall2 diff --git a/atomic_defi_design/Dex/Components/Toast.qml b/atomic_defi_design/Dex/Components/Toast.qml index e67142167..0ee00584d 100644 --- a/atomic_defi_design/Dex/Components/Toast.qml +++ b/atomic_defi_design/Dex/Components/Toast.qml @@ -4,6 +4,7 @@ import QtQuick 2.15 import "../Constants" import App 1.0 +import Dex.Themes 1.0 as Dex AnimatedRectangle { function show(text, duration, info, is_error) { @@ -36,7 +37,7 @@ AnimatedRectangle { radius: margin / 3 opacity: 0 - color: isError ? DexTheme.warningColor : Style.colorTheme1 + color: isError ? Dex.CurrentTheme.warningColor : Dex.CurrentTheme.colorTheme1 z: 1000 DexLabel { diff --git a/atomic_defi_design/Dex/Components/Widget.qml b/atomic_defi_design/Dex/Components/Widget.qml index 6b6c01c90..f66b82fd1 100644 --- a/atomic_defi_design/Dex/Components/Widget.qml +++ b/atomic_defi_design/Dex/Components/Widget.qml @@ -114,7 +114,7 @@ Item RowLayout { - DefaultText { text: root.title; font: DexTypo.subtitle1 } + DexLabel { text: root.title; font: DexTypo.subtitle1 } Item { Layout.fillWidth: true } Qaterial.Icon { diff --git a/atomic_defi_design/Dex/Components/ZcashParamsModal.qml b/atomic_defi_design/Dex/Components/ZcashParamsModal.qml index 30c642674..969eae761 100644 --- a/atomic_defi_design/Dex/Components/ZcashParamsModal.qml +++ b/atomic_defi_design/Dex/Components/ZcashParamsModal.qml @@ -20,7 +20,7 @@ Dex.MultipageModal { titleText: qsTr("%1 Activation Failed!").arg(coins.join(' / ')) - Dex.DefaultText + Dex.DexLabel { Layout.fillWidth: true text: qsTr("To activate ZHTLC coins, you need to download the Zcash Params.\nThis might take a few minutes...") diff --git a/atomic_defi_design/Dex/Components/qmldir b/atomic_defi_design/Dex/Components/qmldir index 248066ada..6db7d0695 100644 --- a/atomic_defi_design/Dex/Components/qmldir +++ b/atomic_defi_design/Dex/Components/qmldir @@ -15,7 +15,7 @@ Popup 1.0 DefaultPopup.qml Rectangle 1.0 DefaultRectangle.qml ScrollView 1.0 DefaultScrollView.qml SearchField 1.0 SearchField.qml -Text 1.0 DefaultText.qml +Text 1.0 DexLabel.qml TextField 1.0 DexTextField.qml TextFieldWithTitle 1.0 TextFieldWithTitle.qml ToolTip 1.0 DefaultTooltip.qml diff --git a/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml b/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml index 2213fb772..58eaa863e 100644 --- a/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml +++ b/atomic_defi_design/Dex/Dashboard/FatalErrorModal.qml @@ -26,7 +26,7 @@ MultipageModal { MultipageModalContent { titleText: qsTr("Fatal Error") - DefaultText { + DexLabel { text: message === "connection dropped" ? qsTr("Connection has been lost. You have been disconnected.") : message } diff --git a/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml b/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml index 2d2cb5e9c..4231bbf74 100644 --- a/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml +++ b/atomic_defi_design/Dex/Dashboard/NotificationsModal.qml @@ -402,7 +402,7 @@ DexPopup anchors.topMargin: 20 spacing: 24 - DefaultText + DexLabel { Layout.fillWidth: true font @@ -428,7 +428,7 @@ DexPopup } - DefaultText + DexLabel { anchors.centerIn: parent visible: !list.visible @@ -517,7 +517,7 @@ DexPopup bottomPadding: 5 spacing: 5 - DefaultText + DexLabel { text: getNotificationTitle(modelData) font: DexTypo.subtitle1 @@ -525,7 +525,7 @@ DexPopup wrapMode: Label.Wrap } - DefaultText + DexLabel { text: getNotificationMsg(modelData) font: DexTypo.subtitle2 @@ -533,7 +533,7 @@ DexPopup wrapMode: Label.Wrap } - DefaultText + DexLabel { text: modelData.human_date font: DexTypo.caption diff --git a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml index 69480206f..08b260918 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/Chart.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/Chart.qml @@ -170,13 +170,13 @@ Item scale: 0.5 } - DefaultText + DexLabel { visible: pair_supported text_value: qsTr("Loading pair chart data") + "..." } - DefaultText + DexLabel { visible: !pair_supported && selected_testcoin == "" text_value: qsTr("There is no chart data for this pair") @@ -184,7 +184,7 @@ Item Layout.alignment: Qt.AlignCenter } - DefaultText + DexLabel { visible: !pair_supported && selected_testcoin != "" text_value: qsTr("There is no chart data for %1 (testcoin) pairs").arg(selected_testcoin) diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml index 799e0b8a1..acafe43b2 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/MarketModeSelector.qml @@ -39,7 +39,7 @@ Rectangle anchors.centerIn: parent spacing: 8 - DefaultText + DexLabel { color: API.app.trading_pg.market_mode == marketMode ? Dex.CurrentTheme.gradientButtonTextEnabledColor : Dex.CurrentTheme.foregroundColor text: diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml index 3e50b624b..35f7749f5 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderForm.qml @@ -269,7 +269,7 @@ ColumnLayout Layout.preferredHeight: 24 visible: !_useCustomMinTradeAmountCheckbox.checked - DefaultText + DexLabel { id: minVolLabel anchors.horizontalCenter: parent.horizontalCenter @@ -295,7 +295,7 @@ ColumnLayout onToggled: setMinimumAmount(0) } - DefaultText + DexLabel { Layout.fillWidth: true height: _useCustomMinTradeAmountCheckbox.height @@ -353,7 +353,7 @@ ColumnLayout anchors.fill: parent anchors.verticalCenter: parent.verticalCenter - DefaultText + DexLabel { Layout.leftMargin: 15 color: Dex.CurrentTheme.warningColor diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml index c39c0619c..b896b048f 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/OrderFormSubfield.qml @@ -41,7 +41,7 @@ RowLayout color: Dex.CurrentTheme.inputModifierBackgroundColor } - DefaultText + DexLabel { id: _left_label anchors.centerIn: parent @@ -61,7 +61,7 @@ RowLayout anchors.topMargin: 30 color: Dex.CurrentTheme.accentColor - DefaultText + DexLabel { text: left_tooltip_text font: Dex.DexTypo.caption @@ -107,7 +107,7 @@ RowLayout hoverEnabled: true } - DefaultText + DexLabel { id: _middle_label anchors.centerIn: parent @@ -127,7 +127,7 @@ RowLayout anchors.topMargin: 30 color: Dex.CurrentTheme.accentColor - DefaultText + DexLabel { text: middle_tooltip_text font: Dex.DexTypo.caption @@ -162,7 +162,7 @@ RowLayout color: Dex.CurrentTheme.inputModifierBackgroundColor } - DefaultText + DexLabel { id: _right_label anchors.centerIn: parent @@ -183,7 +183,7 @@ RowLayout anchors.topMargin: 30 color: Dex.CurrentTheme.accentColor - DefaultText + DexLabel { text: right_tooltip_text font: Dex.DexTypo.caption @@ -211,7 +211,7 @@ RowLayout Item { Layout.fillWidth: true } - DefaultText + DexLabel { id: _fiat_label font.pixelSize: pixel_size diff --git a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml index 83d6e8a38..9e0b50f87 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/PlaceOrderForm/TotalView.qml @@ -19,7 +19,7 @@ ColumnLayout Layout.preferredWidth: parent.width Layout.preferredHeight: 30 - DefaultText + DexLabel { Layout.fillWidth: true Layout.alignment: Qt.AlignLeft @@ -31,7 +31,7 @@ ColumnLayout DefaultInfoTrigger { triggerModal: cex_info_modal } } - DefaultText + DexLabel { Layout.fillWidth: true horizontalAlignment: Text.AlignRight @@ -55,7 +55,7 @@ ColumnLayout Layout.preferredWidth: parent.width Layout.preferredHeight: 30 - DefaultText + DexLabel { Layout.fillWidth: true color: Dex.CurrentTheme.foregroundColor3 @@ -66,7 +66,7 @@ ColumnLayout font.weight: Font.Normal } - DefaultText + DexLabel { Layout.fillWidth: true horizontalAlignment: Text.AlignRight diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderList.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderList.qml index 7aff067cf..c8fb4183f 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderList.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderList.qml @@ -102,7 +102,7 @@ Item } } - DefaultText + DexLabel { visible: list.count === 0 anchors.centerIn: parent diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml index df4d38f8a..6ba51b0da 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrderModal.qml @@ -95,7 +95,7 @@ MultipageModal }, - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter visible: text_value != "" diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml index ab0e0968f..673d97ec4 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/OrdersPage.qml @@ -112,7 +112,7 @@ Item { onClicked: list_model_proxy.apply_all_filtering() } - DefaultText + DexLabel { color: Dex.CurrentTheme.foregroundColor2 font: DexTypo.caption diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml index 4eb305bef..daae2d4c8 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/PriceLine.qml @@ -22,7 +22,7 @@ ColumnLayout spacing: 10 - DefaultText + DexLabel { visible: !price_entered && invalid_cex_price text_value: qsTr("Set swap price for evaluation") @@ -35,7 +35,7 @@ ColumnLayout visible: price_entered Layout.alignment: Qt.AlignCenter - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: qsTr("Exchange rate") + (preferred_order.price !== undefined ? (" (" + qsTr("Selected") + ")") : "") @@ -43,7 +43,7 @@ ColumnLayout } // Price reversed - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: General.formatCrypto("", "1", right_ticker) + " = " + General.formatCrypto("", price_reversed, left_ticker) @@ -52,7 +52,7 @@ ColumnLayout } // Price - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: General.formatCrypto("", price, right_ticker) + " = " + General.formatCrypto("", "1", left_ticker) @@ -69,7 +69,7 @@ ColumnLayout RowLayout { Layout.alignment: Qt.AlignHCenter - DefaultText + DexLabel { text_value: General.formatPercent(lineScale) font.pixelSize: fontSize @@ -92,7 +92,7 @@ ColumnLayout } } - DefaultText + DexLabel { id: price_diff_text anchors.horizontalCenter: parent.horizontalCenter @@ -101,7 +101,7 @@ ColumnLayout font.pixelSize: fontSizeBigger } - DefaultText + DexLabel { text_value: General.formatPercent(-lineScale) font.pixelSize: fontSize @@ -115,7 +115,7 @@ ColumnLayout visible: !invalid_cex_price Layout.alignment: Qt.AlignCenter - DefaultText { + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: General.cex_icon + " " + qsTr("CEXchange rate") font.pixelSize: fontSize @@ -123,7 +123,7 @@ ColumnLayout } // Price reversed - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: General.formatCrypto("", "1", right_ticker) + " = " + General.formatCrypto("", cex_price_reversed, left_ticker) @@ -132,7 +132,7 @@ ColumnLayout } // Price - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: General.formatCrypto("", cex_price, right_ticker) + " = " + General.formatCrypto("", "1", left_ticker) diff --git a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml index 3f0963b26..ae11dea1a 100644 --- a/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml +++ b/atomic_defi_design/Dex/Exchange/ProView/TradingInfo/SwapProgress.qml @@ -198,7 +198,7 @@ ColumnLayout } // Title - DefaultText + DexLabel { Layout.fillWidth: true text_value: `` + qsTr("Progress details") + `` + @@ -234,7 +234,7 @@ ColumnLayout width: root.width height: 50 - DefaultText { + DexLabel { id: icon text_value: is_active ? "●" : "○" @@ -272,7 +272,7 @@ ColumnLayout anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - DefaultText + DexLabel { id: name @@ -299,7 +299,7 @@ ColumnLayout } } - DefaultText + DexLabel { visible: bar.visible font.pixelSize: Style.textSizeSmall2 diff --git a/atomic_defi_design/Dex/Exchange/Trade/BestOrder/List.qml b/atomic_defi_design/Dex/Exchange/Trade/BestOrder/List.qml index 552ee7bbf..75b9f5b7c 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/BestOrder/List.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/BestOrder/List.qml @@ -32,7 +32,7 @@ Widget Layout.preferredWidth: parent.width Layout.preferredHeight: parent.height - DefaultText + DexLabel { text_value: qsTr("Enter volume to see best orders.") anchors.fill: parent diff --git a/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml b/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml index be08030d7..c0e76bf99 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/BestOrder/ListDelegate.qml @@ -124,7 +124,7 @@ Item text_value: !General.isZhtlc(coin) ? qsTr(" %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?
Yes - No").arg(coin).arg(coin) : qsTr(" %1 is not enabled - Please enable it through the coin activation menu").arg(coin) - wrapMode: DefaultText.Wrap + wrapMode: DexLabel.Wrap width: 250 onLinkActivated: { diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml index fece784f8..4cb78f771 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmMultiOrderTradeModal.qml @@ -70,27 +70,27 @@ MultipageModal { id: warning_texts anchors.centerIn: parent - DefaultText { + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: qsTr("These swaps requests can not be undone and this is the final event!") } - DefaultText { + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: qsTr("These transactions can take up to 60 mins - DO NOT close this application!") font.pixelSize: Style.textSizeSmall4 } - DefaultText { + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: qsTr("Same funds will be used until an order matches.") font.pixelSize: Style.textSizeSmall4 } - DefaultText { + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: qsTr("Note that if one order is filled other will not be cancelled.") diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml index 6337d84d9..7d431054f 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml @@ -116,7 +116,7 @@ MultipageModal scale: 0.8 } - DefaultText + DexLabel { text_value: qsTr("Loading fees...") Layout.bottomMargin: 8 @@ -130,7 +130,7 @@ MultipageModal anchors.centerIn: parent visible: root.fees.hasOwnProperty('error') // Should be handled before this modal, but leaving here as a fallback - DefaultText + DexLabel { width: parent.width text_value: root.fees.hasOwnProperty('error') ? root.fees["error"].split("] ").slice(-1) : "" @@ -149,7 +149,7 @@ MultipageModal Repeater { model: root.fees.hasOwnProperty('base_transaction_fees_ticker') && !API.app.trading_pg.preimage_rpc_busy ? General.getFeesDetail(root.fees) : [] - delegate: DefaultText + delegate: DexLabel { font.pixelSize: Style.textSizeSmall1 text: General.getFeesDetailText(modelData.label, modelData.fee, modelData.ticker) @@ -159,7 +159,7 @@ MultipageModal Repeater { model: root.fees.hasOwnProperty('base_transaction_fees_ticker') && !API.app.trading_pg.preimage_rpc_busy ? root.fees.total_fees : [] - delegate: DefaultText + delegate: DexLabel { text: General.getFeesDetailText( qsTr("Total %1 fees:").arg(modelData.coin), @@ -169,13 +169,13 @@ MultipageModal Layout.alignment: Qt.AlignHCenter } - DefaultText + DexLabel { id: errors visible: text_value != '' Layout.alignment: Qt.AlignHCenter width: parent.width - horizontalAlignment: DefaultText.AlignHCenter + horizontalAlignment: DexLabel.AlignHCenter font: DexTypo.caption color: Dex.CurrentTheme.warningColor text_value: General.getTradingError( @@ -269,7 +269,7 @@ MultipageModal text: qsTr("Use custom protection settings for incoming %1 transactions", "TICKER").arg(rel_ticker) } - DefaultSwitch + DexSwitch { id: enable_dpow_confs visible: enable_custom_config.checked && config_section.is_dpow_configurable @@ -289,7 +289,7 @@ MultipageModal Layout.alignment: Qt.AlignCenter spacing: 5 - DefaultText + DexLabel { height: 16 Layout.alignment: Qt.AlignCenter @@ -298,7 +298,7 @@ MultipageModal font.weight: Font.Medium } - DefaultText + DexLabel { height: 12 font: DexTypo.caption @@ -338,7 +338,7 @@ MultipageModal Layout.alignment: Qt.AlignCenter spacing: 3 - DefaultText + DexLabel { height: 30 Layout.alignment: Qt.AlignCenter @@ -378,7 +378,7 @@ MultipageModal enable_custom_config.checked && (config_section.is_dpow_configurable && !enable_dpow_confs.checked) } - DefaultText + DexLabel { id: dpow_off_warning anchors.fill: parent @@ -399,7 +399,7 @@ MultipageModal Layout.alignment: Qt.AlignHCenter - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: qsTr("This swap request can not be undone and is a final event!") @@ -407,7 +407,7 @@ MultipageModal color: Dex.CurrentTheme.foregroundColor2 } - DefaultText + DexLabel { id: warnings_tx_time_text Layout.alignment: Qt.AlignHCenter diff --git a/atomic_defi_design/Dex/Exchange/Trade/FeeIcon.qml b/atomic_defi_design/Dex/Exchange/Trade/FeeIcon.qml index 883e5e13d..ec826c19d 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/FeeIcon.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/FeeIcon.qml @@ -5,7 +5,7 @@ import QtQuick.Controls 2.15 import "../../Components" import "../../Constants" -DefaultText { +DexLabel { property var trade_info property string base diff --git a/atomic_defi_design/Dex/Exchange/Trade/MultiOrder.qml b/atomic_defi_design/Dex/Exchange/Trade/MultiOrder.qml index cf0731874..7a9de1683 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/MultiOrder.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/MultiOrder.qml @@ -125,7 +125,7 @@ InnerBackground { } // Error - DefaultText { + DexLabel { font.pixelSize: Style.textSizeSmall4 visible: model.multi_ticker_error > 0 anchors.verticalCenter: input_price.verticalCenter @@ -138,7 +138,7 @@ InnerBackground { visible: parent.visible && mouse_area.containsMouse contentItem: ColumnLayout { - DefaultText { + DexLabel { text_value: General.getTradingError(model.multi_ticker_error, model.multi_ticker_fees_info, base_ticker, model.ticker) font.pixelSize: Style.textSizeSmall2 } @@ -164,7 +164,7 @@ InnerBackground { field.enabled: !is_parent_coin } - DefaultSwitch { + DexSwitch { id: enable_ticker anchors.rightMargin: 10 anchors.right: parent.right diff --git a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml index 0c8918e6f..da3684ff7 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/OrderBook/Vertical.qml @@ -54,7 +54,7 @@ Widget Layout.fillWidth: true } - DefaultText + DexLabel { id: volume_text visible: parseFloat(pair_volume_24hr) > 0 diff --git a/atomic_defi_design/Dex/Exchange/Trade/Orders/OrderContent.qml b/atomic_defi_design/Dex/Exchange/Trade/Orders/OrderContent.qml index 839700621..55a496486 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/Orders/OrderContent.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/Orders/OrderContent.qml @@ -43,13 +43,13 @@ RowLayout { Layout.fillWidth: true spacing: 5 - DefaultText + DexLabel { Layout.fillWidth: true text: details ? details.base_coin : "" } - DefaultText + DexLabel { Layout.fillWidth: true text: details ? General.coinName(details.base_coin) : "" @@ -59,7 +59,7 @@ RowLayout } } - DefaultText + DexLabel { Layout.fillWidth: true text: details ? details.base_amount : "" @@ -108,13 +108,13 @@ RowLayout { Layout.fillWidth: true spacing: 5 - DefaultText + DexLabel { Layout.fillWidth: true text: details ? details.rel_coin : "" } - DefaultText + DexLabel { Layout.fillWidth: true text: details ? General.coinName(details.rel_coin) : "" @@ -124,7 +124,7 @@ RowLayout } } - DefaultText + DexLabel { Layout.fillWidth: true text: details ? details.rel_amount : "" diff --git a/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml b/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml index 4eb4d92c1..65d0d6e6b 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/PriceLineSimplified.qml @@ -33,7 +33,7 @@ ColumnLayout visible: price_entered Layout.fillWidth: true - DefaultText + DexLabel { Layout.fillWidth: true horizontalAlignment: invalid_cex_price ? Text.AlignHCenter : Text.AlignLeft @@ -42,7 +42,7 @@ ColumnLayout } // Price reversed - DefaultText + DexLabel { Layout.fillWidth: true horizontalAlignment: invalid_cex_price ? Text.AlignHCenter : Text.AlignLeft @@ -51,7 +51,7 @@ ColumnLayout } // Price - DefaultText + DexLabel { visible: price != 1 Layout.fillWidth: true @@ -66,7 +66,7 @@ ColumnLayout visible: !invalid_cex_price Layout.fillWidth: true - DefaultText + DexLabel { Layout.fillWidth: true horizontalAlignment: Text.AlignRight @@ -76,7 +76,7 @@ ColumnLayout } // Price reversed - DefaultText + DexLabel { Layout.fillWidth: true horizontalAlignment: Text.AlignRight @@ -85,7 +85,7 @@ ColumnLayout } // Price - DefaultText + DexLabel { Layout.fillWidth: true horizontalAlignment: Text.AlignRight @@ -122,7 +122,7 @@ ColumnLayout anchors.horizontalCenterOffset: 0.5 * parent.width * Math.min(Math.max(parseFloat(cexPriceDiff) / lineScale, -1), 1) } - DefaultText + DexLabel { text_value: General.formatPercent(lineScale) font.pixelSize: fontSize @@ -131,7 +131,7 @@ ColumnLayout anchors.topMargin: -15 } - DefaultText + DexLabel { id: price_diff_text anchors.top: parent.top @@ -142,7 +142,7 @@ ColumnLayout font.pixelSize: fontSizeBigger } - DefaultText + DexLabel { text_value: General.formatPercent(-lineScale) font.pixelSize: fontSize diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/OrderRemovedModal.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/OrderRemovedModal.qml index 4d5c8fe01..0cec29162 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/OrderRemovedModal.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/OrderRemovedModal.qml @@ -12,7 +12,7 @@ MultipageModal { titleText: qsTr("Selected Order Removed") - DefaultText + DexLabel { Layout.fillWidth: true diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml index 917e515db..cafb9814a 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubHistory.qml @@ -87,7 +87,7 @@ Item leftPadding: 20 topPadding: 20 - DefaultText // Title + DexLabel // Title { text: qsTr("History") font: DexTypo.head6 @@ -160,7 +160,7 @@ Item rightPadding: 15 visible: parent.height > 250 - DefaultText + DexLabel { text: qsTr("Filter settings") topPadding: 10 diff --git a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml index 7b26d9215..100770082 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/SimpleView/SubOrders.qml @@ -79,7 +79,7 @@ Item leftPadding: 20 topPadding: 20 - DefaultText // Title + DexLabel // Title { text: qsTr("Orders") font: DexTypo.head6 diff --git a/atomic_defi_design/Dex/Exchange/Trade/Trading/Items/FeeInfo.qml b/atomic_defi_design/Dex/Exchange/Trade/Trading/Items/FeeInfo.qml index f8ce4d8bc..355778d12 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/Trading/Items/FeeInfo.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/Trading/Items/FeeInfo.qml @@ -33,7 +33,7 @@ Column Layout.rightMargin: Layout.leftMargin Layout.alignment: Qt.AlignLeft - DefaultText + DexLabel { id: tx_fee_text text_value: General.feeText(curr_fee_info, base_ticker, true, true) @@ -45,7 +45,7 @@ Column } - DefaultText + DexLabel { //visible: !fees.visible visible: false diff --git a/atomic_defi_design/Dex/Exchange/Trade/Trading/TradeViewHeader.qml b/atomic_defi_design/Dex/Exchange/Trade/Trading/TradeViewHeader.qml index f92fc2313..59d2aac4c 100644 --- a/atomic_defi_design/Dex/Exchange/Trade/Trading/TradeViewHeader.qml +++ b/atomic_defi_design/Dex/Exchange/Trade/Trading/TradeViewHeader.qml @@ -118,7 +118,7 @@ Item padding: 8 spacing: 8 - DefaultText { text: qsTr("Display Settings"); font: DexTypo.body2 } + DexLabel { text: qsTr("Display Settings"); font: DexTypo.body2 } HorizontalLine { width: parent.width - 20; anchors.horizontalCenter: parent.horizontalCenter; opacity: .4 } diff --git a/atomic_defi_design/Dex/NewUpdateModal.qml b/atomic_defi_design/Dex/NewUpdateModal.qml index fd5121ed3..1e3a13348 100644 --- a/atomic_defi_design/Dex/NewUpdateModal.qml +++ b/atomic_defi_design/Dex/NewUpdateModal.qml @@ -39,7 +39,7 @@ Dex.MultipageModal titleAlignment: Qt.AlignHCenter spacing: 16 - Dex.DefaultText + Dex.DexLabel { Layout.alignment: Qt.AlignHCenter text: qsTr("Fetching...") @@ -69,7 +69,7 @@ Dex.MultipageModal titleAlignment: Qt.AlignHCenter spacing: 16 - Dex.DefaultText + Dex.DexLabel { text: qsTr("Could not check new updates for the following reason: \n%1").arg(Dex.API.app.updateCheckerService.updateInfo.status) } @@ -94,13 +94,13 @@ Dex.MultipageModal titleAlignment: Qt.AlignHCenter spacing: 16 - Dex.DefaultText + Dex.DexLabel { Layout.alignment: Qt.AlignHCenter text: qsTr("%1 %2 is available !").arg(Dex.API.app_name).arg(Dex.API.app.updateCheckerService.updateInfo.newVersion) } - Dex.DefaultText + Dex.DexLabel { visible: Dex.API.app.updateCheckerService.updateInfo.status === "required" Layout.alignment: Qt.AlignHCenter @@ -131,7 +131,7 @@ Dex.MultipageModal titleAlignment: Qt.AlignHCenter spacing: 16 - Dex.DefaultText + Dex.DexLabel { text: qsTr("Your application is up to date!") } diff --git a/atomic_defi_design/Dex/NoConnection.qml b/atomic_defi_design/Dex/NoConnection.qml index 3fd59c9ad..cec990620 100644 --- a/atomic_defi_design/Dex/NoConnection.qml +++ b/atomic_defi_design/Dex/NoConnection.qml @@ -15,19 +15,19 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - DefaultText { + DexLabel { text_value: qsTr("No connection") Layout.alignment: Qt.AlignHCenter font.pixelSize: Style.textSize3 } - DefaultText { + DexLabel { text_value: qsTr("Please make sure you are connected to the internet") Layout.alignment: Qt.AlignHCenter } - DefaultText { + DexLabel { text_value: qsTr("Will automatically retry in %1 seconds").arg(General.formatDouble(API.app.internet_checker.seconds_left_to_auto_retry, 0)) Layout.alignment: Qt.AlignHCenter } diff --git a/atomic_defi_design/Dex/Portfolio/AssetsList.qml b/atomic_defi_design/Dex/Portfolio/AssetsList.qml index 97bbdfcb0..3778b29cb 100644 --- a/atomic_defi_design/Dex/Portfolio/AssetsList.qml +++ b/atomic_defi_design/Dex/Portfolio/AssetsList.qml @@ -283,7 +283,7 @@ Dex.DexListView Dex.DexTooltip { - contentItem: Dex.DefaultText + contentItem: Dex.DexLabel { text: qsTr("Price provider is: %1").arg(DexString.capitalizeFirstLetter(priceProvider)) font: Dex.DexTypo.caption diff --git a/atomic_defi_design/Dex/Portfolio/TradingViewChart.qml b/atomic_defi_design/Dex/Portfolio/TradingViewChart.qml index 72c433c43..ffcdd8499 100644 --- a/atomic_defi_design/Dex/Portfolio/TradingViewChart.qml +++ b/atomic_defi_design/Dex/Portfolio/TradingViewChart.qml @@ -121,12 +121,12 @@ Item { scale: 0.5 } - DefaultText { + DexLabel { text_value: qsTr("Loading market data") + "..." } } - DefaultText { + DexLabel { visible: !ticker_supported text_value: qsTr("There is no chart data for this ticker yet") anchors.centerIn: parent diff --git a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml index 2abfd27ab..393add073 100644 --- a/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/ImportWallet.qml @@ -113,7 +113,7 @@ SetupPage } } - DefaultText + DexLabel { font: DexTypo.head6 Layout.fillWidth: true @@ -199,7 +199,7 @@ SetupPage } } - DefaultText + DexLabel { id: _seedError visible: _seedField.error @@ -263,7 +263,7 @@ SetupPage Layout.preferredWidth: 400 spacing: Style.buttonSpacing - DefaultText + DexLabel { text_value: text_error color: Dex.CurrentTheme.warningColor @@ -359,7 +359,7 @@ SetupPage } } - DefaultText + DexLabel { text_value: text_error color: Dex.CurrentTheme.warningColor diff --git a/atomic_defi_design/Dex/Screens/Startup/Logging.qml b/atomic_defi_design/Dex/Screens/Startup/Logging.qml index 561355172..128c45e94 100644 --- a/atomic_defi_design/Dex/Screens/Startup/Logging.qml +++ b/atomic_defi_design/Dex/Screens/Startup/Logging.qml @@ -30,13 +30,13 @@ SetupPage scale: 0.8 } - DefaultText + DexLabel { text_value: qsTr("Loading, please wait") Layout.bottomMargin: 10 } - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: (current_status === "initializing_kdf" ? qsTr("Initializing KDF") : diff --git a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml index ef22a5bbd..f663d2fca 100644 --- a/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml +++ b/atomic_defi_design/Dex/Screens/Startup/NewWallet.qml @@ -349,7 +349,7 @@ SetupPage spacing: 10 - DefaultText + DexLabel { width: parent.width - 40 color: Style.colorWhite0 @@ -358,7 +358,7 @@ SetupPage text_value: qsTr("Important: Back up your seed phrase before proceeding!") } - DefaultText + DexLabel { width: parent.width - 40 color: Style.colorWhite0 @@ -384,7 +384,7 @@ SetupPage RowLayout { width: parent.width - DefaultText + DexLabel { text: qsTr("Generated Seed") font: DexTypo.body1 @@ -431,7 +431,7 @@ SetupPage radius: 10 opacity: .8 color: Dex.CurrentTheme.backgroundColor - DefaultText + DexLabel { id: _insideLabel text: (index + 1) + ". " + modelData @@ -455,7 +455,7 @@ SetupPage Layout.preferredWidth: 400 spacing: Style.buttonSpacing - DefaultText + DexLabel { text_value: text_error color: Dex.CurrentTheme.warningColor @@ -523,7 +523,7 @@ SetupPage spacing: 5 - DefaultText + DexLabel { width: parent.width - 40 anchors.horizontalCenter: parent.horizontalCenter @@ -534,7 +534,7 @@ SetupPage text_value: qsTr("Let's double check your seed phrase") } - DefaultText + DexLabel { width: parent.width - 40 anchors.horizontalCenter: parent.horizontalCenter @@ -616,7 +616,7 @@ SetupPage color: Dex.CurrentTheme.inputLeftIconBackgroundColor anchors.verticalCenter: parent.verticalCenter - DefaultText + DexLabel { anchors.centerIn: parent font: DexTypo.body1 @@ -663,7 +663,7 @@ SetupPage { Layout.fillWidth: true Layout.preferredHeight: 20 - DefaultText + DexLabel { text_value: guess_text_error color: Dex.CurrentTheme.warningColor @@ -742,7 +742,7 @@ SetupPage } } - DefaultText + DexLabel { text_value: text_error color: Dex.CurrentTheme.warningColor diff --git a/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml b/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml index e0b0fff90..ebdc623ce 100644 --- a/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml +++ b/atomic_defi_design/Dex/Screens/Startup/WalletsView.qml @@ -198,7 +198,7 @@ SetupPage } } - DefaultText + DexLabel { anchors.left: parent.left anchors.leftMargin: 40 diff --git a/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml b/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml index a8fc9d57f..af8cadadc 100644 --- a/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml +++ b/atomic_defi_design/Dex/Settings/AddCustomCoinModal.qml @@ -221,7 +221,7 @@ MultipageModal left_text: currentType.prefix } - DefaultText + DexLabel { visible: input_contract_address.visible Layout.fillWidth: true @@ -335,7 +335,7 @@ MultipageModal { titleText: qsTr("Configuration") - DefaultText + DexLabel { visible: has_contract_address Layout.fillWidth: true @@ -360,7 +360,7 @@ MultipageModal field.placeholderText: qsTr("Enter the Coingecko ID") } - DefaultText + DexLabel { visible: input_coingecko_id.visible Layout.fillWidth: true @@ -427,7 +427,7 @@ MultipageModal MultipageModalContent { titleText: qsTr("Preview Token Configuration") - DefaultText { + DexLabel { id: warning_message visible: coin_name.visible Layout.fillWidth: true @@ -449,7 +449,7 @@ MultipageModal source: input_logo.path } - DefaultText { + DexLabel { id: error_text Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true @@ -460,7 +460,7 @@ MultipageModal color: Style.colorRed } - DefaultText { + DexLabel { id: coin_name Layout.alignment: Qt.AlignHCenter visible: has_contract_address && !error_text.visible diff --git a/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml b/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml index a798ff68d..06b3e4253 100644 --- a/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml +++ b/atomic_defi_design/Dex/Settings/CamouflagePasswordModal.qml @@ -34,7 +34,7 @@ MultipageModal width: parent.width spacing: 10 - DefaultText + DexLabel { width: parent.width - 40 horizontalAlignment: Text.AlignHCenter @@ -44,7 +44,7 @@ MultipageModal font: DexTypo.subtitle2 } - DefaultText + DexLabel { width: parent.width - 40 horizontalAlignment: Text.AlignHCenter @@ -53,7 +53,7 @@ MultipageModal text_value: qsTr("Using it to login will display your balance lower than it actually is.") } - DefaultText + DexLabel { width: parent.width - 40 horizontalAlignment: Text.AlignHCenter diff --git a/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml b/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml index c19c6854f..6d88bf3c6 100644 --- a/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml +++ b/atomic_defi_design/Dex/Settings/DeleteWalletModal.qml @@ -36,7 +36,7 @@ MultipageModal { width: parent.width spacing: 10 - DefaultText { + DexLabel { width: parent.width - 40 horizontalAlignment: Text.AlignHCenter anchors.horizontalCenter: parent.horizontalCenter @@ -45,7 +45,7 @@ MultipageModal { font.pixelSize: Style.textSize2 } - DefaultText { + DexLabel { width: parent.width - 40 horizontalAlignment: Text.AlignHCenter anchors.horizontalCenter: parent.horizontalCenter @@ -62,7 +62,7 @@ MultipageModal { field.placeholderText: qsTr("Enter your wallet password") } - DefaultText { + DexLabel { text_value: qsTr("Wrong Password") color: Style.colorRed visible: wrong_password diff --git a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml index 967b29227..c7d12523e 100644 --- a/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml +++ b/atomic_defi_design/Dex/Settings/RecoverSeedModal.qml @@ -56,7 +56,7 @@ MultipageModal { titleText: qsTr("View seed and private keys") - DefaultText + DexLabel { text_value: qsTr("Please enter your password to view the seed.") } @@ -188,14 +188,14 @@ MultipageModal ColumnLayout { - DefaultText + DexLabel { text: qsTr("Backup Seed") font.pixelSize: Style.textSizeSmall2 color: Dex.CurrentTheme.foregroundColor2 } - DefaultText + DexLabel { id: seedLabel Layout.fillWidth: true @@ -241,13 +241,13 @@ MultipageModal ColumnLayout { - DefaultText + DexLabel { text: qsTr("RPC Password") font.pixelSize: Style.textSizeSmall2 color: Dex.CurrentTheme.foregroundColor2 } - DefaultText + DexLabel { id: rpcPwLabel Layout.fillWidth: true @@ -314,7 +314,7 @@ MultipageModal Layout.alignment: Qt.AlignCenter } - DefaultText + DexLabel { text: model.name font.pixelSize: Style.textSizeSmall4 @@ -362,14 +362,14 @@ MultipageModal { spacing: 5 Layout.fillWidth: true - DefaultText + DexLabel { text: qsTr("Public Address") font.pixelSize: Style.textSizeSmall2 color: Dex.CurrentTheme.foregroundColor2 } - DefaultText + DexLabel { id: publicAddress text: model.public_address != 'Invalid Ticker' ? model.public_address : "Please wait for " + model.name + " to fully activate..." @@ -415,14 +415,14 @@ MultipageModal spacing: 5 Layout.fillWidth: true - DefaultText + DexLabel { text: qsTr("Private Key") font.pixelSize: Style.textSizeSmall2 color: Dex.CurrentTheme.foregroundColor2 } - DefaultText + DexLabel { id: privateKey font: DexTypo.body3 diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml index c069496e0..61a67be74 100644 --- a/atomic_defi_design/Dex/Settings/SettingModal.qml +++ b/atomic_defi_design/Dex/Settings/SettingModal.qml @@ -558,7 +558,7 @@ Qaterial.Dialog text: qsTr("Ask system's password before sending coins ? (2FA)") } - DefaultSwitch + DexSwitch { checked: parseInt(atomic_settings2.value("2FA")) === 1 onCheckedChanged: diff --git a/atomic_defi_design/Dex/Sidebar/Bottom.qml b/atomic_defi_design/Dex/Sidebar/Bottom.qml index af9829b03..838b2eddb 100644 --- a/atomic_defi_design/Dex/Sidebar/Bottom.qml +++ b/atomic_defi_design/Dex/Sidebar/Bottom.qml @@ -154,7 +154,7 @@ MouseArea } } - DefaultSwitch + DexSwitch { id: privacySwitch diff --git a/atomic_defi_design/Dex/Sidebar/Top.qml b/atomic_defi_design/Dex/Sidebar/Top.qml index b73aebbc7..6b65331a5 100644 --- a/atomic_defi_design/Dex/Sidebar/Top.qml +++ b/atomic_defi_design/Dex/Sidebar/Top.qml @@ -70,7 +70,7 @@ MouseArea } } - DefaultText + DexLabel { id: versionLabel anchors.horizontalCenter: dexLogo.horizontalCenter diff --git a/atomic_defi_design/Dex/Wallet/ClaimFaucetResultModal.qml b/atomic_defi_design/Dex/Wallet/ClaimFaucetResultModal.qml index 203658f13..4a2af7fbd 100644 --- a/atomic_defi_design/Dex/Wallet/ClaimFaucetResultModal.qml +++ b/atomic_defi_design/Dex/Wallet/ClaimFaucetResultModal.qml @@ -18,7 +18,7 @@ MultipageModal { titleText: claiming_faucet_rpc_result && claiming_faucet_rpc_result.status ? claiming_faucet_rpc_result.status : "" - DefaultText { + DexLabel { id: message width: parent.width text_value: claiming_faucet_rpc_result && claiming_faucet_rpc_result.message ? diff --git a/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml b/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml index d8f53a2d3..711087996 100644 --- a/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml +++ b/atomic_defi_design/Dex/Wallet/EnableCoinModal.qml @@ -52,7 +52,7 @@ MultipageModal Layout.fillWidth: true Layout.fillHeight: true - DefaultText + DexLabel { id: _title Layout.topMargin: 5 @@ -175,7 +175,7 @@ MultipageModal Layout.preferredHeight: 18 } - DefaultText + DexLabel { Layout.leftMargin: 4 Layout.alignment: Qt.AlignVCenter @@ -225,7 +225,7 @@ MultipageModal Layout.topMargin: 6 Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter - DefaultText + DexLabel { anchors.left: parent.left anchors.verticalCenter: parent.verticalCenter diff --git a/atomic_defi_design/Dex/Wallet/Main.qml b/atomic_defi_design/Dex/Wallet/Main.qml index 7028d16c2..dc90d3a15 100644 --- a/atomic_defi_design/Dex/Wallet/Main.qml +++ b/atomic_defi_design/Dex/Wallet/Main.qml @@ -124,7 +124,7 @@ Item } } - DefaultText + DexLabel { id: ticker_name Layout.topMargin: 0 @@ -143,7 +143,7 @@ Item Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter spacing: 2 - DefaultText + DexLabel { id: balance_title Layout.alignment: Qt.AlignHCenter @@ -152,7 +152,7 @@ Item color: headerTitleColor } - DefaultText + DexLabel { id: name_value Layout.alignment: Qt.AlignHCenter @@ -182,7 +182,7 @@ Item Layout.rightMargin: 10 spacing: 5 - DefaultText + DexLabel { id: price text_value: qsTr("Price") @@ -191,7 +191,7 @@ Item font.pixelSize: headerTitleFont } - DefaultText + DexLabel { text_value: { @@ -212,7 +212,7 @@ Item Layout.rightMargin: 10 spacing: 5 - DefaultText + DexLabel { id: change_24hr text_value: qsTr("Change 24hr") @@ -221,7 +221,7 @@ Item font.pixelSize: headerTitleFont } - DefaultText + DexLabel { id: change_24hr_value Layout.alignment: Qt.AlignHCenter @@ -243,7 +243,7 @@ Item Layout.rightMargin: 10 spacing: 5 - DefaultText + DexLabel { id: portfolio_title text_value: qsTr("Portfolio") @@ -252,7 +252,7 @@ Item font.pixelSize: headerTitleFont } - DefaultText + DexLabel { Layout.alignment: Qt.AlignHCenter text_value: @@ -300,7 +300,7 @@ Item Layout.preferredWidth: Layout.preferredHeight } - DefaultText + DexLabel { id: contract_address_title text_value: General.coinPlatform(api_wallet_page.ticker) + qsTr(" Contract Address") @@ -317,7 +317,7 @@ Item Layout.preferredHeight: General.coinContractAddress(api_wallet_page.ticker) ? headerSmallFont : 0 visible: General.coinContractAddress(api_wallet_page.ticker) !== "" - DefaultText + DexLabel { id: contract_address text_value: General.coinContractAddress(api_wallet_page.ticker) @@ -773,7 +773,7 @@ Item { Layout.fillWidth: true - DefaultText + DexLabel { Layout.fillWidth: true visible: !API.app.settings_pg.fetchingPublicKey @@ -977,13 +977,13 @@ Item scale: 0.5 } - DefaultText + DexLabel { text_value: qsTr("Loading ticker chart data") + "..." } } - DefaultText + DexLabel { visible: !parent.ticker_supported text_value: qsTr("There is no chart data for this ticker yet") @@ -1037,7 +1037,7 @@ Item anchors.centerIn: parent spacing: 24 - DefaultText + DexLabel { id: fetching_text_row Layout.topMargin: 24 diff --git a/atomic_defi_design/Dex/Wallet/SendModal.qml b/atomic_defi_design/Dex/Wallet/SendModal.qml index c6f61248a..071cad3f1 100644 --- a/atomic_defi_design/Dex/Wallet/SendModal.qml +++ b/atomic_defi_design/Dex/Wallet/SendModal.qml @@ -168,6 +168,7 @@ MultipageModal if (result.error_code) { + console.log("Error code: " + result.error_code) root.close() toast.show(qsTr("Failed to send"), General.time_toast_important_error, result.error_message) } @@ -198,6 +199,7 @@ MultipageModal if(root.visible && broadcast_result !== "") { if(broadcast_result.indexOf("error") !== -1) { + console.log("Broadcast error: " + JSON.stringify(broadcast_result)) reset() showError(qsTr("Failed to Broadcast"), General.prettifyJSON(broadcast_result)) } @@ -256,8 +258,8 @@ MultipageModal { enabled: !root.is_send_busy - Layout.preferredWidth: 500 - Layout.preferredHeight: 44 + width: 500 + Layout.preferredHeight: 36 Layout.alignment: Qt.AlignHCenter color: input_address.background.color @@ -268,7 +270,7 @@ MultipageModal id: input_address width: 470 - height: 44 + height: 36 placeholderText: qsTr("Address of the recipient") forceFocus: true font: General.isZhtlc(api_wallet_page.ticker) ? DexTypo.body3 : DexTypo.body2 @@ -328,7 +330,7 @@ MultipageModal Item { Layout.fillWidth: true } - DefaultText + DexLabel { id: reason @@ -355,142 +357,90 @@ MultipageModal Item { Layout.fillWidth: true } } - // Amount to send - AmountField + RowLayout { - id: input_amount - - enabled: !root.is_send_busy - - Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: 500 - Layout.preferredHeight: 44 - Layout.topMargin: 32 - - placeholderText: qsTr("Amount to send") - - onTextEdited: - { - if (text.length === 0) - { - text = ""; - return; - } - } - - DefaultText + Layout.preferredHeight: 36 + Layout.topMargin: 8 + Layout.alignment: Qt.AlignHCenter + + // Amount to send + AmountField { - anchors.right: maxBut.left - anchors.rightMargin: 10 - anchors.verticalCenter: parent.verticalCenter - - text: _preparePage.cryptoSendMode ? API.app.wallet_pg.ticker : API.app.settings_pg.current_currency - font.pixelSize: 16 - } + id: input_amount - Rectangle - { - id: maxBut - anchors.right: parent.right - anchors.rightMargin: 11 - anchors.verticalCenter: parent.verticalCenter - width: 46 - height: 23 - radius: 7 - color: maxButMouseArea.containsMouse ? Dex.CurrentTheme.buttonColorHovered : Dex.CurrentTheme.buttonColorEnabled + enabled: !root.is_send_busy + Layout.preferredWidth: equivalentAmount.visible ? 340 : 500 + Layout.preferredHeight: 36 - DefaultText - { - anchors.centerIn: parent - text: qsTr("MAX") - } + placeholderText: qsTr("Amount to send") - DefaultMouseArea + onTextEdited: { - id: maxButMouseArea - anchors.fill: parent - hoverEnabled: true - onClicked: + if (text.length === 0) { - if (_preparePage.cryptoSendMode) - { - input_amount.text = API.app.get_balance_info_qstr(api_wallet_page.ticker); - } - else - { - let cryptoBalance = new BigNumber(API.app.get_balance_info_qstr(api_wallet_page.ticker)); - input_amount.text = cryptoBalance.multipliedBy(current_ticker_infos.current_currency_ticker_price).toFixed(8); - } + text = ""; + return; } } - } - } - - // Crypto/fiat switch - RowLayout - { - Layout.topMargin: 10 - Layout.alignment: Qt.AlignHCenter - Layout.preferredWidth: 380 - - DefaultText - { - id: equivalentAmount - - property string value: "0" - enabled: !(new BigNumber(current_ticker_infos.current_currency_ticker_price).isLessThanOrEqualTo(0)) - visible: enabled - - text: + DexLabel { - if (!enabled) - { - return qsTr("Fiat amount: Unavailable"); - } - else if (_preparePage.cryptoSendMode) - { - return qsTr("Fiat amount: %1").arg(General.formatFiat('', value, API.app.settings_pg.current_fiat_sign)); - } - else - { - return qsTr("%1 amount: %2").arg(API.app.wallet_pg.ticker).arg(value); - } + anchors.right: maxBut.left + anchors.rightMargin: 10 + anchors.verticalCenter: parent.verticalCenter + + text: _preparePage.cryptoSendMode ? API.app.wallet_pg.ticker : API.app.settings_pg.current_currency + font.pixelSize: 16 } - Connections + Rectangle { - target: input_amount + id: maxBut + anchors.right: parent.right + anchors.rightMargin: 11 + anchors.verticalCenter: parent.verticalCenter + width: 46 + height: 23 + radius: 7 + color: maxButMouseArea.containsMouse ? Dex.CurrentTheme.buttonColorHovered : Dex.CurrentTheme.buttonColorEnabled - function onTextEdited() + DexLabel { - let imputAmount = new BigNumber(input_amount.text); - if (input_amount.text === "" || imputAmount.isLessThanOrEqualTo(0)) - equivalentAmount.value = "0" - else if (_preparePage.cryptoSendMode) - equivalentAmount.value = imputAmount.multipliedBy(current_ticker_infos.current_currency_ticker_price).toFixed(8); - else - equivalentAmount.value = imputAmount.dividedBy(current_ticker_infos.current_currency_ticker_price).toFixed(8); + anchors.centerIn: parent + text: qsTr("MAX") } - function onTextChanged() + DefaultMouseArea { - onTextEdited() + id: maxButMouseArea + anchors.fill: parent + hoverEnabled: true + onClicked: + { + if (_preparePage.cryptoSendMode) + { + input_amount.text = API.app.get_balance_info_qstr(api_wallet_page.ticker); + } + else + { + let cryptoBalance = new BigNumber(API.app.get_balance_info_qstr(api_wallet_page.ticker)); + input_amount.text = cryptoBalance.multipliedBy(current_ticker_infos.current_currency_ticker_price).toFixed(8); + } + } } } } - Item { } Rectangle { enabled: equivalentAmount.enabled visible: equivalentAmount.visible - Layout.alignment: Qt.AlignRight - Layout.preferredWidth: cryptoFiatSwitchText.width + cryptoFiatSwitchIcon.width + 20 - Layout.preferredHeight: 32 radius: 16 + Layout.preferredWidth: 150 + Layout.preferredHeight: 36 color: cryptoFiatSwitchMouseArea.containsMouse ? Dex.CurrentTheme.buttonColorHovered : Dex.CurrentTheme.buttonColorEnabled @@ -505,7 +455,7 @@ MultipageModal anchors.verticalCenter: parent.verticalCenter color: Dex.CurrentTheme.backgroundColor - DefaultText + DexLabel { id: fiat_symbol visible: _preparePage.cryptoSendMode && API.app.settings_pg.current_currency_sign != "KMD" @@ -518,13 +468,14 @@ MultipageModal { visible: !fiat_symbol.visible anchors.centerIn: parent - width: 18 - height: 18 + width: 16 + height: 16 source: _preparePage.cryptoSendMode ? General.coinIcon(API.app.settings_pg.current_currency_sign) : General.coinIcon(API.app.wallet_pg.ticker) } } - DefaultText + // Crypto/fiat switch + DexLabel { id: cryptoFiatSwitchText anchors.left: cryptoFiatSwitchIcon.right @@ -547,12 +498,68 @@ MultipageModal { _preparePage.cryptoSendMode = !_preparePage.cryptoSendMode let temp = input_amount.text - input_amount.text = equivalentAmount.value; - equivalentAmount.value = temp; + input_amount.text = equivalentAmount.value + equivalentAmount.value = temp == "" ? "0" : temp } } } } + // Crypto/fiat values + RowLayout + { + Layout.topMargin: 3 + Layout.bottomMargin: 6 + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: 400 + + DexLabel + { + id: equivalentAmount + + property string value: "0" + enabled: !(new BigNumber(current_ticker_infos.current_currency_ticker_price).isLessThanOrEqualTo(0)) + visible: enabled + color: Dex.CurrentTheme.textPlaceholderColor + + text: + { + if (!enabled) + { + return qsTr("Fiat amount: Unavailable"); + } + else if (_preparePage.cryptoSendMode) + { + return qsTr("Fiat amount: %1").arg(General.formatFiat('', value, API.app.settings_pg.current_fiat_sign)); + } + else + { + return qsTr("%1 amount: %2").arg(API.app.wallet_pg.ticker).arg(value); + } + } + + Connections + { + target: input_amount + + function onTextEdited() + { + let inputAmount = new BigNumber(input_amount.text); + if (input_amount.text === "" || inputAmount.isLessThanOrEqualTo(0)) + equivalentAmount.value = "0" + else if (_preparePage.cryptoSendMode) + equivalentAmount.value = inputAmount.multipliedBy(current_ticker_infos.current_currency_ticker_price).toFixed(8); + else + equivalentAmount.value = inputAmount.dividedBy(current_ticker_infos.current_currency_ticker_price).toFixed(8); + } + + function onTextChanged() + { + onTextEdited() + } + } + } + + } // Memo DefaultRectangle @@ -561,7 +568,7 @@ MultipageModal enabled: !root.is_send_busy Layout.preferredWidth: 500 - Layout.preferredHeight: 44 + Layout.preferredHeight: 36 Layout.alignment: Qt.AlignHCenter color: input_memo.background.color @@ -572,49 +579,85 @@ MultipageModal id: input_memo width: 470 - height: 44 - placeholderText: qsTr("Enter memo") + height: 36 + placeholderText: qsTr("Enter memo (optional)") forceFocus: true font: General.isZhtlc(api_wallet_page.ticker) ? DexTypo.body3 : DexTypo.body2 } } - // IBC channel ID - DefaultRectangle + // Custom IBC Channel switch + ColumnLayout { visible: (["TENDERMINT", "TENDERMINTTOKEN"].includes(current_ticker_infos.type)) - enabled: !root.is_send_busy - - Layout.preferredWidth: 500 - Layout.preferredHeight: 44 + Layout.preferredWidth: 400 Layout.alignment: Qt.AlignHCenter + Layout.topMargin: 12 - color: input_memo.background.color - radius: input_memo.background.radius + RowLayout + { + DexSwitch + { + id: custom_ibc_switch + visible: (["TENDERMINT", "TENDERMINTTOKEN"].includes(current_ticker_infos.type)) + font.pixelSize: 14 + enabled: !root.is_send_busy + Layout.preferredWidth: 220 + onCheckedChanged: input_ibc_channel_id.text = "" + labelWidth: 200 + label.text: qsTr("Use Custom IBC Channel") + label.wrapMode: Label.NoWrap + } - DexTextField + DexTextField + { + id: input_ibc_channel_id + visible: custom_ibc_switch.checked + Layout.preferredWidth: 170 + Layout.preferredHeight: 36 + placeholderText: qsTr("Enter channel ID") + forceFocus: true + font: DexTypo.body3 + } + } + + // Add `?` icon here + // https://komodoplatform.com/en/docs/komodo-wallet/guides/how-to-find-the-right-ibc-channel-for-transfers/ + + // Custom IBC warning + DexLabel { - id: input_ibc_channel_id + font.pixelSize: 12 + visible: custom_ibc_switch.checked + Layout.alignment: Qt.AlignHCenter + horizontalAlignment: DexLabel.AlignHCenter + color: Dex.CurrentTheme.warningColor + text_value: qsTr("Only use custom IBC channel if you know what you are doing! ") + } - width: 470 - height: 44 - placeholderText: qsTr("Enter IBC channel ID") - forceFocus: true - font: DexTypo.body3 + // CEX memo warning + DexLabel + { + font.pixelSize: 12 + Layout.alignment: Qt.AlignHCenter + horizontalAlignment: DexLabel.AlignHCenter + color: Dex.CurrentTheme.warningColor + text_value: qsTr("Avoid IBC transfers to centralized exchanges, as assets may be lost.") } } ColumnLayout { visible: General.getCustomFeeType(current_ticker_infos) - Layout.preferredWidth: 380 + Layout.preferredWidth: 400 Layout.alignment: Qt.AlignHCenter - Layout.topMargin: 32 + Layout.topMargin: 12 // Custom fees switch - DefaultSwitch + DexSwitch { id: custom_fees_switch + font.pixelSize: 14 visible: !General.isZhtlc(api_wallet_page.ticker) enabled: !root.is_send_busy Layout.preferredWidth: 260 @@ -623,40 +666,6 @@ MultipageModal label.text: qsTr("Enable Custom Fees") label.wrapMode: Label.NoWrap } - - RowLayout - { - visible: custom_fees_switch.checked - // Custom fees warning - DefaultText - { - font.pixelSize: 14 - Layout.alignment: Qt.AlignHCenter - horizontalAlignment: DefaultText.AlignHCenter - color: Dex.CurrentTheme.warningColor - } - - DefaultText - { - visible: input_custom_fees.visible - font.pixelSize: 14 - Layout.alignment: Qt.AlignHCenter - horizontalAlignment: DefaultText.AlignHCenter - color: Dex.CurrentTheme.warningColor - text_value: qsTr("Only use custom fees if you know what you are doing! ") - } - - DefaultText - { - visible: input_custom_fees_gas.visible - font.pixelSize: 14 - Layout.alignment: Qt.AlignHCenter - horizontalAlignment: DefaultText.AlignHCenter - color: Dex.CurrentTheme.warningColor - text_value: qsTr("Only use custom fees if you know what you are doing! ") + General.cex_icon - DefaultInfoTrigger { triggerModal: gas_info_modal } - } - } } // Custom Fees section @@ -677,8 +686,8 @@ MultipageModal enabled: !root.is_send_busy - Layout.preferredWidth: 380 - Layout.preferredHeight: 38 + Layout.preferredWidth: 400 + Layout.preferredHeight: 36 Layout.alignment: Qt.AlignHCenter placeholderText: qsTr("Enter the custom fee") + " (" + api_wallet_page.ticker + "/kb)" @@ -698,8 +707,8 @@ MultipageModal enabled: !root.is_send_busy - Layout.preferredWidth: 380 - Layout.preferredHeight: 38 + Layout.preferredWidth: 400 + Layout.preferredHeight: 36 placeholderText: qsTr("Gas Limit") } @@ -712,35 +721,66 @@ MultipageModal enabled: !root.is_send_busy - Layout.preferredWidth: 380 - Layout.preferredHeight: 38 + Layout.preferredWidth: 400 + Layout.preferredHeight: 36 placeholderText: qsTr("Gas price") + " [" + General.tokenUnitName(current_ticker_infos) + "]" } } + + // Custom fees warning + DexLabel + { + visible: input_custom_fees.visible + + color: Dex.CurrentTheme.warningColor + font.pixelSize: 12 + horizontalAlignment: DexLabel.AlignHCenter + Layout.alignment: Qt.AlignHCenter + wrapMode: Label.Wrap + + text_value: qsTr("Only use custom fees if you know what you are doing! ") + } + + // Custom gas fees warning + DexLabel + { + visible: input_custom_fees_gas.visible + + color: Dex.CurrentTheme.warningColor + font.pixelSize: 12 + horizontalAlignment: DexLabel.AlignHCenter + Layout.alignment: Qt.AlignHCenter + wrapMode: Label.Wrap + + text_value: qsTr("Only use custom fees if you know what you are doing! ") + General.cex_icon + DefaultInfoTrigger { triggerModal: gas_info_modal } + } + // Fee is higher than amount error - DefaultText + DexLabel { id: fee_error visible: feeIsHigherThanAmount() + color: Dex.CurrentTheme.warningColor + font.pixelSize: 12 + horizontalAlignment: DexLabel.AlignHCenter Layout.alignment: Qt.AlignHCenter - horizontalAlignment: DefaultText.AlignHCenter - wrapMode: Label.Wrap - color: Style.colorRed + text_value: qsTr("Custom Fee can't be higher than the amount") + "\n" + qsTr("You have %1", "AMT TICKER").arg(General.formatCrypto("", API.app.get_balance_info_qstr(General.getFeesTicker(current_ticker_infos)), General.getFeesTicker(current_ticker_infos))) } } // Not enough funds error - DefaultText + DexLabel { - Layout.topMargin: 16 + Layout.topMargin: 12 Layout.alignment: Qt.AlignHCenter - horizontalAlignment: DefaultText.AlignHCenter + horizontalAlignment: DexLabel.AlignHCenter wrapMode: Label.Wrap visible: !fee_error.visible && !hasFunds() @@ -760,11 +800,11 @@ MultipageModal } // Withdraw status - DefaultText + DexLabel { - Layout.topMargin: 16 + Layout.topMargin: 12 Layout.alignment: Qt.AlignHCenter - horizontalAlignment: DefaultText.AlignHCenter + horizontalAlignment: DexLabel.AlignHCenter wrapMode: Label.Wrap visible: General.isZhtlc(api_wallet_page.ticker) && withdraw_status != "Complete" color: Dex.CurrentTheme.foregroundColor @@ -776,15 +816,15 @@ MultipageModal RowLayout { Layout.alignment: Qt.AlignHCenter - Layout.topMargin: 20 + Layout.topMargin: 16 CancelButton { text: qsTr("Cancel") Layout.alignment: Qt.AlignLeft - Layout.preferredWidth: parent.width / 100 * 48 - Layout.preferredHeight: 48 + Layout.preferredWidth: parent.width / 100 * 42 + Layout.preferredHeight: 42 label.font.pixelSize: 16 radius: 18 @@ -799,7 +839,7 @@ MultipageModal enabled: fieldAreFilled() && hasFunds() && !errorView && !root.is_send_busy Layout.alignment: Qt.AlignRight - Layout.preferredWidth: parent.width / 100 * 48 + Layout.preferredWidth: parent.width / 100 * 42 text: qsTr("Prepare") diff --git a/atomic_defi_design/Dex/Wallet/SendModalContactList.qml b/atomic_defi_design/Dex/Wallet/SendModalContactList.qml index ac9ace2a7..5008db963 100644 --- a/atomic_defi_design/Dex/Wallet/SendModalContactList.qml +++ b/atomic_defi_design/Dex/Wallet/SendModalContactList.qml @@ -71,7 +71,7 @@ MultipageModal } } - DefaultText // Contact Name + DexLabel // Contact Name { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left @@ -81,7 +81,7 @@ MultipageModal elide: Qt.ElideRight } - DefaultText // Contact Addresses Count + DexLabel // Contact Addresses Count { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right @@ -138,7 +138,7 @@ MultipageModal Layout.fillWidth: true spacing: 0 - DefaultText + DexLabel { Layout.leftMargin: addressesView.columnsMargin Layout.preferredWidth: addressesView.nameColumnWidth @@ -146,7 +146,7 @@ MultipageModal color: Dex.CurrentTheme.foregroundColor2 } - DefaultText + DexLabel { Layout.leftMargin: addressesView.columnsMargin text: qsTr("Address") @@ -179,7 +179,7 @@ MultipageModal } } - DefaultText + DexLabel { id: addressKeyLabel width: addressesView.nameColumnWidth @@ -190,7 +190,7 @@ MultipageModal elide: Qt.ElideRight } - DefaultText + DexLabel { anchors.verticalCenter: parent.verticalCenter anchors.left: addressKeyLabel.right diff --git a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml index 35bad4fb0..dc4b12ed6 100644 --- a/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml +++ b/atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml @@ -31,7 +31,7 @@ MultipageModal titleText: qsTr("Transaction Details") // Warning for spam/poison transactions - DefaultText + DexLabel { id: warning_text visible: is_spam @@ -43,7 +43,7 @@ MultipageModal } // Warning for spam/poison transactions - DefaultText + DexLabel { id: warning_text2 visible: is_spam diff --git a/atomic_defi_design/Dex/main.qml b/atomic_defi_design/Dex/main.qml index 81bea2947..d11a417ad 100644 --- a/atomic_defi_design/Dex/main.qml +++ b/atomic_defi_design/Dex/main.qml @@ -207,7 +207,7 @@ DexWindow anchors.verticalCenter: parent.verticalCenter } - DefaultText + DexLabel { id: _label text: API.app.wallet_mgr.wallet_default_name ?? "" diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts index 11040980f..f85da88fb 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_de.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_de.ts @@ -242,7 +242,7 @@ App - + Recover Funds Result Ergebnis der Rückerstattung der Geldmittel @@ -475,27 +475,32 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 Center - + Portfolio Portfolio - + Wallet Brieftasche - + DEX DEX - + + DEX is disabled due to system clock synchronization issues. Please check your device time settings. + + + + Address Book Adressbuch - + Fiat Fiat @@ -1422,7 +1427,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 General - + %n day(s) @@ -1430,7 +1435,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nd day @@ -1439,7 +1444,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nh hours @@ -1448,7 +1453,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nm minutes @@ -1457,7 +1462,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %ns seconds @@ -1466,7 +1471,7 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + %nms milliseconds @@ -1475,117 +1480,117 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - - %1 balance is zero + + Balance is zero! - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount - + Trading Fee - + Minimum Trading Amount Mindesthandelsbetrag - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1764,7 +1769,7 @@ Try again or select 'Allow custom seed' to continue. List - + Funds are recoverable Geldmittel sind erstattungsfähig @@ -1793,11 +1798,16 @@ Try again or select 'Allow custom seed' to continue. + Orderbook is disabled in privacy mode + + + + Orderbook is disabled while creating maker orders - + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 Für diese Order ist ein Mindestbetrag von %1 %2 erforderlich. <br>Ihr Guthaben reicht nicht aus.<br> %3 @@ -2546,102 +2556,109 @@ They will be removed from the orderbook until you log in again. Preis - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Send Senden - + Receive Empfangen - + Max Max - + Swap 25% of your tradable balance. - + + + + Diasble privacy mode to trade + + + + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Mindestvolumen: - + Use custom minimum trade amount Benutzerdefinierten Mindesthandelsbetrag verwenden - + Order Selected Order ausgewählt - + CREATE MAKER SWAP - + START TAKER SWAP @@ -2820,22 +2837,22 @@ Please select a new order. Filter anwenden - + Cancel All Alles stornieren - + From Von - + To Bis - + Please choose the CSV export name and location Bitte wählen Sie den CSV-Exportnamen und den Speicherort aus @@ -3188,172 +3205,192 @@ Please select a new order. SendModal - + Failed to send Fehler beim Senden - + Prepare to send Versandvorbereitung von - + Address of the recipient Adresse des Empfängers - + Amount to send Zu sendender Betrag - + Gas price Gas Preis - + Cancel Abbrechen - + Recipient's address Empfängeradresse - + The address has to be mixed case. Die Adresse muss Groß-/Kleinschreibung sein. - + Failed to Broadcast - + Fix Korrigieren - + MAX MAX - + Fiat amount: Unavailable Fiat-Betrag: Nicht verfügbar - + Fiat amount: %1 Fiat-Betrag: %1 - + %1 amount: %2 %1 Betrag: %2 - + Specify in Fiat In Fiat angeben - + Specify in Crypto In Krypto angeben - - Enter memo - - - - + Enable Custom Fees Benutzerdefinierte Gebühren - + Enter the custom fee Geben Sie die benutzerdefinierte Gebühr ein - + Gas Limit Gas Limit - + Custom Fee can't be higher than the amount Die benutzerdefinierten Gebühren dürfen nicht höher sein als der Betrag - + Not enough funds. Nicht genug Geldmittel. - - + + You have %1 AMT TICKER Sie haben %1 - - + + Enter memo (optional) + + + + + Use Custom IBC Channel + + + + + Enter channel ID + + + + + Only use custom IBC channel if you know what you are doing! + + + + + Avoid IBC transfers to centralized exchanges, as assets may be lost. + + + + + Only use custom fees if you know what you are doing! - + Prepare Vorbereiten - - + + Send Senden - + %1 address TICKER - + copied to clipboard. In die Zwischenablage kopiert - + Amount Menge - + Memo - + Fees Gebühren - + Date Datum - + Back Zurück @@ -3404,11 +3441,6 @@ Please select a new order. SendResult - - - Transaction Complete! - Transaktion abgeschlossen! - %1 txid @@ -3457,6 +3489,11 @@ Please select a new order. Transaction Hash Transaktions-Hash + + + Transaction Broadcast! + + Close @@ -3812,7 +3849,7 @@ Please select a new order. Fiat Balance - + No Selectable coin. Kein wählbarer Coin. @@ -4162,7 +4199,7 @@ There is a toggle in settings where you can turn on/off the display of these tra Toast - + Click here to see the details Klicken Sie hier, um die Details anzuzeigen @@ -4208,32 +4245,32 @@ There is a toggle in settings where you can turn on/off the display of these tra Von - + Entered amount must be higher than 0. - + Select an order. - + MAX MAX - + To Nach - + Pick an order Order auswählen - + Price Preis @@ -4253,68 +4290,79 @@ There is a toggle in settings where you can turn on/off the display of these tra %1 - + + Balance: - + + **** + + + + Pick a coin Wählen Sie einen Coin - + SWAP NOW JETZT TAUSCHEN - + Failed to place the order Die Order konnte nicht platziert werden - + Placed the order Order platziert - - + + Disable privacy mode to trade. + + + + + Search coins - + Min Value - + Hide disabled coins - + No buy orders found for %1. Keine Kauforder für %1 gefunden. - + You can check later or try to sell a different coin. Sie können später nachsehen oder versuchen, einen anderen Coin zu verkaufen. - + Calculating fee estimate... Geschätzten Gebühren werden berechnet... - + Total %1 fees: %1 Gesamtgebühren: - + %2 (%3) %2 (%3) @@ -4382,11 +4430,6 @@ There is a toggle in settings where you can turn on/off the display of these tra Date Datum - - - Unconfirmed - Unbestätigt - Transaction Hash @@ -4443,6 +4486,11 @@ There is a toggle in settings where you can turn on/off the display of these tra To address Nach Adresse + + + Awaiting confirmation + + Notes diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts index 19b66dd49..edfe6724d 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_en.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_en.ts @@ -242,7 +242,7 @@ App - + Recover Funds Result @@ -474,27 +474,32 @@ Center - + Portfolio - + Wallet - + DEX - + + DEX is disabled due to system clock synchronization issues. Please check your device time settings. + + + + Address Book - + Fiat @@ -1421,7 +1426,7 @@ General - + %n day(s) @@ -1429,7 +1434,7 @@ - + %nd day @@ -1438,7 +1443,7 @@ - + %nh hours @@ -1447,7 +1452,7 @@ - + %nm minutes @@ -1456,7 +1461,7 @@ - + %ns seconds @@ -1465,7 +1470,7 @@ - + %nms milliseconds @@ -1474,117 +1479,117 @@ - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - - %1 balance is zero + + Balance is zero! - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount - + Trading Fee - + Minimum Trading Amount - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1763,7 +1768,7 @@ Try again or select 'Allow custom seed' to continue. List - + Funds are recoverable @@ -1792,11 +1797,16 @@ Try again or select 'Allow custom seed' to continue. + Orderbook is disabled in privacy mode + + + + Orderbook is disabled while creating maker orders - + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -2545,102 +2555,109 @@ They will be removed from the orderbook until you log in again. - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Send - + Receive - + Max - + Swap 25% of your tradable balance. - + + + + Diasble privacy mode to trade + + + + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: - + Use custom minimum trade amount - + Order Selected - + CREATE MAKER SWAP - + START TAKER SWAP @@ -2819,22 +2836,22 @@ Please select a new order. - + Cancel All - + From - + To - + Please choose the CSV export name and location @@ -3187,172 +3204,192 @@ Please select a new order. SendModal - + Failed to send - + Prepare to send - + Address of the recipient - + Amount to send - + Gas price - + Cancel Cancel - + Recipient's address - + The address has to be mixed case. - + Failed to Broadcast - + Fix - + MAX - + Fiat amount: Unavailable - + Fiat amount: %1 - + %1 amount: %2 - + Specify in Fiat - + Specify in Crypto - - Enter memo - - - - + Enable Custom Fees - + Enter the custom fee - + Gas Limit - + Custom Fee can't be higher than the amount - + Not enough funds. - - + + You have %1 AMT TICKER - - + + Enter memo (optional) + + + + + Use Custom IBC Channel + + + + + Enter channel ID + + + + + Only use custom IBC channel if you know what you are doing! + + + + + Avoid IBC transfers to centralized exchanges, as assets may be lost. + + + + + Only use custom fees if you know what you are doing! - + Prepare - - + + Send - + %1 address TICKER - + copied to clipboard. - + Amount - + Memo - + Fees - + Date - + Back @@ -3403,11 +3440,6 @@ Please select a new order. SendResult - - - Transaction Complete! - - %1 txid @@ -3456,6 +3488,11 @@ Please select a new order. Transaction Hash + + + Transaction Broadcast! + + Close @@ -3811,7 +3848,7 @@ Please select a new order. - + No Selectable coin. @@ -4153,7 +4190,7 @@ There is a toggle in settings where you can turn on/off the display of these tra Toast - + Click here to see the details @@ -4199,32 +4236,32 @@ There is a toggle in settings where you can turn on/off the display of these tra - + Entered amount must be higher than 0. - + Select an order. - + MAX - + To - + Pick an order - + Price @@ -4244,68 +4281,79 @@ There is a toggle in settings where you can turn on/off the display of these tra - + + Balance: - + + **** + + + + Pick a coin - + SWAP NOW - + Failed to place the order - + Placed the order - - + + Disable privacy mode to trade. + + + + + Search coins - + Min Value - + Hide disabled coins - + No buy orders found for %1. - + You can check later or try to sell a different coin. - + Calculating fee estimate... - + Total %1 fees: - + %2 (%3) @@ -4404,11 +4452,6 @@ There is a toggle in settings where you can turn on/off the display of these tra Date - - - Unconfirmed - - Transaction Hash @@ -4434,6 +4477,11 @@ There is a toggle in settings where you can turn on/off the display of these tra To + + + Awaiting confirmation + + Notes diff --git a/atomic_defi_design/assets/languages/atomic_defi_es.ts b/atomic_defi_design/assets/languages/atomic_defi_es.ts index 6cd3ee405..8b0529736 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_es.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_es.ts @@ -242,7 +242,7 @@ App - + Recover Funds Result Resultados de Recuperar Fondos @@ -474,27 +474,32 @@ Center - + Portfolio Cartera - + Wallet Monedero - + DEX DEX - + + DEX is disabled due to system clock synchronization issues. Please check your device time settings. + + + + Address Book Directorio - + Fiat Fiat @@ -1421,7 +1426,7 @@ General - + %n day(s) @@ -1429,7 +1434,7 @@ - + %nd day @@ -1438,7 +1443,7 @@ - + %nh hours @@ -1447,7 +1452,7 @@ - + %nm minutes @@ -1456,7 +1461,7 @@ - + %ns seconds @@ -1465,7 +1470,7 @@ - + %nms milliseconds @@ -1474,117 +1479,117 @@ - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - - %1 balance is zero + + Balance is zero! - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount - + Trading Fee - + Minimum Trading Amount Cantidad Mínima de Intercambio - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1764,7 +1769,7 @@ Vuelva a intentarlo o seleccione 'Permitir semilla personalizada' pers List - + Funds are recoverable Los fondos son recuperables @@ -1793,11 +1798,16 @@ Vuelva a intentarlo o seleccione 'Permitir semilla personalizada' pers + Orderbook is disabled in privacy mode + + + + Orderbook is disabled while creating maker orders - + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 Este pedido requiere una cantidad mínima de %1 %2 <br>No tiene fondos suficientes.<br> %3 @@ -2548,102 +2558,109 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión.Precio - + Reduce 1% relative to CEX market price. Reducción del 1% en relación con el precio de mercado CEX. - + Use CEX market price. Utilice el precio de mercado CEX. - + Increase 1% relative to CEX market price. Aumento del 1% en relación con el precio de mercado de CEX. - + Send Enviar - + Receive Recibir - + Max Max - + Swap 25% of your tradable balance. Usar el 25% de su saldo comercial. - + + + + Diasble privacy mode to trade + + + + Swap 50% of your tradable balance. Usar el 50% de su saldo comercial. - + Swap 100% of your tradable balance. Usar el 100% de su saldo comercial. - + Min Volume Volumen Mínimo - + Min amount to sell Cantidad mínima para vender - + Min amount to receive Cantidad mínimo para recibir - + Minimum accepted trade equals 10% of order volume. El comercio mínimo aceptado es igual al 10% del volumen del pedido. - + Minimum accepted trade equals 25% of order volume. El comercio mínimo aceptado es igual al 25% del volumen del pedido. - + Minimum accepted trade equals 50% of order volume. El comercio mínimo aceptado es igual al 50% del volumen del pedido. - + Min volume: Volumen mínimo: - + Use custom minimum trade amount Utilizar una cantidad personalizada de intercambio mínima - + Order Selected Pedido seleccionado - + CREATE MAKER SWAP - + START TAKER SWAP @@ -2822,22 +2839,22 @@ Please select a new order. Aplicar Filtro - + Cancel All Cancelar Todo - + From Desde - + To A - + Please choose the CSV export name and location Por favor, elija el nombre y la ubicación de exportación CSV @@ -3190,172 +3207,192 @@ Please select a new order. SendModal - + Failed to send Error al enviar - + Prepare to send Preparar para enviar - + Address of the recipient Dirección del destinatario - + Amount to send Cantidad a enviar - + Gas price Precio del gas - + Cancel Cancelar - + Recipient's address Dirección del destinatario - + The address has to be mixed case. La dirección debe estar en mayúsculas y minúsculas. - + Failed to Broadcast Error al transmitir - + Fix Arreglar - + MAX MAX - + Fiat amount: Unavailable Cantidad en Fiat: No disponible - + Fiat amount: %1 Cantidad de Fiat: %1 - + %1 amount: %2 Cantidad de %1: %2 - + Specify in Fiat Especificar en Fiat - + Specify in Crypto Especificar en Crypto - - Enter memo - - - - + Enable Custom Fees Habilitar Tarifas Personalizadas - + Enter the custom fee Ingrese la tarifa personalizada - + Gas Limit Límite de gas - + Custom Fee can't be higher than the amount Tarifa personalizada no puede ser mayor que la cantidad - + Not enough funds. No hay suficientes fondos. - - + + You have %1 AMT TICKER Tiene %1 - - + + Enter memo (optional) + + + + + Use Custom IBC Channel + + + + + Enter channel ID + + + + + Only use custom IBC channel if you know what you are doing! + + + + + Avoid IBC transfers to centralized exchanges, as assets may be lost. + + + + + Only use custom fees if you know what you are doing! ¡Solo use tarifas personalizadas si sabe lo que está haciendo! - + Prepare Preparar - - + + Send Enviar - + %1 address TICKER %1 dirección - + copied to clipboard. copiado al portapapeles. - + Amount Cantidad - + Memo - + Fees Tarifas - + Date Fecha - + Back Atrás @@ -3406,11 +3443,6 @@ Please select a new order. SendResult - - - Transaction Complete! - ¡Transacción completa! - %1 txid @@ -3459,6 +3491,11 @@ Please select a new order. Transaction Hash Hash de Transaccion + + + Transaction Broadcast! + + Close @@ -3814,7 +3851,7 @@ Please select a new order. Saldo Fiat - + No Selectable coin. No Moneda seleccionable. @@ -4164,7 +4201,7 @@ There is a toggle in settings where you can turn on/off the display of these tra Toast - + Click here to see the details Haga clic aquí para ver los detalles @@ -4210,32 +4247,32 @@ There is a toggle in settings where you can turn on/off the display of these tra Desde - + Entered amount must be higher than 0. - + Select an order. - + MAX MAX - + To A - + Pick an order Elegir una orden - + Price Precio @@ -4255,68 +4292,79 @@ There is a toggle in settings where you can turn on/off the display of these tra %1 - + + Balance: - + + **** + + + + Pick a coin Elija una moneda - + SWAP NOW CAMBIE AHORA - + Failed to place the order Error al realizar el pedido - + Placed the order Realizó el pedido El - - + + Disable privacy mode to trade. + + + + + Search coins - + Min Value - + Hide disabled coins - + No buy orders found for %1. No se encontraron órdenes de compra para %1. - + You can check later or try to sell a different coin. Puede verificar más tarde o intentar vender una moneda diferente. - + Calculating fee estimate... Calculando tarifa estimada... - + Total %1 fees: Total de %1 tarifas: - + %2 (%3) %2 (%3) @@ -4415,11 +4463,6 @@ There is a toggle in settings where you can turn on/off the display of these tra Date Fecha - - - Unconfirmed - Sin confirmar - Transaction Hash @@ -4445,6 +4488,11 @@ There is a toggle in settings where you can turn on/off the display of these tra To A + + + Awaiting confirmation + + Notes diff --git a/atomic_defi_design/assets/languages/atomic_defi_fr.ts b/atomic_defi_design/assets/languages/atomic_defi_fr.ts index 9a64fb3d9..e02b92de1 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_fr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_fr.ts @@ -242,7 +242,7 @@ App - + Recover Funds Result Le résultat de la récupération des fonds @@ -474,27 +474,32 @@ Center - + Portfolio Portfolio - + Wallet Portefeuille - + DEX DEX - + + DEX is disabled due to system clock synchronization issues. Please check your device time settings. + + + + Address Book Carnet d'adresses - + Fiat Monnaie fiduciaire @@ -1421,7 +1426,7 @@ General - + %n day(s) @@ -1429,7 +1434,7 @@ - + %nd day @@ -1438,7 +1443,7 @@ - + %nh hours @@ -1447,7 +1452,7 @@ - + %nm minutes @@ -1456,7 +1461,7 @@ - + %ns seconds @@ -1465,7 +1470,7 @@ - + %nms milliseconds @@ -1474,117 +1479,117 @@ - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - - %1 balance is zero + + Balance is zero! - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount - + Trading Fee - + Minimum Trading Amount Montant de trading minimum - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1763,7 +1768,7 @@ Try again or select 'Allow custom seed' to continue. List - + Funds are recoverable Les fonds sont récupérables @@ -1792,11 +1797,16 @@ Try again or select 'Allow custom seed' to continue. + Orderbook is disabled in privacy mode + + + + Orderbook is disabled while creating maker orders - + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 Cette commande nécessite un montant minimum de %1 %2 <br>Vous n'avez pas assez de fonds.<br> %3 @@ -2540,87 +2550,94 @@ They will be removed from the orderbook until you log in again. OrderForm - + Send Envoyez - + Receive Recevoir - + Max Max - + Swap 25% of your tradable balance. - + + + + Diasble privacy mode to trade + + + + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Min volume : - + Use custom minimum trade amount Utiliser le montant d'échange minimum personnalisé - + Order Selected Ordre séléctionné - + CREATE MAKER SWAP - + START TAKER SWAP @@ -2630,17 +2647,17 @@ They will be removed from the orderbook until you log in again. Prix - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. @@ -2798,12 +2815,12 @@ Please select a new order. OrdersPage - + From De - + To Vers @@ -2829,12 +2846,12 @@ Please select a new order. Exporter CSV - + Cancel All - + Please choose the CSV export name and location Veuillez choisir le nom et l'emplacement de l'exportation CSV @@ -3187,172 +3204,192 @@ Please select a new order. SendModal - + Failed to send Échec de l'envoi - + Prepare to send Préparez à envoyer du - + Address of the recipient Adresse du destinataire - + Amount to send Montant à envoyer - + Gas price Prix ​​du gaz - + Cancel Annuler - + Recipient's address Adresse du destinataire - + The address has to be mixed case. L'adresse doit être mixte (case). - + Failed to Broadcast - + Fix Réparer - + MAX MAX - + Fiat amount: Unavailable - + Fiat amount: %1 - + %1 amount: %2 - + Specify in Fiat - + Specify in Crypto - - Enter memo - - - - + Enable Custom Fees Activer les frais personnalisés - + Enter the custom fee Entrez les frais personnalisées - + Gas Limit Limite de gaz - + Custom Fee can't be higher than the amount Les frais personnalisées ne peuvent pas être supérieurs au montant - + Not enough funds. Pas assez de fonds. - - + + You have %1 AMT TICKER Vous avez %1 - - + + Enter memo (optional) + + + + + Use Custom IBC Channel + + + + + Enter channel ID + + + + + Only use custom IBC channel if you know what you are doing! + + + + + Avoid IBC transfers to centralized exchanges, as assets may be lost. + + + + + Only use custom fees if you know what you are doing! - + Prepare Préparer - - + + Send Envoyez - + %1 address TICKER - + copied to clipboard. - + Amount Montant - + Memo - + Fees Frais - + Date Date - + Back Retour @@ -3403,11 +3440,6 @@ Please select a new order. SendResult - - - Transaction Complete! - Transaction terminée ! - %1 txid @@ -3456,6 +3488,11 @@ Please select a new order. Transaction Hash Hachage de la transaction + + + Transaction Broadcast! + + Close @@ -3811,7 +3848,7 @@ Please select a new order. Balance Fiduciaire - + No Selectable coin. Aucune asset sélectionnable. @@ -4153,7 +4190,7 @@ There is a toggle in settings where you can turn on/off the display of these tra Toast - + Click here to see the details Cliquez ici pour voir les détails @@ -4199,32 +4236,32 @@ There is a toggle in settings where you can turn on/off the display of these tra De - + Entered amount must be higher than 0. - + Select an order. - + MAX MAX - + To Vers - + Pick an order Choisir une commande - + Price Prix @@ -4244,68 +4281,79 @@ There is a toggle in settings where you can turn on/off the display of these tra - + + Balance: - + + **** + + + + Pick a coin Choisissez un actif - + SWAP NOW ÉCHANGER MAINTENANT - + Failed to place the order Échec lors du placement de l'ordre - + Placed the order L'ordre a été placé - - + + Disable privacy mode to trade. + + + + + Search coins - + Min Value - + Hide disabled coins - + No buy orders found for %1. Aucun ordre d'achat trouvé pour %1. - + You can check later or try to sell a different coin. Vous pouvez vérifier plus tard ou essayer de vendre un actif différent. - + Calculating fee estimate... - + Total %1 fees: Frais totaux %1 : - + %2 (%3) @@ -4404,11 +4452,6 @@ There is a toggle in settings where you can turn on/off the display of these tra Date Date - - - Unconfirmed - Non confirmé - Transaction Hash @@ -4434,6 +4477,11 @@ There is a toggle in settings where you can turn on/off the display of these tra To Vers + + + Awaiting confirmation + + Notes diff --git a/atomic_defi_design/assets/languages/atomic_defi_ru.ts b/atomic_defi_design/assets/languages/atomic_defi_ru.ts index eb6959a14..af9b7d5da 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_ru.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_ru.ts @@ -242,7 +242,7 @@ App - + Recover Funds Result Результат восстановления средств @@ -474,27 +474,32 @@ Center - + Portfolio Портфолио - + Wallet Кошелек - + DEX DEX - + + DEX is disabled due to system clock synchronization issues. Please check your device time settings. + + + + Address Book Адресная книга - + Fiat Фиат @@ -1421,7 +1426,7 @@ General - + %n day(s) @@ -1430,7 +1435,7 @@ - + %nd day @@ -1440,7 +1445,7 @@ - + %nh hours @@ -1450,7 +1455,7 @@ - + %nm minutes @@ -1460,7 +1465,7 @@ - + %ns seconds @@ -1470,7 +1475,7 @@ - + %nms milliseconds @@ -1480,117 +1485,117 @@ - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - - %1 balance is zero + + Balance is zero! - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount - + Trading Fee - + Minimum Trading Amount Минимальный торговый объем - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1769,7 +1774,7 @@ Try again or select 'Allow custom seed' to continue. List - + Funds are recoverable Средства могут быть восстановлены @@ -1798,11 +1803,16 @@ Try again or select 'Allow custom seed' to continue. + Orderbook is disabled in privacy mode + + + + Orderbook is disabled while creating maker orders - + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -2551,102 +2561,109 @@ They will be removed from the orderbook until you log in again. Цена - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Send Отправить - + Receive Получить - + Max Макс - + Swap 25% of your tradable balance. - + + + + Diasble privacy mode to trade + + + + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Мин. объем: - + Use custom minimum trade amount Задать минимальный объем сделки - + Order Selected Ордер выбран - + CREATE MAKER SWAP - + START TAKER SWAP @@ -2804,12 +2821,12 @@ Please select a new order. OrdersPage - + From От - + To Кому @@ -2835,12 +2852,12 @@ Please select a new order. Применить фильтр - + Cancel All - + Please choose the CSV export name and location Выберите название и расположение загружаемого файла @@ -3193,172 +3210,192 @@ Please select a new order. SendModal - + Failed to send Ошибка отправки - + Prepare to send Подготовить к отправке - + Address of the recipient Адрес получателя - + Amount to send Сумма для отправки - + Gas price Цена газа - + Cancel - + Recipient's address Адрес получателя - + The address has to be mixed case. Адрес должен быть написан в смешанном регистре. - + Failed to Broadcast - + Fix Фикс - + MAX МАКС - + Fiat amount: Unavailable - + Fiat amount: %1 - + %1 amount: %2 - + Specify in Fiat - + Specify in Crypto - - Enter memo - - - - + Enable Custom Fees Включить настройку комиссий - + Enter the custom fee Введите комиссию сети - + Gas Limit Gas лимит - + Custom Fee can't be higher than the amount Комиссия не может больше общей суммы транзакции - + Not enough funds. Недостаточно средств. - - + + You have %1 AMT TICKER У вас %1 - - + + Enter memo (optional) + + + + + Use Custom IBC Channel + + + + + Enter channel ID + + + + + Only use custom IBC channel if you know what you are doing! + + + + + Avoid IBC transfers to centralized exchanges, as assets may be lost. + + + + + Only use custom fees if you know what you are doing! - + Prepare Подготовка - - + + Send Отправить - + %1 address TICKER - + copied to clipboard. - + Amount Сумма - + Memo - + Fees Комиссия - + Date Дата - + Back Назад @@ -3409,11 +3446,6 @@ Please select a new order. SendResult - - - Transaction Complete! - Транзакция завершена! - %1 txid @@ -3462,6 +3494,11 @@ Please select a new order. Transaction Hash Хэш транзакции + + + Transaction Broadcast! + + Close @@ -3817,7 +3854,7 @@ Please select a new order. Баланс в фиате - + No Selectable coin. Нет монет для выбора. @@ -4159,7 +4196,7 @@ There is a toggle in settings where you can turn on/off the display of these tra Toast - + Click here to see the details Нажмите, чтобы узнать подробности @@ -4205,32 +4242,32 @@ There is a toggle in settings where you can turn on/off the display of these tra От - + Entered amount must be higher than 0. - + Select an order. - + MAX МАКС - + To Получатель - + Pick an order Выберите ордер - + Price Цена @@ -4250,68 +4287,79 @@ There is a toggle in settings where you can turn on/off the display of these tra %1 - + + Balance: - + + **** + + + + Pick a coin Выберите монету - + SWAP NOW - + Failed to place the order Не удалось разместить ордер - + Placed the order Ордер размещен - - + + Disable privacy mode to trade. + + + + + Search coins - + Min Value - + Hide disabled coins - + No buy orders found for %1. Не найдено ордеров на покупку дл] %1. - + You can check later or try to sell a different coin. Вы можете попробовать позже или попробовать продать другой актив. - + Calculating fee estimate... - + Total %1 fees: Всего %1 комиссий: - + %2 (%3) %2 (%3) @@ -4410,11 +4458,6 @@ There is a toggle in settings where you can turn on/off the display of these tra Date Дата - - - Unconfirmed - Не подтверждена - Transaction Hash @@ -4440,6 +4483,11 @@ There is a toggle in settings where you can turn on/off the display of these tra To Получатель + + + Awaiting confirmation + + Notes diff --git a/atomic_defi_design/assets/languages/atomic_defi_tr.ts b/atomic_defi_design/assets/languages/atomic_defi_tr.ts index 9871e932e..05b7aca46 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_tr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_tr.ts @@ -242,7 +242,7 @@ App - + Recover Funds Result Fon Kurtarma Sonucu @@ -474,27 +474,32 @@ Center - + Portfolio - + Wallet Cüzdan - + DEX DEX - + + DEX is disabled due to system clock synchronization issues. Please check your device time settings. + + + + Address Book Adres Defteri - + Fiat Döviz @@ -1421,14 +1426,14 @@ General - + %n day(s) - + %nd day @@ -1436,7 +1441,7 @@ - + %nh hours @@ -1444,7 +1449,7 @@ - + %nm minutes @@ -1452,7 +1457,7 @@ - + %ns seconds @@ -1460,7 +1465,7 @@ - + %nms milliseconds @@ -1468,117 +1473,117 @@ - + - - + <b>Taker tx fee:</b> - + <b>Dex tx fee:</b> - + <b>Dex fee:</b> - + <b>Maker tx fee:</b> - - %1 balance is zero + + Balance is zero! - + Activating %1 (%2%) - + Loading wallet... - + Min: %1 - + Enter an amount - + Trading Fee - + Minimum Trading Amount Minimum Takas Tutarı - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1757,7 +1762,7 @@ Try again or select 'Allow custom seed' to continue. List - + Funds are recoverable Fonlar kurtarılabilir @@ -1786,11 +1791,16 @@ Try again or select 'Allow custom seed' to continue. + Orderbook is disabled in privacy mode + + + + Orderbook is disabled while creating maker orders - + This order requires a minimum amount of %1 %2 <br>You don't have enough funds.<br> %3 @@ -2534,87 +2544,94 @@ They will be removed from the orderbook until you log in again. OrderForm - + Send Gönder - + Receive Al - + Max Maks - + Swap 25% of your tradable balance. - + + + + Diasble privacy mode to trade + + + + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: - + Use custom minimum trade amount - + Order Selected Emir Seçildi - + CREATE MAKER SWAP - + START TAKER SWAP @@ -2624,17 +2641,17 @@ They will be removed from the orderbook until you log in again. Fiyat - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. @@ -2792,12 +2809,12 @@ Please select a new order. OrdersPage - + From Gönderen - + To Alan @@ -2823,12 +2840,12 @@ Please select a new order. CSV'yi dışa aktar - + Cancel All - + Please choose the CSV export name and location Lütfen CSV dışa aktarma adını ve konumunu seçin @@ -3181,172 +3198,192 @@ Please select a new order. SendModal - + Failed to send Gönderilemedi - + Prepare to send Göndermeye hazırlanıyor - + Address of the recipient - + Amount to send - + Gas price - + Cancel İptal - + Recipient's address Alıcı adresi - + The address has to be mixed case. Adres, büyük-küçük harf karışık olmalıdır. - + Failed to Broadcast - + Fix Düzelt - + MAX MAKS - + Fiat amount: Unavailable - + Fiat amount: %1 - + %1 amount: %2 - + Specify in Fiat - + Specify in Crypto - - Enter memo - - - - + Enable Custom Fees Özel İşlem Ücretlerini Etkinleştir - + Enter the custom fee Özel ücreti giriniz - + Gas Limit Gas Limiti - + Custom Fee can't be higher than the amount Özel İşlem Ücreti takas miktarından daha yüksek olamaz - + Not enough funds. Yetersiz bakiye. - - + + You have %1 AMT TICKER %1'niz var - - + + Enter memo (optional) + + + + + Use Custom IBC Channel + + + + + Enter channel ID + + + + + Only use custom IBC channel if you know what you are doing! + + + + + Avoid IBC transfers to centralized exchanges, as assets may be lost. + + + + + Only use custom fees if you know what you are doing! - + Prepare Hazırla - - + + Send Gönder - + %1 address TICKER - + copied to clipboard. - + Amount Miktar - + Memo - + Fees İşlem Ücreti - + Date Tarih - + Back Geri @@ -3397,11 +3434,6 @@ Please select a new order. SendResult - - - Transaction Complete! - İşlem Tamamlandı! - %1 txid @@ -3450,6 +3482,11 @@ Please select a new order. Transaction Hash İşlem Hash'i + + + Transaction Broadcast! + + Close @@ -3805,7 +3842,7 @@ Please select a new order. Fiat Bakiye - + No Selectable coin. Seçilebilir Koin Yok @@ -4147,7 +4184,7 @@ There is a toggle in settings where you can turn on/off the display of these tra Toast - + Click here to see the details Detayları görmek için buraya tıklayın @@ -4193,32 +4230,32 @@ There is a toggle in settings where you can turn on/off the display of these tra Gönderen - + Entered amount must be higher than 0. - + Select an order. - + MAX MAKS - + To Alan - + Pick an order Emri seç - + Price Fiyat @@ -4238,68 +4275,79 @@ There is a toggle in settings where you can turn on/off the display of these tra %1 - + + Balance: - + + **** + + + + Pick a coin - + SWAP NOW - + Failed to place the order Emir başarısız oldu - + Placed the order Emir başarılı - - + + Disable privacy mode to trade. + + + + + Search coins - + Min Value - + Hide disabled coins - + No buy orders found for %1. - + You can check later or try to sell a different coin. - + Calculating fee estimate... - + Total %1 fees: Toplam %1 işlem giderleri: - + %2 (%3) %2 (%3) @@ -4398,11 +4446,6 @@ There is a toggle in settings where you can turn on/off the display of these tra Date Tarih - - - Unconfirmed - Onaylanmamış - Transaction Hash @@ -4428,6 +4471,11 @@ There is a toggle in settings where you can turn on/off the display of these tra To Alan + + + Awaiting confirmation + + Notes diff --git a/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.cpp b/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.cpp index d0a9d1a34..30d65e064 100644 --- a/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.cpp +++ b/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.cpp @@ -46,9 +46,12 @@ namespace atomic_dex::kdf obj["params"]["amount"] = cfg.amount; obj["params"]["to"] = cfg.to; obj["params"]["max"] = cfg.max; - if (cfg.memo.has_value()) + if (cfg.ibc_source_channel.has_value()) { - obj["params"]["ibc_source_channel"] = cfg.ibc_source_channel.value(); + if (cfg.ibc_source_channel.value() != "") + { + obj["params"]["ibc_source_channel"] = cfg.ibc_source_channel.value(); + } } if (cfg.memo.has_value()) { diff --git a/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.hpp b/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.hpp index 2bd780fae..4ff33b0eb 100644 --- a/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.hpp +++ b/src/core/atomicdex/api/kdf/rpc_v2/rpc2.withdraw.hpp @@ -26,11 +26,11 @@ namespace atomic_dex::kdf struct withdraw_request { std::string coin; - std::string to; ///< coins will be withdraw to this address - std::string amount; ///< ignored if max is true - std::optional fees{std::nullopt}; ///< ignored if std::nullopt - std::optional memo; ///< memo for tendermint - std::optional ibc_source_channel; ///< ibc_source_channel for tendermint + std::string to; ///< coins will be withdraw to this address + std::string amount; ///< ignored if max is true + std::optional fees{std::nullopt}; ///< ignored if std::nullopt + std::optional memo{""}; ///< memo for tendermint + std::optional ibc_source_channel{""}; ///< ibc_source_channel for tendermint bool max{false}; }; diff --git a/src/core/atomicdex/pages/qt.wallet.page.cpp b/src/core/atomicdex/pages/qt.wallet.page.cpp index 2d7e438a9..43fe14c24 100644 --- a/src/core/atomicdex/pages/qt.wallet.page.cpp +++ b/src/core/atomicdex/pages/qt.wallet.page.cpp @@ -693,10 +693,14 @@ namespace atomic_dex .to = address.toStdString(), .amount = max ? "0" : amount.toStdString(), .memo = memo.toStdString(), - .ibc_source_channel = ibc_source_channel.toStdString(), .max = max }; + if (ibc_source_channel.toStdString() != "") + { + withdraw_req.ibc_source_channel = ibc_source_channel.toStdString(); + } + auto json_fees = nlohmann::json::parse(QString(QJsonDocument(QVariant(fees_data).toJsonObject()).toJson()).toStdString()); if (with_fees) {