height
- readonly property double scrollbar_margin: scrollbar_visible ? 8 : 0
- property bool visibleBackground: false
-
- boundsBehavior: Flickable.StopAtBounds
- ScrollBar.vertical: DefaultScrollBar { visibleBackground: root.visibleBackground }
-
- implicitWidth: contentItem.childrenRect.width
- implicitHeight: contentItem.childrenRect.height
-
- clip: true
-
- // Opacity animation
- opacity: root.count === 0 ? 0 : enabled ? 1 : 0.2
- Behavior on opacity { SmoothedAnimation { duration: Style.animationDuration * 0.5; velocity: -1 } }
-}
diff --git a/atomic_defi_design/qml/Components/DexLoader.qml b/atomic_defi_design/qml/Components/DexLoader.qml
deleted file mode 100644
index 442dad0b1f..0000000000
--- a/atomic_defi_design/qml/Components/DexLoader.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.15
-
-Loader {
- property var onLoadComplete: () => {}
-
- onLoaded: {
- onLoadComplete()
- onLoadComplete = () => {}
- }
-
- asynchronous: true
- visible: status === Loader.Ready
-}
diff --git a/atomic_defi_design/qml/Components/DexMacControl.qml b/atomic_defi_design/qml/Components/DexMacControl.qml
deleted file mode 100644
index fc6502aefe..0000000000
--- a/atomic_defi_design/qml/Components/DexMacControl.qml
+++ /dev/null
@@ -1,100 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import Qaterial 1.0 as Qaterial
-import QtQuick.Controls.Universal 2.15
-import QtQuick.Layouts 1.12
-
-Item {
- anchors.fill: parent
- Item {
- width: parent.width
- y: 1
- height: 30
- Rectangle {
- width: parent.width - 2
- height: 30
- border.color: 'transparent'
- border.width: 2
- anchors.horizontalCenter: parent.horizontalCenter
- gradient: Gradient {
- orientation: Qt.Horizontal
- GradientStop { position: 0.0; color: "transparent" }
- GradientStop { position: 0.4; color: "transparent" }
- GradientStop { position: 0.6; color: app.globalTheme.surfaceColor }
- GradientStop { position: 1.0; color: Qt.darker(app.globalTheme.dexBoxBackgroundColor, 0.9) }
- }
- }
- MouseArea {
- onPressed: window.startSystemMove();
- anchors.fill: parent
- anchors.rightMargin: 280
- onDoubleClicked: {
- if(window.visibility===ApplicationWindow.Maximized){
- window.showNormal()
- }else {
- window.showMaximized()
- }
- }
- }
- DexMacosHeaderControl {
- anchors.verticalCenter: parent.verticalCenter
- }
- }
- Item {
- id: _left_resize
- height: parent.height
- width: 3
- MouseArea {
- onPressed: window.startSystemResize(Qt.LeftEdge)
- anchors.fill: parent
- cursorShape: "SizeHorCursor"
- }
- }
- Item {
- id: _right_resize
- height: parent.height
- anchors.right: parent.right
- width: 3
- MouseArea {
- onPressed: {
- window.startSystemResize(Qt.RightEdge)
- }
- cursorShape: "SizeHorCursor"
- }
- }
- Item {
- id: _bottom_resize
- height: 3
- width: parent.width
- anchors.bottom: parent.bottom
- MouseArea {
- onPressed: if (active) window.startSystemResize(Qt.BottomEdge)
- //target: null
- anchors.fill: parent
- cursorShape: "SizeVerCursor"
- }
- }
- Item {
- id: _top_resize
- height: 3
- width: parent.width
- MouseArea {
- onPressed: window.startSystemResize(Qt.TopEdge)
- //target: null
- anchors.fill: parent
- cursorShape: "SizeVerCursor"
- }
- }
- Item {
- id: _bottom_right_resize
- height: 6
- width: 6
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- MouseArea {
- onPressed: if (active) window.startSystemResize(Qt.BottomEdge | Qt.RightEdge)
- anchors.fill: parent
- cursorShape: "SizeFDiagCursor"
- }
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexMacosHeaderControl.qml b/atomic_defi_design/qml/Components/DexMacosHeaderControl.qml
deleted file mode 100644
index 7af189715e..0000000000
--- a/atomic_defi_design/qml/Components/DexMacosHeaderControl.qml
+++ /dev/null
@@ -1,92 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import Qaterial 1.0 as Qaterial
-import QtQuick.Controls.Universal 2.15
-import QtQuick.Layouts 1.12
-
-import "../Constants"
-
-Row {
- id: _headerControlRow
- property real size: 13
- property bool hovered: minimizeButton.containsMouse || closeButton.containsMouse || extendButton.containsMouse
- width: 195
- x: 15
- height: 40
- spacing: 9
- anchors.top: parent.top
- anchors.topMargin: 0
- Rectangle {
- width: parent.size
- height: width
- radius: width/2
- color: closeButton.containsPress? Qt.lighter("#FF5E57") : "#FF5E57"
- anchors.verticalCenter: parent.verticalCenter
- Qaterial.ColorIcon {
- visible: _headerControlRow.hovered
- anchors.centerIn: parent
- source: Qaterial.Icons.close
- iconSize: parent.width-2
- color: 'black'
- }
- MouseArea {
- id: closeButton
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- Qt.quit()
- console.log("Window.visibility: "+window.visibility)
- }
- }
- }
- Rectangle {
- width: parent.size
- height: width
- radius: width/2
- color: minimizeButton.containsPress? Qt.lighter("#FFBC2C") : "#FFBC2C"
- Qaterial.ColorIcon {
- visible: _headerControlRow.hovered
- anchors.centerIn: parent
- source:Qaterial.Icons.windowMinimize
- iconSize: parent.width-2
- color: 'black'
- }
- anchors.verticalCenter: parent.verticalCenter
- MouseArea {
- id: minimizeButton
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- window.showMinimized()
- }
- }
- }
- Rectangle {
- width: parent.size
- height: width
- radius: width/2
- color: extendButton.containsPress? Qt.lighter("#26CA42") : "#26CA42"
- Qaterial.ColorIcon {
- visible: _headerControlRow.hovered
- anchors.centerIn: parent
- source: window.visibility===ApplicationWindow.Maximized? Qaterial.Icons.arrowCollapse : Qaterial.Icons.arrowExpand
- iconSize: parent.width-2
- color: 'black'
- }
- anchors.verticalCenter: parent.verticalCenter
- MouseArea {
- id: extendButton
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- if(window.visibility===ApplicationWindow.Maximized){
- window.showNormal()
- }else {
- window.showMaximized()
- }
- }
- }
- }
-
-
-}
diff --git a/atomic_defi_design/qml/Components/DexModal.qml b/atomic_defi_design/qml/Components/DexModal.qml
deleted file mode 100644
index 754796d3b4..0000000000
--- a/atomic_defi_design/qml/Components/DexModal.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-
-Popup {
- id: control
- parent: Overlay.overlay
- property alias title: _headerBackground.text
- property alias headerBackground: _headerBackground
- property alias backgroundColor: _backgroundColor.color
- property alias currentIndex: _layoutPopup.currentIndex
- property alias header: _header.contentItem
- property alias footer: _footer.contentItem
- modal: true
- padding: 0
- Overlay.modeless: DexRectangle {
- color: theme.dexBoxBackgroundColor
- opacity: .3
- }
- background: ClipRRect {
- radius: 8
- DexRectangle {
- id: _backgroundColor
- anchors.fill: parent
- border.width: 2
- radius: parent.radius
- color: theme.dexBoxBackgroundColor
- Container {
- id: _header
- width: parent.width
- height: 60
- contentItem: DexModalHeader {
- id: _headerBackground
- }
- }
- HorizontalLine {
- anchors.top: _footer.top
- width: _headerBackground.width
- opacity: .7
- }
- Container {
- id: _footer
- anchors.bottom: parent.bottom
- height: try { contentItem.height } catch(e){ 0 }
- width: parent.width
- }
-
- }
- }
- contentItem: StackLayout {
- id: _layoutPopup
- anchors.fill: parent
- anchors.topMargin: try { control.header.height } catch(e){ 0 }
- anchors.bottomMargin: try { control.footer.height } catch(e){ 0 }
-
- }
-
-}
-
diff --git a/atomic_defi_design/qml/Components/DexModalHeader.qml b/atomic_defi_design/qml/Components/DexModalHeader.qml
deleted file mode 100644
index 1c3fd24621..0000000000
--- a/atomic_defi_design/qml/Components/DexModalHeader.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.15
-
-DexRectangle {
- id: _headerBackground
- property alias text: _title.text
- /*width: parent.width
- height: parent.height*/
- color: theme.accentColor
- border.width: 0
- radius: 0
- DexLabel {
- id: _title
- anchors.verticalCenter: parent.verticalCenter
- text: ""
- opacity: .8
- font: _font.head6
- leftPadding: 10
- }
- HorizontalLine {
- anchors.bottom: parent.bottom
- width: _headerBackground.width
- opacity: .7
- }
-}
\ No newline at end of file
diff --git a/atomic_defi_design/qml/Components/DexPaginator.qml b/atomic_defi_design/qml/Components/DexPaginator.qml
deleted file mode 100644
index 0695ce6393..0000000000
--- a/atomic_defi_design/qml/Components/DexPaginator.qml
+++ /dev/null
@@ -1,126 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import Qaterial 1.0 as Qaterial
-import "../Constants"
-
-RowLayout {
- id: root
-
- spacing: 6
-
- property var pageSize: API.app.orders_mdl.nb_pages
- property var currentValue: API.app.orders_mdl.current_page
-
- function refreshBtn() {
- currentValue = API.app.orders_mdl.current_page
- var model = []
- if (pageSize < 10) {
- for (var i = 0; i < pageSize; i++){
- model.push({number: i+1, selected: currentValue === i + 1})
- }
- } else {
-
- [1, 2].map(v => model.push({number: v, selected: currentValue === v}));
-
- model.push({number: currentValue - 2 > 1 + 3 ? -1 : 1 + 2, selected: currentValue === 3});
-
- for (var k = Math.max(1 + 3, currentValue - 2); k <= Math.min(pageSize - 3, currentValue + 2); k++) {
- model.push({number: k, selected: currentValue === k});
- }
-
- model.push({number: currentValue + 2 < pageSize - 3 ? -1 : pageSize - 2, selected: currentValue === pageSize - 2});
- [pageSize - 1, pageSize].map(v => model.push({number: v, selected: currentValue === v}));
- }
- btnGroup.model = model
- }
-
- onPageSizeChanged: {
- currentValue = 1
- if (pageSize < 1) {
- pageSize = 1
- }
- refreshBtn()
- }
- DefaultComboBox {
- readonly property int item_count: API.app.orders_mdl.limit_nb_elements
- readonly property var options: [5, 10, 25, 50, 100, 200]
-
- Layout.leftMargin: 0
- Layout.alignment: Qt.AlignCenter
- Layout.preferredWidth: 70
-
- model: options
- currentIndex: options.indexOf(item_count)
- onCurrentValueChanged: API.app.orders_mdl.limit_nb_elements = currentValue
- }
-
- DefaultText {
- Layout.alignment: Qt.AlignCenter
- font.pixelSize: 11
- text_value: qsTr("items per page")
- }
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- }
-
- PaginationButton {
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- radius: 20
- opacity: enabled? 1 : .5
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- iconSize: 14
- color: theme.foregroundColor
- source: Qaterial.Icons.skipPreviousOutline
- }
- enabled: currentValue > 1
- onClicked: {
- --API.app.orders_mdl.current_page
- refreshBtn()
- }
- }
-
-
- Repeater {
- id: btnGroup
- model: [{number: 1, selected: true}]
- delegate: PaginationButton {
- text: modelData.number === -1 ? "..." : ("" + modelData.number)
- radius: 30
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- Layout.alignment: Qt.AlignVCenter
- colorEnabled: modelData.number === currentValue ? 'transparent' : theme.buttonColorEnabled
- colorHovered: modelData.number === currentValue ? 'transparent' : theme.buttonColorHovered
- colorTextEnabled: modelData.number === currentValue ? theme.accentColor : theme.buttonColorTextEnabled
- onClicked: {
- if(currentValue !== model.modelData) {
- API.app.orders_mdl.current_page = btnGroup.model[index].number
- refreshBtn()
- }
- }
- }
- }
- PaginationButton {
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- radius: 20
- opacity: enabled? 1 : .5
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- iconSize: 14
- color: theme.foregroundColor
- source: Qaterial.Icons.skipNextOutline
- }
- enabled: pageSize > 1 && currentValue < pageSize
- onClicked: {
- ++API.app.orders_mdl.current_page
- refreshBtn()
- }
-
- }
-
-}
diff --git a/atomic_defi_design/qml/Components/DexPopup.qml b/atomic_defi_design/qml/Components/DexPopup.qml
deleted file mode 100644
index ad85b8ff9f..0000000000
--- a/atomic_defi_design/qml/Components/DexPopup.qml
+++ /dev/null
@@ -1,133 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-
-import Qaterial 1.0 as Qaterial
-
-Qaterial.Popup
-{
- id: root
-
- parent: Overlay.overlay
-
- spacing: 8
- padding: 4
- property int arrowXDecalage: 0
-
- property int _arrowOrigin
- property color backgroundColor: Qaterial.Style.dialogColor
-
- function openAt(origin, transformOrigin)
- {
- root.transformOrigin = transformOrigin
- root._arrowOrigin = transformOrigin
-
- if(transformOrigin === Item.Top || transformOrigin === Item.Bottom)
- x = origin.x - implicitWidth / 2
- else if(transformOrigin === Item.Left)
- x = origin.x + spacing
- else
- x = origin.x - implicitWidth - spacing
-
- if(transformOrigin === Item.Left || transformOrigin === Item.Right)
- y = origin.y - implicitHeight / 2
- else if(transformOrigin === Item.Top)
- y = origin.y + spacing
- else
- y = origin.y - implicitHeight - spacing
-
- open()
- }
-
- background: Item
- {
- implicitWidth: 50
- implicitHeight: Qaterial.Style.menu.implicitHeight
-
- Rectangle
- {
- anchors.fill: parent
-
- radius: 4
- color: root.backgroundColor
- layer.enabled: true
- layer.effect: Qaterial.ElevationEffect
- {
- elevation: Qaterial.Style.menu.elevation
- } // ElevationEffect
- }
-
- Rectangle
- {
- x:
- {
- if(root._arrowOrigin === Item.Top || root._arrowOrigin === Item.Bottom)
- return ((parent.width - width) / 2)+root.arrowXDecalage
- else if(root._arrowOrigin === Item.Left)
- return (-width / 2)+root.arrowXDecalage
- else
- return (parent.width - width / 2)+root.arrowXDecalage
- }
- y:
- {
- if(root._arrowOrigin === Item.Left || root._arrowOrigin === Item.Right)
- return (parent.height - height) / 2
- else if(root._arrowOrigin === Item.Top)
- return -height / 2
- else
- return parent.height - height / 2
- }
- width: 8
- height: 8
- rotation: 45
- color: root.backgroundColor
- } // Triangle
- } // Rectangle
-
- enter: Transition
- {
- NumberAnimation
- {
- property: "scale"
- from: 0.0
- to: 1.0
- easing.type: Easing.OutQuint
- duration: 220
- }
-
- NumberAnimation
- {
- property: "opacity"
- from: 0.0
- to: 1.0
- easing.type: Easing.OutCubic
- duration: 150
- }
- // NumberAnimation
- }
- // Transition
-
- exit: Transition
- {
- NumberAnimation
- {
- property: "scale"
- from: 1.0
- to: 0.0
- easing.type: Easing.OutQuint
- duration: 220
- }
- // NumberAnimation
-
- NumberAnimation
- {
- property: "opacity"
- from: 1.0
- to: 0.0
- easing.type: Easing.OutCubic
- duration: 150
- }
- // NumberAnimation
- }
- // Transition
-}
-// Popup
\ No newline at end of file
diff --git a/atomic_defi_design/qml/Components/DexRectangle.qml b/atomic_defi_design/qml/Components/DexRectangle.qml
deleted file mode 100644
index e035c966ec..0000000000
--- a/atomic_defi_design/qml/Components/DexRectangle.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import QtQuick 2.15
-import "../Constants"
-
-AnimatedRectangle {
- id: rect
- property bool sizeAnimation: false
- property int sizeAnimationDuration: 150
- radius: Style.rectangleCornerRadius
- color: theme.backgroundColor
- border.color: Style.colorBorder
- border.width: 1
-
- Behavior on width {
- enabled: rect.sizeAnimation
- NumberAnimation {
- duration: rect.sizeAnimationDuration
- }
- }
- Behavior on height {
- enabled: rect.sizeAnimation
- NumberAnimation {
- duration: rect.sizeAnimationDuration
- }
- }
-}
-
diff --git a/atomic_defi_design/qml/Components/DexScrollBar.qml b/atomic_defi_design/qml/Components/DexScrollBar.qml
deleted file mode 100644
index 5226c25ef8..0000000000
--- a/atomic_defi_design/qml/Components/DexScrollBar.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import "../Constants"
-
-ScrollBar {
- id: control
-
- anchors.right: root.right
- anchors.rightMargin: 3
- policy: scrollbar_visible ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
- property bool visibleBackground: true
- width: 6
- contentItem: Item {
- FloatingBackground {
- width: parent.width
- height: parent.height - 7 - 4
- anchors.verticalCenter: parent.verticalCenter
-
- color: Style.colorScrollbar
- border_color_start: Style.colorScrollbarGradient1
- border_color_end: Style.colorScrollbarGradient2
- }
- }
-
- background: Item {
- width: 10
- x: -width/2 + 6/2
- InnerBackground {
- visible: control.visibleBackground
- width: parent.width
- height: parent.height - 7
- anchors.verticalCenter: parent.verticalCenter
-
- color: Style.colorScrollbarBackground
- }
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexSelectableButton.qml b/atomic_defi_design/qml/Components/DexSelectableButton.qml
deleted file mode 100644
index 025804ece8..0000000000
--- a/atomic_defi_design/qml/Components/DexSelectableButton.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-import Qt.labs.settings 1.0
-
-
-import QtQuick.Window 2.12
-
-import Qaterial 1.0 as Qaterial
-
-Item {
- property bool selected: false
- property alias text: _label.text
- property alias hovered: area.containsMouse
- signal clicked()
- width: parent.width-20
- anchors.horizontalCenter: parent.horizontalCenter
- height: 45
- Rectangle {
- anchors.fill: parent
- height: 45
- radius: 5
- opacity: parent.hovered? .4 : !parent.selected? 0 : .9
- color: theme.hightlightColor
- }
- DexLabel {
- id: _label
- anchors.centerIn: parent
- font: theme.textType.button
- text: ""
- opacity: area.containsMouse? 1 : .7
- }
- MouseArea {
- id: area
- cursorShape: "PointingHandCursor"
- onClicked: parent.clicked()
- anchors.fill: parent
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexSlider.qml b/atomic_defi_design/qml/Components/DexSlider.qml
deleted file mode 100644
index 32dd5a87c9..0000000000
--- a/atomic_defi_design/qml/Components/DexSlider.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import "../Constants"
-Slider {
- id: control
- value: 0.5
- opacity: enabled? 1 : .5
-
- background: Rectangle {
- x: control.leftPadding
- y: control.topPadding + control.availableHeight / 2 - height / 2
- implicitWidth: 200
- implicitHeight: 4
- width: control.availableWidth
- height: implicitHeight
- radius: 2
- color: "#bdbebf"
-
- Rectangle {
- width: control.visualPosition * parent.width
- height: parent.height
- color: Style.colorGreen
- radius: 2
- }
- }
- handle: FloatingBackground {
- x: control.leftPadding + control.visualPosition * (control.availableWidth - width)
- y: control.topPadding + control.availableHeight / 2 - height / 2
- implicitWidth: 26
- implicitHeight: 26
- radius: 13
- Rectangle {
- anchors.centerIn: parent
- width: 10
- height: 10
- radius: 10
- color: Style.colorGreen
- }
- //border.color: "#bdbebf"
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexSplitView.qml b/atomic_defi_design/qml/Components/DexSplitView.qml
deleted file mode 100644
index 020a126f52..0000000000
--- a/atomic_defi_design/qml/Components/DexSplitView.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-SplitView {
-
- property var items: []
-
-}
diff --git a/atomic_defi_design/qml/Components/DexSubstractRectangle.qml b/atomic_defi_design/qml/Components/DexSubstractRectangle.qml
deleted file mode 100644
index de70e60039..0000000000
--- a/atomic_defi_design/qml/Components/DexSubstractRectangle.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-import Qt.labs.settings 1.0
-import AtomicDEX.MarketMode 1.0
-
-import "../Constants"
-
-Rectangle {
- id: _mask
- property var target
- property alias subStractItem: maskSubstract
- anchors.fill: target
- color: "transparent"
- visible: true
- radius: 10
- Rectangle {
- id: maskSubstract
- x: parent.width-20
- anchors.verticalCenter: parent.verticalCenter
- radius: 100
- width: 60
- height: 60
- }
- layer.enabled: true
- layer.samplerName: "maskSource"
- layer.effect: ShaderEffect {
- property variant source: _mask.target
- fragmentShader: "
- varying highp vec2 qt_TexCoord0;
- uniform highp float qt_Opacity;
- uniform lowp sampler2D source;
- uniform lowp sampler2D maskSource;
- void main(void) {
- gl_FragColor = texture2D(source, qt_TexCoord0.st) * (1.0-texture2D(maskSource, qt_TexCoord0.st).a) * qt_Opacity;
- }
- "
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexSweetComboBox.qml b/atomic_defi_design/qml/Components/DexSweetComboBox.qml
deleted file mode 100644
index a84e2e71cc..0000000000
--- a/atomic_defi_design/qml/Components/DexSweetComboBox.qml
+++ /dev/null
@@ -1,159 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.impl 2.15
-
-import "../Constants"
-
-ComboBox {
- id: control
- property var dropdownLineText: m => textRole === "" ?
- m.modelData :
- !m.modelData ? m[textRole] : m.modelData[textRole]
- property string currentTicker: "All"
- delegate: ItemDelegate {
- width: control.width+50
- highlighted: control.highlightedIndex === index
- contentItem: DefaultText {
- text_value: control.currentTicker
- color: Style.colorText
- }
- }
-
- indicator: ColorImage {
- x: control.mirrored ? control.padding : control.width - width - control.padding
- y: control.topPadding + (control.availableHeight - height) / 2
- color: control.contentItem.color
- defaultColor: control.contentItem.color
- source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png"
- }
-
- contentItem: DefaultText {
- leftPadding: 10
- rightPadding: control.indicator.width + control.spacing
- color: Style.colorWhite1
- text: control.currentTicker//control.displayText
-
- verticalAlignment: Text.AlignVCenter
- elide: Text.ElideRight
- }
-
- background: Rectangle {
- implicitWidth: 120
- implicitHeight: 40
- color: !control.enabled ? Style.colorTheme5 : control.hovered ? Style.colorTheme7 : Style.colorTheme9
- radius: 4
- }
-
- popup: Popup {
- id: comboPopup
- readonly property double max_height: 350
- y: control.height - 1
- width: control.width+50
- height: Math.min(contentItem.implicitHeight, popup.max_height)
- padding: 1
-
- contentItem: ColumnLayout {
- anchors.rightMargin: 5
-
- DefaultTextField {
- id: input_coin_filter
- placeholderText: qsTr("Search")
-
- background: Item {
- Rectangle {
- anchors.fill: parent
- anchors.rightMargin: 2
- border.color: "transparent"
- color: Style.colorInnerBackground
- }
- }
- onTextChanged: {
- control.model.setFilterFixedString(text)
- }
-
- function reset() {
- text = ""
- }
-
- Connections {
- target: popup
- function onOpened() {
- input_coin_filter.reset()
- input_coin_filter.forceActiveFocus()
- }
- function onClosed() { input_coin_filter.reset() }
- }
-
-
-
- font.pixelSize: 16
- Layout.fillWidth: true
- Layout.leftMargin: 0
- Layout.preferredHeight: 40
- Layout.rightMargin: 2//Layout.leftMargin
- Layout.topMargin: Layout.leftMargin
- Keys.onDownPressed: {
- control.incrementCurrentIndex()
- }
- Keys.onUpPressed: {
- control.decrementCurrentIndex()
- }
-
- Keys.onPressed: {
- if(event.key === Qt.Key_Return) {
- if(control.count > 0) {
- control.currentIndex = 0//control.highlightedIndex
- control.currentTicker = control.currentText
- }
- popup.close()
- event.accepted = true
- }
- }
- }
- Item {
- Layout.maximumHeight: popup.max_height - 100
- Layout.fillWidth: true
- implicitHeight: popup_list_view.contentHeight + 5
- DefaultListView {
- id: popup_list_view
- model: control.popup.visible ? control.model : null
- currentIndex: control.highlightedIndex
- anchors.fill: parent
- anchors.rightMargin: 2
- delegate: ItemDelegate {
- width: control.width+50
- highlighted: control.highlightedIndex === index
- contentItem: DefaultText {
- text_value: ticker
- color: Style.colorText
- }
- onClicked: {
- control.currentTicker = ticker
- popup.close()
- }
- }
-
- DefaultMouseArea {
- anchors.fill: parent
- acceptedButtons: Qt.NoButton
- }
- }
- }
-
- }
-
- background: Item {
- AnimatedRectangle {
- width: parent.width
- y: -5
- height: parent.height+10
- color: Style.colorTheme9
- }
- }
- }
- DefaultMouseArea {
- anchors.fill: parent
- acceptedButtons: Qt.NoButton
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexSwitch.qml b/atomic_defi_design/qml/Components/DexSwitch.qml
deleted file mode 100644
index 89769b81a9..0000000000
--- a/atomic_defi_design/qml/Components/DexSwitch.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Universal 2.15
-import "../Constants"
-
-Switch {
- id: control
- Universal.theme: Style.dark_theme ? Universal.Dark : Universal.Light
- Universal.accent: theme.accent
- Universal.foreground: theme.foregroundColor
- Universal.background: Style.colorQtThemeBackground
-
- font.family:theme.textType.fontFamily
- indicator: Rectangle {
- implicitWidth: 52
- implicitHeight: 22
- //x: control.width - width - control.rightPadding
- y: parent.height / 2 - height / 2
- radius: 13
- color: control.checked ? theme.accentColor : 'transparent'
- border.color: theme.foregroundColor
-
- Rectangle {
- x: control.checked ? parent.width - width : 0
- width: 22
- height: 22
- radius: 11
- border.color: theme.foregroundColor
- }
- }
- DefaultMouseArea {
- anchors.fill: parent
- acceptedButtons: Qt.NoButton
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexText.qml b/atomic_defi_design/qml/Components/DexText.qml
deleted file mode 100644
index 892d03a903..0000000000
--- a/atomic_defi_design/qml/Components/DexText.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick 2.15
-import "../Constants"
-
-Text {
- property string text_value
- property bool privacy: false
-
- Behavior on color { ColorAnimation { duration: Style.animationDuration } }
-
- font: theme.textType.body1
- color: theme.foregroundColor
- text: privacy && General.privacy_mode ? General.privacy_text : text_value
- wrapMode: Text.WordWrap
-
- onLinkActivated: Qt.openUrlExternally(link)
- linkColor: color
-
- DefaultMouseArea {
- anchors.fill: parent
- cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
- acceptedButtons: Qt.NoButton
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexTextArea.qml b/atomic_defi_design/qml/Components/DexTextArea.qml
deleted file mode 100644
index d612110e66..0000000000
--- a/atomic_defi_design/qml/Components/DexTextArea.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import "../Constants"
-
-TextArea {
- id: text_field
-
- font.family: Style.font_family
-
- placeholderTextColor: Style.colorPlaceholderText
- selectedTextColor: Style.colorSelectedText
- selectionColor: Style.colorSelection
-
- 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 { auto_set_size: false }
-
- RightClickMenu { }
-}
diff --git a/atomic_defi_design/qml/Components/DexTextField.qml b/atomic_defi_design/qml/Components/DexTextField.qml
deleted file mode 100644
index fd61878b35..0000000000
--- a/atomic_defi_design/qml/Components/DexTextField.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import "../Constants"
-
-TextField {
- id: text_field
-
- property alias left_text: left_text.text_value
- property alias right_text: right_text.text_value
-
- font: theme.textType.body2
- placeholderTextColor: theme.textPlaceHolderColor
- selectedTextColor: theme.textSelectedColor
- selectionColor: theme.textSelectionColor
- color: theme.foregroundColor
-
- Behavior on color { ColorAnimation { duration: Style.animationDuration } }
- Behavior on placeholderTextColor { ColorAnimation { duration: Style.animationDuration } }
-
- // Right click Context Menu
- selectByMouse: true
- persistentSelection: true
-
- background: InnerBackground { auto_set_size: false; radius: 10 }
-
- leftPadding: Math.max(0, left_text.width + 20)
- rightPadding: Math.max(0, right_text.width + 20)
- topPadding: 7
-
-
- RightClickMenu { }
-
- DefaultText {
- id: left_text
- visible: text_value !== ""
- anchors.left: parent.left
- anchors.leftMargin: 10
- anchors.verticalCenter: parent.verticalCenter
-
- font.pixelSize: text_field.font.pixelSize
- }
-
- DefaultText {
- id: right_text
- visible: text_value !== ""
- anchors.right: parent.right
- anchors.rightMargin: 10
- anchors.verticalCenter: parent.verticalCenter
-
- font.pixelSize: text_field.font.pixelSize
- }
-}
diff --git a/atomic_defi_design/qml/Components/DexTooltip.qml b/atomic_defi_design/qml/Components/DexTooltip.qml
deleted file mode 100644
index 83e80b3b88..0000000000
--- a/atomic_defi_design/qml/Components/DexTooltip.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-ToolTip {
- id: root
- background: FloatingBackground { auto_set_size: false }
-}
diff --git a/atomic_defi_design/qml/Components/DexTradeBox.qml b/atomic_defi_design/qml/Components/DexTradeBox.qml
deleted file mode 100644
index 284edaabad..0000000000
--- a/atomic_defi_design/qml/Components/DexTradeBox.qml
+++ /dev/null
@@ -1,347 +0,0 @@
-import QtQuick 2.15
-import Qaterial 1.0 as Qaterial
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.12
-import "../Exchange/Trade/"
-import "../Constants/" as Constants
-
-Rectangle {
- id: _control
- //border.width: 1.1
- signal reload()
-
- property bool hideHeader: false
- property bool visibility: isVertical? height>=40 ? true : false : width>=40? true : false
- property bool hidden: false
- property bool closed: false
- property bool expandedVert: false
- property bool expandedHort: false
- property bool showed: true
- property bool canBeFull: false
- property bool duplicable: false
- property bool closable: false
- property bool expandable: true
- property bool fullScreen: false
- property string title: "Default Title"
- property int minimumHeight: isVertical? 40 : 250
- property int minimumWidth: isVertical? 40 : 250
- property int maximumHeight: 9999999
- property int maximumWidth: 9999999
- property int defaultHeight: 250
- property int defaultWidth: 250
- property bool reloadable: false
- property bool contentVisible: !hidden
- radius: 3
- property bool isVertical: _control.parent.parent.orientation === Qt.Vertical
- function setHeight(height) {
- SplitView.preferredHeight = height
- }
- function setWidth(width) {
- SplitView.preferredWidth = width
- }
-
- onHiddenChanged: {
- if(isVertical && hidden) {
- SplitView.preferredHeight = 40
- SplitView.minimumHeight = 40
- SplitView.maximumHeight = 40
- }
- else if(isVertical && !hidden){
- SplitView.preferredHeight = defaultHeight
- SplitView.minimumHeight = minimumHeight
- SplitView.maximumHeight = maximumHeight
- SplitView.fillHeight = true
- SplitView.view.update()
- }
- else if(!isVertical && hidden) {
- SplitView.preferredWidth = 40
- SplitView.minimumWidth = 40
- SplitView.maximumWidth = 40
- }
- else if(!isVertical && !hidden){
- SplitView.preferredWidth = defaultWidth
- SplitView.minimumWidth = minimumWidth
- SplitView.maximumWidth = maximumWidth
- SplitView.fillWidth = true
-
- }
- }
-
- //shadowOff: true
- color: theme.dexBoxBackgroundColor
- property alias titleLabel: _texto
-
- function setFalseHeight() {
- SplitView.fillHeight = false
- }
-
- onExpandedVertChanged: {
- let splitManager = SplitView.view
- if(expandedVert) {
- if(splitManager!==null){
- for(var i=0; i< splitManager.itemLists.length;i++){
- let item =splitManager.itemLists[i]
- if (item!==_control){
- try{
- item.expandedVert = false
- item.setFalseHeight()
- }catch(e){}
- }
- }
- SplitView.fillHeight = true
- }
- }else {
- var setted = false
- if(splitManager!==null){
- for(var i=0; i< splitManager.itemLists.length;i++){
- let item =splitManager.itemLists[i]
- if (item!==_control && setted===false){
- try{
- item.expandedVert = true
- setted = true
- }catch(e){}
- }
- }
- setFalseHeight()
- }
- }
- }
- function setFalseWidth() {
- SplitView.fillWidth= false
- }
-
- /*onExpandedHortChanged: {
- let splitManager = SplitView.view
- if(expandedHort) {
- if(splitManager==null){
- for(var i=0; i API.app_name
-
-BasicModal {
- id: root
-
- onClosed: {
- accept_eula.checked = false
- accept_tac.checked = false
- }
-
- property var onConfirm: () => {}
- property bool close_only: false
-
- ModalContent {
- title: qsTr("Disclaimer & Terms of Service")
-
- InnerBackground {
- id: eula_rect
-
- height: 400
- Layout.fillWidth: true
-
- DefaultFlickable {
- anchors.fill: parent
- anchors.margins: 20
-
- contentWidth: eula_text.width
- contentHeight: eula_text.height
-
- DefaultText {
- id: eula_text
- text_value: getEula()
-
- width: eula_rect.width - 40
- }
- }
- }
-
- // Checkboxes
- DefaultCheckBox {
- id: accept_eula
- visible: !close_only
- text: qsTr("Accept EULA")
- }
-
- DefaultCheckBox {
- id: accept_tac
- visible: !close_only
- text: qsTr("Accept Terms and Conditions")
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: close_only ? qsTr("Close") : qsTr("Cancel")
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- PrimaryButton {
- visible: !close_only
- text: qsTr("Confirm")
- Layout.fillWidth: true
- enabled: accept_eula.checked && accept_tac.checked
- onClicked: {
- onConfirm()
- root.close()
- }
- }
- ]
- }
-
- function getEula() {
- return qsTr(
-"This End-User License Agreement ('EULA') is a legal agreement between you and Komodo Platform.
-
-This EULA agreement governs your acquisition and use of our %1 software ('Software', 'Mobile Application', 'Application' or 'App') directly from Komodo Platform or indirectly through a Komodo Platform authorized entity, reseller or distributor (a 'Distributor').
-Please read this EULA agreement carefully before completing the installation process and using the %1 software. It provides a license to use the %1 software and contains warranty information and liability disclaimers.
-If you register for the beta program of the %1 software, this EULA agreement will also govern that trial. By clicking 'accept' or installing and/or using the %1 software, you are confirming your acceptance of the Software and agreeing to become bound by the terms of this EULA agreement.
-If you are entering into this EULA agreement on behalf of a company or other legal entity, you represent that you have the authority to bind such entity and its affiliates to these terms and conditions. If you do not have such authority or if you do not agree with the terms and conditions of this EULA agreement, do not install or use the Software, and you must not accept this EULA agreement.
-This EULA agreement shall apply only to the Software supplied by Komodo Platform herewith regardless of whether other software is referred to or described herein. The terms also apply to any Komodo Platform updates, supplements, Internet-based services, and support services for the Software, unless other terms accompany those items on delivery. If so, those terms apply.
-
-License Grant
-Komodo Platform hereby grants you a personal, non-transferable, non-exclusive licence to use the %1 software on your devices in accordance with the terms of this EULA agreement.
-
-You are permitted to load the %1 software (for example a PC, laptop, mobile or tablet) under your control. You are responsible for ensuring your device meets the minimum security and resource requirements of the %1 software.
-
-You are not permitted to:
-
-- Edit, alter, modify, adapt, translate or otherwise change the whole or any part of the Software nor permit the whole or any part of the Software to be combined with or become incorporated in any other software, nor decompile, disassemble or reverse engineer the Software or attempt to do any such things
-- Reproduce, copy, distribute, resell or otherwise use the Software for any commercial purpose
-- Use the Software in any way which breaches any applicable local, national or international law
-- Use the Software for any purpose that Komodo Platform considers is a breach of this EULA agreement
-
-
-Intellectual Property and Ownership
-Komodo Platform shall at all times retain ownership of the Software as originally downloaded by you and all subsequent downloads of the Software by you. The Software (and the copyright, and other intellectual property rights of whatever nature in the Software, including any modifications made thereto) are and shall remain the property of Komodo Platform.
-
-Komodo Platform reserves the right to grant licences to use the Software to third parties.
-
-Termination
-This EULA agreement is effective from the date you first use the Software and shall continue until terminated. You may terminate it at any time upon written notice to Komodo Platform.
-It will also terminate immediately if you fail to comply with any term of this EULA agreement. Upon such termination, the licenses granted by this EULA agreement will immediately terminate and you agree to stop all access and use of the Software. The provisions that by their nature continue and survive will survive any termination of this EULA agreement.
-
-Governing Law
-This EULA agreement, and any dispute arising out of or in connection with this EULA agreement, shall be governed by and construed in accordance with the laws of Vietnam.
-
-This document was last updated on January 31st, 2020
"
- ).arg(API.app_name)
- }
-}
diff --git a/atomic_defi_design/qml/Components/FloatingBackground.qml b/atomic_defi_design/qml/Components/FloatingBackground.qml
deleted file mode 100644
index 59c6fffa6f..0000000000
--- a/atomic_defi_design/qml/Components/FloatingBackground.qml
+++ /dev/null
@@ -1,105 +0,0 @@
-import QtQuick 2.15
-import QtGraphicalEffects 1.0
-import "../Constants"
-
-Item {
- id: root
- property alias rect: rect
- property alias color: rect.color
- property double border_gradient_start_pos: 0.35
- property double border_gradient_end_pos: 0.65
- property color border_color_start: theme.colorInnerShadowTop
- property color border_color_end: theme.colorInnerShadowBottom
- property alias radius: rect.radius
- property alias border: rect.border
- property alias inner_space: inner_space
- property alias content: inner_space.sourceComponent
- property alias mask: mask_loader.sourceComponent
- property bool verticalShadow: false
- property bool opacity_mask_enabled: false
- property bool auto_set_size: true
- property bool show_shadow: true
- property alias light_gradient: _linear_gradient
- property alias black_shadow: _black_shadow
- property bool topShadowVisible: show_shadow
-
- readonly property var visible_rect: opacity_mask_enabled ? mask_loader : rect
-
- implicitWidth: auto_set_size ? inner_space.width : 0
- implicitHeight: auto_set_size ? inner_space.height : 0
-
- DefaultRectangle {
- id: rect
- anchors.fill: parent
- border.color: "transparent"
-
- Loader {
- anchors.centerIn: parent
- id: inner_space
- }
-
- visible: !opacity_mask_enabled
- }
-
- Loader {
- id: mask_loader
- anchors.fill: rect
- }
-
- LinearGradient {
- id: _linear_gradient
- visible: rect.border.width > 0
- source: visible_rect
- width: parent.width + rect.border.width*2
- height: parent.height + rect.border.width*2
- anchors.centerIn: parent
-
- z: -1
- start: Qt.point(0, 0)
- end: Qt.point(width, height)
-
- gradient: Gradient {
- GradientStop {
- position: border_gradient_start_pos
- color: border_color_start
- }
- GradientStop {
- position: border_gradient_end_pos
- color: border_color_end
- }
- }
- }
-
- DropShadow {
- anchors.fill: visible_rect
- source: visible_rect
- cached: false
- visible: topShadowVisible
- horizontalOffset: verticalShadow ? 0 : -6
- verticalOffset: verticalShadow ? -10 : -6
- radius: verticalShadow ? 25 : 15
- samples: 32
- spread: 0
- color: verticalShadow ? theme.floatShadow2 : theme.floatShadow1
- smooth: true
- z: -2
- }
-
- DropShadow {
- id: _black_shadow
- anchors.fill: visible_rect
- source: visible_rect
- cached: false
- visible: show_shadow
- horizontalOffset: verticalShadow ? 0 : 6
- verticalOffset: verticalShadow ? 10 : 6
- radius: verticalShadow ? 25 : 20
- samples: 32
- spread: 0
- color: theme.floatBoxShadowDark
- smooth: true
- z: -2
- }
-}
-
-
diff --git a/atomic_defi_design/qml/Components/GradientRectangle.qml b/atomic_defi_design/qml/Components/GradientRectangle.qml
deleted file mode 100644
index 3fcda07744..0000000000
--- a/atomic_defi_design/qml/Components/GradientRectangle.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import QtQuick 2.15
-import "../Constants"
-
-Rectangle {
- property alias orientation: gradient.orientation
-
- property alias start_pos: g_start.position
- property alias end_pos: g_end.position
-
- property color start_color: theme.sideBarGradient1
- property color end_color: theme.sideBarGradient2
- Behavior on start_color { ColorAnimation { duration: Style.animationDuration } }
- Behavior on end_color { ColorAnimation { duration: Style.animationDuration } }
-
- gradient: Gradient {
- id: gradient
- orientation: Qt.Horizontal
-
- GradientStop {
- id: g_start
- position: 0.0
- color: start_color
- }
-
- GradientStop {
- id: g_end
- position: 1.0
- color: end_color
- }
- }
-}
diff --git a/atomic_defi_design/qml/Components/HelpModal.qml b/atomic_defi_design/qml/Components/HelpModal.qml
deleted file mode 100644
index 1a0fad4bda..0000000000
--- a/atomic_defi_design/qml/Components/HelpModal.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick 2.12
-
-BasicModal
-{
- property string helpSentence
- property alias title: _content.title
-
- width: 500
-
- ModalContent { id: _content; DexLabel { text: helpSentence } }
-}
diff --git a/atomic_defi_design/qml/Components/HorizontalLine.qml b/atomic_defi_design/qml/Components/HorizontalLine.qml
deleted file mode 100644
index 20dcaeaa1a..0000000000
--- a/atomic_defi_design/qml/Components/HorizontalLine.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.15
-import "../Constants"
-
-AnimatedRectangle {
- height: 2
- property bool light: false
-
- gradient: Gradient {
- orientation: Qt.Vertical
- GradientStop { position: 0.0; color: light ? theme.colorLineGradient3 : theme.colorLineGradient2 }
- GradientStop { position: 1.0; color: light ? theme.colorLineGradient4 : theme.colorLineGradient1 }
- }
-}
diff --git a/atomic_defi_design/qml/Components/InnerBackground.qml b/atomic_defi_design/qml/Components/InnerBackground.qml
deleted file mode 100644
index 03c5813082..0000000000
--- a/atomic_defi_design/qml/Components/InnerBackground.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-import QtQuick 2.15
-import QtGraphicalEffects 1.12
-import Qaterial 1.0 as Qaterial
-import "../Constants"
-
-Item {
- id: control
- property alias content: inner_space.sourceComponent
- property alias color: rect.color
- property alias radius: rect.radius
- property alias border: rect.border
- property bool shadowOff: false
- property bool auto_set_size: true
- implicitWidth: auto_set_size ? inner_space.width : 0
- implicitHeight: auto_set_size ? inner_space.height : 0
- property color bottomBorderColor: theme.colorInnerShadowBottom
- property color topBorderColor: theme.colorInnerShadowTop
-
- Item {
- id: rect_with_shadow
- anchors.fill: parent
-
- DefaultRectangle {
- id: rect
- anchors.fill: parent
- border.color: "transparent"
- color: theme.backgroundColor
-
- Loader {
- anchors.centerIn: parent
- id: inner_space
-
- layer.enabled: true
-
- layer.effect: OpacityMask {
- maskSource: Rectangle {
- width: inner_space.width
- height: inner_space.height
- radius: rect.radius
- }
- }
- }
- }
-
- layer.enabled: !control.shadowOff
- layer.effect: DefaultInnerShadow { }
- }
-
- LinearGradient {
- id: gradient
- visible: rect.border.width > 0
- source: rect
- width: rect.width + rect.border.width*2
- height: rect.height + rect.border.width*2
- anchors.centerIn: parent
-
- z: -1
- start: Qt.point(0, 0)
- end: Qt.point(0, height)
-
- gradient: Gradient {
- GradientStop {
- position: 0.35
- color: control.topBorderColor
- }
- GradientStop {
- position: 0.65
- color: control.bottomBorderColor //Qaterial.Colors.blueA400//
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Components/LinkIcon.qml b/atomic_defi_design/qml/Components/LinkIcon.qml
deleted file mode 100644
index d144cd8b2e..0000000000
--- a/atomic_defi_design/qml/Components/LinkIcon.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import "../Constants"
-
-Circle {
- property string link
- property alias source: icon.source
- property alias text: tooltip_text.text_value
-
- Layout.preferredWidth: 60
- Layout.preferredHeight: Layout.preferredWidth
-
- color: Style.colorOnlyIf(mouse_area.containsMouse, Style.colorTheme4)
-
- radius: 100
-
- DefaultImage {
- id: icon
-
- width: parent.width * 0.9
- height: parent.height * 0.9
-
- anchors.centerIn: parent
-
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: Qt.openUrlExternally(link)
- }
-
- DefaultTooltip {
- visible: mouse_area.containsMouse
-
- contentItem: ColumnLayout {
- DefaultText {
- id: tooltip_text
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Components/ModalContent.qml b/atomic_defi_design/qml/Components/ModalContent.qml
deleted file mode 100644
index 9e81d4da5e..0000000000
--- a/atomic_defi_design/qml/Components/ModalContent.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-
-//! Project Imports
-import "../Constants"
-
-// The content of a modal. Must be a child of a `BasicModal` component.
-ColumnLayout
-{
- Layout.fillWidth: true
-
- property alias title: _header.title
- default property alias content: _innerLayout.data
- property alias footer: _footer.data
-
- ModalHeader { id: _header }
-
- DefaultFlickable
- {
- id: _flickable
-
- readonly property int padding: 25
-
- flickableDirection: Flickable.VerticalFlick
-
- Layout.preferredWidth: contentWidth
- Layout.preferredHeight: contentHeight
- Layout.maximumHeight: window.height - 200
-
- contentWidth: _innerLayout.width + padding // Padding is for preventing shadows effect being cut
- contentHeight: _innerLayout.height + padding
-
- ColumnLayout
- {
- id: _innerLayout
- spacing: Style.rowSpacing
- anchors.centerIn: parent
- width: _modalWidth - (_modalPadding * 2) - _flickable.padding
- }
- }
-
- RowLayout // Footer
- {
- id: _footer
- anchors.topMargin: Style.rowSpacing
- spacing: Style.buttonSpacing
- }
-}
diff --git a/atomic_defi_design/qml/Components/PaginationButton.qml b/atomic_defi_design/qml/Components/PaginationButton.qml
deleted file mode 100644
index 5d615b4db6..0000000000
--- a/atomic_defi_design/qml/Components/PaginationButton.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import "../Constants"
-
-DexButton {
- font.pixelSize: 12
- minWidth: 0
-}
diff --git a/atomic_defi_design/qml/Components/PrimaryButton.qml b/atomic_defi_design/qml/Components/PrimaryButton.qml
deleted file mode 100644
index b4bab9b30d..0000000000
--- a/atomic_defi_design/qml/Components/PrimaryButton.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.15
-
-DefaultButton {
- button_type: "primary"
-}
diff --git a/atomic_defi_design/qml/Components/SetupPage.qml b/atomic_defi_design/qml/Components/SetupPage.qml
deleted file mode 100644
index a0d005bca2..0000000000
--- a/atomic_defi_design/qml/Components/SetupPage.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import "../Constants"
-
-Item {
- id: _control
- property alias image: image
- property alias image_path: image.source
- property alias image_scale: image.scale
- property alias content: inner_space.sourceComponent
- property alias bottom_content: bottom_content.sourceComponent
- property double image_margin: 5
- property string backgroundColor: theme.dexBoxBackgroundColor
- property string borderColor: theme.rectangleBorderColor
- ColumnLayout {
- id: window_layout
-
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- transformOrigin: Item.Center
- spacing: image_margin
-
- DefaultImage {
- id: image
- Layout.maximumWidth: 300
- Layout.maximumHeight: Layout.maximumWidth * paintedHeight/paintedWidth
-
- Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
- antialiasing: true
- }
-
- Pane {
- id: pane
-
- leftPadding: 30
- rightPadding: leftPadding
- topPadding: leftPadding * 0.5
- bottomPadding: topPadding
- Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
- background: DexRectangle {
- color: _control.backgroundColor
- border {
- color: _control.borderColor
- }
- }
-
- contentChildren: Loader {
- id: inner_space
- }
- }
-
- Loader {
- id: bottom_content
- Layout.alignment: Qt.AlignHCenter
- }
- }
-}
diff --git a/atomic_defi_design/qml/Components/SidebarPanel.qml b/atomic_defi_design/qml/Components/SidebarPanel.qml
deleted file mode 100644
index b7693a9717..0000000000
--- a/atomic_defi_design/qml/Components/SidebarPanel.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick 2.15
-import "../Constants"
-
-GradientRectangle {
- id: rect
- radius: theme.rectangleRadius
- color: theme.backgroundColor
- border.color: theme.hightlightColor
- border.width: 1
-
-}
diff --git a/atomic_defi_design/qml/Components/SwapIcon.qml b/atomic_defi_design/qml/Components/SwapIcon.qml
deleted file mode 100644
index 54fc19959a..0000000000
--- a/atomic_defi_design/qml/Components/SwapIcon.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import QtQuick 2.15
-import Qaterial 1.0 as Qaterial
-import "../Constants"
-
-
-Item {
- id: root
- property string top_arrow_ticker
- property string bottom_arrow_ticker
-
- property bool hovered: false
-
- implicitWidth: 20
- implicitHeight: 50
-
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- source: Qaterial.Icons.swapHorizontal
- color: Style.colorWhite4
- }
-}
diff --git a/atomic_defi_design/qml/Components/TextAreaWithTitle.qml b/atomic_defi_design/qml/Components/TextAreaWithTitle.qml
deleted file mode 100644
index ba4cd4c951..0000000000
--- a/atomic_defi_design/qml/Components/TextAreaWithTitle.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import "../Constants"
-
-ColumnLayout {
- property alias title: title_text.text
- property alias field: input_field
- property alias save_button: save_button
- property alias hide_button: hide_button
- property alias hide_button_area: hide_button.mouse_area
- property bool copyable: false
- property bool hidable: false
- property var onReturn // function
-
- property alias remove_newline: input_field.remove_newline
- property bool hiding: true
-
- property bool saveable: false
-
- signal saved()
-
- // Local
- function reset() {
- input_field.text = ''
- }
-
- RowLayout {
- TitleText {
- id: title_text
- Layout.alignment: Qt.AlignVCenter
- }
-
- DefaultButton {
- id: save_button
- button_type: input_field.enabled ? "danger" : "primary"
- Layout.alignment: Qt.AlignVCenter
- text: input_field.enabled ? qsTr("Save") : qsTr("Edit")
- visible: saveable
- onClicked: {
- if(input_field.enabled) saved()
- input_field.enabled = !input_field.enabled
- }
- font.pixelSize: Style.textSizeSmall
- minWidth: 0
- implicitHeight: text_obj.height * 1.25
- }
- }
-
- DefaultTextArea {
- id: input_field
- enabled: !saveable
- Layout.fillWidth: true
-
- HideFieldButton {
- id: hide_button
- }
-
- CopyFieldButton {
-
- }
- }
-}
-
-
diff --git a/atomic_defi_design/qml/Components/TextEditWithTitle.qml b/atomic_defi_design/qml/Components/TextEditWithTitle.qml
deleted file mode 100644
index bb0379ad4c..0000000000
--- a/atomic_defi_design/qml/Components/TextEditWithTitle.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import "../Constants"
-
-ComponentWithTitle {
- property alias text: text.text_value
- property alias value_color: text.color
- property alias privacy: text.privacy
-
- DexLabel {
- id: text
-
- clip: true
- Layout.fillWidth: true
- color: Style.modalValueColor
- textFormat: TextEdit.AutoText
-
- Layout.preferredHeight: show_content ? contentHeight : 0
- Behavior on Layout.preferredHeight { SmoothedAnimation { id: expand_animation; duration: Style.animationDuration * 2; velocity: -1 } }
-
- opacity: show_content ? 1 : 0
- Behavior on opacity { SmoothedAnimation { duration: expand_animation.duration; velocity: -1 } }
- }
-}
diff --git a/atomic_defi_design/qml/Components/TextFieldWithTitle.qml b/atomic_defi_design/qml/Components/TextFieldWithTitle.qml
deleted file mode 100644
index f65b2a50be..0000000000
--- a/atomic_defi_design/qml/Components/TextFieldWithTitle.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import "../Constants"
-
-ColumnLayout {
- property alias title: title_text.text
- property alias field: input_field
- property alias hide_button: hide_button
- property alias hide_button_area: hide_button.mouse_area
- property bool copyable: false
- property bool hidable: false
- property bool required: false
-
- property bool hiding: true
-
- // Local
- function reset() {
- input_field.text = ''
- hiding = true
- }
-
- spacing: Style.rowSpacingSmall
-
- RowLayout {
- TitleText {
- id: title_text
- visible: text !== ''
- }
-
- DexLabel {
- visible: required && input_field.text === ''
- font.pixelSize: Style.textSizeSmall2
- text_value: qsTr("Required")
- color: Style.colorRed
- }
- }
-
- DefaultTextField {
- id: input_field
-
- echoMode: hidable && hiding ? TextInput.Password : TextInput.Normal
-
- Layout.fillWidth: true
-
- HideFieldButton {
- id: hide_button
- }
-
- CopyFieldButton {
-
- }
- }
-}
diff --git a/atomic_defi_design/qml/Components/VerticalLine.qml b/atomic_defi_design/qml/Components/VerticalLine.qml
deleted file mode 100644
index fbf0ca9b0b..0000000000
--- a/atomic_defi_design/qml/Components/VerticalLine.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 2.15
-import "../Constants"
-
-AnimatedRectangle {
- width: 2
-
- gradient: Gradient {
- orientation: Qt.Horizontal
- GradientStop { position: 0.0; color: Style.colorLineGradient1 }
- GradientStop { position: 1.0; color: Style.colorLineGradient2 }
- }
-}
diff --git a/atomic_defi_design/qml/Components/WalletNameField.qml b/atomic_defi_design/qml/Components/WalletNameField.qml
deleted file mode 100644
index 58c6095598..0000000000
--- a/atomic_defi_design/qml/Components/WalletNameField.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 2.15
-
-TextFieldWithTitle {
- id: input_wallet_name
- title: qsTr("Wallet Name")
- field.placeholderText: qsTr("Enter the name of your wallet here")
- field.validator: RegExpValidator { regExp: /[a-zA-Z0-9]+/ }
-
- required: true
-
- function reset() { field.text = '' }
-}
diff --git a/atomic_defi_design/qml/Constants/General.qml b/atomic_defi_design/qml/Constants/General.qml
deleted file mode 100644
index d4e6fc5793..0000000000
--- a/atomic_defi_design/qml/Constants/General.qml
+++ /dev/null
@@ -1,1680 +0,0 @@
-pragma Singleton
-import QtQuick 2.15
-import AtomicDEX.TradingError 1.0
-import AtomicDEX.MarketMode 1.0
-
-QtObject {
- readonly property int width: 1280
- readonly property int height: 800
- readonly property int minimumWidth: 1280
- readonly property int minimumHeight: 800
- readonly property double delta_time: 1000/60
-
- readonly property string os_file_prefix: Qt.platform.os == "windows" ? "file:///" : "file://"
- readonly property string assets_path: "qrc:///"
- readonly property string image_path: assets_path + "atomic_defi_design/assets/images/"
- readonly property string coin_icons_path: image_path + "coins/"
- readonly property string custom_coin_icons_path: os_file_prefix + API.app.settings_pg.get_custom_coins_icons_path() + "/"
-
- function coinIcon(ticker) {
- if(ticker === "" || ticker === "All" || ticker===undefined) {
- return ""
- }else {
- const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
- return (coin_info.is_custom_coin ? custom_coin_icons_path : coin_icons_path) + atomic_qt_utilities.retrieve_main_ticker(ticker.toString()).toLowerCase() + ".png"
- }
- }
-
- // Returns the icon full path of a coin type.
- // If the given coin type has spaces, it will be replaced by '-' characters.
- // If the given coin type is empty, returns an empty string.
- function coinTypeIcon(type) {
- if (type === "") return ""
-
- var filename = type.toLowerCase().replace(" ", "-");
- return coin_icons_path + filename + ".png"
- }
-
- function qaterialIcon(name) {
- return "qrc:/Qaterial/Icons/" + name + ".svg"
- }
-
- readonly property string cex_icon: 'ⓘ'
- readonly property string download_icon: '📥'
- readonly property string right_arrow_icon: "⮕"
- readonly property string privacy_text: "*****"
-
- readonly property string version_string: "Desktop v" + API.app.settings_pg.get_version()
-
- property bool privacy_mode: false
-
- readonly property var reg_pass_input: /[A-Za-z0-9@#$€£%{}[\]()\/\\'"`~,;:.<>+\-_=!^&*|?]+/
- readonly property var reg_pass_valid_low_security: /^(?=.{1,}).*$/
- readonly property var reg_pass_valid: /^(?=.{16,})(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@#$%€£{}[\]()\/\\'"`~,;:.<>+\-_=!^&*|?]).*$/
- readonly property var reg_pass_uppercase: /(?=.*[A-Z])/
- readonly property var reg_pass_lowercase: /(?=.*[a-z])/
- readonly property var reg_pass_numeric: /(?=.*[0-9])/
- readonly property var reg_pass_special: /(?=.*[@#$%{}[\]()\/\\'"`~,€$£;:.<>+\-_=!^&*|?])/
- readonly property var reg_pass_count_low_security: /(?=.{1,})/
- readonly property var reg_pass_count: /(?=.{16,})/
-
- readonly property double time_toast_important_error: 10000
- readonly property double time_toast_basic_info: 3000
-
- readonly property var chart_times: (["1m", "3m", "5m", "15m", "30m", "1h", "2h", "4h", "6h", "12h", "1d", "3d"/*, "1w"*/])
- readonly property var time_seconds: ({ "1m": 60, "3m": 180, "5m": 300, "15m": 900, "30m": 1800, "1h": 3600, "2h": 7200, "4h": 14400, "6h": 21600, "12h": 43200, "1d": 86400, "3d": 259200, "1w": 604800 })
-
-
- property bool initialized_orderbook_pair: false
- readonly property string default_base: atomic_app_primary_coin
- readonly property string default_rel: atomic_app_secondary_coin
-
- function timestampToDouble(timestamp) {
- return (new Date(timestamp)).getTime()
- }
-
- function timestampToString(timestamp) {
- return (new Date(timestamp)).toUTCString()
- }
-
- function timestampToDate(timestamp) {
- return (new Date(timestamp * 1000))
- }
-
- function getDuration(total_ms) {
- let delta = Math.abs(total_ms)
-
- let days = Math.floor(delta / 86400000)
- delta -= days * 86400000
-
- let hours = Math.floor(delta / 3600000) % 24
- delta -= hours * 3600000
-
- let minutes = Math.floor(delta / 60000) % 60
- delta -= minutes * 60000
-
- let seconds = Math.floor(delta / 1000) % 60
- delta -= seconds * 1000
-
- let milliseconds = Math.floor(delta)
-
- return { days, hours, minutes, seconds, milliseconds }
- }
-
- function secondsToTimeLeft(date_now, date_future) {
- const r = getDuration((date_future - date_now)*1000)
- let days = r.days
- let hours = r.hours
- let minutes = r.minutes
- let seconds = r.seconds
-
- if(hours < 10) hours = '0' + hours
- if(minutes < 10) minutes = '0' + minutes
- if(seconds < 10) seconds = '0' + seconds
- return qsTr("%n day(s)", "", days) + ' ' + hours + ':' + minutes + ':' + seconds
- }
-
- function durationTextShort(total) {
- if(!General.exists(total))
- return "-"
-
- const r = getDuration(total)
-
- let text = ""
- if(r.days > 0) text += qsTr("%nd", "day", r.days) + " "
- if(r.hours > 0) text += qsTr("%nh", "hours", r.hours) + " "
- if(r.minutes > 0) text += qsTr("%nm", "minutes", r.minutes) + " "
- if(r.seconds > 0) text += qsTr("%ns", "seconds", r.seconds) + " "
- if(text === "" && r.milliseconds > 0) text += qsTr("%nms", "milliseconds", r.milliseconds) + " "
- if(text === "") text += qsTr("-")
-
- return text
- }
-
- function absString(str) {
- return str.replace("-", "")
- }
-
- function clone(obj) {
- return JSON.parse(JSON.stringify(obj));
- }
-
- function prettifyJSON(j) {
- const j_obj = typeof j === "string" ? JSON.parse(j) : j
- return JSON.stringify(j_obj, null, 4)
- }
-
- function viewTxAtExplorer(ticker, id, add_0x=true) {
- if(id !== '') {
- const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
- const id_prefix = add_0x && (coin_info.type === 'ERC-20' || coin_info.type === 'BEP-20') ? '0x' : ''
- Qt.openUrlExternally(coin_info.explorer_url + coin_info.tx_uri + id_prefix + id)
- }
- }
-
- function viewAddressAtExplorer(ticker, address) {
- if(address !== '') {
- const coin_info = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(ticker)
- Qt.openUrlExternally(coin_info.explorer_url + coin_info.address_uri + address)
- }
- }
-
- function diffPrefix(received) {
- return received === "" ? "" : received === true ? "+ " : "- "
- }
-
- function filterCoins(list, text, type) {
- return list.filter(c => (c.ticker.indexOf(text.toUpperCase()) !== -1 || c.name.toUpperCase().indexOf(text.toUpperCase()) !== -1) &&
- (type === undefined || c.type === type)).sort((a, b) => {
- if(a.ticker < b.ticker) return -1
- if(a.ticker > b.ticker) return 1
- return 0
- })
- }
-
- function validFiatRates(data, fiat) {
- return data && data.rates && data.rates[fiat]
- }
-
- function nFormatter(num, digits) {
- if(num < 1E5) return General.formatDouble(num)
-
- const si = [
- { value: 1, symbol: "" },
- { value: 1E3, symbol: "k" },
- { value: 1E6, symbol: "M" },
- { value: 1E9, symbol: "G" },
- { value: 1E12, symbol: "T" },
- { value: 1E15, symbol: "P" },
- { value: 1E18, symbol: "E" }
- ]
- const rx = /\.0+$|(\.[0-9]*[1-9])0+$/
-
- let i
- for (i = si.length - 1; i > 0; --i)
- if (num >= si[i].value) break
-
- return (num / si[i].value).toFixed(digits).replace(rx, "$1") + si[i].symbol
- }
-
- function formatFiat(received, amount, fiat) {
- return diffPrefix(received) +
- (fiat === API.app.settings_pg.current_fiat ? API.app.settings_pg.current_fiat_sign : API.app.settings_pg.current_currency_sign)
- + " " + nFormatter(parseFloat(amount), 2)
- }
-
- function formatPercent(value, show_prefix=true) {
- let prefix = ''
- if(value > 0) prefix = '+ '
- else if(value < 0) {
- prefix = '- '
- value *= -1
- }
-
- return (show_prefix ? prefix : '') + value + ' %'
- }
-
- readonly property int amountPrecision: 8
- readonly property int sliderDigitLimit: 9
- readonly property int recommendedPrecision: -1337
-
- function getDigitCount(v) {
- return v.toString().replace("-", "").split(".")[0].length
- }
-
- function getRecommendedPrecision(v, limit) {
- const lim = limit || sliderDigitLimit
- return Math.min(Math.max(lim - getDigitCount(v), 0), amountPrecision)
- }
-
- function formatDouble(v, precision, trail_zeros) {
- if(v === '') return "0"
- if(precision === recommendedPrecision) precision = getRecommendedPrecision(v)
-
- if(precision === 0) return parseInt(v).toString()
-
- // Remove more than n decimals, then convert to string without trailing zeros
- const full_double = parseFloat(v).toFixed(precision || amountPrecision)
-
- return trail_zeros ? full_double : full_double.replace(/\.?0+$/,"")
- }
-
- function formatCrypto(received, amount, ticker, fiat_amount, fiat) {
- return diffPrefix(received) + atomic_qt_utilities.retrieve_main_ticker(ticker) + " " + formatDouble(amount) + (fiat_amount ? " (" + formatFiat("", fiat_amount, fiat) + ")" : "")
- }
-
-
- function fullCoinName(name, ticker) {
- return name + " (" + ticker + ")"
- }
-
- function fullNamesOfCoins(coins) {
- return coins.map(c => {
- return { value: c.ticker, text: fullCoinName(c.name, c.ticker) }
- })
- }
-
- function tickersOfCoins(coins) {
- return coins.map(c => {
- return { value: c.ticker, text: c.ticker }
- })
- }
-
- function getMinTradeAmount() {
- /*if (API.app.trading_pg.market_mode == MarketMode.Buy) {
- return API.app.trading_pg.orderbook.rel_min_taker_vol
- }*/
- return API.app.trading_pg.min_trade_vol
- }
-
- function getReversedMinTradeAmount() {
- if (API.app.trading_pg.market_mode == MarketMode.Buy) {
- return API.app.trading_pg.min_trade_vol
- }
- return API.app.trading_pg.orderbook.rel_min_taker_vol
- }
-
- function hasEnoughFunds(sell, base, rel, price, volume) {
- if(sell) {
- if(volume === "") return true
- return API.app.do_i_have_enough_funds(base, volume)
- }
- else {
- if(price === "") return true
- const needed_amount = parseFloat(price) * parseFloat(volume)
- return API.app.do_i_have_enough_funds(rel, needed_amount)
- }
- }
-
- function isZero(v) {
- return !isFilled(v) || parseFloat(v) === 0
- }
-
-
- function exists(v) {
- return v !== undefined && v !== null
- }
-
- function isFilled(v) {
- return exists(v) && v !== ""
- }
-
- function isParentCoinNeeded(ticker, type) {
- for(const c of API.app.portfolio_pg.get_all_enabled_coins())
- if(c.type === type && c.ticker !== ticker) return true
-
- return false
- }
-
- property Timer prevent_coin_disabling: Timer { interval: 5000 }
-
- function canDisable(ticker) {
- if(prevent_coin_disabling.running)
- return false
-
- if(ticker === atomic_app_primary_coin || ticker === atomic_app_secondary_coin) return false
- else if(ticker === "ETH") return !General.isParentCoinNeeded("ETH", "ERC-20")
- else if(ticker === "QTUM") return !General.isParentCoinNeeded("QTUM", "QRC-20")
-
- return true
- }
-
- function tokenUnitName(type) {
- return type === "ERC-20" ? "Gwei" : "Satoshi"
- }
-
- function isParentCoin(ticker) {
- return ticker === "KMD" || ticker === "ETH" || ticker === "QTUM"
- }
-
- function isTokenType(type) {
- return type === "ERC-20" || type === "QRC-20"
- }
-
- function getParentCoin(type) {
- if(type === "ERC-20") return "ETH"
- else if(type === "QRC-20") return "QTUM"
- else if(type === "Smart Chain") return "KMD"
- return "?"
- }
-
- function getRandomInt(min, max) {
- min = Math.ceil(min)
- max = Math.floor(max)
- return Math.floor(Math.random() * (max - min + 1)) + min
- }
-
- function getFiatText(v, ticker, has_info_icon=true) {
- return General.formatFiat('', v === '' ? 0 : API.app.get_fiat_from_amount(ticker, v), API.app.settings_pg.current_fiat)
- + (has_info_icon ? " " + General.cex_icon : "")
- }
-
- function hasParentCoinFees(trade_info) {
- return General.isFilled(trade_info.rel_transaction_fees) && parseFloat(trade_info.rel_transaction_fees) > 0
- }
-
- function feeText(trade_info, base_ticker, has_info_icon=true, has_limited_space=false) {
-
-
- if(!trade_info || !trade_info.trading_fee) return ""
-
- const tx_fee = txFeeText(trade_info, base_ticker, has_info_icon, has_limited_space)
- const trading_fee = tradingFeeText(trade_info, base_ticker, has_info_icon)
- const minimum_amount = minimumtradingFeeText(trade_info, base_ticker, has_info_icon)
-
-
- return tx_fee + "\n" + trading_fee +"
"+minimum_amount
- }
-
- function txFeeText(trade_info, base_ticker, has_info_icon=true, has_limited_space=false) {
-
- if(!trade_info || !trade_info.trading_fee) return ""
-
- const has_parent_coin_fees = hasParentCoinFees(trade_info)
-
- var info = qsTr('%1 Transaction Fee'.arg(trade_info.base_transaction_fees_ticker))+': '+ trade_info.base_transaction_fees + " (%1)".arg(getFiatText(trade_info.base_transaction_fees, trade_info.base_transaction_fees_ticker, has_info_icon))
-
- if (has_parent_coin_fees) {
- info = info+"
"+qsTr('%1 Transaction Fee'.arg(trade_info.rel_transaction_fees_ticker))+': '+ trade_info.rel_transaction_fees + " (%1)".arg(getFiatText(trade_info.rel_transaction_fees, trade_info.rel_transaction_fees_ticker, has_info_icon))
- }
-
- return info+"
"
-// const main_fee = (qsTr('Transaction Fee') + ': ' + General.formatCrypto("", trade_info.base_transaction_fees, trade_info.base_transaction_fees_ticker)) +
-// // Rel Fees
-// (has_parent_coin_fees ? " + " + General.formatCrypto("", trade_info.rel_transaction_fees, trade_info.rel_transaction_fees_ticker) : '')
-
-// let fiat_part = "("
-// fiat_part += getFiatText(trade_info.base_transaction_fees, trade_info.base_transaction_fees_ticker, false)
-// if(has_parent_coin_fees) fiat_part += (has_limited_space ? "\n\t\t+ " : " + ") + getFiatText(trade_info.rel_transaction_fees, trade_info.rel_transaction_fees_ticker, has_info_icon)
-// fiat_part += ")"
-
-// return main_fee + " " + fiat_part
- }
-// function txFeeText2(trade_info, base_ticker, has_info_icon=true, has_limited_space=false) {
-// if(!trade_info || !trade_info.trading_fee) return ""
-
-// const has_parent_coin_fees = hasParentCoinFees(trade_info)
-// const main_fee = (qsTr('Transaction Fee') + ': ' + General.formatCrypto("", trade_info.base_transaction_fees, trade_info.base_transaction_fees_ticker)) +
-// // Rel Fees
-// (has_parent_coin_fees ? " + " + General.formatCrypto("", trade_info.rel_transaction_fees, trade_info.rel_transaction_fees_ticker) : '')
-
-// let fiat_part = "("
-// fiat_part += getFiatText(trade_info.base_transaction_fees, trade_info.base_transaction_fees_ticker, false)
-// if(has_parent_coin_fees) fiat_part += (has_limited_space ? "\n\t\t+ " : " + ") + getFiatText(trade_info.rel_transaction_fees, trade_info.rel_transaction_fees_ticker, has_info_icon)
-// fiat_part += ")"
-
-// return main_fee + " " + fiat_part
-// }
-
- function tradingFeeText(trade_info, base_ticker, has_info_icon=true) {
- if(!trade_info || !trade_info.trading_fee) return ""
-
- return trade_info.trading_fee_ticker+" "+qsTr('Trading Fee') + ': ' + General.formatCrypto("", trade_info.trading_fee, "") +
-
- // Fiat part
- (" ("+
- getFiatText(trade_info.trading_fee, trade_info.trading_fee_ticker, has_info_icon)
- +")")
- }
- function minimumtradingFeeText(trade_info, base_ticker, has_info_icon=true) {
- if(!trade_info || !trade_info.trading_fee) return ""
-
- return API.app.trading_pg.market_pairs_mdl.left_selected_coin+" "+qsTr('Minimum Trading Amount') + ': ' + General.formatCrypto("", API.app.trading_pg.min_trade_vol , "") +
-
- // Fiat part
- (" ("+
- getFiatText(API.app.trading_pg.min_trade_vol , API.app.trading_pg.market_pairs_mdl.left_selected_coin, has_info_icon)
- +")")
- }
-
- function checkIfWalletExists(name) {
- if(API.app.wallet_mgr.get_wallets().indexOf(name) !== -1)
- return qsTr("Wallet %1 already exists", "WALLETNAME").arg(name)
- return ""
- }
-
- function getTradingError(error, fee_info, base_ticker, rel_ticker, left_ticker, right_ticker) {
- switch(error) {
- case TradingError.None:
- return ""
- case TradingError.TotalFeesNotEnoughFunds:
- return qsTr("%1 balance is lower than the fees amount: %2 %3").arg(fee_info.error_fees.coin).arg(fee_info.error_fees.required_balance).arg(fee_info.error_fees.coin)
- case TradingError.BalanceIsLessThanTheMinimalTradingAmount:
- return qsTr("Tradable (after fees) %1 balance is lower than minimum trade amount").arg(base_ticker) + " : " + General.getMinTradeAmount()
- case TradingError.PriceFieldNotFilled:
- return qsTr("Please fill the price field")
- case TradingError.VolumeFieldNotFilled:
- return qsTr("Please fill the volume field")
- case TradingError.VolumeIsLowerThanTheMinimum:
- return qsTr("%1 volume is lower than minimum trade amount").arg(API.app.trading_pg.market_pairs_mdl.left_selected_coin) + " : " + General.getMinTradeAmount()
- case TradingError.ReceiveVolumeIsLowerThanTheMinimum:
- return qsTr("%1 volume is lower than minimum trade amount").arg(rel_ticker) + " : " + General.getReversedMinTradeAmount()
- case TradingError.LeftParentChainNotEnabled:
- return qsTr("%1 needs to be enabled in order to use %2").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(left_ticker)).arg(left_ticker)
- case TradingError.LeftParentChainNotEnoughBalance:
- return qsTr("%1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(left_ticker)).arg(left_ticker)
- case TradingError.RightParentChainNotEnabled:
- return qsTr("%1 needs to be enabled in order to use %2").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(right_ticker)).arg(right_ticker)
- case TradingError.RightParentChainNotEnoughBalance:
- return qsTr("%1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(right_ticker)).arg(right_ticker)
- default:
- return qsTr("Unknown Error") + ": " + error
- }
- }
-
- readonly property var supported_pairs: ({
- "1INCH/BTC": "BINANCE:1INCHBTC",
- "1INCH/ETH": "HUOBI:1INCHETH",
- "1INCH/USDT": "BINANCE:1INCHUSD",
- "1INCH/BUSD": "BINANCE:1INCHUSD",
- "1INCH/USDC": "BINANCE:1INCHUSD",
- "1INCH/TUSD": "BINANCE:1INCHUSD",
- "1INCH/HUSD": "BINANCE:1INCHUSD",
- "1INCH/DAI": "BINANCE:1INCHUSD",
- "1INCH/PAX": "BINANCE:1INCHUSD",
- "ADA/BTC": "BINANCE:ADABTC",
- "ADA/ETH": "BINANCE:ADAETH",
- "ADA/USDT": "BINANCE:ADAUSD",
- "ADA/BUSD": "BINANCE:ADAUSD",
- "ADA/USDC": "BINANCE:ADAUSD",
- "ADA/TUSD": "BINANCE:ADAUSD",
- "ADA/HUSD": "BINANCE:ADAUSD",
- "ADA/DAI": "BINANCE:ADAUSD",
- "ADA/PAX": "BINANCE:ADAUSD",
- "ADA/EURS": "BINANCE:ADAEUR",
- "ADA/TRYB": "BINANCE:ADATRY",
- "ADA/BIDR": "BINANCE:ADABIDR",
- "ADA/BNB": "BINANCE:ADABNB",
- "ADA/BCH": "HITBTC:ADABCH",
- "ADX/BTC": "BINANCE:ADXBTC",
- "ADX/ETH": "BINANCE:ADXETH",
- "ADX/USDT": "BINANCE:ADXUSD",
- "ADX/BUSD": "BINANCE:ADXUSD",
- "ADX/USDC": "BINANCE:ADXUSD",
- "ADX/TUSD": "BINANCE:ADXUSD",
- "ADX/HUSD": "BINANCE:ADXUSD",
- "ADX/DAI": "BINANCE:ADXUSD",
- "ADX/PAX": "BINANCE:ADXUSD",
- "AAVE/BTC": "BINANCE:AAVEBTC",
- "AAVE/ETH": "BINANCE:AAVEETH",
- "AAVE/BNB": "BINANCE:AAVEBNB",
- "AAVE/USDT": "BINANCE:AAVEUSD",
- "AAVE/BUSD": "BINANCE:AAVEUSD",
- "AAVE/USDC": "BINANCE:AAVEUSD",
- "AAVE/TUSD": "BINANCE:AAVEUSD",
- "AAVE/HUSD": "BINANCE:AAVEUSD",
- "AAVE/DAI": "BINANCE:AAVEUSD",
- "AAVE/PAX": "BINANCE:AAVEUSD",
- "AAVE/EURS": "KRAKEN:AAVEEUR",
- "AGI/BTC": "BINANCE:AGIBTC",
- "AGI/ETH": "KUCOIN:AGIETH",
- "AGI/USDT": "BINANCE:AGIUSD",
- "AGI/BUSD": "BINANCE:AGIUSD",
- "AGI/USDC": "BINANCE:AGIUSD",
- "AGI/TUSD": "BINANCE:AGIUSD",
- "AGI/HUSD": "BINANCE:AGIUSD",
- "AGI/DAI": "BINANCE:AGIUSD",
- "AGI/PAX": "BINANCE:AGIUSD",
- "ANKR/BTC": "BINANCE:ANKRBTC",
- "ANKR/ETH": "BITTREX:ANKRETH",
- "ANKR/USDT": "BINANCE:ANKRUSD",
- "ANKR/BUSD": "BINANCE:ANKRUSD",
- "ANKR/USDC": "BINANCE:ANKRUSD",
- "ANKR/TUSD": "BINANCE:ANKRUSD",
- "ANKR/HUSD": "BINANCE:ANKRUSD",
- "ANKR/DAI": "BINANCE:ANKRUSD",
- "ANKR/PAX": "BINANCE:ANKRUSD",
- "ANKR/BNB": "BINANCE:ANKRBNB",
- "ANKR/EURS": "COINBASE:ANKREUR",
- "ANKR/HT": "HUOBI:ANKRHT",
- "ANT/BTC": "BINANCE:ANTBTC",
- "ANT/ETH": "BITFINEX:ANTETH",
- "ANT/USDT": "BINANCE:ANTUSD",
- "ANT/BUSD": "BINANCE:ANTUSD",
- "ANT/USDC": "BINANCE:ANTUSD",
- "ANT/TUSD": "BINANCE:ANTUSD",
- "ANT/HUSD": "BINANCE:ANTUSD",
- "ANT/DAI": "BINANCE:ANTUSD",
- "ANT/PAX": "BINANCE:ANTUSD",
- "ANT/BNB": "BINANCE:ANTBNB",
- "ANT/EURS": "KRAKEN:ANTEUR",
- "ARPA/BTC": "BINANCE:ARPABTC",
- "ARPA/BNB": "BINANCE:ARPABNB",
- "ARPA/HT": "HUOBI:ARPAHT",
- "ARPA/USDT": "BINANCE:ARPAUSD",
- "ARPA/BUSD": "BINANCE:ARPAUSD",
- "ARPA/USDC": "BINANCE:ARPAUSD",
- "ARPA/TUSD": "BINANCE:ARPAUSD",
- "ARPA/HUSD": "BINANCE:ARPAUSD",
- "ARPA/DAI": "BINANCE:ARPAUSD",
- "ARPA/PAX": "BINANCE:ARPAUSD",
- "ATOM/BTC": "BINANCE:ATOMBTC",
- "ATOM/ETH": "KRAKEN:ATOMETH",
- "ATOM/USDT": "COINBASE:ATOMUSD",
- "ATOM/BUSD": "COINBASE:ATOMUSD",
- "ATOM/USDC": "COINBASE:ATOMUSD",
- "ATOM/TUSD": "COINBASE:ATOMUSD",
- "ATOM/HUSD": "COINBASE:ATOMUSD",
- "ATOM/DAI": "COINBASE:ATOMUSD",
- "ATOM/PAX": "COINBASE:ATOMUSD",
- "ATOM/BNB": "BINANCE:ATOMBNB",
- "ATOM/EURS": "KRAKEN:ATOMEUR",
- "ATOM/BCH": "HITBTC:ATOMBCH",
- "AVA/BTC": "BINANCE:AVABTC",
- "AVA/ETH": "KUCOIN:AVAETH",
- "AVA/USDT": "BINANCE:AVAUSD",
- "AVA/BUSD": "BINANCE:AVAUSD",
- "AVA/USDC": "BINANCE:AVAUSD",
- "AVA/TUSD": "BINANCE:AVAUSD",
- "AVA/HUSD": "BINANCE:AVAUSD",
- "AVA/DAI": "BINANCE:AVAUSD",
- "AVA/PAX": "BINANCE:AVAUSD",
- "AVA/BNB": "BINANCE:AVABNB",
- "AVAX/BTC": "BINANCE:AVAXBTC",
- "AVAX/ETH": "OKEX:AVAXETH",
- "AVAX/USDT": "BINANCE:AVAXUSD",
- "AVAX/BUSD": "BINANCE:AVAXUSD",
- "AVAX/USDC": "BINANCE:AVAXUSD",
- "AVAX/TUSD": "BINANCE:AVAXUSD",
- "AVAX/HUSD": "BINANCE:AVAXUSD",
- "AVAX/DAI": "BINANCE:AVAXUSD",
- "AVAX/PAX": "BINANCE:AVAXUSD",
- "AVAX/BNB": "BINANCE:AVAXBNB",
- "AVAX/EURS": "BINANCE:AVAXEUR",
- "BAL/BTC": "BINANCE:BALBTC",
- "BAL/ETH": "HUOBI:BALETH",
- "BAL/USDT": "BINANCE:BALUSD",
- "BAL/BUSD": "BINANCE:BALUSD",
- "BAL/USDC": "BINANCE:BALUSD",
- "BAL/TUSD": "BINANCE:BALUSD",
- "BAL/HUSD": "BINANCE:BALUSD",
- "BAL/DAI": "BINANCE:BALUSD",
- "BAL/PAX": "BINANCE:BALUSD",
- "BAL/EURS": "KRAKEN:BALEUR",
- "BAND/BTC": "BINANCE:BANDBTC",
- "BAND/ETH": "HUOBI:BANDETH",
- "BAND/BNB": "BINANCE:BANDBNB",
- "BAND/USDT": "BINANCE:BANDUSD",
- "BAND/BUSD": "BINANCE:BANDUSD",
- "BAND/USDC": "BINANCE:BANDUSD",
- "BAND/TUSD": "BINANCE:BANDUSD",
- "BAND/HUSD": "BINANCE:BANDUSD",
- "BAND/DAI": "BINANCE:BANDUSD",
- "BAND/PAX": "BINANCE:BANDUSD",
- "BAND/EURS": "COINBASE:BANDEUR",
- "BAT/BTC": "BINANCE:BATBTC",
- "BAT/ETH": "BINANCE:BATETH",
- "BAT/BNB": "BINANCE:BATBNB",
- "BAT/USDT": "BINANCE:BATUSD",
- "BAT/BUSD": "BINANCE:BATUSD",
- "BAT/USDC": "BINANCE:BATUSD",
- "BAT/TUSD": "BINANCE:BATUSD",
- "BAT/HUSD": "BINANCE:BATUSD",
- "BAT/DAI": "BINANCE:BATUSD",
- "BAT/PAX": "BINANCE:BATUSD",
- "BAT/EURS": "KRAKEN:BATEUR",
- "BEST/BTC": "BITPANDAPRO:BESTBTC",
- "BEST/USDT": "HITBTC:BESTUSD",
- "BEST/BUSD": "HITBTC:BESTUSD",
- "BEST/USDC": "HITBTC:BESTUSD",
- "BEST/TUSD": "HITBTC:BESTUSD",
- "BEST/HUSD": "HITBTC:BESTUSD",
- "BEST/DAI": "HITBTC:BESTUSD",
- "BEST/PAX": "HITBTC:BESTUSD",
- "BEST/EURS": "BITPANDAPRO:BESTEUR",
- "BCH/BTC": "BINANCE:BCHBTC",
- "BCH/ETH": "BITTREX:BCHETH",
- "BCH/USDT": "COINBASE:BCHUSD",
- "BCH/BUSD": "COINBASE:BCHUSD",
- "BCH/USDC": "COINBASE:BCHUSD",
- "BCH/TUSD": "COINBASE:BCHUSD",
- "BCH/HUSD": "COINBASE:BCHUSD",
- "BCH/DAI": "COINBASE:BCHUSD",
- "BCH/PAX": "COINBASE:BCHUSD",
- "BCH/BNB": "BINANCE:BCHBNB",
- "BCH/EURS": "HITBTC:BCHEURS",
- "BCH/HT": "HUOBI:BCHHT",
- "BIDR/USDT": "BINANCE:USDTBIDR",
- "BIDR/BUSD": "BINANCE:USDTBIDR",
- "BIDR/USDC": "BINANCE:USDTBIDR",
- "BIDR/TUSD": "BINANCE:USDTBIDR",
- "BIDR/HUSD": "BINANCE:USDTBIDR",
- "BIDR/DAI": "BINANCE:USDTBIDR",
- "BIDR/PAX": "BINANCE:USDTBIDR",
- "BLK/BTC": "BITTREX:BLKBTC",
- "BLK/USDT": "BITTREX:BLKUSD",
- "BLK/BUSD": "BITTREX:BLKUSD",
- "BLK/USDC": "BITTREX:BLKUSD",
- "BLK/TUSD": "BITTREX:BLKUSD",
- "BLK/HUSD": "BITTREX:BLKUSD",
- "BLK/DAI": "BITTREX:BLKUSD",
- "BLK/PAX": "BITTREX:BLKUSD",
- "BNB/BTC": "BINANCE:BNBBTC",
- "BNB/ETH": "BINANCE:BNBETH",
- "BNB/USDT": "BINANCE:BNBUSD",
- "BNB/BUSD": "BINANCE:BNBUSD",
- "BNB/USDC": "BINANCE:BNBUSD",
- "BNB/TUSD": "BINANCE:BNBUSD",
- "BNB/HUSD": "BINANCE:BNBUSD",
- "BNB/DAI": "BINANCE:BNBUSD",
- "BNB/PAX": "BINANCE:BNBUSD",
- "BNB/EURS": "BINANCE:BNBEUR",
- "BNB/TRYB": "BINANCE:BNBTRY",
- "BNB/BIDR": "BINANCE:BNBBIDR",
- "BNT/BTC": "BINANCE:BNTBTC",
- "BNT/ETH": "BINANCE:BNTETH",
- "BNT/USDT": "BINANCE:BNTUSD",
- "BNT/BUSD": "BINANCE:BNTUSD",
- "BNT/USDC": "BINANCE:BNTUSD",
- "BNT/TUSD": "BINANCE:BNTUSD",
- "BNT/HUSD": "BINANCE:BNTUSD",
- "BNT/DAI": "BINANCE:BNTUSD",
- "BNT/PAX": "BINANCE:BNTUSD",
- "BNT/EURS": "COINBASE:BNTEUR",
- "BTC/USDT": "COINBASE:BTCUSD",
- "BTC/BUSD": "COINBASE:BTCUSD",
- "BTC/USDC": "COINBASE:BTCUSD",
- "BTC/TUSD": "COINBASE:BTCUSD",
- "BTC/HUSD": "COINBASE:BTCUSD",
- "BTC/DAI": "COINBASE:BTCUSD",
- "BTC/PAX": "COINBASE:BTCUSD",
- "BTC/EURS": "COINBASE:BTCEUR",
- "BTC/TRYB": "BINANCE:BTCTRY",
- "BTC/BIDR": "BITFINEX:BTCIDR",
- "BTT/BTC": "BITFINEX:BTTBTC",
- "BTT/ETH": "KUCOIN:BTTETH",
- "BTT/USDT": "BITFINEX:BTTUSD",
- "BTT/BUSD": "BITFINEX:BTTUSD",
- "BTT/USDC": "BITFINEX:BTTUSD",
- "BTT/TUSD": "BITFINEX:BTTUSD",
- "BTT/HUSD": "BITFINEX:BTTUSD",
- "BTT/DAI": "BITFINEX:BTTUSD",
- "BTT/PAX": "BITFINEX:BTTUSD",
- "BTT/BNB": "BINANCE:BTTBNB",
- "BTT/EURS": "BINANCE:BTTEUR",
- "BTT/TRYB": "BINANCE:BTTTRY",
- "BTU/BTC": "BITTREX:BTUBTC",
- "BTU/USDT": "BITTREX:BTUUSD",
- "BTU/BUSD": "BITTREX:BTUUSD",
- "BTU/USDC": "BITTREX:BTUUSD",
- "BTU/TUSD": "BITTREX:BTUUSD",
- "BTU/HUSD": "BITTREX:BTUUSD",
- "BTU/DAI": "BITTREX:BTUUSD",
- "BTU/PAX": "BITTREX:BTUUSD",
- "CAKE/BTC": "BINANCE:CAKEBTC",
- "CAKE/USDT": "BINANCE:CAKEUSD",
- "CAKE/BUSD": "BINANCE:CAKEUSD",
- "CAKE/USDC": "BINANCE:CAKEUSD",
- "CAKE/TUSD": "BINANCE:CAKEUSD",
- "CAKE/HUSD": "BINANCE:CAKEUSD",
- "CAKE/DAI": "BINANCE:CAKEUSD",
- "CAKE/PAX": "BINANCE:CAKEUSD",
- "CAKE/BNB": "BINANCE:CAKEBNB",
- "CEL/BTC": "HITBTC:CELBTC",
- "CEL/ETH": "HITBTC:CELETH",
- "CEL/USDT": "HITBTC:CELUSD",
- "CEL/BUSD": "HITBTC:CELUSD",
- "CEL/USDC": "HITBTC:CELUSD",
- "CEL/TUSD": "HITBTC:CELUSD",
- "CEL/HUSD": "HITBTC:CELUSD",
- "CEL/DAI": "HITBTC:CELUSD",
- "CEL/PAX": "HITBTC:CELUSD",
- "CENNZ/BTC": "HITBTC:CENNZBTC",
- "CENNZ/ETH": "HITBTC:CENNZETH",
- "CENNZ/USDT": "HITBTC:CENNZUSD",
- "CENNZ/BUSD": "HITBTC:CENNZUSD",
- "CENNZ/USDC": "HITBTC:CENNZUSD",
- "CENNZ/TUSD": "HITBTC:CENNZUSD",
- "CENNZ/HUSD": "HITBTC:CENNZUSD",
- "CENNZ/DAI": "HITBTC:CENNZUSD",
- "CENNZ/PAX": "HITBTC:CENNZUSD",
- "CHSB/BTC": "KUCOIN:CHSBBTC",
- "CHSB/ETH": "KUCOIN:CHSBETH",
- "CHSB/USDT": "HITBTC:CHSBUSD",
- "CHSB/BUSD": "HITBTC:CHSBUSD",
- "CHSB/USDC": "HITBTC:CHSBUSD",
- "CHSB/TUSD": "HITBTC:CHSBUSD",
- "CHSB/HUSD": "HITBTC:CHSBUSD",
- "CHSB/DAI": "HITBTC:CHSBUSD",
- "CHSB/PAX": "HITBTC:CHSBUSD",
- "CHZ/BTC": "BINANCE:CHZBTC",
- "CHZ/ETH": "HUOBI:CHZETH",
- "CHZ/USDT": "BINANCE:CHZUSD",
- "CHZ/BUSD": "BINANCE:CHZUSD",
- "CHZ/USDC": "BINANCE:CHZUSD",
- "CHZ/TUSD": "BINANCE:CHZUSD",
- "CHZ/HUSD": "BINANCE:CHZUSD",
- "CHZ/DAI": "BINANCE:CHZUSD",
- "CHZ/PAX": "BINANCE:CHZUSD",
- "CHZ/BNB": "BINANCE:CHZBNB",
- "CHZ/EURS": "BINANCE:CHZEUR",
- "COMP/BTC": "BINANCE:COMPBTC",
- "COMP/ETH": "KRAKEN:COMPETH",
- "COMP/USDT": "BINANCE:COMPUSD",
- "COMP/BUSD": "BINANCE:COMPUSD",
- "COMP/USDC": "BINANCE:COMPUSD",
- "COMP/TUSD": "BINANCE:COMPUSD",
- "COMP/HUSD": "BINANCE:COMPUSD",
- "COMP/DAI": "BINANCE:COMPUSD",
- "COMP/PAX": "BINANCE:COMPUSD",
- "COMP/EURS": "KRAKEN:COMPEUR",
- "CRO/BTC": "BITTREX:CROBTC",
- "CRO/ETH": "BITTREX:CROETH",
- "CRO/USDT": "BITTREX:CROUSD",
- "CRO/BUSD": "BITTREX:CROUSD",
- "CRO/USDC": "BITTREX:CROUSD",
- "CRO/TUSD": "BITTREX:CROUSD",
- "CRO/HUSD": "BITTREX:CROUSD",
- "CRO/DAI": "BITTREX:CROUSD",
- "CRO/PAX": "BITTREX:CROUSD",
- "CRO/EURS": "BITTREX:CROEUR",
- "CRO/HT": "HUOBI:CROHT",
- "CRV/BTC": "BINANCE:CRVBTC",
- "CRV/ETH": "KRAKEN:CRVETH",
- "CRV/USDT": "BINANCE:CRVUSD",
- "CRV/BUSD": "BINANCE:CRVUSD",
- "CRV/USDC": "BINANCE:CRVUSD",
- "CRV/TUSD": "BINANCE:CRVUSD",
- "CRV/HUSD": "BINANCE:CRVUSD",
- "CRV/DAI": "BINANCE:CRVUSD",
- "CRV/PAX": "BINANCE:CRVUSD",
- "CRV/BNB": "BINANCE:CRVBNB",
- "CRV/EURS": "KRAKEN:CRVEUR",
- "CVC/BTC": "BINANCE:CVCBTC",
- "CVC/ETH": "BINANCE:CVCETH",
- "CVC/USDT": "BINANCE:CVCUSD",
- "CVC/BUSD": "BINANCE:CVCUSD",
- "CVC/USDC": "BINANCE:CVCUSD",
- "CVC/TUSD": "BINANCE:CVCUSD",
- "CVC/HUSD": "BINANCE:CVCUSD",
- "CVC/DAI": "BINANCE:CVCUSD",
- "CVC/PAX": "BINANCE:CVCUSD",
- "CVT/BTC": "BITTREX:CVTBTC",
- "CVT/ETH": "HITBTC:CVTETH",
- "CVT/USDT": "BITTREX:CVTUSD",
- "CVT/BUSD": "BITTREX:CVTUSD",
- "CVT/USDC": "BITTREX:CVTUSD",
- "CVT/TUSD": "BITTREX:CVTUSD",
- "CVT/HUSD": "BITTREX:CVTUSD",
- "CVT/DAI": "BITTREX:CVTUSD",
- "CVT/PAX": "BITTREX:CVTUSD",
- "DASH/BTC": "BINANCE:DASHBTC",
- "DASH/ETH": "BINANCE:DASHETH",
- "DASH/USDT": "KRAKEN:DASHUSD",
- "DASH/BUSD": "KRAKEN:DASHUSD",
- "DASH/USDC": "KRAKEN:DASHUSD",
- "DASH/TUSD": "KRAKEN:DASHUSD",
- "DASH/HUSD": "KRAKEN:DASHUSD",
- "DASH/DAI": "KRAKEN:DASHUSD",
- "DASH/PAX": "KRAKEN:DASHUSD",
- "DASH/BNB": "BINANCE:DASHBNB",
- "DASH/EURS": "KRAKEN:DASHEUR",
- "DASH/BCH": "HITBTC:DASHBCH",
- "DASH/HT": "HUOBI:DASHHT",
- "DOGE/BTC": "BINANCE:DOGEBTC",
- "DOGE/ETH": "HITBTC:DOGEETH",
- "DOGE/USDT": "BINANCE:DOGEUSD",
- "DOGE/BUSD": "BINANCE:DOGEUSD",
- "DOGE/USDC": "BINANCE:DOGEUSD",
- "DOGE/TUSD": "BINANCE:DOGEUSD",
- "DOGE/HUSD": "BINANCE:DOGEUSD",
- "DOGE/DAI": "BINANCE:DOGEUSD",
- "DOGE/PAX": "BINANCE:DOGEUSD",
- "DOGE/EURS": "BINANCE:DOGEEUR",
- "DOGE/TRYB": "BINANCE:DOGETRY",
- "DOGE/BIDR": "BINANCE:DOGEBIDR",
- "DGB/BTC": "BINANCE:DGBBTC",
- "DGB/ETH": "BITTREX:DGBETH",
- "DGB/USDT": "BITTREX:DGBUSD",
- "DGB/BUSD": "BITTREX:DGBUSD",
- "DGB/USDC": "BITTREX:DGBUSD",
- "DGB/TUSD": "BITTREX:DGBUSD",
- "DGB/HUSD": "BITTREX:DGBUSD",
- "DGB/DAI": "BITTREX:DGBUSD",
- "DGB/PAX": "BITTREX:DGBUSD",
- "DGB/BNB": "BINANCE:DGBBNB",
- "DGB/EURS": "BITTREX:DGBEUR",
- "DIA/BTC": "BINANCE:DIABTC",
- "DIA/ETH": "OKEX:DIAETH",
- "DIA/USDT": "BINANCE:DIAUSD",
- "DIA/BUSD": "BINANCE:DIAUSD",
- "DIA/USDC": "BINANCE:DIAUSD",
- "DIA/TUSD": "BINANCE:DIAUSD",
- "DIA/HUSD": "BINANCE:DIAUSD",
- "DIA/DAI": "BINANCE:DIAUSD",
- "DIA/PAX": "BINANCE:DIAUSD",
- "DIA/BNB": "BINANCE:DIABNB",
- "DODO/BTC": "BINANCE:DODOBTC",
- "DODO/USDT": "BINANCE:DODOUSD",
- "DODO/BUSD": "BINANCE:DODOUSD",
- "DODO/USDC": "BINANCE:DODOUSD",
- "DODO/TUSD": "BINANCE:DODOUSD",
- "DODO/HUSD": "BINANCE:DODOUSD",
- "DODO/DAI": "BINANCE:DODOUSD",
- "DODO/PAX": "BINANCE:DODOUSD",
- "DOT/BTC": "BINANCE:DOTBTC",
- "DOT/ETH": "KRAKEN:DOTETH",
- "DOT/USDT": "BINANCE:DOTUSD",
- "DOT/BUSD": "BINANCE:DOTUSD",
- "DOT/USDC": "BINANCE:DOTUSD",
- "DOT/TUSD": "BINANCE:DOTUSD",
- "DOT/HUSD": "BINANCE:DOTUSD",
- "DOT/DAI": "BINANCE:DOTUSD",
- "DOT/PAX": "BINANCE:DOTUSD",
- "DOT/EURS": "BINANCE:DOTEUR",
- "DOT/TRYB": "BINANCE:DOTTRY",
- "DOT/BIDR": "BINANCE:DOTBIDR",
- "DOT/BNB": "BINANCE:DOTBNB",
- "DX/BTC": "KUCOIN:DXBTC",
- "DX/ETH": "KUCOIN:DXETH",
- "EGLD/BTC": "BINANCE:EGLDBTC",
- "EGLD/USDT": "BINANCE:EGLDUSD",
- "EGLD/BUSD": "BINANCE:EGLDUSD",
- "EGLD/USDC": "BINANCE:EGLDUSD",
- "EGLD/TUSD": "BINANCE:EGLDUSD",
- "EGLD/HUSD": "BINANCE:EGLDUSD",
- "EGLD/DAI": "BINANCE:EGLDUSD",
- "EGLD/PAX": "BINANCE:EGLDUSD",
- "EGLD/BNB": "BINANCE:EGLDBNB",
- "EGLD/EURS": "BINANCE:EGLDEUR",
- "ELF/BTC": "BINANCE:ELFBTC",
- "ELF/ETH": "BINANCE:ELFETH",
- "ELF/USDT": "BINANCE:ELFUSD",
- "ELF/BUSD": "BINANCE:ELFUSD",
- "ELF/USDC": "BINANCE:ELFUSD",
- "ELF/TUSD": "BINANCE:ELFUSD",
- "ELF/HUSD": "BINANCE:ELFUSD",
- "ELF/DAI": "BINANCE:ELFUSD",
- "ELF/PAX": "BINANCE:ELFUSD",
- "EMC2/BTC": "BITTREX:EMC2BTC",
- "EMC2/USDT": "BITTREX:EMC2USD",
- "EMC2/BUSD": "BITTREX:EMC2USD",
- "EMC2/USDC": "BITTREX:EMC2USD",
- "EMC2/TUSD": "BITTREX:EMC2USD",
- "EMC2/HUSD": "BITTREX:EMC2USD",
- "EMC2/DAI": "BITTREX:EMC2USD",
- "EMC2/PAX": "BITTREX:EMC2USD",
- "ENJ/BTC": "BINANCE:ENJBTC",
- "ENJ/ETH": "BINANCE:ENJETH",
- "ENJ/USDT": "BINANCE:ENJUSD",
- "ENJ/BUSD": "BINANCE:ENJUSD",
- "ENJ/USDC": "BINANCE:ENJUSD",
- "ENJ/TUSD": "BINANCE:ENJUSD",
- "ENJ/HUSD": "BINANCE:ENJUSD",
- "ENJ/DAI": "BINANCE:ENJUSD",
- "ENJ/PAX": "BINANCE:ENJUSD",
- "ENJ/BNB": "BINANCE:ENJBNB",
- "ENJ/EURS": "BINANCE:ENJEUR",
- "EOS/BTC": "BINANCE:EOSBTC",
- "EOS/ETH": "BINANCE:EOSETH",
- "EOS/USDT": "BITFINEX:EOSUSD",
- "EOS/BUSD": "BITFINEX:EOSUSD",
- "EOS/USDC": "BITFINEX:EOSUSD",
- "EOS/TUSD": "BITFINEX:EOSUSD",
- "EOS/HUSD": "BITFINEX:EOSUSD",
- "EOS/DAI": "BITFINEX:EOSUSD",
- "EOS/PAX": "BITFINEX:EOSUSD",
- "EOS/BNB": "BINANCE:EOSBNB",
- "EOS/BCH": "HITBTC:EOSBCH",
- "EOS/EURS": "HITBTC:EOSEURS",
- "EOS/TRYB": "BINANCE:EOSTRY",
- "EOS/BIDR": "BITFINEX:EOSIDR",
- "ETC/BTC": "BINANCE:ETCBTC",
- "ETC/ETH": "BINANCE:ETCETH",
- "ETC/USDT": "BINANCE:ETCUSD",
- "ETC/BUSD": "BINANCE:ETCUSD",
- "ETC/USDC": "BINANCE:ETCUSD",
- "ETC/TUSD": "BINANCE:ETCUSD",
- "ETC/HUSD": "BINANCE:ETCUSD",
- "ETC/DAI": "BINANCE:ETCUSD",
- "ETC/PAX": "BINANCE:ETCUSD",
- "ETC/BNB": "BINANCE:ETCBNB",
- "ETC/EURS": "KRAKEN:ETCEUR",
- "ETC/BCH": "HITBTC:ETCBCH",
- "ETH/BTC": "BINANCE:ETHBTC",
- "ETH/USDT": "BITSTAMP:ETHUSD",
- "ETH/BUSD": "BITSTAMP:ETHUSD",
- "ETH/USDC": "BITSTAMP:ETHUSD",
- "ETH/TUSD": "BITSTAMP:ETHUSD",
- "ETH/HUSD": "BITSTAMP:ETHUSD",
- "ETH/DAI": "BITSTAMP:ETHUSD",
- "ETH/PAX": "BITSTAMP:ETHUSD",
- "ETH/EURS": "KRAKEN:ETHEUR",
- "ETH/TRYB": "BINANCE:ETHTRY",
- "ETH/BIDR": "BITFINEX:ETHIDR",
- "EURS/USDT": "FX:EURUSD",
- "EURS/BUSD": "FX:EURUSD",
- "EURS/USDC": "FX:EURUSD",
- "EURS/TUSD": "FX:EURUSD",
- "EURS/HUSD": "FX:EURUSD",
- "EURS/DAI": "FX:EURUSD",
- "EURS/PAX": "FX:EURUSD",
- "EURS/BIDR": "FX_IDC:EURIDR",
- "FIL/BTC": "BINANCE:FILBTC",
- "FIL/ETH": "HUOBI:FILETH",
- "FIL/USDT": "BINANCE:FILUSD",
- "FIL/BUSD": "BINANCE:FILUSD",
- "FIL/USDC": "BINANCE:FILUSD",
- "FIL/TUSD": "BINANCE:FILUSD",
- "FIL/HUSD": "BINANCE:FILUSD",
- "FIL/DAI": "BINANCE:FILUSD",
- "FIL/PAX": "BINANCE:FILUSD",
- "FIL/BNB": "BINANCE:FILBNB",
- "FIL/EURS": "COINBASE:FILEUR",
- "FIRO/BTC": "BINANCE:FIROBTC",
- "FIRO/ETH": "BINANCE:FIROETH",
- "FIRO/USDT": "BITTREX:FIROUSD",
- "FIRO/BUSD": "BITTREX:FIROUSD",
- "FIRO/USDC": "BITTREX:FIROUSD",
- "FIRO/TUSD": "BITTREX:FIROUSD",
- "FIRO/HUSD": "BITTREX:FIROUSD",
- "FIRO/DAI": "BITTREX:FIROUSD",
- "FIRO/PAX": "BITTREX:FIROUSD",
- "FTC/BTC": "BITTREX:FTCBTC",
- "FTC/USDT": "BITTREX:FTCUSD",
- "FTC/BUSD": "BITTREX:FTCUSD",
- "FTC/USDC": "BITTREX:FTCUSD",
- "FTC/TUSD": "BITTREX:FTCUSD",
- "FTC/HUSD": "BITTREX:FTCUSD",
- "FTC/DAI": "BITTREX:FTCUSD",
- "FTC/PAX": "BITTREX:FTCUSD",
- "FTM/BTC": "BINANCE:FTMBTC",
- "FTM/ETH": "KUCOIN:FTMETH",
- "FTM/USDT": "BINANCE:FTMUSD",
- "FTM/BUSD": "BINANCE:FTMUSD",
- "FTM/USDC": "BINANCE:FTMUSD",
- "FTM/FTM": "BINANCE:FTMUSD",
- "FTM/HUSD": "BINANCE:FTMUSD",
- "FTM/DAI": "BINANCE:FTMUSD",
- "FTM/PAX": "BINANCE:FTMUSD",
- "FTM/BNB": "BINANCE:FTMBNB",
- "FUN/BTC": "BINANCE:FUNBTC",
- "FUN/ETH": "BINANCE:FUNETH",
- "FUN/USDT": "BINANCE:FUNUSD",
- "FUN/BUSD": "BINANCE:FUNUSD",
- "FUN/USDC": "BINANCE:FUNUSD",
- "FUN/FUN": "BINANCE:FUNUSD",
- "FUN/HUSD": "BINANCE:FUNUSD",
- "FUN/DAI": "BINANCE:FUNUSD",
- "FUN/PAX": "BINANCE:FUNUSD",
- "GLEEC/BTC": "BITTREX:GLEECBTC",
- "GLEEC/USDT": "BITTREX:GLEECUSD",
- "GLEEC/BUSD": "BITTREX:GLEECUSD",
- "GLEEC/USDC": "BITTREX:GLEECUSD",
- "GLEEC/TUSD": "BITTREX:GLEECUSD",
- "GLEEC/HUSD": "BITTREX:GLEECUSD",
- "GLEEC/DAI": "BITTREX:GLEECUSD",
- "GLEEC/PAX": "BITTREX:GLEECUSD",
- "GNO/BTC": "BITTREX:GNOBTC",
- "GNO/ETH": "KRAKEN:GNOETH",
- "GNO/USDT": "KRAKEN:GNOUSD",
- "GNO/BUSD": "KRAKEN:GNOUSD",
- "GNO/USDC": "KRAKEN:GNOUSD",
- "GNO/TUSD": "KRAKEN:GNOUSD",
- "GNO/HUSD": "KRAKEN:GNOUSD",
- "GNO/DAI": "KRAKEN:GNOUSD",
- "GNO/PAX": "KRAKEN:GNOUSD",
- "GNO/EURS": "KRAKEN:GNOEUR",
- "GRS/BTC": "BINANCE:GRSBTC",
- "GRS/ETH": "HUOBI:GRSETH",
- "GRS/USDT": "BINANCE:GRSUSD",
- "GRS/BUSD": "BINANCE:GRSUSD",
- "GRS/USDC": "BINANCE:GRSUSD",
- "GRS/TUSD": "BINANCE:GRSUSD",
- "GRS/HUSD": "BINANCE:GRSUSD",
- "GRS/DAI": "BINANCE:GRSUSD",
- "GRS/PAX": "BINANCE:GRSUSD",
- "HEX/BTC": "HITBTC:HEXBTC",
- "HEX/USDC": "UNISWAP:HEXUSDC",
- "HOT/BTC": "HITBTC:HOTBTC",
- "HOT/ETH": "BINANCE:HOTETH",
- "HOT/USDT": "HITBTC:HOTUSD",
- "HOT/BUSD": "HITBTC:HOTUSD",
- "HOT/USDC": "HITBTC:HOTUSD",
- "HOT/TUSD": "HITBTC:HOTUSD",
- "HOT/HUSD": "HITBTC:HOTUSD",
- "HOT/DAI": "HITBTC:HOTUSD",
- "HOT/PAX": "HITBTC:HOTUSD",
- "HOT/BNB": "BINANCE:HOTBNB",
- "HOT/EURS": "BINANCE:HOTEUR",
- "HT/BTC": "HUOBI:HTBTC",
- "HT/ETH": "HUOBI:HTETH",
- "HT/USDT": "HUOBI:HTUSDT",
- "HT/HUSD": "HUOBI:HTHUSD",
- "INJ/BTC": "BINANCE:INJBTC",
- "INJ/ETH": "HUOBI:INJETH",
- "INJ/USDT": "BINANCE:INJUSD",
- "INJ/BUSD": "BINANCE:INJUSD",
- "INJ/USDC": "BINANCE:INJUSD",
- "INJ/TUSD": "BINANCE:INJUSD",
- "INJ/HUSD": "BINANCE:INJUSD",
- "INJ/DAI": "BINANCE:INJUSD",
- "INJ/PAX": "BINANCE:INJUSD",
- "INJ/BNB": "BINANCE:INJBNB",
- "INK/BTC": "HITBTC:INKBTC",
- "INK/ETH": "HITBTC:INKETH",
- "INK/USDT": "HITBTC:INKUSDT",
- "IOTA/BTC": "BINANCE:IOTABTC",
- "IOTA/ETH": "BINANCE:IOTAETH",
- "IOTA/USDT": "BINANCE:IOTAUSD",
- "IOTA/BUSD": "BINANCE:IOTAUSD",
- "IOTA/USDC": "BINANCE:IOTAUSD",
- "IOTA/TUSD": "BINANCE:IOTAUSD",
- "IOTA/HUSD": "BINANCE:IOTAUSD",
- "IOTA/DAI": "BINANCE:IOTAUSD",
- "IOTA/PAX": "BINANCE:IOTAUSD",
- "IOTA/BNB": "BINANCE:IOTABNB",
- "IOTA/EURS": "BITPANDAPRO:MIOTAEUR",
- "IOTX/BTC": "BINANCE:IOTXBTC",
- "IOTX/ETH": "BINANCE:IOTXETH",
- "IOTX/USDT": "BINANCE:IOTXUSD",
- "IOTX/BUSD": "BINANCE:IOTXUSD",
- "IOTX/USDC": "BINANCE:IOTXUSD",
- "IOTX/TUSD": "BINANCE:IOTXUSD",
- "IOTX/HUSD": "BINANCE:IOTXUSD",
- "IOTX/DAI": "BINANCE:IOTXUSD",
- "IOTX/PAX": "BINANCE:IOTXUSD",
- "KMD/BTC": "BINANCE:KMDBTC",
- "KMD/ETH": "BINANCE:KMDETH",
- "KMD/USDT": "BINANCE:KMDUSD",
- "KMD/BUSD": "BINANCE:KMDUSD",
- "KMD/USDC": "BINANCE:KMDUSD",
- "KMD/TUSD": "BINANCE:KMDUSD",
- "KMD/HUSD": "BINANCE:KMDUSD",
- "KMD/DAI": "BINANCE:KMDUSD",
- "KMD/PAX": "BINANCE:KMDUSD",
- "KMD/TRYB": "BITTREX:KMDTRY",
- "KMD/BIDR": "BITTREX:KMDIDR",
- "KNC/BTC": "BINANCE:KNCBTC",
- "KNC/ETH": "BINANCE:KNCETH",
- "KNC/USDT": "COINBASE:KNCUSD",
- "KNC/BUSD": "COINBASE:KNCUSD",
- "KNC/USDC": "COINBASE:KNCUSD",
- "KNC/TUSD": "COINBASE:KNCUSD",
- "KNC/HUSD": "COINBASE:KNCUSD",
- "KNC/DAI": "COINBASE:KNCUSD",
- "KNC/PAX": "COINBASE:KNCUSD",
- "KNC/EURS": "KRAKEN:KNCEUR",
- "LBC/BTC": "BITTREX:LBCBTC",
- "LBC/ETH": "BITTREX:LBCETH",
- "LBC/USDT": "BITTREX:LBCUSD",
- "LBC/BUSD": "BITTREX:LBCUSD",
- "LBC/USDC": "BITTREX:LBCUSD",
- "LBC/TUSD": "BITTREX:LBCUSD",
- "LBC/HUSD": "BITTREX:LBCUSD",
- "LBC/DAI": "BITTREX:LBCUSD",
- "LBC/PAX": "BITTREX:LBCUSD",
- "LCC/BTC": "HITBTC:LCCBTC",
- "LCC/USDT": "HITBTC:LCCUSD",
- "LCC/BUSD": "HITBTC:LCCUSD",
- "LCC/USDC": "HITBTC:LCCUSD",
- "LCC/TUSD": "HITBTC:LCCUSD",
- "LCC/HUSD": "HITBTC:LCCUSD",
- "LCC/DAI": "HITBTC:LCCUSD",
- "LCC/PAX": "HITBTC:LCCUSD",
- "LEO/BTC": "BITFINEX:LEOBTC",
- "LEO/ETH": "BITFINEX:LEOETH",
- "LEO/USDT": "BITFINEX:LEOUSD",
- "LEO/BUSD": "BITFINEX:LEOUSD",
- "LEO/USDC": "BITFINEX:LEOUSD",
- "LEO/TUSD": "BITFINEX:LEOUSD",
- "LEO/HUSD": "BITFINEX:LEOUSD",
- "LEO/DAI": "BITFINEX:LEOUSD",
- "LEO/PAX": "BITFINEX:LEOUSD",
- "LINK/BTC": "BINANCE:LINKBTC",
- "LINK/ETH": "BINANCE:LINKETH",
- "LINK/BCH": "HITBTC:LINKBCH",
- "LINK/USDT": "BINANCE:LINKUSD",
- "LINK/BUSD": "BINANCE:LINKUSD",
- "LINK/USDC": "BINANCE:LINKUSD",
- "LINK/TUSD": "BINANCE:LINKUSD",
- "LINK/HUSD": "BINANCE:LINKUSD",
- "LINK/DAI": "BINANCE:LINKUSD",
- "LINK/PAX": "BINANCE:LINKUSD",
- "LINK/EURS": "KRAKEN:LINKEUR",
- "LINK/TRYB": "BINANCE:LINKTRY",
- "LRC/BTC": "BINANCE:LRCBTC",
- "LRC/ETH": "BINANCE:LRCETH",
- "LRC/USDT": "BINANCE:LRCUSD",
- "LRC/BUSD": "BINANCE:LRCUSD",
- "LRC/USDC": "BINANCE:LRCUSD",
- "LRC/TUSD": "BINANCE:LRCUSD",
- "LRC/HUSD": "BINANCE:LRCUSD",
- "LRC/DAI": "BINANCE:LRCUSD",
- "LRC/PAX": "BINANCE:LRCUSD",
- "LTC/BTC": "BINANCE:LTCBTC",
- "LTC/ETH": "BINANCE:LTCETH",
- "LTC/USDT": "COINBASE:LTCUSD",
- "LTC/BUSD": "COINBASE:LTCUSD",
- "LTC/USDC": "COINBASE:LTCUSD",
- "LTC/TUSD": "COINBASE:LTCUSD",
- "LTC/HUSD": "COINBASE:LTCUSD",
- "LTC/DAI": "COINBASE:LTCUSD",
- "LTC/PAX": "COINBASE:LTCUSD",
- "LTC/BNB": "BINANCE:LTCBNB",
- "LTC/EURS": "COINBASE:LTCEUR",
- "LTC/TRYB": "BITFINEX:LTCTRY",
- "LTC/BIDR": "BITFINEX:LTCIDR",
- "LTC/BCH": "HITBTC:LTCBCH",
- "LTC/HT": "HUOBI:LTCHT",
- "MANA/BTC": "BINANCE:MANABTC",
- "MANA/ETH": "BINANCE:MANAETH",
- "MANA/USDT": "BINANCE:MANAUSD",
- "MANA/BUSD": "BINANCE:MANAUSD",
- "MANA/USDC": "BINANCE:MANAUSD",
- "MANA/TUSD": "BINANCE:MANAUSD",
- "MANA/HUSD": "BINANCE:MANAUSD",
- "MANA/DAI": "BINANCE:MANAUSD",
- "MANA/PAX": "BINANCE:MANAUSD",
- "MANA/EURS": "KRAKEN:MANAEUR",
- "MATIC/BTC": "BINANCE:MATICBTC",
- "MATIC/ETH": "HUOBI:MATICETH",
- "MATIC/USDT": "BINANCE:MATICUSD",
- "MATIC/BUSD": "BINANCE:MATICUSD",
- "MATIC/USDC": "BINANCE:MATICUSD",
- "MATIC/TUSD": "BINANCE:MATICUSD",
- "MATIC/HUSD": "BINANCE:MATICUSD",
- "MATIC/DAI": "BINANCE:MATICUSD",
- "MATIC/PAX": "BINANCE:MATICUSD",
- "MATIC/BNB": "BINANCE:MATICBNB",
- "MATIC/EURS": "COINBASE:MATICEUR",
- "MATIC/TRYB": "BINANCE:MATICTRY",
- "MATIC/BIDR": "BINANCE:MATICBIDR",
- "MKR/BTC": "BINANCE:MKRBTC",
- "MKR/ETH": "BITFINEX:MKRETH",
- "MKR/BNB": "BINANCE:MKRBNB",
- "MKR/USDT": "BINANCE:MKRUSD",
- "MKR/BUSD": "BINANCE:MKRUSD",
- "MKR/USDC": "BINANCE:MKRUSD",
- "MKR/TUSD": "BINANCE:MKRUSD",
- "MKR/HUSD": "BINANCE:MKRUSD",
- "MKR/DAI": "BINANCE:MKRUSD",
- "MKR/PAX": "BINANCE:MKRUSD",
- "MKR/EURS": "BITSTAMP:MKREUR",
- "MONA/BTC": "BITTREX:MONABTC",
- "MONA/USDT": "BITTREX:MONAUSD",
- "MONA/BUSD": "BITTREX:MONAUSD",
- "MONA/USDC": "BITTREX:MONAUSD",
- "MONA/TUSD": "BITTREX:MONAUSD",
- "MONA/HUSD": "BITTREX:MONAUSD",
- "MONA/DAI": "BITTREX:MONAUSD",
- "MONA/PAX": "BITTREX:MONAUSD",
- "NAV/BTC": "BINANCE:NAVBTC",
- "NAV/USDT": "BINANCE:NAVUSD",
- "NAV/BUSD": "BINANCE:NAVUSD",
- "NAV/USDC": "BINANCE:NAVUSD",
- "NAV/TUSD": "BINANCE:NAVUSD",
- "NAV/HUSD": "BINANCE:NAVUSD",
- "NAV/DAI": "BINANCE:NAVUSD",
- "NAV/PAX": "BINANCE:NAVUSD",
- "NEAR/BTC": "BINANCE:NEARBTC",
- "NEAR/ETH": "OKEX:NEARETH",
- "NEAR/USDT": "BINANCE:NEARUSD",
- "NEAR/BUSD": "BINANCE:NEARUSD",
- "NEAR/USDC": "BINANCE:NEARUSD",
- "NEAR/TUSD": "BINANCE:NEARUSD",
- "NEAR/HUSD": "BINANCE:NEARUSD",
- "NEAR/DAI": "BINANCE:NEARUSD",
- "NEAR/PAX": "BINANCE:NEARUSD",
- "NEAR/BNB": "BINANCE:NEARBNB",
- "OCEAN/BTC": "BINANCE:OCEANBTC",
- "OCEAN/ETH": "KUCOIN:OCEANETH",
- "OCEAN/USDT": "BINANCE:OCEANUSD",
- "OCEAN/BUSD": "BINANCE:OCEANUSD",
- "OCEAN/USDC": "BINANCE:OCEANUSD",
- "OCEAN/TUSD": "BINANCE:OCEANUSD",
- "OCEAN/HUSD": "BINANCE:OCEANUSD",
- "OCEAN/DAI": "BINANCE:OCEANUSD",
- "OCEAN/PAX": "BINANCE:OCEANUSD",
- "OCEAN/BNB": "BINANCE:OCEANBNB",
- "OCEAN/EURS": "KRAKEN:OCEANEUR",
- "OKB/BTC": "OKEX:OKBBTC",
- "OKB/ETH": "OKEX:OKBETH",
- "OKB/USDT": "OKEX:OKBUSDT",
- "OKB/USDC": "OKEX:OKBUSDC",
- "ONT/BTC": "BINANCE:ONTBTC",
- "ONT/ETH": "BINANCE:ONTETH",
- "ONT/USDT": "BINANCE:ONTUSD",
- "ONT/BUSD": "BINANCE:ONTUSD",
- "ONT/USDC": "BINANCE:ONTUSD",
- "ONT/TUSD": "BINANCE:ONTUSD",
- "ONT/HUSD": "BINANCE:ONTUSD",
- "ONT/DAI": "BINANCE:ONTUSD",
- "ONT/PAX": "BINANCE:ONTUSD",
- "ONT/TRYB": "BINANCE:ONTTRY",
- "ONT/BNB": "BINANCE:ONTBNB",
- "ONT/BCH": "HITBTC:ONTBCH",
- "PAXG/BTC": "BINANCE:PAXGBTC",
- "PAXG/ETH": "KRAKEN:PAXGETH",
- "PAXG/USDT": "KRAKEN:PAXGUSD",
- "PAXG/BUSD": "KRAKEN:PAXGUSD",
- "PAXG/USDC": "KRAKEN:PAXGUSD",
- "PAXG/TUSD": "KRAKEN:PAXGUSD",
- "PAXG/HUSD": "KRAKEN:PAXGUSD",
- "PAXG/DAI": "KRAKEN:PAXGUSD",
- "PAXG/PAX": "KRAKEN:PAXGUSD",
- "PAXG/BNB": "BINANCE:PAXGBNB",
- "PAXG/EURS": "KRAKEN:PAXGEUR",
- "PNK/BTC": "BITFINEX:PNKBTC",
- "PNK/ETH": "BITFINEX:PNKETH",
- "PNK/USDT": "OKEX:PNKUSDT",
- "POWR/BTC": "BINANCE:POWRBTC",
- "POWR/ETH": "BINANCE:POWRETH",
- "QC/USDT": "FX_IDC:CNYUSD",
- "QC/BUSD": "FX_IDC:CNYUSD",
- "QC/USDC": "FX_IDC:CNYUSD",
- "QC/TUSD": "FX_IDC:CNYUSD",
- "QC/HUSD": "FX_IDC:CNYUSD",
- "QC/DAI": "FX_IDC:CNYUSD",
- "QC/PAX": "FX_IDC:CNYUSD",
- "QC/EURS": "FX_IDC:CNYEUR",
- "QC/TRYB": "FX_IDC:CNYTRY",
- "QC/BIDR": "FX_IDC:CNYIDR",
- "QKC/BTC": "BINANCE:QKCBTC",
- "QKC/ETH": "BINANCE:QKCETH",
- "QKC/USDT": "BINANCE:QKCUSD",
- "QKC/BUSD": "BINANCE:QKCUSD",
- "QKC/USDC": "BINANCE:QKCUSD",
- "QKC/TUSD": "BINANCE:QKCUSD",
- "QKC/HUSD": "BINANCE:QKCUSD",
- "QKC/DAI": "BINANCE:QKCUSD",
- "QKC/PAX": "BINANCE:QKCUSD",
- "QNT/BTC": "BITTREX:QNTBTC",
- "QNT/USDT": "BITTREX:QNTUSD",
- "QNT/BUSD": "BITTREX:QNTUSD",
- "QNT/USDC": "BITTREX:QNTUSD",
- "QNT/TUSD": "BITTREX:QNTUSD",
- "QNT/HUSD": "BITTREX:QNTUSD",
- "QNT/DAI": "BITTREX:QNTUSD",
- "QNT/PAX": "BITTREX:QNTUSD",
- "QTUM/BTC": "BINANCE:QTUMBTC",
- "QTUM/ETH": "BINANCE:QTUMETH",
- "QTUM/USDT": "BINANCE:QTUMUSD",
- "QTUM/BUSD": "BINANCE:QTUMUSD",
- "QTUM/USDC": "BINANCE:QTUMUSD",
- "QTUM/TUSD": "BINANCE:QTUMUSD",
- "QTUM/HUSD": "BINANCE:QTUMUSD",
- "QTUM/DAI": "BINANCE:QTUMUSD",
- "QTUM/PAX": "BINANCE:QTUMUSD",
- "QTUM/EURS": "KRAKEN:QTUMEUR",
- "REN/BTC": "BINANCE:RENBTC",
- "REN/ETH": "HUOBI:RENETH",
- "REN/USDT": "BINANCE:RENUSD",
- "REN/BUSD": "BINANCE:RENUSD",
- "REN/USDC": "BINANCE:RENUSD",
- "REN/TUSD": "BINANCE:RENUSD",
- "REN/HUSD": "BINANCE:RENUSD",
- "REN/DAI": "BINANCE:RENUSD",
- "REN/PAX": "BINANCE:RENUSD",
- "REN/EURS": "BITTREX:RENEUR",
- "REP/BTC": "BINANCE:REPBTC",
- "REP/ETH": "BINANCE:REPETH",
- "REP/USDT": "COINBASE:REPUSD",
- "REP/BUSD": "COINBASE:REPUSD",
- "REP/USDC": "COINBASE:REPUSD",
- "REP/REP": "COINBASE:REPUSD",
- "REP/HUSD": "COINBASE:REPUSD",
- "REP/DAI": "COINBASE:REPUSD",
- "REP/PAX": "COINBASE:REPUSD",
- "REP/EURS": "KRAKEN:REPEUR",
- "REV/BTC": "BITTREX:REVBTC",
- "REV/USDT": "BITTREX:REVUSD",
- "REV/BUSD": "BITTREX:REVUSD",
- "REV/USDC": "BITTREX:REVUSD",
- "REV/TUSD": "BITTREX:REVUSD",
- "REV/HUSD": "BITTREX:REVUSD",
- "REV/DAI": "BITTREX:REVUSD",
- "REV/PAX": "BITTREX:REVUSD",
- "RLC/BTC": "BINANCE:RLCBTC",
- "RLC/ETH": "BINANCE:RLCETH",
- "RLC/USDT": "BINANCE:RLCUSD",
- "RLC/BUSD": "BINANCE:RLCUSD",
- "RLC/USDC": "BINANCE:RLCUSD",
- "RLC/TUSD": "BINANCE:RLCUSD",
- "RLC/HUSD": "BINANCE:RLCUSD",
- "RLC/DAI": "BINANCE:RLCUSD",
- "RLC/PAX": "BINANCE:RLCUSD",
- "RSR/BTC": "BINANCE:RSRBTC",
- "RSR/ETH": "OKEX:RSRETH",
- "RSR/USDT": "BINANCE:RSRUSD",
- "RSR/BUSD": "BINANCE:RSRUSD",
- "RSR/USDC": "BINANCE:RSRUSD",
- "RSR/TUSD": "BINANCE:RSRUSD",
- "RSR/HUSD": "BINANCE:RSRUSD",
- "RSR/DAI": "BINANCE:RSRUSD",
- "RSR/PAX": "BINANCE:RSRUSD",
- "RSR/BNB": "BINANCE:RSRBNB",
- "RSR/HT": "HUOBI:RSRHT",
- "RVN/BTC": "BINANCE:RVNBTC",
- "RVN/USDT": "BINANCE:RVNUSD",
- "RVN/BUSD": "BINANCE:RVNUSD",
- "RVN/USDC": "BINANCE:RVNUSD",
- "RVN/TUSD": "BINANCE:RVNUSD",
- "RVN/HUSD": "BINANCE:RVNUSD",
- "RVN/DAI": "BINANCE:RVNUSD",
- "RVN/PAX": "BINANCE:RVNUSD",
- "RVN/TRYB": "BINANCE:RVNTRY",
- "RVN/BNB": "BINANCE:RVNBNB",
- "RVN/HT": "HUOBI:RVNHT",
- "SHR/BTC": "KUCOIN:SHRBTC",
- "SHR/USDT": "KUCOIN:SHRUSDT",
- "SKL/BTC": "BINANCE:SKLBTC",
- "SKL/ETH": "HUOBI:SKLETH",
- "SKL/USDT": "COINBASE:SKLUSD",
- "SKL/BUSD": "COINBASE:SKLUSD",
- "SKL/USDC": "COINBASE:SKLUSD",
- "SKL/TUSD": "COINBASE:SKLUSD",
- "SKL/HUSD": "COINBASE:SKLUSD",
- "SKL/DAI": "COINBASE:SKLUSD",
- "SKL/PAX": "COINBASE:SKLUSD",
- "SKL/EURS": "COINBASE:SKLEUR",
- "SNT/BTC": "BINANCE:SNTBTC",
- "SNT/ETH": "BINANCE:SNTETH",
- "SNT/USDT": "BINANCE:SNTUSD",
- "SNT/BUSD": "BINANCE:SNTUSD",
- "SNT/USDC": "BINANCE:SNTUSD",
- "SNT/TUSD": "BINANCE:SNTUSD",
- "SNT/HUSD": "BINANCE:SNTUSD",
- "SNT/DAI": "BINANCE:SNTUSD",
- "SNT/PAX": "BINANCE:SNTUSD",
- "SNX/BTC": "BINANCE:SNXBTC",
- "SNX/ETH": "KRAKEN:SNXETH",
- "SNX/BNB": "BINANCE:SNXBNB",
- "SNX/USDT": "BINANCE:SNXUSD",
- "SNX/BUSD": "BINANCE:SNXUSD",
- "SNX/USDC": "BINANCE:SNXUSD",
- "SNX/TUSD": "BINANCE:SNXUSD",
- "SNX/HUSD": "BINANCE:SNXUSD",
- "SNX/DAI": "BINANCE:SNXUSD",
- "SNX/PAX": "BINANCE:SNXUSD",
- "SNX/EURS": "KRAKEN:SNXEUR",
- "SPC/BTC": "BITTREX:SPCBTC",
- "SPC/ETH": "HITBTC:SPCETH",
- "SPC/USDT": "HITBTC:SPCUSDT",
- "SRM/BTC": "BINANCE:SRMBTC",
- "SRM/USDT": "BINANCE:SRMUSDT",
- "SRM/BUSD": "BINANCE:SRMBUSD",
- "STFIRO/ETH": "SUSHISWAP:STFIROWETH",
- "STORJ/BTC": "BINANCE:STORJBTC",
- "STORJ/ETH": "KRAKEN:STORJETH",
- "STORJ/USDT": "BINANCE:STORJUSD",
- "STORJ/BUSD": "BINANCE:STORJUSD",
- "STORJ/USDC": "BINANCE:STORJUSD",
- "STORJ/TUSD": "BINANCE:STORJUSD",
- "STORJ/HUSD": "BINANCE:STORJUSD",
- "STORJ/DAI": "BINANCE:STORJUSD",
- "STORJ/PAX": "BINANCE:STORJUSD",
- "STORJ/EURS": "KRAKEN:STORJEUR",
- "SUSHI/BTC": "BINANCE:SUSHIBTC",
- "SUSHI/ETH": "HUOBI:SUSHIETH",
- "SUSHI/USDT": "BINANCE:SUSHIUSD",
- "SUSHI/BUSD": "BINANCE:SUSHIUSD",
- "SUSHI/USDC": "BINANCE:SUSHIUSD",
- "SUSHI/TUSD": "BINANCE:SUSHIUSD",
- "SUSHI/HUSD": "BINANCE:SUSHIUSD",
- "SUSHI/DAI": "BINANCE:SUSHIUSD",
- "SUSHI/PAX": "BINANCE:SUSHIUSD",
- "SUSHI/BNB": "BINANCE:SUSHIBNB",
- "SUSHI/EURS": "COINBASE:SUSHIEUR",
- "SXP/BTC": "BINANCE:SXPBTC",
- "SXP/BNB": "BINANCE:SXPBNB",
- "SXP/USDT": "BINANCE:SXPUSD",
- "SXP/BUSD": "BINANCE:SXPUSD",
- "SXP/USDC": "BINANCE:SXPUSD",
- "SXP/TUSD": "BINANCE:SXPUSD",
- "SXP/HUSD": "BINANCE:SXPUSD",
- "SXP/DAI": "BINANCE:SXPUSD",
- "SXP/PAX": "BINANCE:SXPUSD",
- "SXP/EURS": "BINANCE:SXPEUR",
- "SXP/TRYB": "BINANCE:SXPTRY",
- "SXP/BIDR": "BINANCE:SXPBIDR",
- "SYS/BTC": "BINANCE:SYSBTC",
- "SYS/USDT": "BINANCE:SYSUSD",
- "SYS/BUSD": "BINANCE:SYSUSD",
- "SYS/USDC": "BINANCE:SYSUSD",
- "SYS/TUSD": "BINANCE:SYSUSD",
- "SYS/HUSD": "BINANCE:SYSUSD",
- "SYS/DAI": "BINANCE:SYSUSD",
- "SYS/PAX": "BINANCE:SYSUSD",
- "TMTG/BTC": "OKEX:TMTGBTC",
- "TMTG/USDT": "OKEX:TMTGUSDT",
- "TRAC/BTC": "KUCOIN:TRACBTC",
- "TRAC/ETH": "KUCOIN:TRACETH",
- "TRAC/USDT": "BITTREX:TRACUSD",
- "TRAC/BUSD": "BITTREX:TRACUSD",
- "TRAC/USDC": "BITTREX:TRACUSD",
- "TRAC/TUSD": "BITTREX:TRACUSD",
- "TRAC/HUSD": "BITTREX:TRACUSD",
- "TRAC/DAI": "BITTREX:TRACUSD",
- "TRAC/PAX": "BITTREX:TRACUSD",
- "TRX/BTC": "BINANCE:TRXBTC",
- "TRX/ETH": "BINANCE:TRXETH",
- "TRX/USDT": "KRAKEN:TRXUSD",
- "TRX/BUSD": "KRAKEN:TRXUSD",
- "TRX/USDC": "KRAKEN:TRXUSD",
- "TRX/TUSD": "KRAKEN:TRXUSD",
- "TRX/HUSD": "KRAKEN:TRXUSD",
- "TRX/DAI": "KRAKEN:TRXUSD",
- "TRX/PAX": "KRAKEN:TRXUSD",
- "TRX/BNB": "BINANCE:TRXBNB",
- "TRX/EURS": "KRAKEN:TRXEUR",
- "TRX/TRYB": "BINANCE:TRXTRY",
- "TRX/BCH": "HITBTC:TRXBCH",
- "TRYB/USDT": "FX_IDC:TRYUSD",
- "TRYB/BUSD": "FX_IDC:TRYUSD",
- "TRYB/USDC": "FX_IDC:TRYUSD",
- "TRYB/TUSD": "FX_IDC:TRYUSD",
- "TRYB/HUSD": "FX_IDC:TRYUSD",
- "TRYB/DAI": "FX_IDC:TRYUSD",
- "TRYB/PAX": "FX_IDC:TRYUSD",
- "TRYB/EURS": "FX_IDC:TRYEUR",
- "THC/BTC": "BITTREX:THCBTC",
- "THC/USDT": "BITTREX:THCUSD",
- "THC/BUSD": "BITTREX:THCUSD",
- "THC/USDC": "BITTREX:THCUSD",
- "THC/TUSD": "BITTREX:THCUSD",
- "THC/HUSD": "BITTREX:THCUSD",
- "THC/DAI": "BITTREX:THCUSD",
- "THC/PAX": "BITTREX:THCUSD",
- "UBT/BTC": "BITTREX:UBTBTC",
- "UBT/ETH": "BITTREX:UBTETH",
- "UBT/USDT": "BITTREX:UBTUSD",
- "UBT/BUSD": "BITTREX:UBTUSD",
- "UBT/USDC": "BITTREX:UBTUSD",
- "UBT/TUSD": "BITTREX:UBTUSD",
- "UBT/HUSD": "BITTREX:UBTUSD",
- "UBT/DAI": "BITTREX:UBTUSD",
- "UBT/PAX": "BITTREX:UBTUSD",
- "UBT/EURS": "BITTREX:UBTEUR",
- "UMA/BTC": "BINANCE:UMABTC",
- "UMA/ETH": "OKEX:UMAETH",
- "UMA/USDT": "COINBASE:UMAUSD",
- "UMA/BUSD": "COINBASE:UMAUSD",
- "UMA/USDC": "COINBASE:UMAUSD",
- "UMA/TUSD": "COINBASE:UMAUSD",
- "UMA/HUSD": "COINBASE:UMAUSD",
- "UMA/DAI": "COINBASE:UMAUSD",
- "UMA/PAX": "COINBASE:UMAUSD",
- "UMA/EURS": "COINBASE:UMAEUR",
- "UNI/BTC": "BINANCE:UNIBTC",
- "UNI/ETH": "KRAKEN:UNIETH",
- "UNI/USDT": "COINBASE:UNIUSD",
- "UNI/BUSD": "COINBASE:UNIUSD",
- "UNI/USDC": "COINBASE:UNIUSD",
- "UNI/TUSD": "COINBASE:UNIUSD",
- "UNI/HUSD": "COINBASE:UNIUSD",
- "UNI/DAI": "COINBASE:UNIUSD",
- "UNI/PAX": "COINBASE:UNIUSD",
- "UNI/BNB": "BINANCE:UNIBNB",
- "UNI/EURS": "KRAKEN:UNIEUR",
- "UOS/BTC": "BITFINEX:UOSBTC",
- "UOS/USDT": "BITFINEX:UOSUSD",
- "UOS/BUSD": "BITFINEX:UOSUSD",
- "UOS/USDC": "BITFINEX:UOSUSD",
- "UOS/TUSD": "BITFINEX:UOSUSD",
- "UOS/HUSD": "BITFINEX:UOSUSD",
- "UOS/DAI": "BITFINEX:UOSUSD",
- "UOS/PAX": "BITFINEX:UOSUSD",
- "UQC/BTC": "BITTREX:UQCBTC",
- "UQC/ETH": "KUCOIN:UQCETH",
- "UQC/USDT": "BITTREX:UQCUSD",
- "UQC/BUSD": "BITTREX:UQCUSD",
- "UQC/USDC": "BITTREX:UQCUSD",
- "UQC/TUSD": "BITTREX:UQCUSD",
- "UQC/HUSD": "BITTREX:UQCUSD",
- "UQC/DAI": "BITTREX:UQCUSD",
- "UQC/PAX": "BITTREX:UQCUSD",
- "UTK/BTC": "BINANCE:UTKBTC",
- "UTK/ETH": "HUOBI:UTKETH",
- "UTK/USDT": "BINANCE:UTKUSD",
- "UTK/BUSD": "BINANCE:UTKUSD",
- "UTK/USDC": "BINANCE:UTKUSD",
- "UTK/TUSD": "BINANCE:UTKUSD",
- "UTK/HUSD": "BINANCE:UTKUSD",
- "UTK/DAI": "BINANCE:UTKUSD",
- "UTK/PAX": "BINANCE:UTKUSD",
- "VAL/BTC": "BITTREX:VALBTC",
- "VAL/USDT": "BITTREX:VALUSD",
- "VAL/BUSD": "BITTREX:VALUSD",
- "VAL/USDC": "BITTREX:VALUSD",
- "VAL/TUSD": "BITTREX:VALUSD",
- "VAL/HUSD": "BITTREX:VALUSD",
- "VAL/DAI": "BITTREX:VALUSD",
- "VAL/PAX": "BITTREX:VALUSD",
- "VITE/BTC": "BINANCE:VITEBTC",
- "VITE/USDT": "BINANCE:VITEUSD",
- "VITE/BUSD": "BINANCE:VITEUSD",
- "VITE/USDC": "BINANCE:VITEUSD",
- "VITE/TUSD": "BINANCE:VITEUSD",
- "VITE/HUSD": "BINANCE:VITEUSD",
- "VITE/DAI": "BINANCE:VITEUSD",
- "VITE/PAX": "BINANCE:VITEUSD",
- "VRA/BTC": "KUCOIN:VRABTC",
- "VRA/USDT": "BITTREX:VRAUSD",
- "VRA/BUSD": "BITTREX:VRAUSD",
- "VRA/USDC": "BITTREX:VRAUSD",
- "VRA/TUSD": "BITTREX:VRAUSD",
- "VRA/HUSD": "BITTREX:VRAUSD",
- "VRA/DAI": "BITTREX:VRAUSD",
- "VRA/PAX": "BITTREX:VRAUSD",
- "WBTC/BTC": "BINANCE:WBTCBTC",
- "WBTC/ETH": "BINANCE:WBTCETH",
- "WBTC/USDT": "COINBASE:WBTCUSD",
- "WBTC/BUSD": "COINBASE:WBTCUSD",
- "WBTC/USDC": "COINBASE:WBTCUSD",
- "WBTC/TUSD": "COINBASE:WBTCUSD",
- "WBTC/HUSD": "COINBASE:WBTCUSD",
- "WBTC/DAI": "COINBASE:WBTCUSD",
- "WBTC/PAX": "COINBASE:WBTCUSD",
- "XLM/BTC": "BINANCE:XLMBTC",
- "XLM/ETH": "BINANCE:XLMETH",
- "XLM/USDT": "COINBASE:XLMUSD",
- "XLM/BUSD": "COINBASE:XLMUSD",
- "XLM/USDC": "COINBASE:XLMUSD",
- "XLM/TUSD": "COINBASE:XLMUSD",
- "XLM/HUSD": "COINBASE:XLMUSD",
- "XLM/DAI": "COINBASE:XLMUSD",
- "XLM/PAX": "COINBASE:XLMUSD",
- "XLM/BNB": "BINANCE:XLMBNB",
- "XLM/EURS": "KRAKEN:XLMEUR",
- "XLM/TRYB": "BINANCE:XLMTRY",
- "XLM/BCH": "HITBTC:XLMBCH",
- "XMY/BTC": "BITTREX:XMYBTC",
- "XMY/USDT": "BITTREX:XMYUSD",
- "XMY/BUSD": "BITTREX:XMYUSD",
- "XMY/USDC": "BITTREX:XMYUSD",
- "XMY/TUSD": "BITTREX:XMYUSD",
- "XMY/HUSD": "BITTREX:XMYUSD",
- "XMY/DAI": "BITTREX:XMYUSD",
- "XMY/PAX": "BITTREX:XMYUSD",
- "XRP/BTC": "BINANCE:XRPBTC",
- "XRP/ETH": "BINANCE:XRPETH",
- "XRP/USDT": "BITSTAMP:XRPUSD",
- "XRP/BUSD": "BITSTAMP:XRPUSD",
- "XRP/USDC": "BITSTAMP:XRPUSD",
- "XRP/TUSD": "BITSTAMP:XRPUSD",
- "XRP/HUSD": "BITSTAMP:XRPUSD",
- "XRP/DAI": "BITSTAMP:XRPUSD",
- "XRP/PAX": "BITSTAMP:XRPUSD",
- "XRP/BNB": "BINANCE:XRPBNB",
- "XRP/EURS": "HITBTC:XRPEURS",
- "XRP/TRYB": "BINANCE:XRPTRY",
- "XRP/BCH": "HITBTC:XRPBCH",
- "XRP/HT": "HUOBI:XRPHT",
- "XTZ/BTC": "BINANCE:XTZBTC",
- "XTZ/ETH": "KRAKEN:XTZETH",
- "XTZ/USDT": "COINBASE:XTZUSD",
- "XTZ/BUSD": "COINBASE:XTZUSD",
- "XTZ/USDC": "COINBASE:XTZUSD",
- "XTZ/TUSD": "COINBASE:XTZUSD",
- "XTZ/HUSD": "COINBASE:XTZUSD",
- "XTZ/DAI": "COINBASE:XTZUSD",
- "XTZ/PAX": "COINBASE:XTZUSD",
- "XTZ/BNB": "BINANCE:XTZBNB",
- "XTZ/EURS": "KRAKEN:XTZEUR",
- "XVS/BTC": "BINANCE:XVSBTC",
- "XVS/USDT": "BINANCE:XVSUSD",
- "XVS/BUSD": "BINANCE:XVSUSD",
- "XVS/USDC": "BINANCE:XVSUSD",
- "XVS/TUSD": "BINANCE:XVSUSD",
- "XVS/HUSD": "BINANCE:XVSUSD",
- "XVS/DAI": "BINANCE:XVSUSD",
- "XVS/PAX": "BINANCE:XVSUSD",
- "XVS/BNB": "BINANCE:XVSBNB",
- "YFI/BTC": "BINANCE:YFIBTC",
- "YFI/ETH": "HUOBI:YFIETH",
- "YFI/BNB": "BINANCE:YFIBNB",
- "YFI/USDT": "BINANCE:YFIUSD",
- "YFI/BUSD": "BINANCE:YFIUSD",
- "YFI/USDC": "BINANCE:YFIUSD",
- "YFI/TUSD": "BINANCE:YFIUSD",
- "YFI/HUSD": "BINANCE:YFIUSD",
- "YFI/DAI": "BINANCE:YFIUSD",
- "YFI/PAX": "BINANCE:YFIUSD",
- "YFI/EURS": "KRAKEN:YFIEUR",
- "YFII/BTC": "BINANCE:YFIIBTC",
- "YFII/ETH": "HUOBI:YFIIETH",
- "YFII/BNB": "BINANCE:YFIIBNB",
- "YFII/USDT": "BINANCE:YFIIUSD",
- "YFII/BUSD": "BINANCE:YFIIUSD",
- "YFII/USDC": "BINANCE:YFIIUSD",
- "YFII/TUSD": "BINANCE:YFIIUSD",
- "YFII/HUSD": "BINANCE:YFIIUSD",
- "YFII/DAI": "BINANCE:YFIIUSD",
- "YFII/PAX": "BINANCE:YFIIUSD",
- "ZEC/BTC": "BINANCE:ZECBTC",
- "ZEC/ETH": "BINANCE:ZECETH",
- "ZEC/USDT": "KRAKEN:ZECUSD",
- "ZEC/BUSD": "KRAKEN:ZECUSD",
- "ZEC/USDC": "KRAKEN:ZECUSD",
- "ZEC/TUSD": "KRAKEN:ZECUSD",
- "ZEC/HUSD": "KRAKEN:ZECUSD",
- "ZEC/DAI": "KRAKEN:ZECUSD",
- "ZEC/PAX": "KRAKEN:ZECUSD",
- "ZEC/BNB": "BINANCE:ZECBNB",
- "ZEC/EURS": "HITBTC:ZECEURS",
- "ZEC/BCH": "HITBTC:ZECBCH",
- "ZEC/LTC": "GEMINI:ZECLTC",
- "ZIL/BTC": "BINANCE:ZILBTC",
- "ZIL/ETH": "BINANCE:ZILETH",
- "ZIL/USDT": "BINANCE:ZILUSD",
- "ZIL/BUSD": "BINANCE:ZILUSD",
- "ZIL/USDC": "BINANCE:ZILUSD",
- "ZIL/TUSD": "BINANCE:ZILUSD",
- "ZIL/HUSD": "BINANCE:ZILUSD",
- "ZIL/DAI": "BINANCE:ZILUSD",
- "ZIL/PAX": "BINANCE:ZILUSD",
- "ZIL/BIDR": "BINANCE:ZILBIDR",
- "ZIL/BNB": "BINANCE:ZILBNB",
- "ZRX/BTC": "BINANCE:ZRXBTC",
- "ZRX/ETH": "BINANCE:ZRXETH",
- "ZRX/USDT": "BINANCE:ZRXUSD",
- "ZRX/BUSD": "BINANCE:ZRXUSD",
- "ZRX/USDC": "BINANCE:ZRXUSD",
- "ZRX/TUSD": "BINANCE:ZRXUSD",
- "ZRX/HUSD": "BINANCE:ZRXUSD",
- "ZRX/DAI": "BINANCE:ZRXUSD",
- "ZRX/PAX": "BINANCE:ZRXUSD",
- "ZRX/EURS": "COINBASE:ZRXEUR"
- })
-}
diff --git a/atomic_defi_design/qml/Constants/Style.qml b/atomic_defi_design/qml/Constants/Style.qml
deleted file mode 100644
index 9b03b803dc..0000000000
--- a/atomic_defi_design/qml/Constants/Style.qml
+++ /dev/null
@@ -1,442 +0,0 @@
-pragma Singleton
-import QtQuick 2.15
-import Qaterial 1.0 as Qaterial
-
-QtObject {
- function setQaterialStyle() {
- Qaterial.Style.accentColorLight = Style.colorTheme4
- Qaterial.Style.accentColorDark = Style.colorTheme4
- }
-
- Component.onCompleted: {
- setQaterialStyle()
- }
-
- onDark_themeChanged: setQaterialStyle()
-
- readonly property FontLoader fontB: FontLoader { source: "../../assets/fonts/Ubuntu-B.ttf" }
- readonly property FontLoader fontBI: FontLoader { source: "../../assets/fonts/Ubuntu-BI.ttf" }
- readonly property FontLoader fontL: FontLoader { source: "../../assets/fonts/Ubuntu-L.ttf" }
- readonly property FontLoader fontLI: FontLoader { source: "../../assets/fonts/Ubuntu-LI.ttf" }
- readonly property FontLoader fontM: FontLoader { source: "../../assets/fonts/Ubuntu-M.ttf" }
- readonly property FontLoader fontMI: FontLoader { source: "../../assets/fonts/Ubuntu-MI.ttf" }
- readonly property FontLoader fontR: FontLoader { source: "../../assets/fonts/Ubuntu-R.ttf" }
- readonly property FontLoader fontRI: FontLoader { source: "../../assets/fonts/Ubuntu-R.ttf" }
- readonly property FontLoader fontTh: FontLoader { source: "../../assets/fonts/Ubuntu-Th.ttf" }
- readonly property string font_family: "Ubuntu"
-
- readonly property string listItemPrefix: " ⚬ "
- readonly property string successCharacter: "✓"
- readonly property string failureCharacter: "✘"
- readonly property string warningCharacter: "⚠"
-
- readonly property int animationDuration: 125
-
- readonly property int textSizeVerySmall1: 1
- readonly property int textSizeVerySmall2: 2
- readonly property int textSizeVerySmall3: 3
- readonly property int textSizeVerySmall4: 4
- readonly property int textSizeVerySmall5: 5
- readonly property int textSizeVerySmall6: 6
- readonly property int textSizeVerySmall7: 7
- readonly property int textSizeVerySmall8: 8
- readonly property int textSizeVerySmall9: 9
- readonly property int textSizeSmall: 10
- readonly property int textSizeSmall1: 11
- readonly property int textSizeSmall2: 12
- readonly property int textSizeSmall3: 13
- readonly property int textSizeSmall4: 14
- readonly property int textSizeSmall5: 15
- readonly property int textSize: 16
- readonly property int textSizeMid: 17
- readonly property int textSizeMid1: 18
- readonly property int textSizeMid2: 19
- readonly property int textSize1: 20
- readonly property int textSize2: 24
- readonly property int textSize3: 36
- readonly property int textSize4: 48
- readonly property int textSize5: 60
- readonly property int textSize6: 72
- readonly property int textSize7: 84
- readonly property int textSize8: 96
- readonly property int textSize9: 108
- readonly property int textSize10: 120
- readonly property int textSize11: 132
- readonly property int textSize12: 144
-
- readonly property int rectangleCornerRadius: 7
- readonly property int itemPadding: 12
- readonly property int buttonSpacing: 12
- readonly property int rowSpacing: 12
- readonly property int rowSpacingSmall: 6
- readonly property int iconTextMargin: 5
- readonly property int sidebarLineHeight: 44
- readonly property double hoverLightMultiplier: 1.5
- readonly property double hoverOpacity: 0.6
-
- property bool dark_theme: true
-
-
- function applyOpacity(hex, opacity="00") {
- return "#" + opacity + hex.substr(hex.length - 6)
- }
-
- function colorOnlyIf(condition, color) {
- return applyOpacity(color, condition ? "FF" : "00")
- }
-
- readonly property string colorQtThemeAccent: colorGreen
- readonly property string colorQtThemeForeground: colorWhite1
- readonly property string colorQtThemeBackground: colorTheme9
-
- readonly property string sidebar_atomicdex_logo: dark_theme ? "dex-logo-sidebar.png" : "dex-logo-sidebar-dark.png"
- readonly property string colorRed: dark_theme ? "#D13990" : "#9a1165" // Light is 15% darker than Red2, same with the green set
- readonly property string colorRed2: dark_theme ? "#b61477" : "#b61477"
- readonly property string colorRed3: dark_theme ? "#6d0c47" : "#D13990"
- readonly property string colorYellow: dark_theme ? "#FFC305" : "#FFC305"
- readonly property string colorOrange: dark_theme ? "#F7931A" : "#F7931A"
- readonly property string colorBlue: dark_theme ? "#3B78D1" : "#3B78D1"
- readonly property string colorGreen: dark_theme ? "#74FBEE" : "#109f8d"
- readonly property string colorGreen2: dark_theme ? "#14bca6" : "#14bca6"
- readonly property string colorGreen3: dark_theme ? "#07433b" : "#74FBEE"
-
- readonly property string colorWhite1: dark_theme ? "#FFFFFF" : "#000000"
- readonly property string colorWhite2: dark_theme ? "#F9F9F9" : "#111111"
- readonly property string colorWhite3: dark_theme ? "#F0F0F0" : "#222222"
- readonly property string colorWhite4: dark_theme ? "#C9C9C9" : "#333333"
- readonly property string colorWhite5: dark_theme ? "#8E9293" : "#444444"
- readonly property string colorWhite6: dark_theme ? "#777777" : "#555555"
- readonly property string colorWhite7: dark_theme ? "#666666" : "#666666"
- readonly property string colorWhite8: dark_theme ? "#555555" : "#777777"
- readonly property string colorWhite9: dark_theme ? "#444444" : "#8E9293"
- readonly property string colorWhite10: dark_theme ? "#333333" : "#C9C9C9"
- readonly property string colorWhite11: dark_theme ? "#222222" : "#F0F0F0"
- readonly property string colorWhite12: dark_theme ? "#111111" : "#F9F9F9"
- readonly property string colorWhite13: dark_theme ? "#000000" : "#FFFFFF"
-
- readonly property string colorTheme1: dark_theme ? "#3CC9BF" : "#3CC9BF"
- readonly property string colorTheme2: dark_theme ? "#36A8AA" : "#36A8AA"
- readonly property string colorTheme3: dark_theme ? "#318795" : "#318795"
- readonly property string colorTheme4: dark_theme ? "#2B6680" : "#2B6680"
- readonly property string colorTheme5: dark_theme ? "#23273C" : "#ececf2"
- readonly property string colorTheme6: dark_theme ? "#22263A" : "#efeff5"
- readonly property string colorTheme7: dark_theme ? "#15182A" : "#f2f2f7"
- readonly property string colorTheme8: dark_theme ? "#171A2C" : "#f6f6f9"
- readonly property string colorTheme9: dark_theme ? "#0E1021" : "#F9F9FB"
- readonly property string colorTheme99: dark_theme ? "#2A2C3B" : "#F9F9FB"
-
- readonly property string colorTheme10: dark_theme ? "#2579E0" : "#2579E0"
- readonly property string colorTheme11: dark_theme ? "#00A3FF" : "#00A3FF"
- readonly property string colorThemeLine: dark_theme ? "#1D1F23" : "#1D1F23"
- readonly property string colorThemePassive: dark_theme ? "#777F8C" : "#777F8C"
- readonly property string colorThemePassiveLight: dark_theme ? "#CCCDD0" : "#CCCDD0"
- readonly property string colorThemeDark: dark_theme ? "#26282C" : "#26282C"
- readonly property string colorThemeDark2: dark_theme ? "#3C4150" : "#E6E8ED"
- readonly property string colorThemeDark3: dark_theme ? "#78808D" : "#78808D"
- readonly property string colorThemeDarkLight: dark_theme ? "#78808D" : "#456078"
-
- property string colorRectangle: dark_theme ? colorTheme7 : colorTheme7
- readonly property string colorInnerBackground: dark_theme ? colorTheme7 : colorTheme7
-
- readonly property string colorGradient1: dark_theme ? colorTheme9 : colorTheme9
- readonly property string colorGradient2: dark_theme ? colorTheme5 : colorTheme5
- readonly property string colorGradient3: dark_theme ? "#24283D" : "#24283D"
- readonly property string colorGradient4: dark_theme ? "#0D0F21" : "#0D0F21"
- readonly property string colorLineGradient1: dark_theme ? "#2c2f3c" : "#EEF1F7"
- readonly property string colorLineGradient2: dark_theme ? "#06070c" : "#DCE1E8"
- readonly property string colorLineGradient3: dark_theme ? "#090910" : "#EEF1F7"
- readonly property string colorLineGradient4: dark_theme ? "#24283b" : "#DCE1E8"
- readonly property string colorDropShadowLight: dark_theme ? "#216975a4" : "#21FFFFFF"
- readonly property string colorDropShadowLight2: dark_theme ? "#606975a4" : "#60FFFFFF"
- readonly property string colorDropShadowDark: dark_theme ? "#FF050615" : "#BECDE2"
- readonly property string colorBorder: dark_theme ? "#23273B" : "#DAE1EC"
- readonly property string colorBorder2: dark_theme ? "#1C1F32" : "#DAE1EC"
-
- readonly property string colorInnerShadow: dark_theme ? "#A0000000" : "#BECDE2"
-
- readonly property string colorGradientLine1: dark_theme ? "#00FFFFFF" : "#00CFD4DB"
- readonly property string colorGradientLine2: dark_theme ? "#0FFFFFFF" : "#FFCFD4DB"
-
- readonly property string colorWalletsHighlightGradient: dark_theme ? "#1B5E7D" : "#1B5E7D"
- readonly property string colorWalletsSidebarDropShadow: dark_theme ? "#B0000000" : "#BECDE2"
-
- readonly property string colorScrollbar: dark_theme ? "#202339" : "#C4CCDA"
- readonly property string colorScrollbarBackground: dark_theme ? "#10121F" : "#EFF1F6"
- readonly property string colorScrollbarGradient1: dark_theme ? "#33395A" : "#C4CCDA"
- readonly property string colorScrollbarGradient2: dark_theme ? "#292D48" : "#C4CCDA"
-
- readonly property string colorSidebarIconHighlighted: dark_theme ? "#2BBEF2" : "#FFFFFF"
- readonly property string colorSidebarHighlightGradient1: dark_theme ? "#FF1B5E7D" : "#8b95ed"
- readonly property string colorSidebarHighlightGradient2: dark_theme ? "#BA1B5E7D" : "#AD7faaf0"
- readonly property string colorSidebarHighlightGradient3: dark_theme ? "#5F1B5E7D" : "#A06dc9f3"
- readonly property string colorSidebarHighlightGradient4: dark_theme ? "#001B5E7D" : "#006bcef4"
- readonly property string colorSidebarDropShadow: dark_theme ? "#90000000" : "#BECDE2"
- readonly property string colorSidebarSelectedText: dark_theme ? "#FFFFFF" : "#FFFFFF"
-
- readonly property string colorCoinListHighlightGradient: dark_theme ? "#2C2E40" : "#E0E6F0"
-
- readonly property string colorRectangleBorderGradient1: dark_theme ? "#2A2F48" : "#DDDDDD"
- readonly property string colorRectangleBorderGradient2: dark_theme ? "#0D1021" : "#EFEFEF"
-
- readonly property string colorChartText: dark_theme ? "#405366" : "#B5B9C1"
- readonly property string colorChartLegendLine: dark_theme ? "#3F5265" : "#BDC0C8"
- readonly property string colorChartGrid: dark_theme ? "#202333" : "#E6E8ED"
- readonly property string colorChartLineText: dark_theme ? "#405366" : "#FFFFFF"
-
- readonly property string colorChartMA1: dark_theme ? "#5BC6FA" : "#5BC6FA"
- readonly property string colorChartMA2: dark_theme ? "#F1D17F" : "#F1D17F"
-
- readonly property string colorLineBasic: dark_theme ? "#303344" : "#303344"
-
-
- readonly property string colorText: dark_theme ? Style.colorWhite1 : "#405366"
- readonly property string colorText2: dark_theme ? "#79808C" : "#3C5368"
- readonly property string colorTextDisabled: dark_theme ? Style.colorWhite8 : "#B5B9C1"
- readonly property var colorButtonDisabled: ({
- "default": Style.colorTheme9,
- "primary": Style.colorGreen3,
- "danger": Style.colorRed3
- })
- readonly property var colorButtonHovered: ({
- "default": Style.colorTheme6,
- "primary": Style.colorGreen,
- "danger": Style.colorRed
- })
- readonly property var colorButtonEnabled: ({
- "default": Style.colorRectangle,
- "primary": Style.colorGreen2,
- "danger": Style.colorRed2
- })
- readonly property var colorButtonTextDisabled: ({
- "default": Style.colorWhite8,
- "primary": Style.colorWhite13,
- "danger": Style.colorWhite13
- })
- readonly property var colorButtonTextHovered: ({
- "default": Style.colorText,
- "primary": Style.colorWhite11,
- "danger": Style.colorWhite11
- })
- readonly property var colorButtonTextEnabled: ({
- "default": Style.colorText,
- "primary": Style.colorWhite11,
- "danger": Style.colorWhite11
- })
- readonly property string colorPlaceholderText: Style.colorWhite9
- readonly property string colorSelectedText: Style.colorTheme9
- readonly property string colorSelection: Style.colorGreen2
-
- readonly property string colorTrendingLine: dark_theme ? Style.colorGreen : "#37a6ef"
- readonly property string colorTrendingUnderLine: dark_theme ? Style.colorGradient3 : "#e3f2fd"
-
- readonly property string modalValueColor: colorWhite4
-
- function getValueColor(v) {
- v = parseFloat(v)
- if(v !== 0)
- return v > 0 ? Style.colorGreen : Style.colorRed
-
- return Style.colorWhite4
- }
-
- function getCoinTypeColor(type) {
- switch (type) {
- case 'ERC-20':
- return getCoinColor("ETH")
- case 'QRC-20':
- return getCoinColor("QTUM")
- case 'Smart Chain':
- return getCoinColor("KMD")
- case 'UTXO':
- return getCoinColor("BTC")
- case 'BEP-20':
- return getCoinColor("BNB")
- case 'SLP':
- return getCoinColor("BCH")
- default:
- return getCoinColor("BTC")
- }
- }
-
- function getCoinColor(ticker) {
- const c = colorCoin[atomic_qt_utilities.retrieve_main_ticker(ticker)]
- return c || Style.colorTheme2
- }
-
- readonly property var colorCoin: ({
- "ABY": "#8B0D10",
- "ADA": "#214D78",
- "ADX": "#1B75BC",
- "ANKR": "#2075E8",
- "ARPA": "#CCD9E2",
- "ATOM": "#474B6C",
- "AUR": "#0A6C5E",
- "AVA": "#5B567F",
- "AVAX": "#E84142",
- "BAL": "#4D4D4D",
- "BNB": "#F3BA2F",
- "BCH": "#8DC351",
- "BIDR": "#F0B90B",
- "BSTY": "#78570D",
- "BTC": "#F7931A",
- "BTT": "#666666",
- "BTE": "#FFE201",
- "CAKE": "#D1884F",
- "CDN": "#90191C",
- "CLC": "#0970DC",
- "DGC": "#BC7600",
- "DIMI": "#0BFBE2",
- "EOS": "#4D4D4D",
- "FTC": "#FFFFFF",
- "FTM": "#13B5EC",
- "GLEEC": "#8C41FF",
- "GRS": "#377E96",
- "IOTA": "#404040",
- "JSTR": "#627EEA",
- "DOGE": "#C3A634",
- "ETC": "#328432",
- "ETH": "#627EEA",
- "ETHR": "#627EEA",
- "KMD": "#2B6680",
- "MORTY": "#A4764D",
- "RICK": "#A5CBDD",
- "EMC2": "#00CCFF",
- "INJ": "#17EAE9",
- "DASH": "#008CE7",
- "RVN": "#384182",
- "DGB": "#006AD2",
- "DOT": "#E80082",
- "FIRO": "#BB2100",
- "LBC": "#00775C",
- "LTC": "#BFBBBB",
- "LYNX": "#0071BA",
- "XPM": "#A67522",
- "XVC": "#B50126",
- "ZEC": "#ECB244",
- "ZER": "#FFFFFF",
- "NAV": "#7D59B5",
- "DP": "#E41D25",
- "ECA": "#A915DC",
- "QTUM": "#2E9AD0",
- "CHIPS": "#598182",
- "CIPHS": "#ECD900",
- "AXE": "#C63877",
- "PANGEA": "#D88245",
- "JUMBLR": "#2B4649",
- "DEX": "#43B7B6",
- "COQUI": "#79A541",
- "CRYPTO": "#F58736",
- "LABS": "#C1F6E1",
- "LCC": "#068210",
- "MESH": "#0098DA",
- "MGW": "#854F2F",
- "MONA": "#DEC799",
- "NMC": "#186C9D",
- "RFOX": "#D83331",
- "BOTS": "#F69B57",
- "MCL": "#EA0000",
- "MM": "#F5B700",
- "CCL": "#FFE400",
- "BET": "#F69B57",
- "JRT": "#5EFC84",
- "SUPERNET": "#F69B57",
- "OOT": "#25AAE1",
- "REVS": "#F69B57",
- "ILN": "#523170",
- "VRSC": "#3164D3",
- "WCN": "#E49F00",
- "THC": "#819F6F",
- "1INCH": "#95A7C5",
- "BABYDOGE": "#F3AA47",
- "BAT": "#FF5000",
- "BUSD": "#EDB70B",
- "DAI": "#B68900",
- "USDC": "#317BCB",
- "USDT": "#26A17B",
- "PAX": "#EDE70A",
- "PAXG": "#E5CB22",
- "SMTF": "#F75836",
- "SUSHI": "#E25DA8",
- "TRYB": "#0929AA",
- "TUSD": "#2E3181",
- "AWC": "#31A5F6",
- "VRA": "#D70A41",
- "SPACE": "#E44C65",
- "QC": "#00D7B3",
- "PBC": "#64A3CB",
- "AAVE": "#9C64A6",
- "ANT": "#33DAE6",
- "AGI": "#6815FF",
- "BAND": "#526BFF",
- "BLK": "#595959",
- "IL8P": "#696969",
- "BNT": "#0000FF",
- "BTCZ": "#F5B036",
- "CEL": "#4055A6",
- "CENNZ": "#2E87F1",
- "COMP": "#00DBA3",
- "CRO": "#243565",
- "CVC": "#3AB03E",
- "CVT": "#4B0082",
- "DODO": "#FFF706",
- "EFL": "#FF940B",
- "EGLD": "#1D4CB5",
- "ELF": "#2B5EBB",
- "ENJ": "#6752C3",
- "EURS": "#2F77ED",
- "FIL": "#4CCAD2",
- "FJC": "#00AFEC",
- "FUN": "#EF1C70",
- "GNO": "#00B0CC",
- "HOT": "#983EFF",
- "IOTX": "#00CDCE",
- "KNC": "#117980",
- "LEO": "#F79B2C",
- "LINK": "#356CE4",
- "LRC": "#32C2F8",
- "MANA": "#FF3C6C",
- "MATIC": "#1E61ED",
- "MKR": "#1BAF9F",
- "NEAR": "#595959",
- "NVC": "#FCF96D",
- "OCEAN": "#595959",
- "ONT": "#2692AF",
- "POWR": "#05BCAA",
- "QI": "#FFFFFF",
- "QIAIR": "#FEFEFE",
- "QKC": "#2175B4",
- "QNT": "#46DDC8",
- "REP": "#0E0E21",
- "REV": "#78034D",
- "RLC": "#FFE100",
- "SFUSD": "#9881B8",
- "SNT": "#596BED",
- "SNX": "#00D1FF",
- "SOULJA": "#8F734A",
- "STFIRO": "#00D4F7",
- "STORJ": "#2683FF",
- "SXP": "#FD5F3B",
- "SYS": "#0084C7",
- "TRC": "#096432",
- "TRX": "#F30031",
- "TSL": "#64B082",
- "UIS": "#008DCD",
- "UNO": "#2F87BB",
- "VAL": "#1EEC84",
- "VITE": "#007AFF",
- "VRM": "#586A7A",
- "WSB": "#FEBB84",
- "WBTC": "#CCCCCC",
- "XLM": "#737373",
- "XMY": "#F01385",
- "XRP": "#2E353D",
- "XTZ": "#A8E000",
- "XVS": "#F4BC54",
- "YFI": "#006BE6",
- "YFII": "#FF2A79",
- "ZET": "#155169",
- "ZIL": "#42BBB9",
- "ZRX": "#302C2C",
- "UNI": "#FF007A"
- })
-}
diff --git a/atomic_defi_design/qml/Dashboard/NewUpdateModal.qml b/atomic_defi_design/qml/Dashboard/NewUpdateModal.qml
deleted file mode 100644
index 100bdd39a7..0000000000
--- a/atomic_defi_design/qml/Dashboard/NewUpdateModal.qml
+++ /dev/null
@@ -1,174 +0,0 @@
-// Qt imports
-import QtQml 2.15 //> Component
-import QtQuick.Layouts 1.15 //> Layout.fillWidth
-import QtQuick.Controls 2.15 //> ProgressBar
-
-// Project imports
-import "../Components" //> BasicModal
-import "../Constants" //> API.app.self_update_service
-
-BasicModal
-{
- id: root
-
- readonly property var self_update_service: API.app.self_update_service
- readonly property string last_release_tag_name: self_update_service.last_release_tag_name
- readonly property bool update_needed: self_update_service.update_needed
- readonly property bool update_downloading: self_update_service.update_downloading
- readonly property real update_download_progress: self_update_service.update_download_progress
- readonly property bool update_ready: self_update_service.update_ready
- property bool invalid_update_files: self_update_service.invalid_update_files
-
- // Display the good modal section according to current self update service state
- function select_index()
- {
- if (invalid_update_files)
- {
- invalid_update_files = false
- currentIndex = 0
- close()
- update_invalid_checksum.open()
- }
- else if (update_ready)
- {
- currentIndex = 4
- visible = true
- }
- else if (update_downloading)
- {
- currentIndex = 3
- visible = true
- }
- else if (update_needed)
- {
- currentIndex = 2
- visible = true
- }
- else if (currentIndex === 1)
- {
- currentIndex = 0
- }
- else
- {
- currentIndex = 1
- }
- }
-
- // Fetches latest update info when opening this modal.
- onOpened:
- {
- select_index()
- self_update_service.fetch_last_release_info()
- }
-
- onUpdate_neededChanged: select_index()
- onUpdate_downloadingChanged: select_index()
- onUpdate_readyChanged: select_index()
- onInvalid_update_filesChanged: select_index()
-
- // Section when fetching update
- ModalContent
- {
- title: qsTr("Searching new updates...")
-
- DefaultText
- {
- text: qsTr("Please wait while the application is finding a new update... You can close this modal if you want.")
- }
- }
-
- // Section when no new update is found.
- ModalContent
- {
- title: qsTr("Already updated")
-
- DefaultText
- {
- text: qsTr("%1 is already up-to-date !").arg(API.app_name)
- }
- }
-
- // Second section. Asks user to update its client.
- ModalContent
- {
- title: qsTr("New update detected !")
-
- DefaultText
- {
- Layout.fillWidth: true
-
- text: qsTr("Do you want to update %1 from %2 to %3 ?")
- .arg(API.app_name).arg(API.current_version).arg(last_release_tag_name)
- }
-
- footer:
- [
- PrimaryButton
- {
- text: qsTr("Download")
-
- onClicked: self_update_service.download_update()
- },
- DefaultButton
- {
- text: qsTr("Remind me later")
-
- onClicked: root.visible = false
- }
- ]
- }
-
- // Download progress bar
- ModalContent
- {
- title: qsTr("Download in progress...")
-
- RowLayout
- {
- Layout.fillWidth: true
-
- ProgressBar
- {
- Layout.fillWidth: true
- value: update_download_progress
- }
-
- DefaultText
- {
- Layout.preferredWidth: 40
- text: "%1 %".arg(Math.round(update_download_progress * 100))
- }
- }
- }
-
- // Update download finished... Asks for restart
- ModalContent
- {
- title: qsTr("Update downloaded")
-
- DefaultText
- {
- text: qsTr("Update has been successfully downloaded. Do you want to restart the application now ?")
- }
-
- footer:
- [
- PrimaryButton
- {
- text: qsTr("Restart now")
-
- onClicked:
- {
- self_update_service.perform_update()
- root.visible = false
- }
- },
- DefaultButton
- {
- text: qsTr("Restart later")
-
- onClicked: close()
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Dashboard/NotificationsModal.qml b/atomic_defi_design/qml/Dashboard/NotificationsModal.qml
deleted file mode 100644
index 16387ab13b..0000000000
--- a/atomic_defi_design/qml/Dashboard/NotificationsModal.qml
+++ /dev/null
@@ -1,425 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import Qt.labs.platform 1.0
-import Qaterial 1.0 as Qaterial
-
-import "../Constants"
-import "../Components"
-
-DexPopup {
- id: root
-
- width: 400
- height: 440
-
- property var notification_map: [{icon: Qaterial.Icons.arrowUpCircleOutline,color: theme.redColor}, {icon: Qaterial.Icons.arrowDownCircleOutline,color: theme.greenColor}, {icon: Qaterial.Icons.emailOutline,color: theme.foregroundColor}]
- backgroundColor: Qt.darker(app.globalTheme.dexBoxBackgroundColor, 0.9)
-
- function reset() {
- notifications_list = []
- root.close()
- }
- enum NotificationKind
- {
- Send,
- Receive,
- Others
- }
- function showApp() {
- switch(window.real_visibility) {
- case 4:
- window.showMaximized()
- break
- case 5:
- window.showFullScreen()
- break
- default:
- window.show()
- break
- }
- window.raise()
- window.requestActivate()
- }
-
- function performNotificationAction(notification) {
- root.close()
-
- switch(notification.click_action) {
- case "open_notifications":
- root.open()
- break
- case "open_wallet_page":
- api_wallet_page.ticker = notification.params.ticker
- dashboard.current_page = idx_dashboard_wallet
- break
- case "open_swaps_page":
- dashboard.current_page = idx_dashboard_exchange
-
- dashboard.loader.onLoadComplete = () => {
- dashboard.current_component.current_page = dashboard.isSwapDone(notification.params.new_swap_status) ? idx_exchange_history : idx_exchange_orders
- }
- break
- case "open_log_modal":
- showError(notification.title, notification.long_message)
- break
- default:
- console.log("Unknown notification click action", notification.click_action)
- break
- }
- }
- function newNotification(event_name, params, id, title, message, human_date, click_action = "open_notifications", long_message = "") {
-
- let obj;
- if (title.indexOf("You received")!==-1 ) {
- obj = { event_name, params, id, title, message, human_date, click_action, long_message, kind:NotificationsModal.NotificationKind.Receive }
- } else if(title.indexOf("You sent")!==-1) {
- obj = { event_name, params, id, title, message, human_date, click_action, long_message, kind:NotificationsModal.NotificationKind.Send }
- } else {
- obj = { event_name, params, id, title, message, human_date, click_action, long_message, kind:NotificationsModal.NotificationKind.Others }
- }
-
- // Update if it already exists
- let updated_existing_one = false
- for(let i = 0; i < notifications_list.length; ++i) {
- if(notifications_list[i].id === obj.id) {
- notifications_list[i] = General.clone(obj)
- updated_existing_one = true
- break
- }
- }
-
- // Add new line
- if(!updated_existing_one) {
- notifications_list = [obj].concat(notifications_list)
- }
-
- // Display OS notification
- displayMessage(obj.title, obj.message)
-
- // Refresh the list if updated an existing one
- if(updated_existing_one)
- notifications_list = notifications_list
- }
-
- // Events
- function onUpdateSwapStatus(old_swap_status, new_swap_status, swap_uuid, base_coin, rel_coin, human_date) {
- newNotification("onUpdateSwapStatus",
- { old_swap_status, new_swap_status, swap_uuid, base_coin, rel_coin, human_date },
- swap_uuid,
- base_coin + "/" + rel_coin + " - " + qsTr("Swap status updated"),
- getStatusText(old_swap_status) + " " + General.right_arrow_icon + " " + getStatusText(new_swap_status),
- human_date,
- "open_swaps_page")
- }
-
- function onBalanceUpdateStatus(am_i_sender, amount, ticker, human_date, timestamp) {
- const change = General.formatCrypto("", amount, ticker)
- newNotification("onBalanceUpdateStatus",
- { am_i_sender, amount, ticker, human_date, timestamp },
- timestamp,
- am_i_sender ? qsTr("You sent %1").arg(change) : qsTr("You received %1").arg(change),
- qsTr("Your wallet balance changed"),
- human_date,
- "open_wallet_page")
- }
-
- readonly property string check_internet_connection_text: qsTr("Please check your internet connection (e.g. VPN service or firewall might block it).")
- function onEnablingCoinFailedStatus(coin, error, human_date, timestamp) {
- // Check if there is mismatch error, ignore this one
- for(let n of notifications_list) {
- if(n.event_name === "onMismatchCustomCoinConfiguration" && n.params.asset === coin) {
- console.log("Ignoring onEnablingCoinFailedStatus event because onMismatchCustomCoinConfiguration exists for", coin)
- return
- }
- }
-
- // Display the notification
- const title = qsTr("Failed to enable %1", "TICKER").arg(coin)
-
- error = check_internet_connection_text + "\n\n" + error
-
- newNotification("onEnablingCoinFailedStatus",
- { coin, error, human_date, timestamp },
- timestamp,
- title,
- check_internet_connection_text,
- human_date,
- "open_log_modal",
- error)
-
- toast.show(title, General.time_toast_important_error, error)
- }
-
- function onEndpointNonReacheableStatus(base_uri, human_date, timestamp) {
- const title = qsTr("Endpoint not reachable")
-
- const error = qsTr("Could not reach to endpoint") + ". " + check_internet_connection_text + "\n\n" + base_uri
-
- newNotification("onEndpointNonReacheableStatus",
- { base_uri, human_date, timestamp },
- timestamp,
- title,
- base_uri,
- human_date,
- "open_log_modal",
- error)
-
- toast.show(title, General.time_toast_important_error, error)
- }
-
- function onMismatchCustomCoinConfiguration(asset, human_date, timestamp) {
- const title = qsTr("Mismatch at %1 custom asset configuration", "TICKER").arg(asset)
-
- newNotification("onMismatchCustomCoinConfiguration",
- { asset, human_date, timestamp },
- timestamp,
- title,
- qsTr("Application needs to be restarted for %1 custom asset.", "TICKER").arg(asset),
- human_date)
-
- toast.show(title, General.time_toast_important_error, "", true, true)
- }
-
- function onBatchFailed(reason, from, human_date, timestamp) {
- const title = qsTr("Batch %1 failed. Reason: %2").arg(from).arg(reason)
-
- newNotification("onBatchFailed",
- { human_date, timestamp },
- timestamp,
- title,
- reason,
- human_date)
-
- toast.show(title, General.time_toast_important_error, reason)
- }
-
- // System
- Component.onCompleted: {
- API.app.notification_mgr.updateSwapStatus.connect(onUpdateSwapStatus)
- API.app.notification_mgr.balanceUpdateStatus.connect(onBalanceUpdateStatus)
- API.app.notification_mgr.enablingCoinFailedStatus.connect(onEnablingCoinFailedStatus)
- API.app.notification_mgr.endpointNonReacheableStatus.connect(onEndpointNonReacheableStatus)
- API.app.notification_mgr.mismatchCustomCoinConfiguration.connect(onMismatchCustomCoinConfiguration)
- API.app.notification_mgr.batchFailed.connect(onBatchFailed)
- }
- Component.onDestruction: {
- API.app.notification_mgr.updateSwapStatus.disconnect(onUpdateSwapStatus)
- API.app.notification_mgr.balanceUpdateStatus.disconnect(onBalanceUpdateStatus)
- API.app.notification_mgr.enablingCoinFailedStatus.disconnect(onEnablingCoinFailedStatus)
- API.app.notification_mgr.endpointNonReacheableStatus.disconnect(onEndpointNonReacheableStatus)
- API.app.notification_mgr.mismatchCustomCoinConfiguration.disconnect(onMismatchCustomCoinConfiguration)
- API.app.notification_mgr.batchFailed.disconnect(onBatchFailed)
- }
-
- function displayMessage(title, message) {
- if(API.app.settings_pg.notification_enabled)
- tray.showMessage(title, message)
- }
- SystemTrayIcon {
- id: tray
- visible: true
- iconSource: General.image_path + "dex-tray-icon.png"
-
- tooltip: API.app_name
- onMessageClicked: {
- if(notifications_list.length > 0)
- performNotificationAction(notifications_list[0])
- showApp()
- }
- menu: Menu {
- MenuItem {
- text: qsTr("Show")
- onTriggered: showApp()
- }
-
- MenuItem {
- text: qsTr("Restart")
- onTriggered: API.app.restart()
- }
-
- MenuItem {
- text: qsTr("Quit")
- onTriggered: Qt.quit()
- }
- }
- }
-
- ColumnLayout {
- anchors.fill: parent
- Item {
- Layout.preferredHeight: 65
- Layout.fillWidth: parent
- RowLayout {
- anchors.fill: parent
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- leftPadding: 15
- font: theme.textType.head6
- text: "Notifications"
- }
- Qaterial.AppBarButton {
- enabled: list.count>0
- Layout.alignment: Qt.AlignVCenter
- icon.source: Qaterial.Icons.checkAll
- onClicked: notifications_list = []
- }
- }
- Rectangle {
- height: 2
- color: theme.foregroundColor
- opacity: .05
- width: parent.width-20
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
- }
- }
-
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
-
- DefaultText {
- anchors.centerIn: parent
- visible: !list.visible
- text_value: qsTr("There isn't any notification")
- font.pixelSize: Style.textSizeSmall2
- }
-
- DefaultListView {
- id: list
- visible: notifications_list.length !== 0
- anchors.fill: parent
- model: notifications_list
- delegate: Rectangle {
- color: mouseArea.containsMouse? theme.dexBoxBackgroundColor : 'transparent'
- function removeNotification() {
- notifications_list.splice(index, 1)
- notifications_list = notifications_list
- }
- height: _column.height+10
- width: list.width
- MouseArea {
- id: mouseArea
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- performNotificationAction(notifications_list[index])
- removeNotification()
- }
- }
- RowLayout {
- anchors.fill: parent
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 60
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: notification_map[modelData.kind].icon
- iconSize: 32
- x: 10
- color: notification_map[modelData.kind].color
- opacity: .6
- }
- }
- VerticalLine {
- Layout.preferredHeight: 50
- Layout.preferredWidth: 1
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- Column {
- id: _column
- width: parent.width
- leftPadding: 15
- topPadding: 5
- bottomPadding: 5
- spacing: 5
- DexLabel {
- text: modelData.title
- font: theme.textType.body1
- width: parent.width
- wrapMode: Label.Wrap
- }
- DexLabel {
- text: modelData.message
- font: theme.textType.subtitle2
- width: parent.width
- wrapMode: Label.Wrap
- color: theme.accentColor
- }
- DexLabel {
- text: modelData.human_date
- font: theme.textType.caption
- }
-
- }
- Qaterial.AppBarButton {
- id: action_button
- scale: .6
- anchors.bottom: parent.bottom
- anchors.right: parent.right
- anchors.bottomMargin: -4
- icon.source: {
- let name
- switch(modelData.event_name) {
- case "onEnablingCoinFailedStatus":
- name = "repeat"
- break
- case "onMismatchCustomCoinConfiguration":
- name = "restart-alert"
- break
- default:
- name = "check"
- break
- }
-
- return General.qaterialIcon(name)
- }
-
- function removeNotification() {
- notifications_list.splice(index, 1)
- notifications_list = notifications_list
- }
-
- onClicked: {
- // Action might create another event so we save it and then remove the current one, then take the action
- const event_before_removal = General.clone(modelData)
-
- // Action
- switch(event_before_removal.event_name) {
- case "onEnablingCoinFailedStatus":
- removeNotification()
- console.log("Retrying to enable", event_before_removal.params.coin, "asset...")
- API.app.enable_coins([event_before_removal.params.coin])
- break
- case "onMismatchCustomCoinConfiguration":
- console.log("Restarting for", event_before_removal.params.asset, "custom asset configuration mismatch...")
- root.close()
- restart_modal.open()
- break
- default:
- removeNotification()
- break
- }
- }
- }
- }
- }
-
- Rectangle {
- height: 2
- color: theme.foregroundColor
- opacity: .05
- visible: !(list.count==index+1)
- width: parent.width-20
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
- }
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Exchange.qml b/atomic_defi_design/qml/Exchange/Exchange.qml
deleted file mode 100644
index 027eccd562..0000000000
--- a/atomic_defi_design/qml/Exchange/Exchange.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-import "./Trade"
-import "./Orders"
-import "./History"
-
-Item {
- id: exchange
- readonly property int layout_margin: 15
-
- property int current_page: idx_exchange_trade
-
- readonly property string left_ticker: API.app.trading_pg.market_pairs_mdl.left_selected_coin
- readonly property string right_ticker: API.app.trading_pg.market_pairs_mdl.right_selected_coin
- readonly property string base_ticker: API.app.trading_pg.market_pairs_mdl.base_selected_coin
- readonly property string rel_ticker: API.app.trading_pg.market_pairs_mdl.rel_selected_coin
-
- function cancelOrder(order_id) {
- API.app.trading_pg.orders.cancel_order(order_id)
- }
-
- Component.onCompleted: {
- API.app.trading_pg.on_gui_enter_dex()
- }
-
- Component.onDestruction: API.app.trading_pg.on_gui_leave_dex()
-
- ColumnLayout {
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
-
- anchors.fill: parent
- anchors.topMargin: 20
-
- spacing: layout_margin
-
- Trade {
- id: trade
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.bottomMargin: layout_margin
- Layout.rightMargin: Layout.bottomMargin
- }
-
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/History/History.qml b/atomic_defi_design/qml/Exchange/History/History.qml
deleted file mode 100644
index 8b8cca162c..0000000000
--- a/atomic_defi_design/qml/Exchange/History/History.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../../Components"
-import "../../Constants"
-import ".."
-
-OrdersPage {
- page_index: idx_exchange_history
-
- title: qsTr("Recent Swaps")
- //empty_text: qsTr("You don't have recent orders.")
- is_history: true
-}
diff --git a/atomic_defi_design/qml/Exchange/Orders/Orders.qml b/atomic_defi_design/qml/Exchange/Orders/Orders.qml
deleted file mode 100644
index abee954e1b..0000000000
--- a/atomic_defi_design/qml/Exchange/Orders/Orders.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../../Components"
-import "../../Constants"
-import ".."
-
-OrdersPage {
- page_index: idx_exchange_orders
-
- title: qsTr("Orders")
- //empty_text: qsTr("You don't have any orders.")
- is_history: false
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/BestOrder/Header.qml b/atomic_defi_design/qml/Exchange/Trade/BestOrder/Header.qml
deleted file mode 100644
index f70841305a..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/BestOrder/Header.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../../../Components"
-import "../../../Constants"
-
-Item {
- property bool is_horizontal: false
- height: 40
- width: parent.width
- z: 2
- Rectangle {
- anchors.fill: parent
- color: theme.dexBoxBackgroundColor
- }
-
- RowLayout {
- width: parent.width - 30
- height: parent.height
- anchors.horizontalCenter: parent.horizontalCenter
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 130
- text: sell_mode? qsTr("You get") : qsTr("You send")
- font.family: Style.font_family
- font.pixelSize: 10
- font.bold: true
- font.weight: Font.Black
- }
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 70
-
- text: qsTr("Fiat Price")
- font.family: Style.font_family
- font.pixelSize: 10
- font.bold: true
- font.weight: Font.Black
- horizontalAlignment: Label.AlignRight
-
- }
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- //Layout.preferredWidth: 120
- text: qsTr("CEX rate")
- horizontalAlignment: Label.AlignRight
- font.family: Style.font_family
- font.pixelSize: 10
- font.bold: true
- font.weight: Font.Black
- }
- }
-
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/BestOrder/List.qml b/atomic_defi_design/qml/Exchange/Trade/BestOrder/List.qml
deleted file mode 100644
index ee5401f0c0..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/BestOrder/List.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-import "../../../Constants/"
-
-
-Item {
- id: _control
- Header {}
-
- ListView {
- id: list
- anchors.topMargin: 40
- anchors.fill: parent
- model: API.app.trading_pg.orderbook.best_orders.proxy_mdl
- clip: true
- reuseItems: true
- delegate: ListDelegate {}
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/BestOrder/ListDelegate.qml b/atomic_defi_design/qml/Exchange/Trade/BestOrder/ListDelegate.qml
deleted file mode 100644
index 9038442303..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/BestOrder/ListDelegate.qml
+++ /dev/null
@@ -1,150 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-
-import Qaterial 1.0 as Qaterial
-
-import "../../../Components"
-import "../../../Constants"
-
-Item {
- id: _control
- property bool coinEnable: API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled
- property var isAsk: {
- if(parseInt(cex_rates)>0){
- false
- }else if(parseInt(cex_rates)<0) {
- true
- }else {
- undefined
- }
- }
- width: visible? list.width : 0
- height: 36
-
-
- AnimatedRectangle {
- visible: mouse_are.containsMouse
- width: parent.width
- height: parent.height
- color: theme.foregroundColor
- opacity: 0.1
- }
-
- RowLayout {
- id: row
- width: parent.width - 30
- height: parent.height
- anchors.horizontalCenter: parent.horizontalCenter
- spacing: 10
- Row {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 130
- leftPadding: -10
- spacing: 5
- Image {
- source: General.coinIcon(coin)
- width: 20
- height: 20
- smooth: true
- antialiasing: true
- opacity: !_control.coinEnable? .1 : 1
- anchors.verticalCenter: parent.verticalCenter
- }
- DefaultText {
- anchors.verticalCenter: parent.verticalCenter
- leftPadding: 2
- text: send + " " + atomic_qt_utilities.retrieve_main_ticker(coin)
- font.family: _font.fontFamily
- font.pixelSize: 10
-
- }
- }
- DefaultTooltip {
- id: _tooltip
- dim: true
- modal: true
- closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
- width: 250
- contentItem: DexLabelUnlinked {
- text_value: 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)
- wrapMode: DefaultText.Wrap
- width: 250
- onLinkActivated: {
- if(link==="#no") {
- _tooltip.close()
- }else {
- if (API.app.enable_coins([coin]) === true) {
- _control.coinEnable = true
- _tooltip.close()
- }
- else {
- cannot_enable_coin_modal.open()
- }
- }
- }
-
- ModalLoader {
- property string coin_to_enable_ticker: coin
- id: cannot_enable_coin_modal
- sourceComponent: CannotEnableCoinModal { coin_to_enable_ticker: cannot_enable_coin_modal.coin_to_enable_ticker }
- }
- }
- delay: 200
- }
-
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 70
- text: price_fiat+API.app.settings_pg.current_fiat_sign
- font.family: _font.fontFamily
- font.pixelSize: 10
- horizontalAlignment: Label.AlignRight
- opacity: 1
-
- }
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
-
- text: cex_rates==="0"? "N/A" : parseFloat(cex_rates)>0? "+"+parseFloat(cex_rates).toFixed(2)+"%" : parseFloat(cex_rates).toFixed(2)+"%"
- font.family: _font.fontFamily
- font.pixelSize: 10
-
- Behavior on rightPadding {
- NumberAnimation {
- duration: 150
- }
- }
-
- color:cex_rates==="0"? Qt.darker(theme.foregroundColor) : parseFloat(cex_rates)<0? Style.colorGreen : Style.colorRed
- horizontalAlignment: Label.AlignRight
- opacity: 1
-
- }
- }
-
-
- DefaultMouseArea {
- id: mouse_are
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- if(!API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled){
- _tooltip.open()
- }else {
- app.pairChanged(base_ticker, coin)
- API.app.trading_pg.orderbook.select_best_order(uuid)
- }
-
- //if(is_mine) return
- //isAsk? selectOrder(true, coin, price, quantity, price_denom, price_numer, quantity_denom, quantity_numer, min_volume) : selectOrder(false, coin, price, quantity, price_denom, price_numer, quantity_denom, quantity_numer, min_volume)
- }
- }
- HorizontalLine {
- width: parent.width
- opacity: .4
- }
-
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/CandleStickChart.qml b/atomic_defi_design/qml/Exchange/Trade/CandleStickChart.qml
deleted file mode 100644
index a356806bb8..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/CandleStickChart.qml
+++ /dev/null
@@ -1,138 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtCharts 2.3
-import QtWebEngine 1.8
-
-import "../../Components"
-import "../../Constants"
-
-// List
-
-DexBox {
- id: graph_bg
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
-
-
- content: Item {
- id: root
-
- width: graph_bg.width
- height: graph_bg.height
-
- property bool pair_supported: false
- readonly property bool is_fetching: chart.loadProgress < 100
-
- RowLayout {
- visible: pair_supported && !chart.visible
- anchors.centerIn: parent
-
- DefaultBusyIndicator {
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: -15
- Layout.rightMargin: Layout.leftMargin*0.75
- scale: 0.5
- }
-
- DefaultText {
- text_value: qsTr("Loading market data") + "..."
- }
- }
-
- DefaultText {
- visible: !pair_supported
- onVisibleChanged: if(visible) {
- dex_chart.visible = false
- }
- text_value: qsTr("There is no chart data for this pair yet")
- anchors.centerIn: parent
- }
-
- Component.onCompleted: try{loadChart(left_ticker?? atomic_app_primary_coin, right_ticker?? atomic_app_secondary_coin)}catch(e){}
-
- Connections {
- target: app
- function onPairChanged(base, rel) {
- root.loadChart(base, rel)
- }
- }
-
- readonly property string theme: app.globalTheme.chartTheme
- onThemeChanged: try{loadChart(left_ticker?? atomic_app_primary_coin, right_ticker?? atomic_app_secondary_coin, true)}catch(e){}
-
- property string chart_base
- property string chart_rel
- property string loaded_symbol
- function loadChart(base, rel, force=false) {
- const pair = atomic_qt_utilities.retrieve_main_ticker(base) + "/" + atomic_qt_utilities.retrieve_main_ticker(rel)
- const pair_reversed = atomic_qt_utilities.retrieve_main_ticker(rel) + "/" + atomic_qt_utilities.retrieve_main_ticker(base)
-
- console.log("Will try to load TradingView chart", pair)
-
- // Normal pair
- let symbol = General.supported_pairs[pair]
- if(!symbol) {
- console.log("Symbol not found for", pair)
- symbol = General.supported_pairs[pair_reversed]
- }
-
- // Reversed pair
- if(!symbol) {
- console.log("Symbol not found for", pair_reversed)
- pair_supported = false
- return
- }
-
- pair_supported = true
-
- // Load HTML
- if(!force && symbol === loaded_symbol) {
- console.log("Chart is already loaded,", symbol)
- return
- }
-
- loaded_symbol = symbol
- console.log("Loading TradingView chart", symbol, " theme: ", theme)
-
- chart_base = atomic_qt_utilities.retrieve_main_ticker(base)
- chart_rel = atomic_qt_utilities.retrieve_main_ticker(rel)
-
- chart.loadHtml(`
-
-
-
-
- `)
- }
-
- WebEngineView {
- id: chart
- anchors.fill: parent
- anchors.margins: -1
- visible: !is_fetching && pair_supported
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/qml/Exchange/Trade/ConfirmTradeModal.qml
deleted file mode 100644
index 4e02e106a2..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/ConfirmTradeModal.qml
+++ /dev/null
@@ -1,310 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import AtomicDEX.TradingError 1.0
-
-import "../../Components"
-import "../../Constants"
-import ".."
-
-import "Orders/"
-
-BasicModal {
- id: root
-
- width: 1100
-
- readonly property var fees: API.app.trading_pg.fees
- //onOpened: fees =
- /*onOpened: reset()
-
- function reset() {
- //API.app.trading_pg.determine_fees()
- }
-
- function isEmpty(data){
- //console.log(JSON.stringify(data))
- if(data.length<0) {
- return true
- }else {
- return false
- }
- }
- function isVisible(n){
-
- return isEmpty(fees)? false : parseFloat(n)===0? false: true
- }*/
-
- /*Connections {
- target: API.app.trading_pg
- function onFeesChanged() {
- fees = API.app.trading_pg.fees
- API.app.trading_pg.determine_error_cases()
- }
- }*/
-
- /*onClosed: {
- API.app.trading_pg.reset_fees()
- }*/
-
- ModalContent {
- title: qsTr("Confirm Exchange Details")
-
- OrderContent {
- Layout.topMargin: 25
- Layout.fillWidth: true
- Layout.leftMargin: 20
- Layout.rightMargin: Layout.leftMargin
- height: 120
- Layout.alignment: Qt.AlignHCenter
-
- details: ({
- base_coin: base_ticker,
- rel_coin: rel_ticker,
- base_amount: base_amount,
- rel_amount: rel_amount,
-
- order_id: '',
- date: '',
- })
- in_modal: true
- }
-
- PriceLine {
- Layout.alignment: Qt.AlignHCenter
- }
-
- HorizontalLine {
- Layout.topMargin: 10
- Layout.bottomMargin: 10
- Layout.fillWidth: true
- }
-
- FloatingBackground {
- Layout.alignment: Qt.AlignHCenter
- Layout.bottomMargin: 10
-
- color: Style.colorTheme5
-
- width: warning_texts.width + 20
- height: warning_texts.height + 20
-
- ColumnLayout {
- id: warning_texts
- anchors.centerIn: parent
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
-
- text_value: qsTr("This swap request can not be undone and is a final event!")
- }
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
-
- text_value: qsTr("This transaction can take up to 60 mins - DO NOT close this application!")
- font.pixelSize: Style.textSizeSmall4
- }
- }
- }
-
- HorizontalLine {
- Layout.bottomMargin: 10
- Layout.fillWidth: true
- visible: true
- }
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 120
- visible: true
- Column {
- anchors.centerIn: parent
-
- DefaultListView {
- enabled: true
- model: fees.total_fees
- delegate: DefaultText {
- visible: true
- text: qsTr("Total %1 fees: %2 (%3)").arg(modelData.coin).arg(parseFloat(modelData.required_balance).toFixed(8) / 1).arg(General.getFiatText(modelData.required_balance, modelData.coin, false))
- }
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- Item {width: 1; height: 10}
- DefaultText {
- id: errors
- anchors.horizontalCenter: parent.horizontalCenter
- width: parent.width
- horizontalAlignment: DefaultText.AlignHCenter
- font.pixelSize: Style.textSizeSmall4
- color: Style.colorRed
-
- text_value: General.getTradingError(
- last_trading_error,
- curr_fee_info,
- base_ticker,
- rel_ticker, left_ticker, right_ticker)
- }
- Item {width: 1; height: 10}
- }
- }
-
- HorizontalLine {
- Layout.bottomMargin: 10
- Layout.fillWidth: true
- }
-
- ColumnLayout {
- id: config_section
-
- readonly property var default_config: API.app.trading_pg.get_raw_mm2_coin_cfg(rel_ticker)
-
- readonly property bool is_dpow_configurable: config_section.default_config.requires_notarization || false
- Layout.bottomMargin: 10
- Layout.alignment: Qt.AlignHCenter
-
- ColumnLayout {
- Layout.alignment: Qt.AlignHCenter
- visible: !enable_custom_config.checked
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: qsTr("Security configuration")
- font.weight: Font.Medium
- }
-
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: "✅ " + (config_section.is_dpow_configurable ? qsTr("dPoW protected") :
- qsTr("%1 confirmations for incoming %2 transactions").arg(config_section.default_config.required_confirmations || 1).arg(rel_ticker))
- }
-
- DefaultText {
- visible: config_section.is_dpow_configurable
- Layout.alignment: Qt.AlignHCenter
- text_value: General.cex_icon + ' ' + qsTr('Read more about dPoW') + ''
- font.pixelSize: Style.textSizeSmall2
- }
- }
-
- // Enable custom config
- DefaultCheckBox {
- Layout.alignment: Qt.AlignHCenter
- id: enable_custom_config
-
- text: qsTr("Use custom protection settings for incoming %1 transactions", "TICKER").arg(rel_ticker)
- }
-
- // Configuration settings
- ColumnLayout {
- id: custom_config
- visible: enable_custom_config.checked
-
- Layout.alignment: Qt.AlignHCenter
-
- // dPoW configuration switch
- DefaultSwitch {
- id: enable_dpow_confs
- Layout.alignment: Qt.AlignHCenter
-
- visible: config_section.is_dpow_configurable
- checked: true
- text: qsTr("Enable Komodo dPoW security")
- }
-
- DefaultText {
- visible: enable_dpow_confs.visible && enable_dpow_confs.enabled
- Layout.alignment: Qt.AlignHCenter
- text_value: General.cex_icon + ' ' + qsTr('Read more about dPoW') + ''
- font.pixelSize: Style.textSizeSmall2
- }
-
- // Normal configuration settings
- ColumnLayout {
- Layout.alignment: Qt.AlignHCenter
- visible: !config_section.is_dpow_configurable || !enable_dpow_confs.checked
- enabled: !config_section.is_dpow_configurable || !enable_dpow_confs.checked
-
- HorizontalLine {
- Layout.topMargin: 10
- Layout.bottomMargin: 10
- Layout.fillWidth: true
- }
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: qsTr("Required Confirmations") + ": " + required_confirmation_count.value
- color: parent.enabled ? Style.colorText : Style.colorTextDisabled
- }
-
- DefaultSlider {
- id: required_confirmation_count
- readonly property int default_confirmation_count: 3
- Layout.alignment: Qt.AlignHCenter
- stepSize: 1
- from: 1
- to: 5
- live: true
- snapMode: Slider.SnapAlways
- value: default_confirmation_count
- }
- }
- }
-
- FloatingBackground {
- visible: enable_custom_config.visible && enable_custom_config.enabled && enable_custom_config.checked &&
- (config_section.is_dpow_configurable && !enable_dpow_confs.checked)
- Layout.alignment: Qt.AlignHCenter
- Layout.bottomMargin: 10
-
- color: Style.colorRed3
-
- width: dpow_off_warning.width + 20
- height: dpow_off_warning.height + 20
-
- ColumnLayout {
- id: dpow_off_warning
- anchors.centerIn: parent
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
-
- text_value: Style.warningCharacter + " " + qsTr("Warning, this atomic swap is not dPoW protected!")
- }
- }
- }
- DefaultBusyIndicator {
- visible: buy_sell_rpc_busy
- Layout.alignment: Qt.AlignCenter
- }
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Cancel")
- Layout.fillWidth: true
- onClicked: {
- //fees = []
- root.close()
- }
- },
-
- PrimaryButton {
- text: qsTr("Confirm")
- Layout.fillWidth: true
- enabled: !buy_sell_rpc_busy && last_trading_error === TradingError.None
- onClicked: {
- trade({
- enable_custom_config: enable_custom_config.checked,
- is_dpow_configurable: config_section.is_dpow_configurable,
- enable_dpow_confs: enable_dpow_confs.checked,
- required_confirmation_count: required_confirmation_count.value,
- }, config_section.default_config)
- }
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/DefaultSweetModal.qml b/atomic_defi_design/qml/Exchange/Trade/DefaultSweetModal.qml
deleted file mode 100644
index c46fc1e86e..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/DefaultSweetModal.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../../Components"
-import "../../Constants"
-import ".."
-
-import "Orders/"
-
-DefaultModal {
- id: root
-
- width: API.app.trading_pg.preimage_rpc_busy? 300 : 1100
-
- onOpened: reset()
-
- function reset() {
- API.app.trading_pg.determine_fees()
-
- }
- Connections {
- target: API.app.trading_pg
- function onFeesChanged() {
- console.log(JSON.stringify(API.app.trading_pg.fees))
- }
- }
- Connections {
- target: API.app.trading_pg
- function onPreImageRpcStatusChanged(){
- console.log(API.app.trading_pg.preimage_rpc_busy)
- }
- }
-
-
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/DexComboBoxLine.qml b/atomic_defi_design/qml/Exchange/Trade/DexComboBoxLine.qml
deleted file mode 100644
index 6112b31ca5..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/DexComboBoxLine.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-import QtQuick.Controls.Universal 2.15
-
-import "../../Components"
-import "../../Constants"
-
-RowLayout {
- id: root
-
- property int padding: 0
- property var details
- property color color: !details ? "white" : Style.getCoinColor(details.ticker)
- Behavior on color { ColorAnimation { duration: Style.animationDuration } }
- property alias bottom_text: bottom_line.text_value
-
- DefaultImage {
- id: icon
- source: General.coinIcon(ticker)
- Layout.preferredWidth: 32
- Layout.preferredHeight: 45
- Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
- Layout.leftMargin: padding
- Layout.topMargin: Layout.leftMargin
- Layout.bottomMargin: Layout.leftMargin
-
- ColumnLayout {
- anchors.left: parent.right
- anchors.leftMargin: 12
- anchors.verticalCenter: parent.verticalCenter
- width: root.width-40
- DefaultText {
- text_value: !details ? "" :
- `${details.ticker} ${details.name}`
- color: Style.colorText
- font.pixelSize: Style.textSizeSmall3
- }
-
- DexLabel {
- id: bottom_line
- property string real_value: !details ? "" :
- details.balance + " (" + General.formatFiat("", details.main_currency_balance, API.app.settings_pg.current_fiat_sign) + ")"
- text: real_value
- Layout.fillWidth: true
- elide: Text.ElideRight
- color: theme.foregroundColor
- font: theme.textType.body2
- wrapMode: Label.NoWrap
- ToolTip.text: real_value
- Component.onCompleted: {
- font.pixelSize = 11.5
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/OrderBook/Header.qml b/atomic_defi_design/qml/Exchange/Trade/OrderBook/Header.qml
deleted file mode 100644
index 78d5a9c1dd..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/OrderBook/Header.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../../../Components"
-import "../../../Constants"
-
-Item {
- property bool is_ask: false
- property bool is_horizontal: false
- height: 40
- width: parent.width
- z: 2
- Rectangle {
- anchors.fill: parent
- color: theme.dexBoxBackgroundColor
- }
-
- RowLayout {
- width: parent.width - 30
- height: parent.height
- anchors.horizontalCenter: parent.horizontalCenter
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 60
- text: is_ask? qsTr("Price") + " ("+atomic_qt_utilities.retrieve_main_ticker(right_ticker)+")" : qsTr("Price") + " ("+atomic_qt_utilities.retrieve_main_ticker(right_ticker)+")"
- font.family: _font.fontFamily
- font.pixelSize: 9
- font.bold: true
- font.weight: Font.Black
- color: is_ask? theme.redColor : theme.greenColor
- }
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 100
-
- text: qsTr("Quantity") + " ("+ atomic_qt_utilities.retrieve_main_ticker(left_ticker) +")"
- font.family: _font.fontFamily
- font.pixelSize: 9
- font.bold: true
- font.weight: Font.Black
- horizontalAlignment: Label.AlignRight
-
- }
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Total") + "("+ atomic_qt_utilities.retrieve_main_ticker(right_ticker) +")"
- horizontalAlignment: Label.AlignRight
- font.family: _font.fontFamily
- font.pixelSize: 9
- font.bold: true
- font.weight: Font.Black
- }
- }
-
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/OrderBook/List.qml b/atomic_defi_design/qml/Exchange/Trade/OrderBook/List.qml
deleted file mode 100644
index d239b91b74..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/OrderBook/List.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-import "../../../Constants/"
-
-
-Item {
- id: _control
- property bool hide_header: false
- property bool isAsk
- property bool isVertical: false
- Header {
- visible: !hide_header
- is_ask: isAsk
- }
-
- ListView {
- id: orderList
- anchors.topMargin: hide_header? 0 : 40
- anchors.fill: parent
- model: isAsk? API.app.trading_pg.orderbook.asks.proxy_mdl : API.app.trading_pg.orderbook.bids.proxy_mdl
- clip: true
- reuseItems: true
-
- Timer {
- id: _tm
- interval: 2000
- onTriggered: {
- console.log("changing")
- orderList.positionViewAtEnd()
- }
- }
- onContentHeightChanged : {
- if(isVertical) {
- _tm.start()
- }
- }
-
- delegate: ListDelegate {
- isAsk: _control.isAsk? true : false
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/OrderBook/ListDelegate.qml b/atomic_defi_design/qml/Exchange/Trade/OrderBook/ListDelegate.qml
deleted file mode 100644
index b192e20314..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/OrderBook/ListDelegate.qml
+++ /dev/null
@@ -1,182 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../../../Components"
-import "../../../Constants"
-
-Item {
- property bool isAsk
- width: visible? orderList.width : 0
- height: 36
-
- AnimatedRectangle {
- visible: mouse_are.containsMouse
- width: parent.width
- height: parent.height
- color: theme.foregroundColor
- opacity: 0.1
- }
-
- Rectangle {
- anchors.verticalCenter: parent.verticalCenter
- width: 6
- height: 6
- radius: width/2
- x: 3
- visible: is_mine
- color: isAsk? Style.colorRed : Style.colorGreen
- }
- HorizontalLine {
- width: parent.width
- opacity: .4
- }
- Rectangle {
- id: progress
- height: 2
- anchors.bottom: parent.bottom
- radius: 3
- x: 10
- color: isAsk? Style.colorRed : Style.colorGreen
- width: 0
- Component.onCompleted: width =((depth * 100) * (parent.width + 40)) / 100
- opacity: 0.8//!isVertical? 1.1-(index * 0.1) : 1-(1.1-(index * 0.1))
- Behavior on width {
- NumberAnimation {
- duration: 1000
- }
- }
- //anchors.verticalCenter: parent.verticalCenter
- }
- RowLayout {
- id: row
- width: mouse_are.containsMouse? parent.width - 15 : parent.width - 30
- height: parent.height
- anchors.horizontalCenter: parent.horizontalCenter
- onWidthChanged: progress.width = ((depth * 100) * (width + 40)) / 100
- spacing: 10
- Qaterial.ColorIcon {
- visible: mouse_are.containsMouse && !enough_funds_to_pay_min_volume //(min_volume > 0 && API.app.trading_pg.orderbook.base_max_taker_vol.decimal < min_volume) && min_volume !== API.app.trading_pg.mm2_min_volume
- source: Qaterial.Icons.alert
- Layout.alignment: Qt.AlignVCenter
- iconSize: 13
- color: Qaterial.Colors.amber
- }
- DefaultTooltip {
- visible: mouse_are.containsMouse && !enough_funds_to_pay_min_volume //(min_volume > 0 && API.app.trading_pg.orderbook.base_max_taker_vol.decimal < min_volume) && min_volume !== API.app.trading_pg.mm2_min_volume
- width: 300
- contentItem: DefaultText {
- text_value: qsTr("This order require a minimum amount of %1 %2
You don't have enough funds.
Your max balance after fees is: (%3)").arg(min_volume).arg(isAsk ? API.app.trading_pg.market_pairs_mdl.right_selected_coin : API.app.trading_pg.market_pairs_mdl.left_selected_coin).arg(isAsk ? API.app.trading_pg.orderbook.rel_max_taker_vol.decimal : API.app.trading_pg.orderbook.base_max_taker_vol.decimal)
- wrapMode: DefaultText.Wrap
- width: 300
- }
- delay: 200
- }
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 60
- text: parseFloat(General.formatDouble(
- price, General.amountPrecision, true)).toFixed(8)
- font.family: _font.fontFamily
- font.pixelSize: 11
- color: isAsk? Style.colorRed : Style.colorGreen
-
- }
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 100
- text: parseFloat(quantity).toFixed(6)
- font.family: _font.fontFamily
- font.pixelSize: 11
- horizontalAlignment: Label.AlignRight
- opacity: 1
-
- }
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: parseFloat(total).toFixed(8)
- Behavior on rightPadding {
- NumberAnimation {
- duration: 150
- }
- }
- rightPadding: (is_mine) && (mouse_are.containsMouse || cancel_button.containsMouse) ? 30 : 0
- horizontalAlignment: Label.AlignRight
- font.family: _font.fontFamily
- font.pixelSize: 11
- opacity: 1
-
- }
- }
-
-
- DefaultMouseArea {
- id: mouse_are
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- if(is_mine) return
-
- if(!enough_funds_to_pay_min_volume ){
-
- }
- else {
- exchange_trade.orderSelected = true
- orderList.currentIndex = index
- if(isAsk) {
- selectOrder(true, coin, price, quantity, price_denom, price_numer, quantity_denom, quantity_numer, min_volume, base_min_volume, base_max_volume, rel_min_volume, rel_max_volume, base_max_volume_denom, base_max_volume_numer, uuid)
- }else {
- selectOrder(false, coin, price, quantity, price_denom, price_numer, quantity_denom, quantity_numer, min_volume, base_min_volume, base_max_volume, rel_min_volume, rel_max_volume, base_max_volume_denom, base_max_volume_numer, uuid)
- }
- }
-
-
- }
- }
-
- Qaterial.ColorIcon {
- id: cancel_button_text
- property bool requested_cancel: false
- visible: is_mine && !requested_cancel
-
- source: Qaterial.Icons.close
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: 1
- anchors.right: parent.right
- anchors.rightMargin: mouse_are.containsMouse || cancel_button.containsMouse? 12 : 6
- Behavior on iconSize {
- NumberAnimation {
- duration: 200
- }
- }
-
- iconSize: mouse_are.containsMouse || cancel_button.containsMouse? 16 : 0
-
- color: cancel_button.containsMouse ? Qaterial.Colors.red : mouse_are.containsMouse? Style.colorText2 : Qaterial.Colors.red
-
- DefaultMouseArea {
- id: cancel_button
- anchors.fill: parent
- hoverEnabled: true
-
-
- onClicked: {
- if(!is_mine) return
-
- cancel_button_text.requested_cancel = true
- cancelOrder(uuid)
- }
- }
- }
- AnimatedRectangle {
- visible: !enough_funds_to_pay_min_volume && mouse_are.containsMouse
- color: Style.colorTheme9
- anchors.fill: parent
- opacity: .3
- }
-
-
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/OrderBook/Vertical.qml b/atomic_defi_design/qml/Exchange/Trade/OrderBook/Vertical.qml
deleted file mode 100644
index 66751904e0..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/OrderBook/Vertical.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../../../Components"
-
-Item {
- id: orderBook
- visible: isUltraLarge
-
- ColumnLayout {
- anchors.fill: parent
- spacing: 10
-
- InnerBackground {
- Layout.fillWidth: true
- Layout.fillHeight: true
- radius: 2
- color: 'transparent'
- ColumnLayout {
- anchors.fill: parent
- spacing: 2
- List {
- isAsk: true
- isVertical: true
- Layout.fillHeight: true
- Layout.fillWidth: true
- }
- Item {
- Layout.preferredHeight: 4
- Layout.fillWidth: true
- Rectangle {
- width: parent.width
- height: parent.height
- anchors.horizontalCenter: parent.horizontalCenter
- color: theme.surfaceColor
- }
- }
- List {
- isAsk: false
- hide_header: true
- Layout.fillHeight: true
- Layout.fillWidth: true
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderContent.qml b/atomic_defi_design/qml/Exchange/Trade/Orders/OrderContent.qml
deleted file mode 100644
index 4dab5e26ea..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderContent.qml
+++ /dev/null
@@ -1,125 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import "../../../Components"
-import "../../../Constants"
-
-// Content
-Item {
- property var details
- property bool in_modal: false
-
- readonly property bool is_placed_order: !details ? false :
- details.order_id !== ''
-
- // Base Icon
- DefaultImage {
- id: base_icon
- source: General.coinIcon(!details ? atomic_app_primary_coin :
- details.base_coin)
- width: in_modal ? Style.textSize5 : Style.textSize3
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.2
- }
-
- // Rel Icon
- DefaultImage {
- id: rel_icon
- source: General.coinIcon(!details ? atomic_app_primary_coin :
- details.rel_coin)
- width: base_icon.width
- anchors.right: parent.right
- anchors.rightMargin: base_icon.anchors.leftMargin
- }
-
- // Base Amount
- DefaultText {
- id: base_amount
- text_value: !details ? "" :
- "~ " + General.formatCrypto("", details.base_amount, details.base_coin)
- font.pixelSize: in_modal ? Style.textSize2 : Style.textSize
-
- anchors.horizontalCenter: base_icon.horizontalCenter
- anchors.top: base_icon.bottom
- anchors.topMargin: 10
- privacy: is_placed_order
- }
-
- // Swap icon
- SwapIcon {
- anchors.verticalCenter: base_icon.bottom
- anchors.horizontalCenter: parent.horizontalCenter
- top_arrow_ticker: !details ? atomic_app_primary_coin :
- details.base_coin
- bottom_arrow_ticker: !details ? atomic_app_primary_coin :
- details.rel_coin
- }
-
- // Rel Amount
- DefaultText {
- id: rel_amount
- text_value: !details ? "" :
- "~ " + General.formatCrypto("", details.rel_amount, details.rel_coin)
- font.pixelSize: base_amount.font.pixelSize
-
- anchors.horizontalCenter: rel_icon.horizontalCenter
- anchors.top: base_amount.top
- privacy: is_placed_order
- }
-
- // Order ID
- DefaultText {
- id: order_id
- visible: !in_modal && is_placed_order
- text_value: !details ? "" :
- qsTr("ID") + ": " + details.order_id
- color: Style.colorTheme2
- anchors.top: base_amount.bottom
- anchors.topMargin: base_amount.anchors.topMargin
- privacy: is_placed_order
- }
-
- // Status Text
- DefaultText {
- visible: !details ? false : !in_modal && (details.is_swap || !details.is_maker)
- color: !details ? "white" : visible ? getStatusColor(details.order_status) : ''
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: base_icon.top
- text_value: !details ? "" :
- visible ? getStatusTextWithPrefix(details.order_status) : ''
- }
-
- // Date
- DefaultText {
- id: date
- visible: !details ? false : !in_modal && details.date !== ''
- text_value: !details ? "" :
- details.date
- color: Style.colorTheme2
- anchors.top: order_id.bottom
- anchors.topMargin: base_amount.anchors.topMargin
- }
-
- // Maker/Taker
- DefaultText {
- visible: !in_modal && is_placed_order
- text_value: !details ? "" :
- details.is_maker ? qsTr("Maker Order"): qsTr("Taker Order")
- color: Style.colorThemeDarkLight
- anchors.verticalCenter: date.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- // Cancel button
- DangerButton {
- visible: !details ? false :
- !in_modal && details.cancellable
- anchors.right: parent.right
- anchors.bottom: date.bottom
- text: qsTr("Cancel")
- onClicked: cancelOrder(details.order_id)
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderLine.qml b/atomic_defi_design/qml/Exchange/Trade/Orders/OrderLine.qml
deleted file mode 100644
index a3e7748dd6..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderLine.qml
+++ /dev/null
@@ -1,207 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import Qaterial 1.0 as Qaterial
-
-import QtGraphicalEffects 1.0
-import "../../../Components"
-import "../../../Constants"
-
-Rectangle {
- property var details
- property alias clickable: mouse_area.enabled
- readonly property bool is_placed_order: !details ? false :
- details.order_id !== ''
-
- width: list.model.count>6? list.width-15 : list.width-8
- height: 40
-
- color: mouse_area.containsMouse? theme.hightlightColor : "transparent"
-
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- hoverEnabled: enabled
- onClicked: {
- order_modal.open()
- order_modal.item.details = details
- }
- }
- RowLayout {
- anchors.fill: parent
- anchors.leftMargin: 10
- anchors.rightMargin: 10
- RowLayout {
- id: status_text
- Layout.fillHeight: true
- Layout.preferredWidth: 15
-
- spacing: 5
- visible: clickable? !details ? false :
- (details.is_swap || !details.is_maker) : false
-
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- font.pixelSize: base_amount.font.pixelSize
- color: !details ? "white" : getStatusColor(details.order_status)
- text_value: !details ? "" :
- visible ? getStatusStep(details.order_status) : ''
- }
- }
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 20
-
- visible: !status_text.visible? clickable? true : false : false
-
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- iconSize: 17
- color: Style.colorWhite4
- source: Qaterial.Icons.clipboardTextSearchOutline
- }
- }
-
- DefaultText {
- visible: clickable
- font.pixelSize: base_amount.font.pixelSize
- text_value: !details ? "" :
- details.date?? ""
- Layout.fillHeight: true
- verticalAlignment: Label.AlignVCenter
- Layout.preferredWidth: 120
- }
-
- DefaultImage {
- id: base_icon
- source: General.coinIcon(!details ? atomic_app_primary_coin :
- details.base_coin?? atomic_app_primary_coin)
- Layout.preferredWidth: Style.textSize1
- Layout.preferredHeight: Style.textSize1
- Layout.alignment: Qt.AlignVCenter
- }
- DefaultText {
- id: base_amount
- text_value: !details ? "" :
- General.formatCrypto("", details.base_amount, details.base_coin, details.base_amount_current_currency, API.app.settings_pg.current_currency)
- font.pixelSize: 11
-
-
- Layout.fillHeight: true
- Layout.preferredWidth: 160
- verticalAlignment: Label.AlignVCenter
- privacy: is_placed_order
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- SwapIcon {
- visible: !status_text.visible
- width: 30
- height: 50
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- top_arrow_ticker: !details ? atomic_app_primary_coin :
- details.base_coin?? ""
- bottom_arrow_ticker: !details ? atomic_app_primary_coin :
- details.rel_coin?? ""
- }
- }
-
- DefaultText {
- id: rel_amount
- text_value: !details ? "" :
- General.formatCrypto("", details.rel_amount, details.rel_coin, details.rel_amount_current_currency, API.app.settings_pg.current_currency)
- font.pixelSize: base_amount.font.pixelSize
-
- Layout.fillHeight: true
- Layout.preferredWidth: 160
- verticalAlignment: Label.AlignVCenter
- horizontalAlignment: Label.AlignRight
- privacy: is_placed_order
- }
- DefaultImage {
- id: rel_icon
- source: General.coinIcon(!details ? atomic_app_primary_coin :
- details.rel_coin?? atomic_app_secondary_coin)
-
- width: base_icon.width
- Layout.preferredWidth: Style.textSize1
- Layout.preferredHeight: Style.textSize1
- Layout.alignment: Qt.AlignVCenter
- }
- DefaultText {
- font.pixelSize: base_amount.font.pixelSize
- visible: !details || details.recoverable === undefined ? false :
- details.recoverable && details.order_status !== "refunding"
- Layout.fillHeight: true
- Layout.preferredWidth: 40
- verticalAlignment: Label.AlignVCenter
- horizontalAlignment: Label.AlignHCenter
- text_value: Style.warningCharacter
- color: Style.colorYellow
-
- DefaultTooltip {
- visible: (parent.visible && mouse_area.containsMouse) ?? false
-
- contentItem: ColumnLayout {
- DefaultText {
- text_value: qsTr("Funds are recoverable")
- font.pixelSize: Style.textSizeSmall4
- }
- }
- }
- }
- Qaterial.FlatButton {
- id: cancel_button_text
- visible: (!is_history? details.cancellable?? false : false)===true? (mouse_area.containsMouse || hovered)? true : false : false
-
- Layout.fillHeight: true
- Layout.preferredWidth: 30
- Layout.alignment: Qt.AlignVCenter
- outlinedColor: Style.colorTheme5
- Behavior on scale {
- NumberAnimation { duration: 200 }
- }
- Qaterial.ColorIcon {
- iconSize: 13
- color: Qaterial.Colors.pink300
- source: Qaterial.Icons.close
- anchors.centerIn: parent
- scale: parent.visible? 1 : 0
- }
-
-
- onClicked: { if(details) cancelOrder(details.order_id) }
- hoverEnabled: true
-
- }
- Rectangle {
- visible: (!is_history? details.cancellable?? false : false) === true? (mouse_area.containsMouse || cancel_button_text.hovered )? false : true : false
- width: 5
- height: 5
- color: Style.colorRed
- Layout.alignment: Qt.AlignVCenter
- }
-
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 40
- visible: !clickable
- }
- }
-
-
-
-
-
- // Order ID
- HorizontalLine {
- width: parent.width
- color: Style.colorWhite9
- opacity: .4
- anchors.bottom: parent.bottom
- }
-
- // !isSwapDone(details.order_status) && Qt.platform.os != "osx" needeed for new progress later
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderList.qml b/atomic_defi_design/qml/Exchange/Trade/Orders/OrderList.qml
deleted file mode 100644
index c99b205df9..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderList.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../../../Components"
-import "../../../Constants"
-import "../../../"
-
-Item {
- property string title
- property var items
- property bool is_history: false
-
- ColumnLayout {
- width: parent.width-10
- height: parent.height
- anchors.horizontalCenter: parent.horizontalCenter
-
- HorizontalLine {
- Layout.fillWidth: true
- color: Style.colorWhite8
- }
-
- DefaultListView {
- id: list
- Layout.fillWidth: true
- Layout.fillHeight: true
-
- model: items.orders_proxy_mdl
- enabled: !is_history || !API.app.orders_mdl.fetching_busy
-
- property int animationTimestamp: 0
- readonly property int animationTime: 600
- readonly property int animationDelay: 50
- property bool resetAnimation: false
-
- // Row
- delegate: OrderLine {
- readonly property double anim_time: list.animationTimestamp > index*list.animationDelay ?
- Math.min((list.animationTimestamp-index*list.animationDelay)/(list.animationTime), 1) : 0
- details: model
- opacity: anim_time
- }
-
- populate: Transition {
- PropertyAction { target: list; property: "resetAnimation"; value: !list.resetAnimation }
- }
-
-
- onResetAnimationChanged: {
- list.animationTimestamp = 0
- spawn_anim_timer.repeat = true
- spawn_anim_timer.restart()
- }
-
- Timer {
- id: spawn_anim_timer
- interval: General.delta_time
- running: true
- repeat: true
- onTriggered: () => {
- list.animationTimestamp += interval
- if(list.animationTimestamp > list.animationDelay*list.count + list.animationTime)
- repeat = false
- }
- }
- }
-
- // Pagination
- DexPaginator {
- visible: is_history && list.count>0
- enabled: list.enabled
- Layout.maximumHeight: 70
- Layout.alignment: Qt.AlignHCenter
- Layout.fillWidth: true
- Layout.bottomMargin: 10
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderModal.qml b/atomic_defi_design/qml/Exchange/Trade/Orders/OrderModal.qml
deleted file mode 100644
index b5df7b0889..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Orders/OrderModal.qml
+++ /dev/null
@@ -1,212 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../../../Components"
-import "../../../Constants"
-
-BasicModal {
- id: root
-
- property var details
-
- onDetailsChanged: {
- if(!details) root.close()
- }
-
- onOpened: swap_progress.updateSimulatedTime()
-
- onClosed: details = undefined
-
- ModalContent {
- title: !details ? "" :
- details.is_swap ? qsTr("Swap Details") : qsTr("Order Details")
-
- // Complete image
- DefaultImage {
- visible: !details ? false :
- details.is_swap && details.order_status === "successful"
- Layout.alignment: Qt.AlignHCenter
- source: General.image_path + "exchange-trade-complete.svg"
- }
-
- // Loading symbol
- DefaultBusyIndicator {
- running: (!details ? false :
- details.is_swap &&
- details.order_status !== "successful" &&
- details.order_status !== "failed") && Qt.platform.os != "osx"
- Layout.alignment: Qt.AlignHCenter
- }
-
- // Status Text
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 20
- font.pixelSize: Style.textSize3
- visible: !details ? false :
- details.is_swap || !details.is_maker
- color: !details ? "white" :
- visible ? getStatusColor(details.order_status) : ''
- text_value: !details ? "" :
- visible ? getStatusTextWithPrefix(details.order_status) : ''
- }
-
- OrderContent {
- Layout.topMargin: 25
- Layout.fillWidth: true
- Layout.leftMargin: 20
- Layout.rightMargin: Layout.leftMargin
- height: 120
- Layout.alignment: Qt.AlignHCenter
- details: root.details
- in_modal: true
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- Layout.bottomMargin: 20
- color: Style.colorWhite8
- }
-
- // Maker/Taker
- DefaultText {
- text_value: !details ? "" :
- details.is_maker ? qsTr("Maker Order"): qsTr("Taker Order")
- color: Style.colorThemeDarkLight
- Layout.alignment: Qt.AlignRight
- }
-
- // Refund state
- TextFieldWithTitle {
- Layout.topMargin: -20
-
- title: qsTr("Refund State")
- field.text: !details ? "" :
- details.order_status === "refunding" ? qsTr("Your swap failed but the auto-refund process for your payment started already. Please wait and keep application opened until you receive your payment back") : ""
- field.readOnly: true
-
- visible: field.text !== ''
- }
-
- // Date
- TextEditWithTitle {
- title: qsTr("Date")
- text: !details ? "" :
- details.date
- visible: text !== ''
- }
-
- // ID
- TextEditWithTitle {
- title: qsTr("ID")
- text: !details ? "" :
- details.order_id
- visible: text !== ''
- privacy: true
- }
-
- // Payment ID
- TextEditWithTitle {
- title: !details ? "" :
- details.is_maker ? qsTr("Maker Payment Sent ID") : qsTr("Maker Payment Spent ID")
- text: !details ? "" :
- details.maker_payment_id
- visible: text !== ''
- privacy: true
- }
-
- // Payment ID
- TextEditWithTitle {
- title: !details ? "" :
- details.is_maker ? qsTr("Taker Payment Spent ID") : qsTr("Taker Payment Sent ID")
- text: !details ? "" :
- details.taker_payment_id
- visible: text !== ''
- privacy: true
- }
-
- // Error ID
- TextEditWithTitle {
- title: qsTr("Error ID")
- text: !details ? "" :
- details.order_error_state
- visible: text !== ''
- }
-
- // Error Details
- TextFieldWithTitle {
- title: qsTr("Error Log")
- field.text: !details ? "" :
- details.order_error_message
- field.readOnly: true
- copyable: true
-
- visible: field.text !== ''
- }
-
- HorizontalLine {
- visible: swap_progress.visible
- Layout.fillWidth: true
- Layout.topMargin: 10
- Layout.bottomMargin: Layout.topMargin
- color: Style.colorWhite8
- }
-
- SwapProgress {
- id: swap_progress
- visible: General.exists(details) && details.order_status !== "matching"
- Layout.fillWidth: true
- details: root.details
- }
-
- // Buttons
- footer:
- [
- DefaultButton
- {
- text: qsTr("Close")
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- // Cancel button
- DangerButton
- {
- visible: !details ? false :
- details.cancellable
- Layout.fillWidth: true
- text: qsTr("Cancel Order")
- onClicked: cancelOrder(details.order_id)
- },
-
- // Recover Funds button
- PrimaryButton
- {
- Layout.fillWidth: true
- enabled: !API.app.orders_mdl.recover_fund_busy
- visible: !details ? false :
- details.recoverable && details.order_status !== "refunding"
- text: enabled ? qsTr("Recover Funds") : qsTr("Refunding...")
- onClicked: API.app.orders_mdl.recover_fund(details.order_id)
- },
-
- PrimaryButton
- {
- text: qsTr("View on Explorer")
- Layout.fillWidth: true
- visible: !details ? false :
- details.maker_payment_id !== '' || details.taker_payment_id !== ''
- onClicked: {
- if(!details) return
-
- const maker_id = details.maker_payment_id
- const taker_id = details.taker_payment_id
-
- if(maker_id !== '') General.viewTxAtExplorer(details.is_maker ? details.base_coin : details.rel_coin, maker_id)
- if(taker_id !== '') General.viewTxAtExplorer(details.is_maker ? details.rel_coin : details.base_coin, taker_id)
- }
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Orders/OrdersPage.qml b/atomic_defi_design/qml/Exchange/Trade/Orders/OrdersPage.qml
deleted file mode 100644
index afb2336b6f..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Orders/OrdersPage.qml
+++ /dev/null
@@ -1,262 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import Qt.labs.platform 1.1
-
-import Qaterial 1.0 as Qaterial
-
-import "../../../Components"
-import "../../../Constants"
-import "../../.."
-
-Item {
- id: root
-
- readonly property date default_min_date: new Date("2019-01-01")
- readonly property date default_max_date: new Date(new Date().setDate(new Date().getDate() + 30))
-
- property var list_model: API.app.orders_mdl
- property var list_model_proxy: API.app.orders_mdl.orders_proxy_mdl
- property int page_index
-
- property alias title: order_list.title
- //property alias empty_text: order_list.empty_text
- property alias items: order_list.items
-
- property bool is_history: false
-
- function applyDateFilter() {
- list_model_proxy.filter_minimum_date = min_date.date
-
- if(max_date.date < min_date.date)
- max_date.date = min_date.date
-
- list_model_proxy.filter_maximum_date = max_date.date
- }
-
- function applyTickerFilter() {
- list_model_proxy.set_coin_filter(combo_base.currentValue + "/" + combo_rel.currentValue)
- }
- function applyTickerFilter2(ticker1, ticker2) {
- list_model_proxy.set_coin_filter(ticker1 + "/" + ticker2)
- }
-
- function applyFilter() {
- applyDateFilter()
- applyTickerFilter2(combo_base.currentTicker, combo_rel.currentTicker)
- }
-
- Component.onCompleted: {
- list_model_proxy.is_history = root.is_history
- applyFilter()
- list_model_proxy.apply_all_filtering()
- }
-
- ColumnLayout {
- anchors.horizontalCenter: parent.horizontalCenter
-
- anchors.fill: parent
- anchors.bottomMargin: is_history? 0 : 10
- spacing: 15
-
- // Bottom part
- Item {
- id: orders_settings
- property bool displaySetting: false
- Layout.fillWidth: true
- Layout.preferredHeight: displaySetting? 80 : 30
- Behavior on Layout.preferredHeight {
- NumberAnimation {
- duration: 150
- }
- }
-
- Rectangle {
- width: parent.width
- height: orders_settings.displaySetting? 50 : 10
- Behavior on height {
- NumberAnimation {
- duration: 150
- }
- }
- anchors.bottom: parent.bottom
- anchors.bottomMargin: -15
- visible: false
- color: Style.colorTheme5
- }
-
- Row {
- x: 5
- y: 0
- spacing: 5
- Qaterial.OutlineButton {
- icon.source: Qaterial.Icons.filter
- text: qsTr("Filter")
- foregroundColor:Style.colorWhite5
- anchors.verticalCenter: parent.verticalCenter
- outlinedColor: Style.colorTheme5
- onClicked: orders_settings.displaySetting = !orders_settings.displaySetting
- }
-
- DexLabel {
- opacity: .4
- visible: !orders_settings.displaySetting
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Filter") + ": %1 / %2
%3: %4 - %5"
- .arg(combo_base.currentTicker)
- .arg(combo_rel.currentTicker)
- .arg(qsTr("Date"))
- .arg(min_date.date.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd"))
- .arg(max_date.date.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd"))
- }
-
- Qaterial.OutlineButton {
- visible: root.is_history && orders_settings.displaySetting
- foregroundColor:Style.colorWhite5
- outlinedColor: Style.colorTheme5
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Export CSV")
- enabled: list_model.length > 0
- onClicked: {
- export_csv_dialog.folder = General.os_file_prefix + API.app.settings_pg.get_export_folder()
- export_csv_dialog.open()
- }
- }
- }
-
- Row {
- anchors.right: parent.right
- y: 0
- rightPadding: 5
- Qaterial.OutlineButton {
- visible: root.is_history & orders_settings.displaySetting
- Layout.leftMargin: 30
- text: qsTr("Apply Filter")
- foregroundColor: enabled? Style.colorGreen2 : Style.colorTheme5
- outlinedColor: enabled? Style.colorGreen2 : Style.colorTheme5
- enabled: list_model_proxy.can_i_apply_filtering
- onClicked: list_model_proxy.apply_all_filtering()
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.OutlineButton {
- icon.source: Qaterial.Icons.close
- text: "Cancel All"
- visible: !is_history && API.app.orders_mdl.length>0
- foregroundColor: Qaterial.Colors.pink
- anchors.verticalCenter: parent.verticalCenter
- outlinedColor: Style.colorTheme5
- onClicked: API.app.trading_pg.orders.cancel_order(list_model_proxy.get_filtered_ids())
- }
- }
- RowLayout {
- visible: orders_settings.height>75
- width: parent.width-20
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
- anchors.bottomMargin: -15
- spacing: 10
- DefaultSweetComboBox {
- id: combo_base
- model: API.app.portfolio_pg.global_cfg_mdl.all_proxy
- onCurrentTickerChanged: applyFilter()
- Layout.fillWidth: true
- height: 100
- valueRole: "ticker"
- textRole: 'ticker'
- }
- Qaterial.ColorIcon {
- Layout.alignment: Qt.AlignVCenter
- source: Qaterial.Icons.swapHorizontal
- DefaultMouseArea {
- id: swap_button
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- const base_idx = combo_base.currentIndex
- combo_base.currentIndex = combo_rel.currentIndex
- combo_rel.currentIndex = base_idx
- }
- }
- }
-
- DefaultSweetComboBox {
- id: combo_rel
- model: API.app.portfolio_pg.global_cfg_mdl.all_proxy//combo_base.model
- onCurrentTickerChanged: applyFilter()
- Layout.fillWidth: true
- height: 100
- valueRole: "ticker"
- textRole: 'ticker'
- }
- Qaterial.TextFieldDatePicker {
- id: min_date
- title: qsTr("From")
- from: default_min_date
- to: default_max_date
- date: default_min_date
- font.pixelSize: 13
- onAccepted: applyDateFilter()
- Layout.fillWidth: true
- }
-
- Qaterial.TextFieldDatePicker {
- id: max_date
- enabled: min_date.enabled
- title: qsTr("To")
- from: min_date.date
- to: default_max_date
- date: default_max_date
- font.pixelSize: 13
- onAccepted: applyDateFilter()
- Layout.fillWidth: true
- }
- }
- }
-
- RowLayout {
- Layout.fillWidth: true
- Layout.fillHeight: true
-
- spacing: parent.spacing
-
- OrderList {
- id: order_list
- items: list_model
- is_history: root.is_history
- Layout.fillHeight: true
- Layout.fillWidth: true
- }
-
- }
- }
- ModalLoader {
- id: order_modal
- sourceComponent: OrderModal {}
- }
-
- FileDialog {
- id: export_csv_dialog
-
- title: qsTr("Please choose the CSV export name and location")
- fileMode: FileDialog.SaveFile
-
- defaultSuffix: "csv"
- nameFilters: [ "CSV files (*.csv)", "All files (*)" ]
-
- onAccepted: {
- const path = currentFile.toString()
-
- // Export
- console.log("Exporting to CSV: " + path)
- API.app.exporter_service.export_swaps_history_to_csv(path.replace(General.os_file_prefix, ""))
-
- // Open the save folder
- const folder_path = path.substring(0, path.lastIndexOf("/"))
- Qt.openUrlExternally(folder_path)
- }
- onRejected: {
- console.log("CSV export cancelled")
- }
- }
-}
-
diff --git a/atomic_defi_design/qml/Exchange/Trade/Orders/SwapProgress.qml b/atomic_defi_design/qml/Exchange/Trade/Orders/SwapProgress.qml
deleted file mode 100644
index dffa6c21a4..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Orders/SwapProgress.qml
+++ /dev/null
@@ -1,207 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../../../Components"
-import "../../../Constants"
-
-// Content
-ColumnLayout {
- id: root
-
- property var details
-
- readonly property var all_events: !details ? [] : has_error_event ? details.events.map(e => e.state) : details.success_events
-
- readonly property bool has_error_event: {
- if(!details) return false
-
- const events = details.events
-
- for(let i = events.length - 1; i >= 0; --i)
- if(details.error_events.indexOf(events[i].state) !== -1)
- return true
-
- return false
- }
-
- readonly property double total_time_passed: {
- if(!details) return 0
-
- const events = details.events
-
- let sum = 0
- for(let i = 0; i < events.length; ++i)
- sum += events[i].time_diff
-
- return sum
- }
-
- readonly property double total_time_passed_estimated: {
- const events = all_events
-
- let sum = 0
- for(let i = 0; i < events.length; ++i)
- sum += API.app.orders_mdl.average_events_time_registry[events[i]]
-
- return sum
- }
-
- readonly property int current_event_idx: {
- if(!details) return -1
- const events = details.events
- if(events.length === 0) return -1
- if(all_events.length === 0) return -1
-
- const last_state = events[events.length-1].state
- if(last_state === "Finished") return -1
-
- const idx = all_events.indexOf(last_state)
- if(idx === -1) return -1
-
- return idx + 1
- }
-
- // Simulated time of the running event
- property double simulated_time: 0
- function updateSimulatedTime() {
- if(!details) {
- simulated_time = 0
- return
- }
-
- const events = details.events
- if(!events || events.length === 0) {
- simulated_time = 0
- return
- }
-
- const last_event = events[events.length - 1]
- if(!last_event.timestamp) {
- simulated_time = 0
- return
- }
-
- if(current_event_idx !== -1) {
- const diff = Date.now() - last_event.timestamp
- simulated_time = diff - (diff % 1000)
- }
- else simulated_time = 0
- }
-
- Timer {
- running: current_event_idx !== -1
- interval: 1000
- repeat: true
- onTriggered: updateSimulatedTime()
- }
-
- function getTimeText(duration, estimated) {
- return `` + qsTr("act", "SHORT FOR ACTUAL TIME") + ": " + `` +
- `` + General.durationTextShort(duration) + `` +
- ` | ` + qsTr("est", "SHORT FOR ESTIMATED") + ": " +
- General.durationTextShort(estimated) + ``
- }
-
- onTotal_time_passedChanged: updateSimulatedTime()
-
- // Title
- DefaultText {
- text_value: `` + qsTr("Progress details") + `` +
- ` | ` +
- getTimeText(total_time_passed + simulated_time, total_time_passed_estimated)
- font.pixelSize: Style.textSize1
- Layout.bottomMargin: 10
- }
-
- Repeater {
- Layout.fillWidth: true
- Layout.fillHeight: true
- model: all_events
-
- delegate: Item {
- readonly property var event: {
- if(!details) return undefined
- const idx = details.events.map(e => e.state).indexOf(modelData)
- if(idx === -1) return undefined
-
- return details.events[idx]
- }
-
- readonly property bool is_current_event: index === current_event_idx
-
- readonly property bool is_active: General.exists(event) || is_current_event
-
- readonly property double time_passed: event ? event.time_diff : is_current_event ? simulated_time : 0
-
- width: root.width
- height: 50
-
- DefaultText {
- id: icon
-
- text_value: is_active ? "●" : "○"
- anchors.left: parent.left
- anchors.leftMargin: 10
- anchors.verticalCenter: col_layout.verticalCenter
- color: {
- // Already exists, completed event
- if(event) {
- // Red for the Finished if swap failed
- if(event.state === "Finished" && details.order_status === "failed") return Style.colorRed
-
- // Red for error event, green for the others
- return details.error_events.indexOf(event.state) === -1 ? Style.colorGreen : Style.colorRed
- }
-
- // In progress one is orange
- if(is_current_event)
- return Style.colorOrange
-
- // Passive color for the rest
- return Style.colorTextDisabled
- }
- }
-
- ColumnLayout {
- id: col_layout
-
- anchors.left: icon.right
- anchors.leftMargin: icon.anchors.leftMargin
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
-
- DefaultText {
- id: name
-
- font.pixelSize: Style.textSizeSmall4
-
- text_value: getEventText(modelData)
- color: event ? Style.colorText : is_current_event ? Style.colorText2 : Style.colorTextDisabled
- }
-
- AnimatedRectangle {
- id: bar
- visible: is_active
- width: 300
- height: 2
-
- color: Style.colorWhite8
-
- AnimatedRectangle {
- width: parent.width * (total_time_passed > 0 ? (time_passed / (total_time_passed + simulated_time)) : 0)
- height: parent.height
- color: Style.colorGreen
- }
- }
-
- DefaultText {
- visible: bar.visible
- font.pixelSize: Style.textSizeSmall2
-
- text_value: !is_active ? '' : getTimeText(time_passed, API.app.orders_mdl.average_events_time_registry[modelData])
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/PriceLine.qml b/atomic_defi_design/qml/Exchange/Trade/PriceLine.qml
deleted file mode 100644
index b96cbbf459..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/PriceLine.qml
+++ /dev/null
@@ -1,137 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../../Components"
-import "../../Constants"
-
-// Price
-RowLayout {
-
- readonly property string price: non_null_price
- readonly property string price_reversed: API.app.trading_pg.price_reversed
- readonly property string cex_price: API.app.trading_pg.cex_price
- readonly property string cex_price_reversed: API.app.trading_pg.cex_price_reversed
- readonly property string cex_price_diff: API.app.trading_pg.cex_price_diff
- readonly property bool invalid_cex_price: API.app.trading_pg.invalid_cex_price
- readonly property bool price_entered: !General.isZero(non_null_price)
-
- readonly property int fontSize: Style.textSizeSmall1
- readonly property int fontSizeBigger: Style.textSizeSmall2
- readonly property int line_scale: getComparisonScale(cex_price_diff)
-
- function getComparisonScale(value) {
- return Math.min(Math.pow(10, General.getDigitCount(parseFloat(value))), 1000000000)
- }
-
- function limitDigits(value) {
- return parseFloat(General.formatDouble(value, 2))
- }
-
- DefaultText {
- visible: !price_entered && invalid_cex_price
- Layout.alignment: Qt.AlignHCenter
- text_value: qsTr("Set swap price for evaluation")
- font.pixelSize: fontSizeBigger
- }
-
- ColumnLayout {
- visible: price_entered
- Layout.alignment: Qt.AlignHCenter
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: qsTr("Exchange rate") + (preffered_order.price !== undefined ? (" (" + qsTr("Selected") + ")") : "")
- font.pixelSize: fontSize
- }
-
- // Price reversed
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: General.formatCrypto("", "1", right_ticker) + " = " + General.formatCrypto("", price_reversed, left_ticker)
- font.pixelSize: fontSizeBigger
- font.weight: Font.Medium
- }
-
- // Price
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: General.formatCrypto("", price, right_ticker) + " = " + General.formatCrypto("", "1", left_ticker)
- font.pixelSize: fontSize
- }
- }
-
- // Price Comparison
- ColumnLayout {
- visible: price_entered && !invalid_cex_price
- Layout.alignment: Qt.AlignHCenter
-
- DefaultText {
- id: price_diff_text
- Layout.topMargin: 10
- Layout.bottomMargin: Layout.topMargin
- Layout.alignment: Qt.AlignHCenter
- color: parseFloat(cex_price_diff) <= 0 ? Style.colorGreen : Style.colorRed
- text_value: (parseFloat(cex_price_diff) > 0 ? qsTr("Expensive") : qsTr("Expedient")) + ": " + qsTr("%1 compared to CEX", "PRICE_DIFF%").arg("" + General.formatPercent(limitDigits(cex_price_diff)) + "")
- font.pixelSize: fontSize
- }
-
- RowLayout {
- Layout.alignment: Qt.AlignHCenter
- DefaultText {
- text_value: General.formatPercent(line_scale)
- font.pixelSize: fontSize
- }
-
- GradientRectangle {
- width: 125
- height: 6
-
- start_color: Style.colorGreen
- end_color: Style.colorRed
-
- AnimatedRectangle {
- width: 4
- height: parent.height * 2
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.horizontalCenterOffset: 0.5 * parent.width * Math.min(Math.max(parseFloat(cex_price_diff) / line_scale, -1), 1)
- }
- }
-
- DefaultText {
- text_value: General.formatPercent(-line_scale)
- font.pixelSize: fontSize
- }
- }
- }
-
- // CEXchange
- ColumnLayout {
- visible: !invalid_cex_price
- Layout.alignment: Qt.AlignHCenter
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: General.cex_icon + " " + qsTr("CEXchange rate")
- font.pixelSize: fontSize
-
- CexInfoTrigger {}
- }
-
- // Price reversed
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: General.formatCrypto("", "1", right_ticker) + " = " + General.formatCrypto("", cex_price_reversed, left_ticker)
- font.pixelSize: fontSizeBigger
- font.weight: Font.Medium
- }
-
- // Price
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: General.formatCrypto("", cex_price, right_ticker) + " = " + General.formatCrypto("", "1", left_ticker)
- font.pixelSize: fontSize
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/ProView.qml b/atomic_defi_design/qml/Exchange/Trade/ProView.qml
deleted file mode 100644
index 9840f045f2..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/ProView.qml
+++ /dev/null
@@ -1,682 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.15
-
-import QtGraphicalEffects 1.0
-
-import Qaterial 1.0 as Qaterial
-import Qt.labs.settings 1.0
-
-import AtomicDEX.MarketMode 1.0
-import AtomicDEX.TradingError 1.0
-
-import "../../Components"
-import "../../Constants"
-import "../../Wallet"
-
-// Trade Form / Component import
-import "TradeBox/"
-import "Trading/"
-import "Trading/Items/"
-
-// OrderBook / Component import
-import "OrderBook/" as OrderBook
-
-// Best Order
-import "BestOrder/" as BestOrder
-
-// Orders (orders, history)
-import "Orders/" as OrdersView
-
-import "./" as Here
-
-ColumnLayout {
- id: form
- property alias dexConfig: dex_config_popup
- function selectOrder(is_asks, coin, price, quantity, price_denom, price_numer, quantity_denom, quantity_numer, min_volume, base_min_volume, base_max_volume, rel_min_volume, rel_max_volume, base_max_volume_denom, base_max_volume_numer, uuid) {
- setMarketMode(!is_asks ? MarketMode.Sell : MarketMode.Buy)
-
- API.app.trading_pg.preffered_order = {
- "coin": coin,
- "price": price,
- "quantity": quantity,
- "price_denom": price_denom,
- "price_numer": price_numer,
- "quantity_denom": quantity_denom,
- "quantity_numer": quantity_numer,
- "min_volume": min_volume,
- "base_min_volume": base_min_volume,
- "base_max_volume": base_max_volume,
- "rel_min_volume": rel_min_volume,
- "rel_max_volume": rel_max_volume,
- "base_max_volume_denom": base_max_volume_denom,
- "base_max_volume_numer": base_max_volume_numer,
- "uuid": uuid
- }
-
- form_base.focusVolumeField()
- }
- Connections {
- target: exchange_trade
- function onBuy_sell_rpc_busyChanged() {
- if (buy_sell_rpc_busy)
- return
-
- const response = General.clone(buy_sell_last_rpc_data)
-
- if (response.error_code) {
- confirm_trade_modal.close()
-
- toast.show(qsTr("Failed to place the order"),
- General.time_toast_important_error,
- response.error_message)
-
- return
- } else if (response.result && response.result.uuid) {
- // Make sure there is information
- confirm_trade_modal.close()
-
- toast.show(qsTr("Placed the order"), General.time_toast_basic_info,
- General.prettifyJSON(response.result), false)
-
- General.prevent_coin_disabling.restart()
- tabView.currentIndex = 1
- }
- }
- }
- spacing: 10
- anchors.topMargin: 20
- anchors.leftMargin: 10
- anchors.fill: parent
- Connections {
- target: app
- function onPairChanged(base, rel) {
- dex_chart.visible = true
- }
- }
-
- DexBoxManager {
- id: splitView
- Layout.fillWidth: true
- Layout.fillHeight: true
- itemLists: [left_section, order_form]
- spacing: 15
- handle: Item {
- implicitWidth: 2
- implicitHeight: 4
- Rectangle {
- implicitWidth: 2
- implicitHeight: 4
- anchors.centerIn: parent
- opacity: 0
- color: 'transparent'
- }
- }
-
- DexTradeBox {
- id: left_section
- minimumWidth: 550
- defaultWidth: 560
- expandedHort: true
- hideHeader: true
- SplitView.fillHeight: true
- color: 'transparent'
- DexBoxManager {
- anchors.fill: parent
- anchors.margins: 0
- anchors.rightMargin: 0
- orientation: Qt.Vertical
- handle: Item {
- implicitWidth: 40
- implicitHeight: 6
- InnerBackground {
- implicitWidth: 40
- implicitHeight: 6
- anchors.centerIn: parent
- opacity: 0.4
- }
- }
- itemLists: [dex_chart, optionBox]
- DexTradeBox {
- id: dex_chart
- title: qsTr("Chart")
- expandedVert: dex_chart.visible? true : false
- onVisibleChanged: {
- if(visible) {
- expandedVert = true
- }
- }
- canBeFull: true
- onFullScreenChanged: {
- if(fullScreen){
- _best_order_box.visible = false
- _orderbook_box.visible = false
- optionBox.visible = false
- order_form.visible = false
- } else {
- _best_order_box.visible = true
- _orderbook_box.visible = true
- optionBox.visible = true
- order_form.visible = true
- }
- }
- Item {
- id: chart_view
- anchors.fill: parent
- anchors.topMargin: 40
- CandleStickChart {
- id: candleChart
- color: 'transparent'
- anchors.fill: parent
- }
- }
- }
- DexTradeBox {
- canBeFull: true
- hideHeader: true
- maximumHeight: 80
- minimumHeight: 75
- RowLayout {
- id: selectors
- spacing: 20
- anchors.fill: parent
- anchors.rightMargin: 10
- anchors.leftMargin: 10
- TickerSelector {
- id: selector_left
- left_side: true
- Layout.fillHeight: true
- ticker_list: API.app.trading_pg.market_pairs_mdl.left_selection_box
- ticker: left_ticker
- Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
- Layout.fillWidth: true
- }
-
- SwapIcon {
- Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
- Layout.preferredHeight: selector_left.height * 0.65
-
- top_arrow_ticker: selector_left.ticker
- bottom_arrow_ticker: selector_right.ticker
- hovered: swap_button.containsMouse
-
- DefaultMouseArea {
- id: swap_button
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- if (!block_everything)
- setPair(true, right_ticker)
- }
- }
- }
- TickerSelector {
- id: selector_right
- left_side: false
- ticker_list: API.app.trading_pg.market_pairs_mdl.right_selection_box
- ticker: right_ticker
- Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
- Layout.fillWidth: true
- }
- }
-
- }
-
-
- DexTradeBox {
- id: optionBox
- expandedVert: dex_chart.visible? false : true
- expandable: true
- defaultHeight: tabView.currentIndex === 0 ? 200 : isUltraLarge? 400 : 270
- Connections {
- target: tabView
- function onCurrentIndexChanged() {
- if (tabView.currentIndex !== 0) {
- optionBox.setHeight(isUltraLarge? 400 : 270)
- } else {
- optionBox.setHeight(200)
- }
- }
- }
- closable: true
- title: qsTr("Trading Information")
- Column {
- topPadding: 40
- width: parent.width
- height: parent.height
- clip: !parent.contentVisible
- anchors.horizontalCenter: parent.horizontalCenter
- Qaterial.LatoTabBar {
- z: 4
- id: tabView
- property int taux_exchange: 0
- property int order_idx: 1
- property int history_idx: 2
- width: parent.width
- currentIndex: tabView.currentIndex
- anchors.horizontalCenter: parent.horizontalCenter
- Material.foreground: theme.foregroundColor
- background: Rectangle {
- radius: 0
- color: theme.dexBoxBackgroundColor
- }
-
- y: 5
- leftPadding: 15
- Qaterial.LatoTabButton {
- width: 150
- text: qsTr("Exchange Rates")
- font.pixelSize: 14
- textColor: CheckBox ? Qaterial.Style.buttonAccentColor : theme.foregroundColor
- opacity: checked ? 1 : .6
- }
- Qaterial.LatoTabButton {
- width: 120
- text: qsTr("Orders")
- font.pixelSize: 14
- textColor: CheckBox ? Qaterial.Style.buttonAccentColor : theme.foregroundColor
- opacity: checked ? 1 : .6
- }
- Qaterial.LatoTabButton {
- width: 120
- text: qsTr("History")
- font.pixelSize: 14
- textColor: CheckBox ? Qaterial.Style.buttonAccentColor : theme.foregroundColor
- opacity: checked ? 1 : .6
- }
- }
- Item {
- anchors.horizontalCenter: parent.horizontalCenter
- width: parent.width
- height: optionBox.height - (tabView.height + 40)
- SwipeView {
- id: swipeView
- clip: true
- interactive: false
- currentIndex: tabView.currentIndex
- anchors.fill: parent
- onCurrentIndexChanged: {
- if(currentIndex===2) {
- history_component.list_model_proxy.is_history = true
- } else {
- history_component.list_model_proxy.is_history = false
- }
- }
-
- PriceLine {
- id: price_line_obj
- }
-
- OrdersView.OrdersPage {
- id: order_component
- clip: true
- }
- OrdersView.OrdersPage {
- id: history_component
- is_history: true
- clip: true
- }
- }
- }
- }
- }
- Item {
- SplitView.maximumHeight: 1
- }
- }
- }
- Item {
- id: _book_and_best
- property bool showing: (_best_order_box.visible || _orderbook_box.visible)
- SplitView.minimumWidth: showing? 300 : 0
- SplitView.maximumWidth: showing? 310 : 0
- SplitView.preferredWidth: showing? 280 : 0
- clip: true
- DexBoxManager {
- anchors.fill: parent
- orientation: Qt.Vertical
- handle: Item {
- implicitWidth: 40
- implicitHeight: 6
- InnerBackground {
- implicitWidth: 40
- implicitHeight: 6
- anchors.centerIn: parent
- opacity: 0.4
- }
- }
- itemLists: [_orderbook_box, _best_order_box]
- DexTradeBox {
- id: _orderbook_box
- SplitView.fillWidth: true
- closable: true
- title: qsTr("Order Book")
- expandedVert: true
- Behavior on SplitView.preferredWidth {
- NumberAnimation {
- duration: 100
- }
- }
- OrderBook.Vertical {
- clip: !parent.contentVisible
- visible: parent.contentVisible
- anchors.topMargin: 40
- anchors.fill: parent
- }
- }
- DexTradeBox {
- id: _best_order_box
- defaultHeight: 250
- minimumHeight: 130
- closable: true
- title: qsTr("Best Orders")
- reloadable: true
- onReload: {
-
- API.app.trading_pg.orderbook.refresh_best_orders()
- }
- Behavior on SplitView.preferredWidth {
- NumberAnimation {
- duration: 100
- }
- }
- BestOrder.List {
- clip: !parent.contentVisible
- id: best_order_list
- visible: parent.contentVisible
- y: 40
- width: parent.width
- height: parent.height-40
- }
- }
- }
- }
-
- DexTradeBox {
- id: order_form
- closable: true
- title: qsTr("Place Order")
- defaultWidth: isBigScreen? 300 : 280
- maximumWidth: isBigScreen? 310 : 280
- minimumWidth: isBigScreen? 290 : 280
- expandable: false
- SplitView.fillHeight: true
- ColumnLayout {
- visible: parent.contentVisible
- anchors.topMargin: 60
- anchors.fill: parent
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 30
- Layout.maximumHeight: 35
- Row {
- width: parent.width - 80
- anchors.centerIn: parent
- Rectangle {
- width: (parent.width / 2)
- height: 35
- radius: 8
- color: !sell_mode ? Qt.darker(
- theme.greenColor) : Qt.lighter(theme.dexBoxBackgroundColor)
- border.color: !sell_mode ? theme.greenColor : color
- Rectangle {
- anchors.right: parent.right
- color: parent.color
- height: parent.height
- width: parent.radius
- border.color: parent.border.color
- border.width: parent.border.width
-
- Rectangle {
- anchors.left: parent.left
- color: parent.color
- height: parent.height - (parent.border.width * 2)
- anchors.verticalCenter: parent.verticalCenter
- width: 2
- }
- }
- DefaultText {
- anchors.centerIn: parent
- opacity: !sell_mode ? 1 : .5
- text: qsTr("Buy")+" "+atomic_qt_utilities.retrieve_main_ticker(left_ticker)
- color: !sell_mode? Qaterial.Colors.white : theme.foregroundColor
- }
- DefaultMouseArea {
- anchors.fill: parent
- id: buySelector
- onClicked: setMarketMode(MarketMode.Buy)
- }
- }
- Rectangle {
- width: (parent.width / 2)
- height: 35
- radius: 8
- color: sell_mode ? Qt.darker(
- theme.redColor) : Qt.lighter(theme.dexBoxBackgroundColor)
- border.color: sell_mode ? theme.redColor : color
- Rectangle {
- anchors.left: parent.left
- color: parent.color
- height: parent.height
- width: parent.radius
- border.color: parent.border.color
- border.width: parent.border.width
- Rectangle {
- anchors.right: parent.right
- color: parent.color
- height: parent.height - (parent.border.width * 2)
- anchors.verticalCenter: parent.verticalCenter
- width: 2
- }
- }
- DefaultText {
- anchors.centerIn: parent
-
- opacity: sell_mode ? 1 : .5
- text: qsTr("Sell")+" "+atomic_qt_utilities.retrieve_main_ticker(left_ticker)
- color: sell_mode? Qaterial.Colors.white : theme.foregroundColor
-
- }
- DefaultMouseArea {
- anchors.fill: parent
- id: sellSelector
- onClicked: setMarketMode(MarketMode.Sell)
- }
- }
- }
- }
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- ColumnLayout {
- property int space: 10
- anchors.fill: parent
- anchors.topMargin: 5
- spacing: 10
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 40
- visible: API.app.trading_pg.preffered_order.price !== undefined
- Rectangle {
- width: parent.width - 20
- height: 40
- color: 'transparent'
- radius: 8
- border.color: theme.redColor
- anchors.horizontalCenter: parent.horizontalCenter
- y: 5
- DefaultText {
- anchors.verticalCenter: parent.verticalCenter
- leftPadding: 15
- color: theme.redColor
- text: qsTr("Order Selected")
- }
- Qaterial.FlatButton {
- foregroundColor: theme.redColor
- icon.source: Qaterial.Icons.close
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
- height: 40
- width: 40
- anchors.rightMargin: 15
- onClicked: API.app.trading_pg.reset_order()
- }
- }
- }
-
- OrderForm {
- id: form_base
- Layout.fillWidth: true
- Layout.leftMargin: 10
- Layout.rightMargin: 10
- Layout.preferredHeight: 270
- border.color: 'transparent'
- color: 'transparent'
- Layout.alignment: Qt.AlignHCenter
- }
- Item {
- Layout.preferredHeight: 90
- Layout.fillWidth: true
- TotalView {}
- }
- Item {
-
- Layout.fillHeight: true
- Layout.fillWidth: true
- Layout.leftMargin: 10
- Layout.rightMargin: 10
- Column {
- anchors.fill: parent
- anchors.leftMargin: 5
- anchors.rightMargin: 5
- FeeInfo {
- id: bg
- visible: false
- }
- spacing: 15
-
- // Trade button
- DefaultButton {
- width: parent.width - 20
- anchors.horizontalCenter: parent.horizontalCenter
-
- button_type: sell_mode ? "danger" : "primary"
-
- text: qsTr("Start Swap")
- font.weight: Font.Medium
- enabled: form_base.can_submit_trade
- onClicked: confirm_trade_modal.open()
- }
-
- Column {
- spacing: parent.spacing
- visible: errors.text_value !== ""
- width: parent.width
- bottomPadding: 10
- HorizontalLine {
- Layout.fillWidth: true
- Layout.bottomMargin: layout_margin
- }
-
- // Show errors
- DefaultText {
- id: errors
- anchors.horizontalCenter: parent.horizontalCenter
- width: parent.width
- horizontalAlignment: DefaultText.AlignHCenter
- font.pixelSize: Style.textSizeSmall4
- color: theme.redColor
-
- text_value: General.getTradingError(
- last_trading_error,
- curr_fee_info,
- base_ticker,
- rel_ticker, left_ticker, right_ticker)
- }
- }
- }
- }
- Item {}
- }
- }
- }
- }
- }
-
- ModalLoader {
- id: confirm_trade_modal
- sourceComponent: ConfirmTradeModal {}
- }
- DexPopup {
- id: dex_config_popup
- spacing: 8
- padding: 4
- arrowXDecalage: 75
- backgroundColor: theme.dexBoxBackgroundColor
- Settings {
- id: proview_settings
- property bool chart_visibility: true
- property bool option_visibility: true
- property bool orderbook_visibility: true
- property bool best_order_visibility: true
- property bool form_visibility: true
- }
-
- contentItem: Item {
- implicitWidth: 350
- implicitHeight: 190
- Column {
- anchors.fill: parent
- rightPadding: 20
- padding: 10
- spacing: 8
- DexLabel {
- text: "Display Settings"
- font: _font.body2
- }
- HorizontalLine { width: parent.width-20;anchors.horizontalCenter: parent.horizontalCenter;opacity: .4 }
- DexCheckEye {
- text: "Trading Information"
- targetProperty: "visible"
- target: optionBox
- }
- HorizontalLine { width: parent.width-20;anchors.horizontalCenter: parent.horizontalCenter;opacity: .4 }
- DexCheckEye {
- text: "Order Book"
- targetProperty: "visible"
- target: _orderbook_box
- }
- HorizontalLine { width: parent.width-20;anchors.horizontalCenter: parent.horizontalCenter;opacity: .4 }
- DexCheckEye {
- text: "Best Order"
- targetProperty: "visible"
- target: _best_order_box
- }
- HorizontalLine { width: parent.width-20;anchors.horizontalCenter: parent.horizontalCenter;opacity: .4 }
- DexCheckEye {
- id: place_visibility
- text: "Place Order"
- targetProperty: "visible"
- target: order_form
- }
- }
- Component.onCompleted: {
- dex_chart.visible = proview_settings.chart_visibility
- optionBox.visible = proview_settings.option_visibility
- _orderbook_box.visible = proview_settings.orderbook_visibility
- _best_order_box.visible = proview_settings.best_order_visibility
- order_form.visible = proview_settings.form_visibility
- }
- Component.onDestruction: {
- proview_settings.form_visibility = order_form.visible
- proview_settings.chart_visibility = dex_chart.visible
- proview_settings.option_visibility = optionBox.visible
- proview_settings.orderbook_visibility = _orderbook_box.visible
- proview_settings.best_order_visibility = _best_order_box.visible
- }
- }
- }
-
-
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/BestOrdersModal.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/BestOrdersModal.qml
deleted file mode 100644
index 8b0e9b2c05..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/BestOrdersModal.qml
+++ /dev/null
@@ -1,204 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15 //> Item
-import QtQuick.Layouts 1.15 //> RowLayout
-import QtQuick.Controls 2.15 //> ItemDelegate
-
-//! Project Imports
-import "../../../Components" //> BasicModal
-import "../../../Constants" //> API
-
-BasicModal
-{
- property var selectedOrder
- property string currentLeftToken // The token we wanna sell
-
- property int _rowWidth: width - 20
- property int _rowHeight: 50
- property int _tokenColumnSize: 60
- property int _quantityColumnSize: 100
- property int _quantityInBaseColumnSize: 100
- property int _fiatVolumeColumnSize: 50
- property int _cexRateColumnSize: 50
-
- onOpened: API.app.trading_pg.orderbook.refresh_best_orders()
- id: root
- width: 800
- ModalContent
- {
- title: qsTr("Best Orders")
- DefaultListView
- {
- enabled: !API.app.trading_pg.orderbook.best_orders_busy
- Layout.preferredHeight: 450
- Layout.fillWidth: true
- model: API.app.trading_pg.orderbook.best_orders.proxy_mdl
- header: Item // Best orders list header
- {
- width: _rowWidth
- height: _rowHeight
- RowLayout // Order Columns Name
- {
- anchors.verticalCenter: parent.verticalCenter
- anchors.fill: parent
- DefaultText // "Token" Header
- {
- Layout.preferredWidth: _tokenColumnSize
- text: qsTr("Token")
- font.family: Style.font_family
- font.bold: true
- font.weight: Font.Black
- }
- DefaultText // "Available Quantity" Header
- {
- Layout.preferredWidth: _quantityColumnSize
- text: qsTr("Available Quantity")
- font.family: Style.font_family
- font.bold: true
- font.weight: Font.Black
- }
- DefaultText // "Available Quantity (in BASE)" header
- {
- Layout.preferredWidth: _quantityInBaseColumnSize
- text: qsTr("Available Quantity (in %1)").arg(currentLeftToken)
- font.family: Style.font_family
- font.bold: true
- font.weight: Font.Black
- }
- DefaultText // "Fiat Volume" column header
- {
- Layout.preferredWidth: _fiatVolumeColumnSize
- text: qsTr("Fiat Volume")
- font.family: Style.font_family
- font.bold: true
- font.weight: Font.Black
- }
- DefaultText // "CEX Rate" column header
- {
- Layout.preferredWidth: _cexRateColumnSize
- text: qsTr("CEX Rate")
- font.family: Style.font_family
- font.bold: true
- font.weight: Font.Black
- }
- }
- }
- delegate: ItemDelegate // Order Line
- {
- width: _rowWidth
- height: _rowHeight
- HorizontalLine { width: parent.width }
- RowLayout // Order Info
- {
- anchors.verticalCenter: parent.verticalCenter
- anchors.fill: parent
- RowLayout // Order Token
- {
- property int _iconWidth: 24
-
- Layout.preferredWidth: _tokenColumnSize
- DefaultImage // Order Token Icon
- {
- Layout.preferredWidth: parent._iconWidth
- Layout.preferredHeight: 24
- source: General.coinIcon(coin)
- }
- DefaultText // Order Token Name
- {
- id: _tokenName
- Layout.preferredWidth: _tokenColumnSize - parent._iconWidth
- text: coin
- font.pixelSize: 14
- }
- }
- VerticalLine { Layout.preferredHeight: parent.parent.height }
- DefaultText // Order Available Quantity
- {
- Layout.preferredWidth: _quantityColumnSize
- text: parseFloat(General.formatDouble(quantity, General.amountPrecision, true)).toFixed(8)
- font.pixelSize: 14
- }
- VerticalLine { Layout.preferredHeight: parent.parent.height }
- DefaultText // Order Available Quantity In BASE
- {
- Layout.preferredWidth: _quantityInBaseColumnSize
- text: parseFloat(General.formatDouble(base_max_volume, General.amountPrecision, true)).toFixed(8)
- font.pixelSize: 14
- }
- VerticalLine { Layout.preferredHeight: parent.parent.height }
- DefaultText // Order Fiat Volume
- {
- Layout.preferredWidth: _fiatVolumeColumnSize
- text: price_fiat+API.app.settings_pg.current_fiat_sign
- }
- VerticalLine { Layout.preferredHeight: parent.parent.height }
- DefaultText
- {
- Layout.preferredWidth: _cexRateColumnSize
- text: cex_rates=== "0" ? "N/A" : parseFloat(cex_rates)>0? "+"+parseFloat(cex_rates).toFixed(2)+"%" : parseFloat(cex_rates).toFixed(2)+"%"
- }
- DefaultTooltip
- {
- id: _tooltip
- dim: true
- modal: true
- closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
- width: 250
- contentItem: DexLabelUnlinked
- {
- text_value: 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)
- wrapMode: DefaultText.Wrap
- width: 250
- onLinkActivated:
- {
- if (link==="#no") _tooltip.close()
- else
- {
- if (API.app.enable_coins([coin]) === true) _tooltip.close()
- else cannot_enable_coin_modal.open()
- }
- }
- ModalLoader
- {
- property string coin_to_enable_ticker: coin
- id: cannot_enable_coin_modal
- sourceComponent: CannotEnableCoinModal { coin_to_enable_ticker: cannot_enable_coin_modal.coin_to_enable_ticker }
- }
- }
- delay: 200
- }
- }
- onClicked:
- {
- if (!API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled) _tooltip.open()
- else selectedOrder = { "coin": coin, "uuid": uuid, "price": price, "base_min_volume": base_min_volume, "base_max_volume": base_max_volume }
- }
- }
-
- BusyIndicator
- {
- width: 200
- height: 200
- visible: !parent.enabled
- running: visible
- anchors.centerIn: parent
- }
- }
-
- footer:
- [
- DefaultButton
- {
- Layout.fillWidth: true
- text: qsTr("Cancel")
- onClicked: close()
- },
- PrimaryButton
- {
- enabled: !API.app.trading_pg.orderbook.best_orders_busy
- Layout.fillWidth: true
- text: qsTr("Refresh")
- onClicked: API.app.trading_pg.orderbook.refresh_best_orders()
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/CoinsListModal.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/CoinsListModal.qml
deleted file mode 100644
index 9e6917771d..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/CoinsListModal.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15 //> Rectangle, MouseArea
-import QtQuick.Layouts 1.15 //> RowLayout
-import QtQuick.Controls 2.15 //> TextField, TextField.background, ItemDelegate
-
-//! Project Imports
-import "../../../Components" //> BasicModal, DefaultText
-import "../../../Constants" //> API
-
-BasicModal
-{
- property string selectedTicker
- id: root
- width: 450
- height: 560
- ColumnLayout {
- spacing: 10
- Layout.fillWidth: true
- height: 540
- DexLabel {
- text: qsTr("Select a ticker")
- font: _font.head5
- opacity: .7
- }
- HorizontalLine {
-
- }
- RowLayout
- {
- Layout.fillWidth: true
- TextField
- {
- id: searchName
- Layout.fillWidth: true
- Layout.preferredHeight: 60
- Layout.alignment: Qt.AlignHCenter
- placeholderText: "Search a name"
- font.pixelSize: Style.textSize1
- background: Rectangle
- {
- color: theme.backgroundColor
- border.width: 1
- border.color: theme.colorRectangleBorderGradient1
- radius: 10
- }
- onTextChanged:
- {
- if (text.length > 30)
- text = text.substring(0, 30)
- API.app.trading_pg.market_pairs_mdl.left_selection_box.search_exp = text
- }
-
- Component.onDestruction: API.app.trading_pg.market_pairs_mdl.left_selection_box.search_exp = ""
- }
- }
-
- RowLayout
- {
- Layout.topMargin: 10
- Layout.fillWidth: true
- DefaultText { text: qsTr("Token name") }
- }
-
- DefaultListView
- {
- id: view
- Layout.fillWidth: true
- Layout.fillHeight: true
- model: API.app.trading_pg.market_pairs_mdl.left_selection_box
- spacing: 20
- clip: true
- delegate: ItemDelegate
- {
- width: root.width
- anchors.horizontalCenter: root.horizontalCenter
- height: 40
-
- DefaultImage
- {
- id: _coinIcon
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 5
- anchors.left: parent.left
- width: 30
- height: 30
- source: General.coinIcon(model.ticker)
- DefaultText
- {
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.right
- anchors.leftMargin: 20
- text: General.formatCrypto("", model.balance, model.ticker)
-
- DefaultText
- {
- anchors.left: parent.right
- anchors.leftMargin: 5
- text: "(%1)".arg(General.getFiatText(model.balance, model.ticker, false))
- }
- }
- }
-
- MouseArea
- {
- anchors.fill: parent
- onClicked:
- {
- root.selectedTicker = model.ticker
- close()
- }
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/List.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/List.qml
deleted file mode 100644
index 91e4d61d68..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/List.qml
+++ /dev/null
@@ -1,299 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-//! 3rdParty Imports
-import Qaterial 1.0 as Qaterial
-
-//! Project Imports
-import "../../../Components"
-import "../../../Constants" //> Style
-import "../Orders" as Orders
-import "Main.js" as Main
-
-DexListView {
- id: order_list_view
- anchors.fill: parent
- model: API.app.orders_mdl.orders_proxy_mdl
- clip: true
- currentIndex: -1
- delegate: ClipRRect {
- property var details: model
- readonly property bool is_placed_order: !details ? false :
- details.order_id !== ''
-
- property bool expanded: order_list_view.currentIndex === index
- width: order_list_view.width
- height: expanded? colum_order.height+10 : 35
- radius: 1
- Rectangle {
- anchors.fill: parent
- color: order_mouse_area.containsMouse? theme.surfaceColor : 'transparent'
- border.color: theme.surfaceColor
- border.width: expanded? 1 : 0
- }
- DexMouseArea {
- id: order_mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- if(order_list_view.currentIndex === index) {
- order_list_view.currentIndex = -1
- }else {
- order_list_view.currentIndex = index
- }
- }
- }
- Column {
- id: colum_order
- width: parent.width
- spacing: 5
- RowLayout {
- width: parent.width
- height: 30
- spacing: 5
- Item {
- Layout.preferredWidth: 30
- height: 30
- BusyIndicator {
- width: 25
- height: width
- anchors.centerIn: parent
- running: !isSwapDone(details.order_status) && Qt.platform.os != "osx"
- DefaultText {
- anchors.centerIn: parent
- font.pixelSize: 9
- color: !details ? "white" : getStatusColor(details.order_status)
- text_value: !details ? "" :
- visible ? getStatusStep(details.order_status) : ''
- }
- }
- }
- DefaultImage {
- id: base_icon
- source: General.coinIcon(!details ? atomic_app_primary_coin :
- details.base_coin?? atomic_app_primary_coin)
- Layout.preferredWidth: Style.textSize1
- Layout.preferredHeight: Style.textSize1
- Layout.alignment: Qt.AlignVCenter
- }
- DefaultText {
- id: base_amount
- text_value: !details ? "" :
- General.formatCrypto("", details.base_amount, details.base_coin)
- //details.base_amount_current_currency, API.app.settings_pg.current_currency
- font.pixelSize: 11
-
-
- Layout.fillHeight: true
- Layout.preferredWidth: 110
- verticalAlignment: Label.AlignVCenter
- privacy: is_placed_order
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- SwapIcon {
- //visible: !status_text.visible
- width: 30
- height: 30
- opacity: .6
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- top_arrow_ticker: !details ? atomic_app_primary_coin :
- details.base_coin?? ""
- bottom_arrow_ticker: !details ? atomic_app_primary_coin :
- details.rel_coin?? ""
- }
- }
-
- DefaultText {
- id: rel_amount
- text_value: !details ? "" :
- General.formatCrypto("", details.rel_amount, details.rel_coin)
- font.pixelSize: base_amount.font.pixelSize
-
- Layout.fillHeight: true
- Layout.preferredWidth: 110
- verticalAlignment: Label.AlignVCenter
- horizontalAlignment: Label.AlignRight
- privacy: is_placed_order
- }
- DefaultImage {
- id: rel_icon
- source: General.coinIcon(!details ? atomic_app_primary_coin :
- details.rel_coin?? atomic_app_secondary_coin)
-
- width: base_icon.width
- Layout.preferredWidth: Style.textSize1
- Layout.preferredHeight: Style.textSize1
- Layout.alignment: Qt.AlignVCenter
- }
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- opacity: .6
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- source: expanded? Qaterial.Icons.chevronUp : Qaterial.Icons.chevronDown
- iconSize: 14
- }
- }
-
- }
- RowLayout {
- width: parent.width-40
- anchors.horizontalCenter: parent.horizontalCenter
- height: 20
- opacity: .6
- DexLabel {
- Layout.fillWidth: true
- Layout.fillHeight: true
- verticalAlignment: Label.AlignVCenter
- text: !details ? "" :
- General.formatCrypto("", details.base_amount, details.base_coin)
- }
- DexLabel {
- Layout.fillWidth: true
- Layout.fillHeight: true
- verticalAlignment: Label.AlignVCenter
- horizontalAlignment: Text.AlignRight
- text: !details ? "" :
- General.formatCrypto("", details.rel_amount, details.rel_coin)
- }
- }
- RowLayout {
- width: parent.width-40
- anchors.horizontalCenter: parent.horizontalCenter
- height: 20
- opacity: .6
- DexLabel {
- Layout.fillWidth: true
- Layout.fillHeight: true
- verticalAlignment: Label.AlignVCenter
- text: "%1 %2".arg(API.app.settings_pg.current_currency).arg(details.base_amount_current_currency)
- }
- DexLabel {
- Layout.fillWidth: true
- Layout.fillHeight: true
- verticalAlignment: Label.AlignVCenter
- horizontalAlignment: Text.AlignRight
- text: "%1 %2".arg(API.app.settings_pg.current_currency).arg(details.rel_amount_current_currency)
- }
- }
- RowLayout {
- width: parent.width-40
- anchors.horizontalCenter: parent.horizontalCenter
- height: 20
- opacity: .6
- DexLabel {
- Layout.fillWidth: true
- Layout.fillHeight: true
- verticalAlignment: Label.AlignVCenter
- text: !details ? "" : details.date?? ""
- }
- Item {
- Layout.preferredWidth: 100
- Layout.fillHeight: true
- visible: !details || details.recoverable === undefined ? false : details.recoverable && details.order_status !== "refunding"
- Row {
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 0
- spacing: 5
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.alert
- iconSize: 15
- color: Qaterial.Colors.amber
- }
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- text: "Refund "
- color: Qaterial.Colors.amber
- }
- }
- MouseArea {
- id: refund_hover
- anchors.fill: parent
- hoverEnabled: true
- }
- DefaultTooltip {
- visible: (parent.visible && refund_hover.containsMouse) ?? false
-
- contentItem: ColumnLayout {
- DexLabel {
- text_value: qsTr("Funds are recoverable")
- font.pixelSize: Style.textSizeSmall4
- }
- }
- }
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 30
- opacity: .6
- Qaterial.OutlineButton {
- Layout.preferredWidth: 100
- Layout.fillHeight: true
- bottomInset: 0
- topInset: 0
- outlinedColor: theme.redColor
- visible: (!main_order.is_history? details.cancellable?? false : false)===true? (order_mouse_area.containsMouse || hovered)? true : false : false
- onClicked: { if(details) cancelOrder(details.order_id) }
- Row {
- anchors.centerIn: parent
- spacing: 5
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.close
- iconSize: 17
- color: theme.redColor
- }
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- text: "Cancel "
- color: theme.redColor
- }
- }
- }
-
- Qaterial.OutlineButton {
- Layout.preferredWidth: 80
- Layout.fillHeight: true
- bottomInset: 0
- topInset: 0
- outlinedColor: Qaterial.Colors.gray
- Row {
- anchors.centerIn: parent
- spacing: 5
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.eye
- iconSize: 15
- color: Qaterial.Colors.gray
- }
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- text: "Show "
- color: Qaterial.Colors.gray
- }
- }
- onClicked: {
- order_modal.open()
- order_modal.item.details = details
- }
- }
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
-
- }
- }
- }
-
- }
-}
\ No newline at end of file
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/Main.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/Main.qml
deleted file mode 100644
index 85b7d34ab9..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/Main.qml
+++ /dev/null
@@ -1,208 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-//! 3rdParty Imports
-import Qaterial 1.0 as Qaterial
-
-//! Project Imports
-import "../../../Components"
-import "../../../Constants" //> Style
-import "../Orders" as Orders
-import "Main.js" as Main
-
-Item {
- id: root
-
- readonly property var subPages: Main.getSubPages()
-
- // Variable which holds the current sub-page of the SimpleView.
- property var currentSubPage: subPages.Trade
-
- onCurrentSubPageChanged: _selectedTabMarker.update()
-
- Connections
- {
- target: exchange_trade
- function onOrderPlaced()
- {
- currentSubPage = subPages.Orders
- }
- }
-
- Column
- {
- width: root.currentSubPage===subPages.Trade? _simpleTrade.best? 600 : 380 : 380
- y: 120
- spacing: 30
- anchors.horizontalCenter: parent.horizontalCenter
-
- InnerBackground // Sub-pages Tabs Selector
- {
- anchors.horizontalCenter: parent.horizontalCenter
- width: 250
- height: 40
- border.width: 1
- border.color: theme.dexBoxBackgroundColor
- color: theme.surfaceColor
- radius: 40
-
- FloatingBackground // Selected Tab Rectangle
- {
- id: _selectedTabMarker
-
- function update() // Updates transform according to selected sub-page.
- {
- switch (currentSubPage)
- {
- case subPages.Trade:
- x = 0
- break;
- case subPages.Orders:
- x = (parent.width / 3)
- orders_view.update()
- break;
- case subPages.History:
- x = (parent.width / 3) *2
- history_view.update()
- break;
- }
- }
-
- Behavior on x {
- NumberAnimation {
- duration: 150
- }
- }
- show_shadow: false
- light_gradient.visible: false
-
- border.width: 2
- border.color: 'transparent'
- height: parent.height
- anchors.verticalCenter: parent.verticalCenter
- width: (parent.width / 3)
- radius: 40
- color: theme.accentColor
- }
- RowLayout {
- anchors.fill: parent
- spacing: 0
- DexLabel // Trade Tab
- {
- id: _tradeText
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- Layout.preferredWidth: parent.width/3
- Layout.fillHeight: true
- text: qsTr("Trade")
- font.pixelSize: Style.textSize
- color: children[1].containsMouse? currentSubPage === subPages.Trade? theme.foregroundColor : theme.accentColor : theme.foregroundColor
- DexMouseArea
- {
- anchors.fill: parent
- onClicked: if (currentSubPage !== subPages.Trade) currentSubPage = subPages.Trade
- hoverEnabled: true
- }
- }
-
- DexLabel // Orders Tab
- {
- id: _ordersText
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- Layout.preferredWidth: parent.width/3
- Layout.fillHeight: true
- text: qsTr("Orders")
- font.pixelSize: Style.textSize
- color: children[1].containsMouse? currentSubPage === subPages.Orders? theme.foregroundColor : theme.accentColor : theme.foregroundColor
- DexMouseArea
- {
- anchors.fill: parent
- onClicked: if (currentSubPage !== subPages.Orders) currentSubPage = subPages.Orders
- hoverEnabled: true
- }
- }
-
- DexLabel // History Tab
- {
- id: _historyText
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- Layout.preferredWidth: parent.width/3
- Layout.fillHeight: true
- text: qsTr("History")
- font.pixelSize: Style.textSize
- color: children[1].containsMouse? currentSubPage === subPages.History? theme.foregroundColor : theme.accentColor : theme.foregroundColor
- DexMouseArea
- {
- anchors.fill: parent
- onClicked: if (currentSubPage !== subPages.History) currentSubPage = subPages.History
- hoverEnabled: true
- }
- }
- }
-
- }
-
- SwipeView {
- id: _swipeSimplifiedView
- currentIndex: root.currentSubPage
- anchors.horizontalCenter: parent.horizontalCenter
- width: 600
- height: 650
- clip: true
- interactive: false
- Item {
- DexRectangle {
- id: subTradePage
- height: _simpleTrade.height
- width: _simpleTrade.best? 600 : _simpleTrade.coinSelection? 450 : 380
- anchors.horizontalCenter: parent.horizontalCenter
- radius: 20
- color: theme.dexBoxBackgroundColor
- sizeAnimationDuration: 250
- sizeAnimation: true
- ClipRRect {
- anchors.fill: parent
- radius: 20
- Trade
- {
- id: _simpleTrade
- width: parent.width
- }
- }
- }
- }
- Item {
- DexRectangle {
- width: 380
- anchors.horizontalCenter: parent.horizontalCenter
- height: 500
- radius: 20
- color: theme.dexBoxBackgroundColor
- SubOrders {
- id: orders_view
- }
- }
- }
- Item {
- DexRectangle {
- width: 380
- anchors.horizontalCenter: parent.horizontalCenter
- height: 500
- radius: 20
- color: theme.dexBoxBackgroundColor
- SubHistory {
- id: history_view
- }
- }
- }
- }
- }
- ModalLoader {
- id: order_modal
- sourceComponent: Orders.OrderModal {}
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/OrderRemovedModal.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/OrderRemovedModal.qml
deleted file mode 100644
index 281ab68c75..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/OrderRemovedModal.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import "../../../Components"
-import "../../../Constants"
-
-BasicModal
-{
- id: root
- width: 1000
- ModalContent
- {
- title: qsTr("Selected Order Removed")
-
- DefaultText
- {
- text: qsTr("The selected order does not exist anymore, it might have been matched or canceled, and no order with a better price is available. Please select a new order.")
- }
-
- footer:
- [
- DefaultButton
- {
- text: qsTr("OK")
- onClicked: close()
- }
- ]
- }
-
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubBestOrder.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubBestOrder.qml
deleted file mode 100644
index 4de6148928..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubBestOrder.qml
+++ /dev/null
@@ -1,249 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15 //> Item
-import QtQuick.Layouts 1.15 //> RowLayout
-import QtQuick.Controls 2.15 //> ItemDelegate
-
-//! Project Imports
-import "../../../Components" //> BasicModal
-import "../../../Constants" //> API
-
-DefaultListView
-{
- id: _listBestOrdersView
-
- property var tradeCard
- property var selectedOrder
- property bool best: true
- property string currentLeftToken // The token we wanna sell
-
- property int _rowWidth: width - 20
- property int _rowHeight: 50
- property int _tokenColumnSize: 60
- property int _quantityColumnSize: 100
- property int _quantityInBaseColumnSize: 100
- property int _fiatVolumeColumnSize: 50
- property int _cexRateColumnSize: 50
-
- enabled: !API.app.trading_pg.orderbook.best_orders_busy
- model: API.app.trading_pg.orderbook.best_orders.proxy_mdl
- headerPositioning: ListView.OverlayHeader
- reuseItems: true
- cacheBuffer: 40
- clip: true
-
- Connections
- {
- target: _tradeCard
- function onBestChanged()
- {
- API.app.trading_pg.orderbook.best_orders.proxy_mdl.setFilterFixedString("")
- positionViewAtBeginning()
- }
- }
-
- onVisibleChanged: currentLeftToken = _tradeCard.selectedTicker
-
- header: DexRectangle // Best orders list header
- {
- width: _rowWidth
- height: _rowHeight
- border.color: 'transparent'
- color: theme.dexBoxBackgroundColor
- z: 2
- radius: 0
-
- MouseArea { anchors.fill: parent }
- RowLayout // Order Columns Name
- {
- anchors.verticalCenter: parent.verticalCenter
- anchors.fill: parent
- DexLabel // "Token" Header
- {
- Layout.preferredWidth: _tokenColumnSize
- text: qsTr("Token")
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- }
- DexLabel // "Available Quantity" Header
- {
- Layout.preferredWidth: _quantityColumnSize
- text: qsTr("Available Quantity")
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- }
- DexLabel // "Available Quantity (in BASE)" header
- {
- Layout.preferredWidth: _quantityInBaseColumnSize
- text: qsTr("Available Quantity (in %1)").arg(currentLeftToken)
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- }
- DexLabel // "Fiat Volume" column header
- {
- Layout.preferredWidth: _fiatVolumeColumnSize
- text: qsTr("Fiat Volume")
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- }
- DexLabel // "CEX Rate" column header
- {
- Layout.preferredWidth: _cexRateColumnSize
- text: qsTr("CEX Rate")
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- }
- }
- }
-
- delegate: ItemDelegate // Order Line
- {
- property bool _isCoinEnabled: API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled
-
- width: _rowWidth
- height: _rowHeight
-
- HorizontalLine { width: parent.width; opacity: .5 }
-
- RowLayout // Order Info
- {
- anchors.verticalCenter: parent.verticalCenter
- anchors.fill: parent
- RowLayout // Order Token
- {
- property int _iconWidth: 24
-
- Layout.preferredWidth: _tokenColumnSize
- DefaultImage // Order Token Icon
- {
- Layout.preferredWidth: parent._iconWidth
- Layout.preferredHeight: 24
-
- source: General.coinIcon(coin)
- opacity: !_isCoinEnabled? .1 : 1
- }
- DefaultText // Order Token Name
- {
- id: _tokenName
- Layout.preferredWidth: _tokenColumnSize - parent._iconWidth
- text: coin
- font.pixelSize: 14
- }
- }
-
- DefaultText // Order Available Quantity
- {
- Layout.preferredWidth: _quantityColumnSize
- text: parseFloat(General.formatDouble(quantity, General.amountPrecision, true)).toFixed(8)
- font.pixelSize: 14
- }
-
- DefaultText // Order Available Quantity In BASE
- {
- Layout.preferredWidth: _quantityInBaseColumnSize
- text: parseFloat(General.formatDouble(base_max_volume, General.amountPrecision, true)).toFixed(8)
- font.pixelSize: 14
- }
-
- DefaultText // Order Fiat Volume
- {
- Layout.preferredWidth: _fiatVolumeColumnSize
- text: price_fiat+API.app.settings_pg.current_fiat_sign
- }
-
- DefaultText
- {
- Layout.preferredWidth: _cexRateColumnSize
- color: cex_rates=== "0" ? Qt.darker(theme.foregroundColor) : parseFloat(cex_rates)>0? theme.redColor : theme.greenColor
- text: cex_rates=== "0" ? "N/A" : parseFloat(cex_rates)>0? "+"+parseFloat(cex_rates).toFixed(2)+"%" : parseFloat(cex_rates).toFixed(2)+"%"
- }
- DefaultTooltip
- {
- id: _tooltip
-
- width: 250
-
- dim: true
- modal: true
- closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
- contentItem: DexLabelUnlinked
- {
- text_value: 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)
- wrapMode: DefaultText.Wrap
- width: 250
- onLinkActivated:
- {
- if (link === "#no") _tooltip.close()
- else
- {
- if (API.app.enable_coins([coin]) === false)
- cannot_enable_coin_modal.open()
- else
- {
- color = theme.buttonColorTextDisabled
- opacity = 0.8
- _coinIsEnabling.visible = true
- }
- }
- }
- }
-
- BusyIndicator
- {
- id: _coinIsEnabling
-
- visible: false
- enabled: visible
- anchors.fill: parent
-
- Connections
- {
- target: API.app.portfolio_pg.global_cfg_mdl.all_disabled_proxy
-
- function onLengthChanged()
- {
- _tooltip.close()
- _isCoinEnabled = API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled
- }
- }
- }
-
- ModalLoader
- {
- property string coin_to_enable_ticker: coin
- id: cannot_enable_coin_modal
- sourceComponent: CannotEnableCoinModal { coin_to_enable_ticker: cannot_enable_coin_modal.coin_to_enable_ticker }
- }
-
- delay: 200
- }
- }
- onClicked:
- {
- if (!API.app.portfolio_pg.global_cfg_mdl.get_coin_info(coin).is_enabled)
- {
- _tooltip.open()
- }
- else
- {
- _listBestOrdersView.tradeCard.best = false
- _listBestOrdersView.selectedOrder = { "coin": coin, "uuid": uuid, "price": price, "base_min_volume": base_min_volume, "base_max_volume": base_max_volume, "from_best_order": true }
- }
- }
- }
- DexLabel {
- anchors.centerIn: parent
- text: qsTr('No best order.')
- visible: parent.count==0
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubCoinSelector.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubCoinSelector.qml
deleted file mode 100644
index 6ba74ed59c..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubCoinSelector.qml
+++ /dev/null
@@ -1,191 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15 //> Item
-import QtQuick.Layouts 1.15 //> RowLayout
-import QtQuick.Controls 2.15 //> ItemDelegate
-
-// 3rdParty
-import Qaterial 1.0 as Qaterial
-
-//! Project Imports
-import "../../../Components" //> BasicModal
-import "../../../Constants" //> API
-
-DefaultListView
-{
- id: _listCoinView
-
- property int _rowWidth: width - 20
- property int _rowHeight: 50
- property int _tokenColumnSize: 160
-
- signal tickerSelected(var ticker)
-
- model: API.app.trading_pg.market_pairs_mdl.left_selection_box
- headerPositioning: ListView.OverlayHeader
- reuseItems: true
- cacheBuffer: 40
-
- header: DexRectangle
- {
- z: 2
- width: _rowWidth
- height: _rowHeight
- border.color: 'transparent'
- color: theme.dexBoxBackgroundColor
- radius: 0
-
- RowLayout // Coins Columns Name
- {
- anchors.verticalCenter: parent.verticalCenter
- anchors.fill: parent
- spacing: 2
- DexLabel // "Token" Header
- {
- property bool asc: true
-
- Layout.preferredWidth: _tokenColumnSize
- text: qsTr("Token")
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- color: children[1].containsMouse? theme.accentColor : theme.foregroundColor
- DexMouseArea
- {
- anchors.fill: parent
- hoverEnabled: true
- onClicked:
- {
- parent.asc = !parent.asc
- _listCoinView.model.sort_by_name(parent.asc)
- }
- }
- }
- DexLabel // "Balance" Header
- {
- property bool asc: true
-
- Layout.fillWidth: true
- text: qsTr("Balance")
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- color: children[1].containsMouse? theme.accentColor : theme.foregroundColor
-
- DexMouseArea
- {
- anchors.fill: parent
- hoverEnabled: true
- onClicked:
- {
- parent.asc = !parent.asc
- _listCoinView.model.sort_by_currency_balance(parent.asc)
- }
- }
- }
- DexLabel // Fiat Balance Header
- {
- property bool asc: true
-
- text: qsTr("Balance Fiat")
- font.family: Style.font_family
- font.bold: true
- font.pixelSize: 12
- font.weight: Font.Bold
- color: children[1].containsMouse? theme.accentColor : theme.foregroundColor
-
- DexMouseArea
- {
- anchors.fill: parent
- hoverEnabled: true
- onClicked:
- {
- parent.asc = !parent.asc
- _listCoinView.model.sort_by_currency_balance(parent.asc)
- }
- }
- }
- }
- }
-
- delegate: ItemDelegate
- {
- width: _listCoinView._rowWidth
- height: 40
- RowLayout
- {
- anchors.fill: parent
- spacing: 2
- Item
- {
- Layout.preferredWidth: _tokenColumnSize
- height: 40
- Row
- {
- anchors.verticalCenter: parent.verticalCenter
- spacing: 10
- DefaultImage
- {
- id: _coinIcon
- width: 20
- height: 20
- source: General.coinIcon(model.ticker)
- anchors.verticalCenter: parent.verticalCenterv
- }
- DefaultText
- {
- anchors.verticalCenter: parent.verticalCenter
- text: model.ticker
-
- }
- }
- Qaterial.DebugRectangle
- {
- anchors.fill: parent
- visible: false
- }
- }
- Item
- {
- Layout.fillWidth: true
- height: 40
- DexLabel
- {
- anchors.verticalCenter: parent.verticalCenter
- text: model.balance.replace(" ","")
- horizontalAlignment: Label.AlignLeft
-
- }
- Qaterial.DebugRectangle
- {
- anchors.fill: parent
- visible: false
- }
- }
- DexLabel
- {
- Layout.alignment: Qt.AlignVCenter
- text: "%1".arg(General.getFiatText(model.balance, model.ticker, false))
- Qaterial.DebugRectangle
- {
- anchors.fill: parent
- visible: false
- }
- }
- }
-
- MouseArea
- {
- anchors.fill: parent
- onClicked: tickerSelected(model.ticker)
- }
- }
-
- DexLabel
- {
- anchors.centerIn: parent
- text: qsTr('No Selectable coin.')
- visible: parent.count === 0
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubHistory.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubHistory.qml
deleted file mode 100644
index fd9ad74aba..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubHistory.qml
+++ /dev/null
@@ -1,326 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import Qt.labs.platform 1.1
-
-//! 3rdParty Imports
-import Qaterial 1.0 as Qaterial
-
-//! Project Imports
-import "../../../Components"
-import "../../../Constants" //> Style
-import "../Orders" as Orders
-import "Main.js" as Main
-
-Item {
- id: _subHistoryRoot
-
- readonly property date default_min_date: new Date("2019-01-01")
- readonly property date default_max_date: new Date(new Date().setDate(new Date().getDate() + 30))
- property var list_model_proxy: API.app.orders_mdl.orders_proxy_mdl
- property bool displayFilter: false
- property bool _filterApplied: false
-
- function update() {
- list_model_proxy.is_history = true
- applyTickerFilter()
- applyDateFilter()
- applyAllFiltering()
- }
-
- function applyTickerFilter() {
- applyTickerFilter2(combo_base.currentTicker, combo_rel.currentTicker)
- }
-
- function applyTickerFilter2(ticker1, ticker2) {
- list_model_proxy.set_coin_filter(ticker1 + "/" + ticker2)
- }
-
- function applyDateFilter() {
- list_model_proxy.filter_minimum_date = min_date.date
-
- if(max_date.date < min_date.date)
- max_date.date = min_date.date
-
- list_model_proxy.filter_maximum_date = max_date.date
- }
- function applyFilter() {
- applyTickerFilter()
- applyDateFilter()
-
- }
- function applyAllFiltering() {
- list_model_proxy.apply_all_filtering()
- }
-
- anchors.fill: parent
-
- ColumnLayout // History Content
- {
- height: parent.height
- width: parent.width
- spacing: 20
-
- Column // Header
- {
- leftPadding: 20
- topPadding: 20
-
- DefaultText // Title
- {
- text: qsTr("History")
- font.pixelSize: Style.textSize1
- }
-
- DexLabel // Description
- {
- width: _subHistoryRoot.width - 40
- anchors.topMargin: 12
- font.pixelSize: Style.textSizeSmall4
- //text: _filterApplied? "" : qsTr("Finished orders")
- DexLabel {
- opacity: .4
- text: qsTr("Filter") + ": %1 / %2
%3: %4 - %5"
- .arg(combo_base.currentTicker)
- .arg(combo_rel.currentTicker)
- .arg(qsTr("Date"))
- .arg(min_date.date.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd"))
- .arg(max_date.date.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd"))
- }
- Qaterial.AppBarButton // Reset Form Button
- {
- width: 50
- height: 50
- anchors.right: parent.right
- anchors.rightMargin: -5
- anchors.bottom: parent.bottom
- anchors.bottomMargin: -8
-
- icon.source: _subHistoryRoot.displayFilter ? Qaterial.Icons.close : Qaterial.Icons.filter
-
- hoverEnabled: true
-
- ToolTip.delay: 500
- ToolTip.timeout: 5000
- ToolTip.visible: hovered
- ToolTip.text: _subHistoryRoot.displayFilter ? qsTr("Close filtering options.") : qsTr("Open filering options.")
-
- onClicked: _subHistoryRoot.displayFilter = !_subHistoryRoot.displayFilter
- }
- }
- }
-
- HorizontalLine { height: 2; Layout.fillWidth: true }
-
- Item {
- id: main_order
- Layout.fillHeight: true
- Layout.fillWidth: true
- property bool is_history: true
-
- Component.onCompleted: {
- _subHistoryRoot.list_model_proxy.is_history = is_history
- }
- List {
- id: order_list_view
- }
- DexRectangle {
- anchors.fill: parent
- color: theme.dexBoxBackgroundColor
- opacity: .8
- visible: _subHistoryRoot.displayFilter
- border.width: 0
- }
- DexRectangle {
- width: parent.width
- height: _subHistoryRoot.displayFilter? 330 : 60
- visible: height>100
- sizeAnimation: true
- color: theme.dexBoxBackgroundColor
- radius: 0
- y: -20
- Column {
- anchors.horizontalCenter: parent.horizontalCenter
- leftPadding: 15
- rightPadding: 15
- visible: parent.height>250
- DexLabel {
- text: qsTr("Filter settings")
- topPadding: 10
- leftPadding: 10
- font: _font.body1
- }
- RowLayout {
- width: main_order.width - 30
- height: 35
- anchors.horizontalCenter: parent.horizontalCenter
- spacing: 0
- DexLabel {
- text: qsTr("Base Ticker")
- leftPadding: 10
- font: _font.body2
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignVCenter
- opacity: .6
- }
- DefaultSweetComboBox {
- id: combo_base
- model: API.app.portfolio_pg.global_cfg_mdl.all_proxy
- onCurrentTickerChanged: applyTickerFilter()
- height: 60
- valueRole: "ticker"
- textRole: 'ticker'
- }
-
- }
- RowLayout {
- width: main_order.width - 30
- height: 35
- anchors.horizontalCenter: parent.horizontalCenter
- spacing: 5
- DexLabel {
- text: qsTr("Rel Ticker")
- leftPadding: 10
- font: _font.body2
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignVCenter
- opacity: .6
- }
- DefaultSweetComboBox {
- id: combo_rel
- model: API.app.portfolio_pg.global_cfg_mdl.all_proxy//combo_base.model
- onCurrentTickerChanged: applyTickerFilter()
- height: 60
- valueRole: "ticker"
- textRole: 'ticker'
-
- }
-
- }
- spacing: 10
- Qaterial.TextFieldDatePicker {
- id: min_date
- title: qsTr("From")
- from: default_min_date
- to: default_max_date
- date: default_min_date
- onAccepted: applyDateFilter()
- width: parent.width - 50
- height: 60
- opacity: .8
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- Qaterial.TextFieldDatePicker {
- id: max_date
- enabled: min_date.enabled
- title: qsTr("To")
- from: min_date.date
- to: default_max_date
- date: default_max_date
- onAccepted: applyDateFilter()
- width: parent.width - 50
- rightInset: 0
- height: 60
- opacity: .8
- anchors.horizontalCenter: parent.horizontalCenter
- }
- }
- Item {
- anchors.bottom: parent.bottom
- width: parent.width
- height: 60
- Row {
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 20
- spacing: 10
- DexAppButton {
- height: 35
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Cancel")
- onClicked: {
- _subHistoryRoot.displayFilter = false
- }
- }
- DexAppButton {
- height: 35
- anchors.verticalCenter: parent.verticalCenter
- backgroundColor: Qaterial.Colors.lightGreen700
- text: qsTr("Apply filter")
- onClicked: {
- _subHistoryRoot.displayFilter = false
- _subHistoryRoot.applyFilter()
- _subHistoryRoot.applyAllFiltering()
- }
- }
- }
- }
- }
-
- }
- HorizontalLine
- {
- height: 2
- Layout.fillWidth: true
- }
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 30
- Item{
- width: parent.width
- height: 50
- y: -20
- DefaultComboBox {
- readonly property int item_count: API.app.orders_mdl.limit_nb_elements
- readonly property var options: [5, 10, 25, 50, 100, 200]
- anchors.verticalCenter: parent.verticalCenter
- height: 35
- width: 80
- x: 15
- model: options
- currentIndex: options.indexOf(item_count)
- onCurrentValueChanged: API.app.orders_mdl.limit_nb_elements = currentValue
- }
- DexAppButton {
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- text: qsTr("Export")
- height: 35
- anchors.rightMargin: 15
- onClicked: {
- export_csv_dialog.folder = General.os_file_prefix + API.app.settings_pg.get_export_folder()
- export_csv_dialog.open()
- }
- }
- }
-
- }
- FileDialog {
- id: export_csv_dialog
-
- title: qsTr("Please choose the CSV export name and location")
- fileMode: FileDialog.SaveFile
-
- defaultSuffix: "csv"
- nameFilters: [ "CSV files (*.csv)", "All files (*)" ]
-
- onAccepted: {
- const path = currentFile.toString()
-
- // Export
- console.log("Exporting to CSV: " + path)
- API.app.exporter_service.export_swaps_history_to_csv(path.replace(General.os_file_prefix, ""))
-
- // Open the save folder
- const folder_path = path.substring(0, path.lastIndexOf("/"))
- Qt.openUrlExternally(folder_path)
- }
- onRejected: {
- console.log("CSV export cancelled")
- }
- }
-
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubOrders.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubOrders.qml
deleted file mode 100644
index 5aacc424b6..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/SubOrders.qml
+++ /dev/null
@@ -1,282 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-//! 3rdParty Imports
-import Qaterial 1.0 as Qaterial
-
-//! Project Imports
-import "../../../Components"
-import "../../../Constants" //> Style
-import "../Orders" as Orders
-import "Main.js" as Main
-
-Item
-{
- id: _subOrdersRoot
-
- readonly property date default_min_date: new Date("2019-01-01")
- readonly property date default_max_date: new Date(new Date().setDate(new Date().getDate() + 30))
- property var list_model_proxy: API.app.orders_mdl.orders_proxy_mdl
- property bool displayFilter: false
-
- anchors.fill: parent
-
- function update() {
- list_model_proxy.is_history = false
- applyTickerFilter()
- applyDateFilter()
- applyAllFiltering()
- }
-
- function applyTickerFilter() {
- applyTickerFilter2(combo_base.currentTicker, combo_rel.currentTicker)
- }
-
- function applyTickerFilter2(ticker1, ticker2) {
- list_model_proxy.set_coin_filter(ticker1 + "/" + ticker2)
- }
-
- function applyDateFilter() {
- list_model_proxy.filter_minimum_date = min_date.date
-
- if(max_date.date < min_date.date)
- max_date.date = min_date.date
-
- list_model_proxy.filter_maximum_date = max_date.date
- }
-
- function applyFilter() {
- applyTickerFilter()
- applyDateFilter()
- }
-
- function applyAllFiltering() {
- list_model_proxy.apply_all_filtering()
- }
-
- ColumnLayout // Orders Content
- {
- height: parent.height
- width: parent.width
- spacing: 20
-
- Column // Header
- {
- leftPadding: 20
- topPadding: 20
-
- DefaultText // Title
- {
- text: qsTr("Orders")
- font.pixelSize: Style.textSize1
- }
-
- DexLabel // Description
- {
- width: _subOrdersRoot.width - 40
- anchors.topMargin: 12
- font.pixelSize: Style.textSizeSmall4
- //text: _filterApplied? "" : qsTr("Finished orders")
- DexLabel {
- opacity: .4
- text: qsTr("Filter") + ": %1 / %2
%3: %4 - %5"
- .arg(combo_base.currentTicker)
- .arg(combo_rel.currentTicker)
- .arg(qsTr("Date"))
- .arg(min_date.date.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd"))
- .arg(max_date.date.toLocaleDateString(Locale.ShortFormat, "yyyy-MM-dd"))
- }
- Qaterial.AppBarButton // Reset Form Button
- {
- width: 50
- height: 50
- anchors.right: parent.right
- anchors.rightMargin: -5
- anchors.bottom: parent.bottom
- anchors.bottomMargin: -8
-
- icon.source: _subOrdersRoot.displayFilter ? Qaterial.Icons.close : Qaterial.Icons.filter
-
- hoverEnabled: true
-
- ToolTip.delay: 500
- ToolTip.timeout: 5000
- ToolTip.visible: hovered
- ToolTip.text: _subOrdersRoot.displayFilter ? qsTr("Close filtering options.") : qsTr("Open filering options.")
-
- onClicked: _subOrdersRoot.displayFilter = !_subOrdersRoot.displayFilter
- }
- }
- }
-
- HorizontalLine
- {
- height: 2
- Layout.fillWidth: true
- }
- Item {
- id: main_order
- Layout.fillHeight: true
- Layout.fillWidth: true
- property bool is_history: false
- property var list_model_proxy: API.app.orders_mdl.orders_proxy_mdl
- Component.onCompleted: {
- list_model_proxy.is_history = false
- }
- List { id: order_list_view }
- DexRectangle {
- anchors.fill: parent
- color: theme.dexBoxBackgroundColor
- opacity: .8
- visible: _subOrdersRoot.displayFilter
- border.width: 0
- }
- DexRectangle {
- width: parent.width
- height: _subOrdersRoot.displayFilter? 330 : 60
- visible: height>100
- sizeAnimation: true
- color: theme.dexBoxBackgroundColor
- radius: 0
- y: -20
- Column {
- anchors.horizontalCenter: parent.horizontalCenter
- leftPadding: 15
- rightPadding: 15
- visible: parent.height>250
- DexLabel {
- text: qsTr("Filter settings")
- topPadding: 10
- leftPadding: 10
- font: _font.body1
- }
- RowLayout {
- width: main_order.width - 30
- height: 35
- anchors.horizontalCenter: parent.horizontalCenter
- spacing: 0
- DexLabel {
- text: qsTr("Base Ticker")
- leftPadding: 10
- font: _font.body2
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignVCenter
- opacity: .6
- }
- DefaultSweetComboBox {
- id: combo_base
- model: API.app.portfolio_pg.global_cfg_mdl.all_proxy
- onCurrentTickerChanged: applyTickerFilter()
- height: 60
- valueRole: "ticker"
- textRole: 'ticker'
- }
-
- }
- RowLayout {
- width: main_order.width - 30
- height: 35
- anchors.horizontalCenter: parent.horizontalCenter
- spacing: 5
- DexLabel {
- text: qsTr("Rel Ticker")
- leftPadding: 10
- font: _font.body2
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignVCenter
- opacity: .6
- }
- DefaultSweetComboBox {
- id: combo_rel
- model: API.app.portfolio_pg.global_cfg_mdl.all_proxy//combo_base.model
- onCurrentTickerChanged: applyTickerFilter()
- height: 60
- valueRole: "ticker"
- textRole: 'ticker'
-
- }
-
- }
- spacing: 10
- Qaterial.TextFieldDatePicker {
- id: min_date
- title: qsTr("From")
- from: default_min_date
- to: default_max_date
- date: default_min_date
- onAccepted: applyDateFilter()
- width: parent.width - 50
- height: 60
- opacity: .8
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- Qaterial.TextFieldDatePicker {
- id: max_date
- enabled: min_date.enabled
- title: qsTr("To")
- from: min_date.date
- to: default_max_date
- date: default_max_date
- onAccepted: applyDateFilter()
- width: parent.width - 50
- rightInset: 0
- height: 60
- opacity: .8
- anchors.horizontalCenter: parent.horizontalCenter
- }
- }
- Item {
- anchors.bottom: parent.bottom
- width: parent.width
- height: 60
- Row {
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 20
- spacing: 10
- DexAppButton {
- height: 35
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Cancel")
- onClicked: {
- _subOrdersRoot.displayFilter = false
- }
- }
- DexAppButton {
- height: 35
- anchors.verticalCenter: parent.verticalCenter
- backgroundColor: Qaterial.Colors.lightGreen700
- text: qsTr("Apply filter")
- onClicked: {
- _subOrdersRoot.displayFilter = false
- _subOrdersRoot.applyFilter()
- _subOrdersRoot.applyAllFiltering()
- }
- }
- }
- }
- }
-
- }
- HorizontalLine
- {
- height: 2
- Layout.fillWidth: true
- }
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 15
- DexLabel // Title
- {
- text: order_list_view.count+" "+qsTr("Orders")
- anchors.horizontalCenter: parent.horizontalCenter
- y: -10
- //anchors.verticalCenterOffset: -4
- }
- }
-
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SimpleView/Trade.qml b/atomic_defi_design/qml/Exchange/Trade/SimpleView/Trade.qml
deleted file mode 100644
index 141fb77399..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SimpleView/Trade.qml
+++ /dev/null
@@ -1,961 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-//! 3rdParty Imports
-import Qaterial 1.0 as Qaterial
-
-//! Project Imports
-import AtomicDEX.TradingError 1.0
-import AtomicDEX.SelectedOrderStatus 1.0
-import "../../../Components"
-import "../../../Constants"
-import "../"
-
-ClipRRect // Trade Card
-{
- id: _tradeCard
-
- property string selectedTicker: left_ticker
- property var selectedOrder: undefined
- property bool best: false
- property bool coinSelection: false
-
- onSelectedTickerChanged: { selectedOrder = undefined; setPair(true, selectedTicker); _fromValue.field.text = "" }
- onSelectedOrderChanged:
- {
- if (typeof selectedOrder !== 'undefined' && selectedOrder.from_best_order) API.app.trading_pg.orderbook.select_best_order(selectedOrder.uuid)
- else if (typeof selectedOrder !== 'undefined') API.app.trading_pg.preffered_order = selectedOrder
- else API.app.trading_pg.reset_order()
-
- API.app.trading_pg.determine_fees()
- }
- onEnabledChanged: selectedOrder = undefined
- Component.onDestruction: selectedOrder = undefined
- Component.onCompleted: _fromValue.field.forceActiveFocus()
- onBestChanged: if (best) API.app.trading_pg.orderbook.refresh_best_orders()
-
- width: bestOrderSimplified.visible ? 600 : coinSelection ? 450 : 380
- height: col.height + 15
- radius: 20
-
- Connections // Catches C++ `trading_page` class signals.
- {
- enabled: parent.enabled
- target: API.app.trading_pg
-
- function onSelectedOrderStatusChanged() // When the selected order status has changed.
- {
- if (API.app.trading_pg.selected_order_status == SelectedOrderStatus.OrderNotExistingAnymore)
- {
- _orderDisappearModalLoader.open()
- _confirmSwapModal.close()
- }
- }
-
- function onPreferredOrderChangeFinished() // When selected order has changed
- {
- if (typeof selectedOrder === 'undefined')
- return
- if (parseFloat(_fromValue.field.text) > API.app.trading_pg.max_volume)
- _fromValue.field.text = API.app.trading_pg.max_volume
- }
-
- function onVolumeChanged()
- {
- _fromValue.field.text = API.app.trading_pg.volume
- }
- }
-
- Connections
- {
- target: API.app.trading_pg.orderbook.bids
-
- function onBetterOrderDetected(newOrder)
- {
- // We shoould rename SelectedOrderStatus enum to OrderbookNotification.
- if (API.app.trading_pg.selected_order_status == SelectedOrderStatus.BetterPriceAvailable)
- {
- // Price changed and we can still afford the volume.
- if (parseFloat(newOrder.base_max_volume) <= selectedOrder.base_max_volume && parseFloat(newOrder.rel_max_volume) >= API.app.trading_pg.total_amount)
- {
- console.log("Updating forms with better price");
- Qaterial.SnackbarManager.show(
- {
- expandable: true,
- text: qsTr("Better price found: %1. Updating forms.")
- .arg(parseFloat(newOrder.price).toFixed(8)),
- timeout: Qaterial.Style.snackbar.longDisplayTime
- })
- selectedOrder = newOrder
- }
- else
- {
- console.log("Asking user if he want a better price but lower volume");
- Qaterial.SnackbarManager.show(
- {
- expandable: true,
- action: "Update",
- text: qsTr("Better price (%1) found but received quantity (%2) is lower than your current one (%3). Click here to update the selected order.")
- .arg(parseFloat(newOrder.price).toFixed(8))
- .arg(parseFloat(newOrder.rel_max_volume).toFixed(8))
- .arg(API.app.trading_pg.total_amount),
- onAccept: function() { selectedOrder = newOrder },
- onClose: function() { selectedOrder = undefined },
- maximumLineCount: 2,
- timeout: 10000
- })
- }
- }
- }
- }
-
- ModalLoader
- {
- id: _orderDisappearModalLoader
- sourceComponent: OrderRemovedModal {}
- onLoaded: selectedOrder = undefined
- }
-
- MouseArea // Swap Card Mouse Area
- {
- anchors.fill: parent
- onPressed: _fromValue.focus = false // When clicking outside `_fromValue` TextField, `fromValue` losts its focus.
- }
-
- Column // Swap Card Content
- {
- id: col
-
- width: parent.width
- spacing: 20
-
- Column // Header
- {
- id: _swapCardHeader
-
- width: parent.width - 20
- leftPadding: 20
- topPadding: 20
-
- DefaultText // Title
- {
- text: qsTr("Swap")
- font.pixelSize: Style.textSize1
- }
-
- DefaultText // Description
- {
- anchors.topMargin: 12
- font.pixelSize: Style.textSizeSmall4
- text: qsTr("Instant trading with best orders")
-
- Qaterial.AppBarButton // Reset Form Button
- {
- enabled: !coinSelection && !best && typeof selectedOrder !== 'undefined'
- visible: enabled
-
- anchors.left: parent.right
- anchors.leftMargin: 100
- anchors.bottom: parent.bottom
- anchors.bottomMargin: -8
-
- width: 50
- height: 50
-
- hoverEnabled: true
-
- ToolTip.delay: 500
- ToolTip.timeout: 5000
- ToolTip.visible: hovered
- ToolTip.text: qsTr("Reset form.")
-
- onClicked: selectedOrder = undefined
-
- Qaterial.ColorIcon
- {
- anchors.centerIn: parent
- source: Qaterial.Icons.broom
- color: theme.buttonColorTextEnabled
- opacity: .8
- }
- }
- }
- }
-
- HorizontalLine
- {
- width: _tradeCard.width
- }
-
- ColumnLayout // Content
- {
- width: parent.width
-
- anchors.horizontalCenter: parent.horizontalCenter
-
- DefaultRectangle // From
- {
- id: swap_from_card
- Layout.preferredWidth: _tradeCard.width - 20
- Layout.preferredHeight: 90
- Layout.alignment: Qt.AlignHCenter
- radius: 20
- visible: !coinSelectorSimplified.visible
-
- DefaultText // From Text
- {
- id: _fromTitle
- anchors.top: parent.top
- anchors.topMargin: 14
- anchors.left: parent.left
- anchors.leftMargin: 17
- text: qsTr("From")
- font.pixelSize: Style.textSizeSmall4
- }
-
- Text // Tradable Balance
- {
- readonly property int _maxWidth: 140
-
- id: _fromBalance
- width: Math.min(_maxWidth, _textMetrics.boundingRect.width + 10)
- anchors.verticalCenter: _fromTitle.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 17
- text: qsTr("%1").arg(API.app.trading_pg.max_volume)
- font.pixelSize: Style.textSizeSmall2
- elide: Text.ElideRight
- color: Style.colorWhite1
-
- DexImage
- {
- id: _fromBalanceIcon
- width: 16
- height: 16
- anchors.right: parent.left
- anchors.rightMargin: 8
- anchors.verticalCenter: parent.verticalCenter
- source: General.image_path + "menu-assets-white.svg"
- opacity: .6
- }
-
- MouseArea
- {
- anchors.left: _fromBalanceIcon.left
- anchors.right: _fromBalance.right
- anchors.top: _fromBalance.top
- anchors.bottom: _fromBalance.bottom
- hoverEnabled: true
- ToolTip
- {
- visible: parent.containsMouse
- text: qsTr("Tradable: ") + parent.parent.text
- }
- }
-
- TextMetrics
- {
- id: _textMetrics
- font: _fromBalance.font
- text: _fromBalance.text
- elide: _fromBalance.elide
- }
- }
-
- AmountField // Amount
- {
- id: _fromValue
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 19
- anchors.left: parent.left
- anchors.leftMargin: 2
- field.placeholderText: typeof selectedOrder !== 'undefined' ? qsTr("Minimum: %1").arg(API.app.trading_pg.min_trade_vol) : qsTr("Enter an amount")
- field.font.pixelSize: Style.textSizeSmall5
- field.background: Rectangle { color: theme.backgroundColor }
- field.onTextChanged:
- {
- if (field.text === "")
- {
- API.app.trading_pg.volume = 0
- field.text = ""
- }
- else
- API.app.trading_pg.volume = field.text
- //API.app.trading_pg.determine_fees()
- //API.app.trading_pg.orderbook.refresh_best_orders()
- }
- field.onFocusChanged:
- {
- if (!focus && parseFloat(field.text) < parseFloat(API.app.trading_pg.min_trade_vol))
- {
- field.text = API.app.trading_pg.min_trade_vol
- }
- }
- Component.onCompleted: field.text = ""
- }
-
- Text // Amount In Fiat
- {
- enabled: _fromValue.field.text
- anchors.top: _fromValue.bottom
- anchors.topMargin: -3
- anchors.left: _fromValue.left
- anchors.leftMargin: 24
- font.pixelSize: Style.textSizeSmall1
- color: theme.buttonColorTextDisabled
- text: enabled ? General.getFiatText(_fromValue.field.text, selectedTicker) : ""
- }
-
- Rectangle // Select ticker button
- {
- id: _selectTickerBut
-
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 19
- anchors.right: parent.right
- anchors.rightMargin: 20
-
- width: _selectedTickerIcon.width + Math.max(_selectedTickerText.implicitWidth, _selectedTickerTypeText.implicitWidth) + _selectedTickerArrow.width + 29.5
-
- height: 30
-
- radius: 10
- border.width: 0
- color: _selectedTickerMouseArea.containsMouse ? "#8b95ed" : theme.backgroundColor
-
- DefaultMouseArea
- {
- id: _selectedTickerMouseArea
- anchors.fill: parent
- onClicked:
- {
- _tradeCard.coinSelection = true
- _tradeCard.best = false
- }
- hoverEnabled: true
- }
-
- DefaultImage
- {
- id: _selectedTickerIcon
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 5
- anchors.left: parent.left
- width: 20
- height: 20
- source: General.coinIcon(selectedTicker)
- }
-
- DefaultText
- {
- id: _selectedTickerText
-
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: -5
- anchors.left: _selectedTickerIcon.right
- anchors.leftMargin: 10
-
- width: 60
-
- text: atomic_qt_utilities.retrieve_main_ticker(selectedTicker)
- font.pixelSize: Style.textSizeSmall2
-
- wrapMode: Text.NoWrap
-
- DefaultText
- {
- id: _selectedTickerTypeText
-
- anchors.top: parent.bottom
-
- text: API.app.portfolio_pg.global_cfg_mdl.get_coin_info(selectedTicker).type
- font.pixelSize: 9
- }
- }
-
- Arrow
- {
- id: _selectedTickerArrow
-
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 5
-
- up: false
- }
-
- ModalLoader
- {
- property string selectedTicker
- onSelectedTickerChanged: _tradeCard.selectedTicker = selectedTicker
- id: coinsListModalLoader
- sourceComponent: CoinsListModal {}
- }
-
- Connections
- {
- target: coinsListModalLoader
- function onLoaded() { coinsListModalLoader.item.selectedTickerChanged.connect(function() { _tradeCard.selectedTicker = coinsListModalLoader.item.selectedTicker }) }
- }
- }
-
- DexRectangle // MAX Button
- {
- anchors.right: _selectTickerBut.left
- anchors.rightMargin: 5
- anchors.verticalCenter: _selectTickerBut.verticalCenter
-
- width: 40
- height: 20
-
- border.width: 0
-
- DefaultMouseArea
- {
- id: _maxButMouseArea
- anchors.fill: parent
- hoverEnabled: true
- onClicked: _fromValue.field.text = API.app.trading_pg.max_volume
- }
-
- DexLabel
- {
- anchors.centerIn: parent
- color: _maxButMouseArea.containsMouse ?
- _maxButMouseArea.pressed ? "#173948" : "#204c61"
- : theme.accentColor
- text: qsTr("MAX")
- }
- }
- }
-
- DefaultRectangle // To
- {
- Layout.preferredWidth: _tradeCard.width - 20
- Layout.preferredHeight: 90
- Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 15
- radius: 20
- visible: !bestOrderSimplified.visible && !coinSelectorSimplified.visible
-
- DefaultText
- {
- anchors.fill: parent
- anchors.leftMargin: 17
- anchors.topMargin: 14
- text: qsTr("To")
- font.pixelSize: Style.textSizeSmall4
- }
-
- AmountField // Amount
- {
- id: _toValue
- enabled: false
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 19
- anchors.left: parent.left
- anchors.leftMargin: 2
- field.text: API.app.trading_pg.total_amount
- field.font.pixelSize: Style.textSizeSmall5
- field.color: theme.buttonColorTextDisabled
- field.background: Rectangle { color: theme.backgroundColor }
- }
-
- Text // Amount In Fiat
- {
- enabled: parseFloat(_toValue.field.text) > 0
- anchors.top: _toValue.bottom
- anchors.topMargin: -3
- anchors.left: _toValue.left
- anchors.leftMargin: 24
- font.pixelSize: Style.textSizeSmall1
- color: theme.buttonColorTextDisabled
- text: enabled ? General.getFiatText(_toValue.field.text, _tradeCard.selectedOrder.coin?? "") : ""
- }
-
- Rectangle // Shows best order coin
- {
- id: _selectBestOrderButton
-
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 19
- anchors.right: parent.right
- anchors.rightMargin: 20
-
- height: 30
- width: _bestOrderIcon.enabled ?
- _bestOrderIcon.width + Math.max(_bestOrderTickerText.implicitWidth, _bestOrderTickerTypeText.implicitWidth) + _bestOrderArrow.width + 29.5 :
- _bestOrderNoTickerText.implicitWidth + 30
-
- radius: 10
- border.width: 0
-
- color: _bestOrdersMouseArea.containsMouse ? "#8b95ed" : theme.backgroundColor
- opacity: _bestOrdersMouseArea.enabled ? 1 : 0.3
-
- DefaultMouseArea
- {
- id: _bestOrdersMouseArea
-
- anchors.fill: parent
-
- enabled: parseFloat(_fromValue.field.text) > 0
-
- hoverEnabled: true
-
- onClicked: _tradeCard.best = true
- }
-
- // When no order is currently selected.
- DefaultText
- {
- id: _bestOrderNoTickerText
-
- enabled: !_bestOrderIcon.enabled
- visible: enabled
-
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 5
- anchors.left: parent.left
-
- text: qsTr("Pick an order")
- font.pixelSize: Style.textSizeSmall2
- }
-
- // Token Icon (When a best order is currently selected)
- DefaultImage
- {
- id: _bestOrderIcon
-
- enabled: typeof selectedOrder !== 'undefined'
- visible: enabled
-
- anchors.verticalCenter: parent.verticalCenter
- anchors.leftMargin: 5
- anchors.left: parent.left
-
- width: 20
- height: 20
-
- source: enabled ? General.coinIcon(selectedOrder.coin) : ""
- }
-
- // Ticker (When a best order is currently selected)
- DefaultText
- {
- id: _bestOrderTickerText
-
- enabled: _bestOrderIcon.enabled
- visible: _bestOrderIcon.visible
-
- anchors.verticalCenter: _bestOrderIcon.verticalCenter
- anchors.verticalCenterOffset: -5
- anchors.left: _bestOrderIcon.right
- anchors.leftMargin: 10
-
- width: 60
-
- text: enabled ? atomic_qt_utilities.retrieve_main_ticker(selectedOrder.coin) : ""
- font.pixelSize: Style.textSizeSmall2
-
- wrapMode: Text.NoWrap
-
-
- DefaultText
- {
- id: _bestOrderTickerTypeText
-
- anchors.top: parent.bottom
-
- text: enabled ? API.app.portfolio_pg.global_cfg_mdl.get_coin_info(selectedOrder.coin).type : ""
- font.pixelSize: 9
- }
- }
-
- Arrow
- {
- id: _bestOrderArrow
-
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 5
-
- up: false
- }
-
- ModalLoader
- {
- id: _bestOrdersModalLoader
- sourceComponent: BestOrdersModal {}
- }
- }
- }
-
- RowLayout // Unit Price
- {
- id: _unitPrice
-
- // LAYOUT
- Layout.topMargin: 10
- Layout.alignment: Qt.AlignHCenter
- Layout.fillWidth: true
-
- enabled: typeof selectedOrder !== 'undefined'
- visible: enabled && !bestOrderSimplified.visible && !coinSelectorSimplified.visible
-
- DefaultText
- {
- Layout.rightMargin: 120
- font.pixelSize: Style.textSizeSmall3
- text: qsTr("Price")
- }
- DefaultText
- {
- Layout.alignment: Qt.AlignRight
- font.pixelSize: Style.textSizeSmall3
- text: selectedOrder ? "1 %1 = %2 %3"
- .arg(atomic_qt_utilities.retrieve_main_ticker(selectedTicker))
- .arg(parseFloat(API.app.trading_pg.price).toFixed(8))
- .arg(atomic_qt_utilities.retrieve_main_ticker(selectedOrder.coin))
- : ""
- }
- }
-
- Item
- {
- Layout.topMargin: 10
- Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: _tradeCard.width - 30
- Layout.preferredHeight: 40
- visible: !bestOrderSimplified.visible && !coinSelectorSimplified.visible
-
- DefaultButton
- {
- enabled: !API.app.trading_pg.preimage_rpc_busy && !_swapAlert.visible
-
- anchors.fill: parent
- text: qsTr("Swap Now")
- onClicked: _confirmSwapModal.open()
-
- ModalLoader
- {
- id: _confirmSwapModal
- sourceComponent: ConfirmTradeModal {}
- }
-
- Connections
- {
- target: exchange_trade
- function onBuy_sell_rpc_busyChanged()
- {
- if (buy_sell_rpc_busy)
- return
-
- const response = General.clone(buy_sell_last_rpc_data)
-
- if (response.error_code)
- {
- _confirmSwapModal.close()
-
- toast.show(qsTr("Failed to place the order"),
- General.time_toast_important_error,
- response.error_message)
-
- selectedOrder = undefined
- return
- }
- else if (response.result && response.result.uuid)
- {
- selectedOrder = undefined
- _fromValue.field.text = "0"
-
- // Make sure there is information
- _confirmSwapModal.close()
-
- toast.show(qsTr("Placed the order"), General.time_toast_basic_info,
- General.prettifyJSON(response.result), false)
-
- General.prevent_coin_disabling.restart()
- }
- }
- }
- }
-
- Image // Alert
- {
- id: _swapAlert
-
- function getAlert()
- {
- var left_ticker = API.app.trading_pg.market_pairs_mdl.left_selected_coin
- var right_ticker = API.app.trading_pg.market_pairs_mdl.right_selected_coin
- if (_fromValue.field.text === "" || parseFloat(_fromValue.field.text) === 0)
- return qsTr("Entered amount must be superior than 0.")
- if (typeof selectedOrder === 'undefined')
- return qsTr("You must select an order.")
- if (API.app.trading_pg.last_trading_error == TradingError.VolumeIsLowerThanTheMinimum)
- return qsTr("Entered amount is below the minimum required by this order: %1").arg(selectedOrder.base_min_volume)
- if (API.app.trading_pg.last_trading_error == TradingError.LeftParentChainNotEnabled)
- return qsTr("%1 needs to be enabled in order to use %2").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(left_ticker)).arg(left_ticker)
- if (API.app.trading_pg.last_trading_error == TradingError.LeftParentChainNotEnoughBalance)
- return qsTr("%1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(left_ticker)).arg(left_ticker)
- if (API.app.trading_pg.last_trading_error == TradingError.RightParentChainNotEnabled)
- return qsTr("%1 needs to be enabled in order to use %2").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(right_ticker)).arg(right_ticker)
- if (API.app.trading_pg.last_trading_error == TradingError.RightParentChainNotEnoughBalance)
- return qsTr("%1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions").arg(API.app.portfolio_pg.global_cfg_mdl.get_parent_coin(right_ticker)).arg(right_ticker)
-
- return ""
- }
-
- anchors.left: parent.left
- anchors.leftMargin: 10
- anchors.verticalCenter: parent.verticalCenter
-
- visible: ToolTip.text !== ""
-
- source: Qaterial.Icons.alert
-
- ToolTip.visible: _alertMouseArea.containsMouse
- ToolTip.text: getAlert()
-
- DefaultColorOverlay
- {
- anchors.fill: parent
- source: parent
- color: "yellow"
- }
- MouseArea
- {
- id: _alertMouseArea
- anchors.fill: parent
- hoverEnabled: true
- }
- }
- }
- }
- Item
- {
- id: coinSelectorSimplified
- width: parent.width
- height: 300
- visible: _tradeCard.coinSelection
- Item
- {
- width: parent.width
- height: 50
- Qaterial.ColorIcon
- {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.magnify
- x: 25
- opacity: .7
- }
- DexTextField
- {
- id: _coinSearchField
- width: parent.width-70
- height: parent.height
- font.pixelSize: 16
- x: 45
- placeholderText: qsTr("Search")
- background: DexRectangle
- {
- border.width: 0
- color: 'transparent'
- }
- onTextChanged:
- {
- _coinList.model.setFilterFixedString(text)
- }
- }
- }
- Connections {
- target: _tradeCard
- function onCoinSelectionChanged() {
- _coinSearchField.text = ""
- }
- }
-
- SubCoinSelector
- {
- id: _coinList
-
- onTickerSelected:
- {
- _tradeCard.selectedTicker = ticker
- _tradeCard.coinSelection = false
- _fromValue.field.forceActiveFocus()
- }
-
- anchors.fill: parent
- anchors.rightMargin: 10
- anchors.leftMargin: 20
- anchors.bottomMargin: 10
- anchors.topMargin: 50
- }
-
- }
- Item
- {
- id: bestOrderSimplified
- width: parent.width
- height: 300
- visible: _tradeCard.best
- Item
- {
- width: parent.width
- height: 50
- Qaterial.ColorIcon
- {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.magnify
- x: 25
- opacity: .7
- }
- DexTextField
- {
- id: _bestOrderSearchField
- width: parent.width-70
- height: parent.height
- font.pixelSize: 16
- x: 45
- placeholderText: qsTr("Search")
- background: DexRectangle
- {
- border.width: 0
- color: 'transparent'
- }
- onTextChanged:
- {
- API.app.trading_pg.orderbook.best_orders.proxy_mdl.setFilterFixedString(text)
- }
- }
- }
- Connections {
- target: _tradeCard
- function onBestChanged() {
- _bestOrderSearchField.text = ""
- }
- }
- SubBestOrder
- {
- id: _bestOrderList
- tradeCard: _tradeCard
- onSelectedOrderChanged:
- {
- _tradeCard.selectedOrder = selectedOrder
- _bestOrderSearchField.text = ""
- _fromValue.field.forceActiveFocus()
- }
- onBestChanged:
- {
- if(!best)
- {
- _tradeCard.best = false
- }
- }
- anchors.fill: parent
- anchors.rightMargin: 10
- anchors.leftMargin: 20
- anchors.bottomMargin: 10
- anchors.topMargin: 50
- visible: _tradeCard.width == 600
- }
- BusyIndicator
- {
- width: 200
- height: 200
- visible: API.app.trading_pg.orderbook.best_orders_busy
- running: visible
- anchors.centerIn: parent
- }
-
- }
-
-
- Item // Swap Info - Details
- {
- id: _feesCard
- anchors.horizontalCenter: parent.horizontalCenter
- width: 350
- height: 60
-
- enabled: !_swapAlert.visible
- visible: _feesList.count !== 0 & _tradeCard.selectedOrder !== undefined & parseFloat(_fromValue.field.text) > 0 & !bestOrderSimplified.visible & !coinSelectorSimplified.visible
-
- DexRectangle {
- radius: 25
- anchors.fill: parent
- }
-
- DefaultBusyIndicator
- {
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- visible: API.app.trading_pg.preimage_rpc_busy
- }
-
- DefaultListView
- {
- id: _feesList
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
-
- visible: !API.app.trading_pg.preimage_rpc_busy
- enabled: parent.enabled
- model: API.app.trading_pg.fees.total_fees
- delegate: RowLayout
- {
- width: _feesCard.width
- Component.onCompleted: _feesCard.height += 20
- Component.onDestruction: _feesCard.height -= 20
-
- DefaultText
- {
- Layout.alignment: Qt.AlignLeft
- Layout.leftMargin: 10
- text: qsTr("Total %1 fees: ").arg(modelData.coin)
- font.pixelSize: Style.textSizeSmall3
- }
- DefaultText
- {
- Layout.alignment: Qt.AlignRight
- Layout.rightMargin: 10
- text: qsTr("%2 (%3)")
- .arg(parseFloat(modelData.required_balance).toFixed(8) / 1)
- .arg(General.getFiatText(modelData.required_balance, modelData.coin, false))
- font.pixelSize: Style.textSizeSmall3
- }
- }
- }
- }
- }
- Row
- {
- anchors.rightMargin: 15
- anchors.right: parent.right
- y: 12
- Qaterial.AppBarButton
- {
- icon.source: Qaterial.Icons.refresh
- visible: _tradeCard.best
- enabled: !API.app.trading_pg.orderbook.best_orders_busy
- onClicked:
- {
- API.app.trading_pg.orderbook.refresh_best_orders()
- }
- }
- Qaterial.AppBarButton
- {
- icon.source: Qaterial.Icons.close
- visible: _tradeCard.best || _tradeCard.coinSelection
- onClicked:
- {
- _tradeCard.best = false
- _tradeCard.coinSelection = false
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/SweetDexComboBox.qml b/atomic_defi_design/qml/Exchange/Trade/SweetDexComboBox.qml
deleted file mode 100644
index f4e2bd75d0..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/SweetDexComboBox.qml
+++ /dev/null
@@ -1,174 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.0
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.impl 2.15
-import QtQuick.Controls.Universal 2.15
-
-import "../../Components"
-import "../../Constants"
-
-DefaultComboBox {
- id: control
-
- mainBorderColor: Style.getCoinColor(ticker)
- border.width: 2
- radius: 10
-
- contentItem: DexComboBoxLine {
- id: line
- padding: 10
-
- Component.onCompleted: portfolio_mdl.portfolioItemDataChanged.connect(forceUpdateDetails)
- Component.onDestruction: portfolio_mdl.portfolioItemDataChanged.disconnect(forceUpdateDetails)
-
- function forceUpdateDetails() {
- console.log("Portfolio item data changed, force-updating the selected ticker details!")
- ++update_count
- }
-
- property int update_count: 0
- property var prev_details
-
- details: {
- const idx = combo.currentIndex
-
- if(idx === -1) return prev_details
-
- // Update count triggers the change for auto-update
- const new_details = {
- update_count: line.update_count,
- ticker: model.data(model.index(idx, 0), 257),
- name: model.data(model.index(idx, 0), 259),
- balance: model.data(model.index(idx, 0), 260),
- main_currency_balance: model.data(model.index(idx, 0), 261)
- }
-
- prev_details = new_details
-
- return new_details
- }
- }
-
- // Each dropdown item
- height: 80
- delegate: ItemDelegate {
- Universal.accent: control.lineHoverColor
- width: control.width
- highlighted: control.highlightedIndex === index
-
-
- contentItem: DexComboBoxLine {
- details: model
- }
- z: 5
- }
-
- // Dropdown itself
- popup: Popup {
- id: popup
- readonly property double max_height: 450//control.Window.height - bottomMargin - mapToItem(control.Window.contentItem, x, y).y
- y: control.height - 1
- width: control.width
- height: Math.min(contentItem.implicitHeight, popup.max_height)
- z: 4
- bottomMargin: 20
-
- padding: 1
- rightMargin: 5
-
- contentItem: ColumnLayout {
- anchors.rightMargin: 5
-
- // Search input
- DefaultTextField {
- id: input_coin_filter
- background: Item {
- Rectangle {
- anchors.fill: parent
- anchors.rightMargin: 2
- border.color: "transparent"
- color: theme.backgroundColor
- }
- }
-
- function reset() {
- text = ""
- renewIndex()
- }
-
- Connections {
- target: popup
- function onOpened() {
- input_coin_filter.reset()
- input_coin_filter.forceActiveFocus()
- }
- function onClosed() { input_coin_filter.reset() }
- }
-
- placeholderText: qsTr("Search")
-
- onTextChanged: {
- ticker_list.setFilterFixedString(text)
- renewIndex()
- }
- font.pixelSize: 16
-
- Layout.fillWidth: true
- Layout.leftMargin: 0
- Layout.preferredHeight: 60
- Layout.rightMargin: 2//Layout.leftMargin
- Layout.topMargin: Layout.leftMargin
- Keys.onDownPressed: {
- control.incrementCurrentIndex()
- }
- Keys.onUpPressed: {
- control.decrementCurrentIndex()
- }
-
- Keys.onPressed: {
- if(event.key === Qt.Key_Return) {
- if(control.count > 0) {
- control.currentIndex = 0
- }
- popup.close()
- event.accepted = true
- }
- }
- }
- Item {
- Layout.maximumHeight: popup.max_height - 100
- Layout.fillWidth: true
- implicitHeight: popup_list_view.contentHeight + 5
- DefaultListView {
- id: popup_list_view
- // Scrollbar appears if this extra space is not added
- model: control.popup.visible ? control.delegateModel : null
- currentIndex: control.highlightedIndex
- anchors.fill: parent
- anchors.rightMargin: 2
-
- DefaultMouseArea {
- anchors.fill: parent
- acceptedButtons: Qt.NoButton
- }
- }
- }
-
-
- }
-
- background: Item {
- AnimatedRectangle {
- width: parent.width
- y: -5
- height: parent.height+10
- color: theme.dexBoxBackgroundColor
- border.width: 1
- border.color: control.mainBorderColor
- //radius: Style.rectangleCornerRadius
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/TickerSelector.qml b/atomic_defi_design/qml/Exchange/Trade/TickerSelector.qml
deleted file mode 100644
index 687a73eb87..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/TickerSelector.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-
-import "../../Components"
-import "../../Constants"
-
-RowLayout {
- id: root
-
- spacing: 5
- layoutDirection: left_side ? Qt.LeftToRight : Qt.RightToLeft
-
- property bool left_side: false
- property var ticker_list
- property string ticker
-
- function renewIndex() {
- combo.currentIndex = combo.indexOfValue(ticker)
- }
-
- onTickerChanged: renewIndex()
-
- Component.onCompleted: renewIndex()
-
- SweetDexComboBox {
- id: combo
-
- enabled: !block_everything
-
- model: ticker_list
-
- valueRole: "ticker"
-
- // Indicates user input, when list changes, index stays the same so we know it's not user input
- property bool index_changed: false
- height: parent.height
- onCurrentIndexChanged: combo.index_changed = true
-
- onCurrentValueChanged: {
- // User input
- if(combo.index_changed) {
- combo.index_changed = false
- // Set the ticker
- if(currentValue !== undefined)
- setPair(left_side, currentValue)
- }
- // List change
- else {
- // Correct the index
- if(currentText.indexOf(ticker) === -1) {
- const target_index = indexOfValue(ticker)
- if(currentIndex !== target_index)
- currentIndex = target_index
- }
- }
- }
-
- Layout.fillWidth: true
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Trade.qml b/atomic_defi_design/qml/Exchange/Trade/Trade.qml
deleted file mode 100644
index 0ea2f9346b..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Trade.qml
+++ /dev/null
@@ -1,183 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.15
-import Qt.labs.settings 1.0
-import QtGraphicalEffects 1.0
-
-import Qaterial 1.0 as Qaterial
-
-import AtomicDEX.MarketMode 1.0
-import AtomicDEX.TradingError 1.0
-import AtomicDEX.TradingMode 1.0
-
-import "../../Components"
-import "../../Constants"
-import "../../Wallet"
-
-// Trade Form / Component import
-import "TradeBox/"
-import "Trading/"
-import "Trading/Items/"
-
-// OrderBook / Component import
-import "OrderBook/" as OrderBook
-
-// Best Order
-import "BestOrder/" as BestOrder
-
-// Orders (orders, history)
-import "Orders/" as OrdersView
-
-import "./" as Here
-
-import "SimpleView" as SimpleView
-
-Item {
- id: exchange_trade
- readonly property string total_amount: API.app.trading_pg.total_amount
- property bool orderSelected: false
- //property var form_base: sell_mode? form_base.formBase : buyBox.formBase
- Component.onCompleted: {
- API.app.trading_pg.on_gui_enter_dex()
- if(dashboard.current_ticker!==undefined){
- onOpened(dashboard.current_ticker)
- }else {
- onOpened()
- }
- dashboard.current_ticker = undefined
- }
-
- Component.onDestruction: {
- API.app.trading_pg.on_gui_leave_dex()
- }
- property bool isUltraLarge: true // width > 1400
- property bool isBigScreen: width > 1400
- onIsUltraLargeChanged: {
- if (isUltraLarge) {
- API.app.trading_pg.orderbook.asks.proxy_mdl.qml_sort(
- 0, Qt.DescendingOrder)
- } else {
- API.app.trading_pg.orderbook.asks.proxy_mdl.qml_sort(
- 0, Qt.AscendingOrder)
- }
- }
-
- readonly property bool block_everything: swap_cooldown.running
- || fetching_multi_ticker_fees_busy
-
- readonly property bool fetching_multi_ticker_fees_busy: false
-
- signal prepareMultiOrder
- property bool multi_order_values_are_valid: true
-
- readonly property string non_null_price: backend_price === '' ? '0' : backend_price
- readonly property string non_null_volume: backend_volume === '' ? '0' : backend_volume
- readonly property bool price_is_empty: parseFloat(non_null_price) <= 0
-
- readonly property string backend_price: API.app.trading_pg.price
- function setPrice(v) {
- API.app.trading_pg.price = v
- }
- readonly property int last_trading_error: API.app.trading_pg.last_trading_error
- readonly property string max_volume: API.app.trading_pg.max_volume
- readonly property string backend_volume: API.app.trading_pg.volume
- function setVolume(v) {
- API.app.trading_pg.volume = v
- }
-
- property bool sell_mode: API.app.trading_pg.market_mode.toString(
- ) === "Sell"
- function setMarketMode(v) {
- API.app.trading_pg.market_mode = v
- }
-
- readonly property string base_amount: API.app.trading_pg.base_amount
- readonly property string rel_amount: API.app.trading_pg.rel_amount
-
- Timer {
- id: swap_cooldown
- repeat: false
- interval: 1000
- }
-
- function inCurrentPage() {
- return exchange.inCurrentPage()
- && exchange.current_page === idx_exchange_trade
- }
-
- readonly property var preffered_order: API.app.trading_pg.preffered_order
-
-
-
- // Cache Trade Info
- property bool valid_fee_info: API.app.trading_pg.fees.base_transaction_fees !== undefined
- readonly property var curr_fee_info: API.app.trading_pg.fees
- property var fees_data: []
-
- // Trade
- function onOpened(ticker) {
-
- if (!General.initialized_orderbook_pair) {
- General.initialized_orderbook_pair = true
- API.app.trading_pg.set_current_orderbook(General.default_base,
- General.default_rel)
- }
- setPair(true, ticker)
- app.pairChanged(base_ticker, rel_ticker)
- }
-
- function setPair(is_left_side, changed_ticker) {
- swap_cooldown.restart()
-
- if (API.app.trading_pg.set_pair(is_left_side, changed_ticker))
- pairChanged(base_ticker, rel_ticker)
- }
-
- function trade(options, default_config) {
- // Will move to backend - nota, conf
- let nota = ""
- let confs = ""
-
- if (options.enable_custom_config) {
- if (options.is_dpow_configurable) {
- nota = options.enable_dpow_confs ? "1" : "0"
- }
-
- if (nota !== "1") {
- confs = options.required_confirmation_count.toString()
- }
- } else {
- if (General.exists(default_config.requires_notarization)) {
- nota = default_config.requires_notarization ? "1" : "0"
- }
-
- if (nota !== "1" && General.exists(
- default_config.required_confirmations)) {
- confs = default_config.required_confirmations.toString()
- }
- }
-
- if (sell_mode)
- API.app.trading_pg.place_sell_order(nota, confs)
- else
- API.app.trading_pg.place_buy_order(nota, confs)
-
- orderPlaced()
- }
-
- signal orderPlaced()
-
- readonly property bool buy_sell_rpc_busy: API.app.trading_pg.buy_sell_rpc_busy
- readonly property var buy_sell_last_rpc_data: API.app.trading_pg.buy_sell_last_rpc_data
-
- Loader
- {
- id: _viewLoader
- anchors.fill: parent
- source: API.app.trading_pg.current_trading_mode == TradingMode.Pro ? "ProView.qml" : "SimpleView/Main.qml"
- }
-
- TradeViewHeader {
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/TradeBox/BuyBox.qml b/atomic_defi_design/qml/Exchange/Trade/TradeBox/BuyBox.qml
deleted file mode 100644
index e1554cf438..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/TradeBox/BuyBox.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qt.labs.settings 1.0
-import AtomicDEX.MarketMode 1.0
-
-import "../../../Components"
-import "../../../Constants"
-import "../../../Wallet"
-
-FloatingBackground {
- property alias can_submit_trade: form_base.can_submit_trade
- property alias formBase: form_base
- Layout.preferredHeight: !sell_mode? 350 : 45
- Behavior on Layout.preferredHeight {
- NumberAnimation {
- duration: 200
- }
- }
- Layout.fillWidth: true
- radius: sell_mode? 3 : 4
- border.color: Style.colorGreen
- color: Style.colorTheme9
- opacity:mouse_area2.containsMouse? 1 : !sell_mode? 1 : .2
- Rectangle {
- width: parent.width
- height: 45
- color: Style.colorGreen
- radius: 2
- DefaultText {
- anchors.centerIn: parent
- text: qsTr("Buy")+" "+ atomic_qt_utilities.retrieve_main_ticker(left_ticker)
- color: Style.colorTheme9
- font.pixelSize: Style.textSize2
- }
- }
-
- OrderForm {
- id: form_base
- y: 45
- width: parent.width-25
- height: parent.height-45
- clip: true
- visible: !sell_mode
- border.color: 'transparent'
- color: 'transparent'
- anchors.horizontalCenter: parent.horizontalCenter
-
- }
-
- DefaultMouseArea {
- anchors.fill: parent
- id: mouse_area2
- visible: sell_mode
- hoverEnabled: true
- onClicked: setMarketMode(MarketMode.Buy)
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/TradeBox/OrderForm.qml b/atomic_defi_design/qml/Exchange/Trade/TradeBox/OrderForm.qml
deleted file mode 100644
index b982b8cdb6..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/TradeBox/OrderForm.qml
+++ /dev/null
@@ -1,250 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-
-import AtomicDEX.MarketMode 1.0
-import AtomicDEX.TradingError 1.0
-
-import "../../../Components"
-import "../../../Constants"
-
-FloatingBackground {
- id: root
- radius: 0
- show_shadow: false
- function focusVolumeField() {
- input_volume.field.forceActiveFocus()
- }
-
- readonly property string total_amount: API.app.trading_pg.total_amount
-
- readonly property bool can_submit_trade: last_trading_error === TradingError.None
-
- // Will move to backend: Minimum Fee
- function getMaxBalance() {
- if(General.isFilled(base_ticker))
- return API.app.get_balance(base_ticker)
-
- return "0"
- }
-
- // Will move to backend: Minimum Fee
- function getMaxVolume() {
- // base in this orderbook is always the left side, so when it's buy, we want the right side balance (rel in the backend)
- const value = sell_mode ? API.app.trading_pg.orderbook.base_max_taker_vol.decimal :
- API.app.trading_pg.orderbook.rel_max_taker_vol.decimal
-
- if(General.isFilled(value))
- return value
-
- return getMaxBalance()
- }
- function setMinimumAmount(value){
- API.app.trading_pg.min_trade_vol = value
- }
-
- function reset() {
- }
-
- //implicitHeight: form_layout.height
- Connections {
- target: exchange_trade
- function onBackend_priceChanged() {
- input_price.field.text = exchange_trade.backend_price
- }
- function onBackend_volumeChanged() {
- input_volume.field.text = exchange_trade.backend_volume
- }
- }
- ColumnLayout {
- id: form_layout
- width: parent.width
-
- ColumnLayout {
- Layout.alignment: Qt.AlignTop
-
- Layout.fillWidth: true
- spacing: 15
- Layout.topMargin: 20
- Item {
- Layout.fillWidth: true
- Layout.bottomMargin: input_volume.field.font.pixelSize
- height: input_volume.height
-
- DexAmountField {
- id: input_price
-
- width: parent.width
- leftText: qsTr("Price")
- rightText: atomic_qt_utilities.retrieve_main_ticker(right_ticker)
- field.enabled: !(API.app.trading_pg.preffered_order.price!==undefined)
- field.text: backend_price
- field.onTextChanged: setPrice(value)
-
- DefaultTooltip {
- visible: handler.containsMouse
- width: 200
- contentItem: DefaultText {
- text_value: qsTr("Cancel selected order to change price")
- wrapMode: DefaultText.Wrap
- width: 200
- }
- delay: 200
- }
- Rectangle {
- width: parent.width
- height: parent.height
- radius: 4
- color: Style.colorTheme9
- opacity: .8
- visible: !parent.field.enabled
- MouseArea {
- id: handler
- anchors.fill: parent
- hoverEnabled: true
- }
- }
-
- }
-
- DefaultText {
- id: price_usd_value
- anchors.right: input_price.right
- anchors.top: input_price.bottom
- anchors.topMargin: 7
-
- text_value: General.getFiatText(non_null_price, right_ticker)
- font.pixelSize: input_price.field.font.pixelSize
-
- CexInfoTrigger {}
- }
- }
-
-
- Item {
- Layout.fillWidth: true
- Layout.bottomMargin: input_volume.field.font.pixelSize
- height: input_volume.height
-
- DexAmountField {
- id: input_volume
- width: parent.width
- leftText: qsTr("Volume")
- rightText: atomic_qt_utilities.retrieve_main_ticker(left_ticker)
- field.placeholderText: sell_mode ? qsTr("Amount to sell") : qsTr("Amount to receive")
-
- field.text: API.app.trading_pg.volume
- field.onTextChanged: setVolume(value)
- }
-
- DefaultText {
- anchors.right: input_volume.right
- anchors.top: input_volume.bottom
- anchors.topMargin: price_usd_value.anchors.topMargin
-
- text_value: General.getFiatText(non_null_volume, left_ticker)
- font.pixelSize: input_volume.field.font.pixelSize
-
- CexInfoTrigger {}
- }
- }
-
- DexRangeSlider
- {
- id: _volumeRange
-
- property real oldSecondValue: 0
- property real oldFirstValue: 0
-
- function getRealValue() { return first.position * (first.to - first.from) }
- function getRealValue2() { return second.position * (second.to - second.from) }
-
- enabled: input_volume.field.enabled && !(!sell_mode && General.isZero(non_null_price)) && to > 0
-
- Layout.preferredWidth: parent.width - 20
-
- rangeBackgroundColor: Style.colorTheme7
- rangeDistanceColor: sell_mode? Style.colorRed : Style.colorGreen
- from: API.app.trading_pg.orderbook.current_min_taker_vol
- to: Math.max(0, parseFloat(max_volume))
-
- first.value: parseFloat(API.app.trading_pg.min_trade_vol)
-
- firstDisabled: !_useCustomMinTradeAmountCheckbox.checked
- defaultFirstValue: parseFloat(API.app.trading_pg.min_trade_vol)
-
- firstTooltip.text: qsTr("Minimum volume: %1").arg(General.formatDouble(first.value, General.getRecommendedPrecision(second.value)))
- second.value: parseFloat(non_null_volume)
- secondTooltip.text: qsTr("Volume: %1").arg(General.formatDouble(second.value, General.getRecommendedPrecision(to)))
-
- first.onValueChanged: if (first.pressed) setMinimumAmount(General.formatDouble(first.value))
- second.onValueChanged: if (second.pressed) setVolume(General.formatDouble(second.value))
- second.onPressedChanged: if (second.pressed) oldSecondValue = second.value
-
- DexLabel
- {
- anchors.left: parent.right
- anchors.leftMargin: 8
- anchors.verticalCenter: parent.verticalCenter
-
- text: General.cex_icon
-
- DefaultMouseArea
- {
- anchors.fill: parent
- hoverEnabled: true
-
- onClicked: _sliderHelpModal.open()
-
- DefaultTooltip
- {
- visible: parent.containsMouse
- delay: 500
-
- contentItem: DefaultText
- {
- text_value: qsTr("How it works ?")
- wrapMode: DefaultText.Wrap
- width: 300
- }
- }
- }
-
- ModalLoader
- {
- id: _sliderHelpModal
- sourceComponent: HelpModal
- {
- title: qsTr("How to use the pro-view slider ?")
- helpSentence: qsTr("This slider is used to setup the order requirements you need.\nLeft slider: Sets the minimum amount required to process a trade.\nRight slider: Sets the volume you want to trade.")
- }
- }
- }
- }
-
- DexCheckBox
- {
- id: _useCustomMinTradeAmountCheckbox
-
- Layout.topMargin: 15
- Layout.alignment: Qt.AlignHCenter
-
- text: qsTr("Use custom minimum trade amount")
- font.pixelSize: 13
- onPressed:
- {
- if (!checked)
- {
- _volumeRange.oldFirstValue = _volumeRange.defaultFirstValue
- }
- else
- {
- _volumeRange.defaultFirstValue = API.app.trading_pg.orderbook.current_min_taker_vol
- _volumeRange.first.value = API.app.trading_pg.orderbook.current_min_taker_vol
- }
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/TradeBox/SellBox.qml b/atomic_defi_design/qml/Exchange/Trade/TradeBox/SellBox.qml
deleted file mode 100644
index 835ff627df..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/TradeBox/SellBox.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-import Qt.labs.settings 1.0
-import AtomicDEX.MarketMode 1.0
-
-import "../../../Components"
-import "../../../Constants"
-import "../../../Wallet"
-
-Item {
- property alias can_submit_trade: form_base.can_submit_trade
- property alias formBase: form_base
- Layout.preferredHeight: sell_mode? 350 : 45
- Behavior on Layout.preferredHeight {
- NumberAnimation {
- duration: 200
- }
- }
- //color: Style.colorTheme
- Layout.fillWidth: true
- //radius: sell_mode? 4 : 3
- //border.color: Style.colorRed
- //color: Style.colorTheme6
- opacity: mouse_area.containsMouse? 1 : sell_mode? 1 : .35
-
- Rectangle {
- visible: false
- width: parent.width
- height: 45
- color: Style.colorRed
- radius: 6
- Rectangle {
- anchors.bottom: parent.bottom
- width: parent.width
- height: parent.radius
- color: Style.colorTheme6
- }
-
- DefaultText {
- anchors.centerIn: parent
- anchors.verticalCenterOffset: -2
- text: qsTr("Sell")+" "+ atomic_qt_utilities.retrieve_main_ticker(left_ticker)
- color: Qaterial.Colors.gray200
- font.pixelSize: Style.textSize1
- }
- }
- OrderForm {
- id: form_base
- y: 45
- width: parent.width-25
- height: parent.height-45
- //clip: true
- visible: sell_mode
- border.color: 'transparent'
- color: 'transparent'
- anchors.horizontalCenter: parent.horizontalCenter
-
- }
-
-
-
-
-
-
- DefaultMouseArea {
- anchors.fill: parent
- id: mouse_area
- visible: !sell_mode
- hoverEnabled: true
- onClicked: setMarketMode(MarketMode.Sell)
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Trading/Items/TotalView.qml b/atomic_defi_design/qml/Exchange/Trade/Trading/Items/TotalView.qml
deleted file mode 100644
index dfc6001da9..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Trading/Items/TotalView.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.15
-
-import Qaterial 1.0 as Qaterial
-import Qt.labs.settings 1.0
-
-import AtomicDEX.MarketMode 1.0
-import AtomicDEX.TradingError 1.0
-
-
-import "../../../../Components"
-import "../../../../Constants"
-
-
-Item {
- anchors.fill: parent
- anchors.topMargin: 0
- Item {
- width: parent.width
- height: 140
- Column {
- width: parent.width-15
- anchors.horizontalCenter: parent.horizontalCenter
- spacing: 5
- leftPadding: 10
- rightPadding: 10
- RowLayout {
- width: parent.width
- height: 30
- DefaultText {
- color: theme.foregroundColor
- text: "TOTAL "+API.app.settings_pg.current_fiat+" "+General.cex_icon
- font.pixelSize: 14
- font.weight: Font.Normal
- opacity: .6
- CexInfoTrigger {}
- }
- Item {
- height: 30
- Layout.fillWidth: true
- DefaultText {
- anchors.verticalCenter: parent.verticalCenter
- anchors.rightMargin: 20
- anchors.right: parent.right
- font.weight: Font.DemiBold
- font.pixelSize: 16
- font.family: 'lato'
- color: theme.accentColor
- text_value: General.getFiatText(total_amount, right_ticker).replace(General.cex_icon,"")
- }
- }
- }
-
- Rectangle {
- color: theme.foregroundColor
- opacity: .2
- height: 1.5
- width:parent.width-20
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- RowLayout {
- width: parent.width
- height: 30
- DexLabel {
- color: theme.foregroundColor
- text: "TOTAL "+ atomic_qt_utilities.retrieve_main_ticker(right_ticker)
- font.pixelSize: 14
- opacity: .6
- font.weight: Font.Normal
- }
- Item {
- height: 30
- Layout.fillWidth: true
- DefaultText {
- anchors.verticalCenter: parent.verticalCenter
- anchors.rightMargin: 20
- anchors.right: parent.right
- font.weight: Font.DemiBold
- font.pixelSize: 16
- font.family: 'lato'
- color: theme.accentColor
- text_value: General.formatCrypto("", total_amount, right_ticker).replace(right_ticker,"")
- }
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Exchange/Trade/Trading/TradeViewHeader.qml b/atomic_defi_design/qml/Exchange/Trade/Trading/TradeViewHeader.qml
deleted file mode 100644
index d1ee3c42d1..0000000000
--- a/atomic_defi_design/qml/Exchange/Trade/Trading/TradeViewHeader.qml
+++ /dev/null
@@ -1,198 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Material 2.15
-
-import Qaterial 1.0 as Qaterial
-import Qt.labs.settings 1.0
-
-import AtomicDEX.MarketMode 1.0
-import AtomicDEX.TradingError 1.0
-
-import AtomicDEX.TradingMode 1.0
-
-import "../" as OtherPage
-
-import "../../../Components"
-import "../../../Constants"
-
-
-Item {
- height: 40
- visible: true
- width: parent.width-5
- anchors.horizontalCenterOffset: 5
- anchors.horizontalCenter: parent.horizontalCenter
- y: -20
-
- Row {
- anchors.right: parent.right
- anchors.verticalCenter: parent.verticalCenter
- spacing: 5
- Rectangle {
- width: _learnRow.implicitWidth+15
- height: 25
- radius: height/2
- visible: false
- Behavior on color {
- ColorAnimation {
- duration: 150
- }
- }
- color: tuto_area.containsMouse? 'transparent' : theme.accentColor
- Row {
- id: _learnRow
- anchors.centerIn: parent
- spacing: 10
- Qaterial.ColorIcon {
- source: Qaterial.Icons.televisionPlay
- anchors.verticalCenter: parent.verticalCenter
- iconSize: 15
- color: tuto_area.containsMouse? theme.accentColor : theme.surfaceColor
- }
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- font.weight: Font.Medium
- color: tuto_area.containsMouse? theme.accentColor : theme.surfaceColor
- text: qsTr("How to trade")
- }
- }
- DexMouseArea {
- id: tuto_area
- hoverEnabled: true
- anchors.fill: parent
- }
- }
- Rectangle {
- width: _faqRow.implicitWidth+15
- height: 25
- radius: height/2
- visible: false
- Behavior on color {
- ColorAnimation {
- duration: 150
- }
- }
- color: faq_area.containsMouse? 'transparent' : theme.accentColor
- Row {
- id: _faqRow
- anchors.centerIn: parent
- spacing: 10
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- font.weight: Font.Medium
- color: faq_area.containsMouse? theme.accentColor : theme.surfaceColor
- text: qsTr("FAQ")
- }
- }
- DexMouseArea {
- id: faq_area
- hoverEnabled: true
- anchors.fill: parent
- }
- }
- Rectangle {
- width: 40
- height: 25
- visible: API.app.trading_pg.current_trading_mode == TradingMode.Pro
- radius: height/2
- Behavior on color {
- ColorAnimation {
- duration: 150
- }
- }
- color: cog_area.containsMouse? 'transparent' : API.app.trading_pg.current_trading_mode == TradingMode.Pro ? _viewLoader.item.dexConfig.visible? 'transparent' : theme.accentColor : theme.accentColor
- Row {
- anchors.centerIn: parent
- spacing: 10
- Qaterial.ColorIcon {
- source: Qaterial.Icons.cog
- anchors.verticalCenter: parent.verticalCenter
- iconSize: 15
- color: cog_area.containsMouse? theme.accentColor : API.app.trading_pg.current_trading_mode == TradingMode.Pro ? _viewLoader.item.dexConfig.visible? theme.accentColor : theme.surfaceColor : theme.surfaceColor
- }
- }
- DexMouseArea {
- id: cog_area
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- if(API.app.trading_pg.current_trading_mode == TradingMode.Pro) {
- if(_viewLoader.item.dexConfig.visible){
- _viewLoader.item.dexConfig.close()
- }else {
- _viewLoader.item.dexConfig.openAt(mapToItem(Overlay.overlay, width / 2, height), Item.Top)
- }
- }
- }
- }
- }
- }
-
- RowLayout {
- anchors.fill: parent
- spacing: 5
- Item {
- Layout.preferredWidth: 140
- Layout.fillHeight: true
- Rectangle {
- id: background_rect
- width: 70
- height: 20
- radius: 20
- anchors.verticalCenter: parent.verticalCenter
- color: theme.accentColor
- Behavior on x {
- NumberAnimation {
- duration: 200
- }
- }
- x: API.app.trading_pg.current_trading_mode != TradingMode.Pro ? 0 : 70
- }
- RowLayout {
- anchors.fill: parent
- spacing: 0
- DexLabel {
- text: "Simple"
- Layout.preferredWidth: 70
- Layout.fillHeight: true
- verticalAlignment: Text.AlignVCenter
- horizontalAlignment: Text.AlignHCenter
- font.bold: true
- color: background_rect.x === 0 ? theme.surfaceColor : simple_area.containsMouse ? theme.accentColor : theme.foregroundColor
- DexMouseArea {
- id: simple_area
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- background_rect.x = 0
- API.app.trading_pg.current_trading_mode = TradingMode.Simple
- }
- }
- }
- DexLabel {
- text: "Pro"
- Layout.preferredWidth: 70
- Layout.fillHeight: true
- verticalAlignment: Text.AlignVCenter
- horizontalAlignment: Text.AlignHCenter
- font.bold: true
- color: background_rect.x !== 0 ? theme.surfaceColor : pro_area.containsMouse ? theme.accentColor : theme.foregroundColor
- DexMouseArea {
- id: pro_area
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- background_rect.x = 70
- API.app.trading_pg.current_trading_mode = TradingMode.Pro
- }
- }
- }
- }
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- }
- }
-}
diff --git a/atomic_defi_design/qml/Portfolio/AssetPieChart.qml b/atomic_defi_design/qml/Portfolio/AssetPieChart.qml
deleted file mode 100644
index e2e3bff892..0000000000
--- a/atomic_defi_design/qml/Portfolio/AssetPieChart.qml
+++ /dev/null
@@ -1,255 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtWebEngine 1.8
-
-import QtGraphicalEffects 1.0
-import QtCharts 2.3
-import Qaterial 1.0 as Qaterial
-import ModelHelper 0.1
-
-import AtomicDEX.WalletChartsCategories 1.0
-
-import "../Components"
-import "../Constants"
-
-// Portfolio
-Item {
- property alias pieTimer2: pieTimer
- function refresh() {
- pieSeries.clear()
- for (var i = 0; i < portfolio_mdl.pie_chart_proxy_mdl.rowCount(); i++) {
- let data = portfolio_mdl.pie_chart_proxy_mdl.get(i)
- addItem(data)
- }
- }
- function addItem(value) {
- var item = pieSeries.append(value.ticker, value.main_currency_balance)
- item.labelColor = 'white'
- item.color = Qt.lighter(Style.getCoinColor(value.ticker))
- item.borderColor = theme.backgroundColor
- item.borderWidth = 2
- item.holeSize = 1
- item.labelFont = theme.textType.body2
- item.hovered.connect(function (state) {
- if (state) {
- item.explodeDistanceFactor = 0.01
- portfolio.currentTotal = API.app.settings_pg.current_fiat_sign + " " + value.main_currency_balance
- portfolio.currentValue = value.balance + " " + item.label
- item.color = Qt.lighter(Qt.lighter(Style.getCoinColor(value.ticker)))
- } else {
- item.explodeDistanceFactor = 0.01
- portfolio.currentValue = ""
- portfolio.currentTotal = ""
- item.color = Style.getCoinColor(value.ticker)
- }
- })
- }
- Timer {
- id: pieTimer
- interval: 500
- onTriggered: {
- refresh()
- }
- }
- DexRectangle {
- y: 35
- height: parent.height
- width: parent.width
- anchors.centerIn: parent
- RowLayout {
- anchors.fill: parent
- spacing: 0
- Item {
- Layout.preferredWidth: (parent.width / 2) - 150
- Layout.fillHeight: true
- ChartView {
- id: _chartView
-
- width: 620
- height: 620
- theme: ChartView.ChartView.ChartThemeLight
- antialiasing: true
- legend.visible: false
- smooth: true
- scale: portfolio.isUltraLarge? 1 : 0.7
- Behavior on scale {
- NumberAnimation {
- duration: 200
- }
- }
- y: portfolio.isUltraLarge? -55 : -150
- backgroundColor: 'transparent'
-
- anchors.centerIn: parent
- dropShadowEnabled: true
-
- PieSeries {
- id: pieSeries
- }
- Rectangle {
- anchors.centerIn: parent
- color: theme.backgroundColor
- width: 370
- height: width
- radius: width / 2
- Column {
- anchors.centerIn: parent
- spacing: 5
- DefaultText {
- anchors.horizontalCenter: parent.horizontalCenter
- text_value: currentTotal !== "" ? currentTotal : General.formatFiat("", API.app.portfolio_pg.balance_fiat_all, API.app.settings_pg.current_currency)
- font: theme.textType.head4
- color: Qt.lighter(
- Style.colorWhite4,
- currency_change_button.containsMouse ? Style.hoverLightMultiplier : 1.0)
- privacy: true
- DexFadebehavior on text {
- fadeDuration: 100
- }
- Component.onCompleted: {
- font.family = 'Lato'
- }
- }
- DefaultText {
- anchors.horizontalCenter: parent.horizontalCenter
- text_value: portfolio.currentValue
- font: theme.textType.body2
- DexFadebehavior on text {
- fadeDuration: 100
- }
- color: Qt.lighter(
- theme.foregroundColor, 0.6)
- privacy: true
- Component.onCompleted: {
- font.family = 'Lato'
- }
- }
- DefaultText {
- id: count_label
- anchors.horizontalCenter: parent.horizontalCenter
- text_value: portfolio_helper.count + " " + qsTr(
- "Assets")
- font: theme.textType.body2
- DexFadebehavior on text {
- fadeDuration: 100
- }
- color: Qt.lighter(
- theme.foregroundColor, 0.8)
- privacy: true
- visible: portfolio.currentValue == ""
-
- Component.onCompleted: {
- font.family = 'Lato'
- }
- }
- }
- DefaultMouseArea {
- id: currency_change_button
-
- width: parent.width - 100
- height: parent.height - 100
- anchors.centerIn: parent
-
- hoverEnabled: true
- onClicked: {
- const current_fiat = API.app.settings_pg.current_currency
- const available_fiats = API.app.settings_pg.get_available_currencies()
- const current_index = available_fiats.indexOf(
- current_fiat)
- const next_index = (current_index + 1)
- % available_fiats.length
- const next_fiat = available_fiats[next_index]
- API.app.settings_pg.current_currency = next_fiat
- }
- }
- }
- Rectangle {
- anchors.centerIn: parent
- width: 295
- height: width
- color: 'transparent'
- radius: width/2
- border.width: API.app.portfolio_pg.balance_fiat_all > 0 ? 0 : 5
- border.color: Qt.lighter(theme.backgroundColor)
- }
- }
- }
- Item {
- Layout.preferredWidth: (parent.width/2) + 150
- Layout.fillHeight: true
- Item {
- scale: portfolio.isUltraLarge? 1 : 0.95
- y: 10
- Behavior on scale {
- NumberAnimation {
- duration: 200
- }
- }
- width: parent.width-100
- anchors.verticalCenter: parent.verticalCenter
- height: !portfolio.isUltraLarge? _pieColumn.height > 300 ? 300 : _pieColumn.height : _pieColumn.height > 550 ? 550 :_pieColumn.height
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
-
- anchors.horizontalCenter: parent.horizontalCenter
- Flickable {
- anchors.fill: parent
- contentHeight: _pieColumn.height
- clip: true
- Column {
- id: _pieColumn
- width: parent.width
- Repeater {
- model: portfolio_mdl.pie_chart_proxy_mdl
-
- RowLayout {
- id: rootItem
- property color itemColor: Style.getCoinColor(
- ticker)
- width: parent.width
- height: 50
- spacing: 20
- DexLabel {
- Layout.preferredWidth: 60
- text: ticker
- Layout.alignment: Qt.AlignVCenter
- Component.onCompleted: font.weight = Font.Medium
- }
- Rectangle {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- height: 8
- radius: 10
- color: theme.dexBoxBackgroundColor
- Rectangle {
- height: parent.height
- width: (parseFloat(percent_main_currency) * parent.width) / 100
- radius: 10
- color: rootItem.itemColor
- }
- }
-
- DexLabel {
- text: percent_main_currency + " %"
- Component.onCompleted: font.family = 'lato'
- Layout.alignment: Qt.AlignVCenter
- }
- }
- }
- }
- }
-
- }
- }
- }
-
-
-
-
-
- }
-}
diff --git a/atomic_defi_design/qml/Portfolio/PieItem.qml b/atomic_defi_design/qml/Portfolio/PieItem.qml
deleted file mode 100644
index aec7c5a8f2..0000000000
--- a/atomic_defi_design/qml/Portfolio/PieItem.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import QtCharts 2.3
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-PieSlice {
- label: "XRP"; value: 10; color: Qaterial.Colors.yellow500;
- borderColor: theme.backgroundColor
- labelColor: 'white'; labelFont: theme.textType.head5
- borderWidth: 3
- Behavior on explodeDistanceFactor {
- NumberAnimation {
- duration: 150
- }
- }
-
- onHovered: {
- if(state){
- exploded = true
- explodeDistanceFactor = 0.13
- labelVisible= true;
- }else {
- exploded = false
- labelVisible= false
- explodeDistanceFactor = 0.0
- borderWidth = 1
- }
- }
-}
diff --git a/atomic_defi_design/qml/Portfolio/Portfolio.qml b/atomic_defi_design/qml/Portfolio/Portfolio.qml
deleted file mode 100644
index e0616a98dd..0000000000
--- a/atomic_defi_design/qml/Portfolio/Portfolio.qml
+++ /dev/null
@@ -1,272 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtWebEngine 1.8
-
-import QtGraphicalEffects 1.0
-import QtCharts 2.3
-import Qaterial 1.0 as Qaterial
-import ModelHelper 0.1
-
-import AtomicDEX.WalletChartsCategories 1.0
-
-import "../Components"
-import "../Constants"
-
-// Portfolio
-Item {
- id: portfolio
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.bottomMargin: 40
- Layout.margins: 40
- property bool isUltraLarge: width > 1400
- property bool isSpline: false
- function getPercent(fiat_amount) {
- const portfolio_balance = parseFloat(
- API.app.portfolio_pg.balance_fiat_all)
- if (fiat_amount <= 0 || portfolio_balance <= 0)
- return "-"
-
- return General.formatPercent(
- (100 * fiat_amount / portfolio_balance).toFixed(2), false)
- }
-
- property string total: General.formatFiat(
- "", API.app.portfolio_pg.balance_fiat_all,
- API.app.settings_pg.current_currency)
- readonly property int sort_by_name: 0
- readonly property int sort_by_value: 1
- readonly property int sort_by_change: 3
- readonly property int sort_by_trend: 4
- readonly property int sort_by_price: 5
- property string currentValue: ""
- property string currentTotal: ""
- property var portfolio_helper: portfolio_mdl.pie_chart_proxy_mdl.ModelHelper
-
- property int current_sort: sort_by_value
- property bool ascending: false
-
- function applyCurrentSort() {
- // Apply the sort
- switch (current_sort) {
- case sort_by_name:
- portfolio_coins.sort_by_name(ascending)
- break
- case sort_by_value:
- portfolio_coins.sort_by_currency_balance(ascending)
- break
- case sort_by_price:
- portfolio_coins.sort_by_currency_unit(ascending)
- break
- case sort_by_trend:
- case sort_by_change:
- portfolio_coins.sort_by_change_last24h(ascending)
- break
- }
- }
-
- onTotalChanged: {
- pie.refresh()
- pie.pieTimer2.restart()
- }
- Component.onCompleted: {
- reset()
- }
-
- function reset() {
- input_coin_filter.reset()
- }
-
- function updateChart(chart, historical, color) {
- chart.removeAllSeries()
-
- let i
- if (historical.length > 0) {
- // Fill chart
- let series = chart.createSeries(ChartView.SeriesTypeSpline,
- "Price", chart.axes[0],
- chart.axes[1])
-
- series.style = Qt.SolidLine
- series.color = color
-
- let min = 999999999
- let max = -999999999
- for (i = 0; i < historical.length; ++i) {
- let price = historical[i]
- series.append(i / historical.length, historical[i])
- min = Math.min(min, price)
- max = Math.max(max, price)
- }
-
- chart.axes[1].min = min * 0.99
- chart.axes[1].max = max * 1.01
- }
-
- // Hide background grid
- for (i = 0; i < chart.axes.length; ++i)
- chart.axes[i].visible = false
- }
-
- Flickable {
- id: flick
- anchors.fill: parent
- anchors.topMargin: 90
- contentHeight: _column.height
- clip: true
- onHeightChanged: console.log(height)
- Column {
- id: _column
- topPadding: 10
- width: parent.width
- spacing: 35
-
- Item {
- width: parent.width
- anchors.horizontalCenter: parent.horizontalCenter
- visible: true
- height: portfolio.isUltraLarge ? 600 : 350
- RowLayout {
- anchors.fill: parent
- anchors.rightMargin: 40
- anchors.leftMargin: 40
- spacing: 35
- AmountChart {
- id: willyBG
- Layout.fillHeight: true
- Layout.fillWidth: true
- visible: false
- }
-
- AssetPieChart {
- id: pie
- Layout.fillWidth: true
- Layout.preferredHeight: portfolio.isUltraLarge ? 600 : 350
- Layout.alignment: Qt.AlignTop
- }
- }
- }
- Item {
- width: parent.width
- height: 30
- visible: true
- Item {
- anchors.fill: parent
- anchors.leftMargin: 40
- anchors.rightMargin: 40
- anchors.topMargin: 5
- RowLayout {
- anchors.fill: parent
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- DefaultSwitch {
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Show only coins with balance")
- checked: portfolio_coins.with_balance
- onCheckedChanged: portfolio_coins.with_balance = checked
-
- DexLabel
- {
- anchors.left: parent.right
- anchors.leftMargin: 5
- anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: 1
-
- font.pixelSize: 12
-
- text: qsTr("(%1/%2)").arg(coinsList.innerList.count).arg(portfolio_mdl.length)
- }
- }
- }
- DexTextField {
- id: input_coin_filter
- implicitHeight: 45
- function reset() {
- if (text === "")
- resetCoinFilter()
- else
- text = ""
- }
-
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 250
- height: 60
-
- placeholderText: qsTr("Search")
-
- onTextChanged: {
- portfolio_coins.setFilterFixedString(text)
- }
-
- width: 120
- }
- }
- }
- }
-
- TableDex
- {
- id: coinsList
- }
-
- Item {
- width: 1
- height: 10
- }
- }
- }
- Item {
- width: parent.width
- height: 80
- visible: true
-
- RowLayout {
- anchors.fill: parent
- anchors.leftMargin: 40
- anchors.rightMargin: 40
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- DexLabel {
- font: theme.textType.head4
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Portfolio")
- }
- }
- Item {
-
- Row {
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- Qaterial.ExtendedFabButton {
- width: 250
- backgroundColor: theme.accentColor
- foregroundColor: theme.foregroundColor
- Row {
- anchors.centerIn: parent
- spacing: 6
- Qaterial.ColorIcon {
- source: Qaterial.Icons.plus
- color: theme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- }
- DexLabel {
- text: qsTr("Add asset")
- anchors.verticalCenter: parent.verticalCenter
- }
- }
- onClicked: enable_coin_modal.open()
- }
- }
-
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: 200
-
- width: 120
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Portfolio/SmartChartView.qml b/atomic_defi_design/qml/Portfolio/SmartChartView.qml
deleted file mode 100644
index 3895505df5..0000000000
--- a/atomic_defi_design/qml/Portfolio/SmartChartView.qml
+++ /dev/null
@@ -1,142 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtWebEngine 1.8
-
-import QtGraphicalEffects 1.0
-import QtCharts 2.3
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-// Portfolio
-Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 600
- InnerBackground {
- id: price_graph_bg
- radius: 20
- anchors.fill: parent
- content: Item {
- property bool ticker_supported: false
- readonly property bool is_fetching: chart.loadProgress < 100
- readonly property string chartTheme: Style.dark_theme ? "dark" : "light"
- property color backgroundColor: theme.chartTradingLineBackgroundColor
- property var ticker: api_wallet_page.ticker
-
- function loadChart() {
- const pair = atomic_qt_utilities.retrieve_main_ticker(ticker) + "/" + atomic_qt_utilities.retrieve_main_ticker(API.app.settings_pg.current_currency)
- const pair_reversed = atomic_qt_utilities.retrieve_main_ticker(API.app.settings_pg.current_currency) + "/" + atomic_qt_utilities.retrieve_main_ticker(ticker)
- const pair_usd = atomic_qt_utilities.retrieve_main_ticker(ticker) + "/" + "USD"
- const pair_usd_reversed = "USD" + "/" + atomic_qt_utilities.retrieve_main_ticker(ticker)
- const pair_busd = atomic_qt_utilities.retrieve_main_ticker(ticker) + "/" + "BUSD"
- const pair_busd_reversed = "BUSD" + "/" + atomic_qt_utilities.retrieve_main_ticker(ticker)
-
- // Normal pair
- let symbol = General.supported_pairs[pair]
- if (!symbol) {
- console.log("Symbol not found for", pair)
- symbol = General.supported_pairs[pair_reversed]
- }
-
- // Reversed pair
- if (!symbol) {
- console.log("Symbol not found for", pair_reversed)
- symbol = General.supported_pairs[pair_usd]
- }
-
- // Pair with USD
- if (!symbol) {
- console.log("Symbol not found for", pair_usd)
- symbol = General.supported_pairs[pair_usd_reversed]
- }
-
- // Reversed pair with USD
- if (!symbol) {
- console.log("Symbol not found for", pair_usd_reversed)
- symbol = General.supported_pairs[pair_busd]
- }
-
- // Pair with BUSD
- if (!symbol) {
- console.log("Symbol not found for", pair_busd)
- symbol = General.supported_pairs[pair_busd_reversed]
- }
-
- // Reversed pair with BUSD
- if (!symbol) {
- console.log("Symbol not found for", pair_busd_reversed)
- ticker_supported = false
- return
- }
-
- ticker_supported = true
-
- console.debug("Wallet: Loading chart for %1".arg(symbol))
-
- chart.loadHtml(`
-
-
-
- `.arg(theme.backgroundColor).arg(theme.chartTradingLineColor).arg(theme.chartTradingLineBackgroundColor))
- }
-
- width: price_graph_bg.width
- height: price_graph_bg.height
-
- onTickerChanged: loadChart()
- onChartThemeChanged: loadChart()
- onBackgroundColorChanged: loadChart()
-
- RowLayout {
- visible: ticker_supported && !chart.visible
- anchors.centerIn: parent
-
- DefaultBusyIndicator {
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: -15
- Layout.rightMargin: Layout.leftMargin*0.75
- scale: 0.5
- }
-
- DefaultText {
- text_value: qsTr("Loading market data") + "..."
- }
- }
-
- DefaultText {
- visible: !ticker_supported
- text_value: qsTr("There is no chart data for this ticker yet")
- anchors.centerIn: parent
- }
-
- WebEngineView {
- id: chart
- anchors.fill: parent
- anchors.margins: -1
- visible: !is_fetching && ticker_supported
- }
- }
- }
- }
diff --git a/atomic_defi_design/qml/Portfolio/TableDex.qml b/atomic_defi_design/qml/Portfolio/TableDex.qml
deleted file mode 100644
index d5edf19943..0000000000
--- a/atomic_defi_design/qml/Portfolio/TableDex.qml
+++ /dev/null
@@ -1,358 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtWebEngine 1.8
-
-import QtGraphicalEffects 1.0
-import QtCharts 2.3
-import Qaterial 1.0 as Qaterial
-import ModelHelper 0.1
-
-import AtomicDEX.WalletChartsCategories 1.0
-
-import "../Components"
-import "../Constants"
-
-Item {
- property alias innerList: list
-
- width: parent.width
- height: 150+(list.count*65)
- visible: true
- Item {
- anchors.fill: parent
- anchors.margins: 15
- anchors.leftMargin: 40
- anchors.rightMargin: 40
- Rectangle {
- width: parent.width
- height: 60
- color: Qt.darker(theme.backgroundColor, 0.8)
- RowLayout {
- anchors.fill: parent
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- ColumnHeader {
- id: coin_header
- icon_at_left: true
- anchors.left: parent.left
- anchors.leftMargin: 40
- anchors.verticalCenter: parent.verticalCenter
-
- text: qsTr("Asset")
- sort_type: sort_by_name
- }
- }
- Item {
- Layout.preferredWidth: 50
- Layout.fillHeight: true
-
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
-
- ColumnHeader {
- id: balance_header
- icon_at_left: true
- anchors.verticalCenter: parent.verticalCenter
-
- text: qsTr("Balance")
- sort_type: sort_by_value
- }
- }
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 140
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
- ColumnHeader {
- id: change_24h_header
- icon_at_left: false
- anchors.verticalCenter: parent.verticalCenter
-
- //text: qsTr("Change 24h")
- DefaultText {
- id: title
- text: qsTr("Change 24h")
- anchors.verticalCenter: parent.verticalCenter
- }
- sort_type: sort_by_change
- }
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- visible: app.width>1370
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
- ColumnHeader {
- id: trend_7d_header
- icon_at_left: false
- anchors.verticalCenter: parent.verticalCenter
- DefaultText {
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- }
- sort_type: sort_by_trend
- }
- DefaultText {
- text: qsTr("Trend 7d")
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenter: parent.horizontalCenter
- }
- }
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 140
- ColumnHeader {
- id: price_header
- icon_at_left: false
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 10
-
- text: qsTr("Price")
- sort_type: sort_by_price
- }
- }
- }
- }
- DefaultListView {
- id: list
- visible: true
- y: 60
- width: parent.width
- height: parent.height - 50
- interactive: false
- model: portfolio_coins
- cacheBuffer: 2000
- scrollbar_visible: false
-
- delegate: AnimatedRectangle {
- color: Qt.lighter(
- mouse_area.containsMouse ? theme.hightlightColor : index % 2 !== 0 ? Qt.darker(theme.backgroundColor, 0.8) : "transparent",
- mouse_area.containsMouse ? Style.hoverLightMultiplier : 1.0)
- width: list.width
- height: 65
- AnimatedRectangle {
- id: main_color
- color: Style.getCoinColor(ticker)
- width: 10
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- visible: false
- }
-
- // Click area
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- hoverEnabled: true
- acceptedButtons: Qt.LeftButton | Qt.RightButton
- onClicked: {
- if (!can_change_ticker)
- return
-
- if (mouse.button === Qt.RightButton)
- context_menu.popup()
- else {
- api_wallet_page.ticker = ticker
- dashboard.current_page = idx_dashboard_wallet
- }
- }
- onPressAndHold: {
- if (!can_change_ticker)
- return
-
- if (mouse.source === Qt.MouseEventNotSynthesized)
- context_menu.popup()
- }
- }
-
- // Right click menu
- CoinMenu {
- id: context_menu
- }
- RowLayout {
- anchors.fill: parent
- spacing: 5
- Item {
- Layout.preferredWidth: 50
- Layout.fillHeight: true
- DefaultImage {
- id: icon
- source: General.coinIcon(ticker)
- width: Style.textSize2
- anchors.centerIn: parent
- }
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- DefaultText {
- id: coin_name
- text_value: name
- bottomPadding: 20
- font: theme.textType.body2
- anchors.verticalCenter: parent.verticalCenter
- }
- DefaultText {
- id: type_tag
- anchors.bottom: coin_name.bottom
-
- text: model.type
- font: theme.textType.overLine
- opacity: .7
- color: Style.getCoinTypeColor(model.type)
- }
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
- DefaultText {
- id: balance_value
- font: theme.textType.body2
-
- text_value: General.formatCrypto(
- "", balance, ticker,
- main_currency_balance,
- API.app.settings_pg.current_currency)
- color: Qt.darker(theme.foregroundColor, 0.8)
- anchors.verticalCenter: parent.verticalCenter
- privacy: true
- }
-
- }
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 140
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
- DefaultText {
- id: change_24h_value
- font: theme.textType.body2
- text_value: {
- const v = parseFloat(change_24h)
- return v === 0 ? '-' : General.formatPercent(
- v)
- }
- anchors.horizontalCenter: parent.horizontalCenter
- color: Style.getValueColor(change_24h)
- anchors.verticalCenter: parent.verticalCenter
- }
-
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- visible: app.width>1370
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
- ChartView {
- property var historical: trend_7d
- id: chart
- width: 200
- height: 100
- antialiasing: true
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- legend.visible: false
-
- function refresh() {
- updateChart(chart, historical,
- Style.getValueColor(change_24h))
- }
-
- property bool dark_theme: Style.dark_theme
- onDark_themeChanged: refresh()
- onHistoricalChanged: refresh()
- backgroundColor: "transparent"
- }
-
-
- }
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 140
- DefaultText {
- id: price_value
- anchors.right: parent.right
- anchors.rightMargin: 10
- font: theme.textType.body2
-
- text_value: General.formatFiat(
- '',
- main_currency_price_for_one_unit,
- API.app.settings_pg.current_currency)
- color: theme.colorThemeDarkLight
- anchors.verticalCenter: parent.verticalCenter
- }
- DefaultImage {
- visible: API.app.portfolio_pg.oracle_price_supported_pairs.join(
- ",").indexOf(ticker) !== -1
- source: General.coinIcon('BAND')
- width: 12
- height: width
- anchors.left: parent.right
- anchors.leftMargin: 5
-
- CexInfoTrigger {}
- }
- }
- }
- }
- footer: Item {
- width: parent.width
- height: 60
- Rectangle {
- anchors.horizontalCenter: parent.horizontalCenter
- width: parent.width-2
- height: parent.height-2
- color: 'transparent'
- border.color: theme.foregroundColor
- opacity: .15
- radius: 4
- }
- Row {
- anchors.centerIn: parent
- spacing: 10
- opacity: .5
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.plusBox
- }
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- text: "Add new asset"
- }
- }
-
- MouseArea {
- anchors.fill: parent
- cursorShape: "PointingHandCursor"
- onClicked: enable_coin_modal.open()
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Screens/Dashboard.qml b/atomic_defi_design/qml/Screens/Dashboard.qml
deleted file mode 100644
index 8784c363c6..0000000000
--- a/atomic_defi_design/qml/Screens/Dashboard.qml
+++ /dev/null
@@ -1,385 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import "../Components"
-import "../Constants"
-
-import "../Dashboard"
-import "../Portfolio"
-import "../Wallet"
-import "../Exchange"
-import "../Settings"
-import "../Support"
-import "../Sidebar"
-import "../Fiat"
-import "../Settings" as SettingsPage
-
-
-Item {
- id: dashboard
-
- readonly property int idx_dashboard_portfolio: 0
- readonly property int idx_dashboard_wallet: 1
- readonly property int idx_dashboard_exchange: 2
- readonly property int idx_dashboard_addressbook: 3
- readonly property int idx_dashboard_news: 4
- readonly property int idx_dashboard_dapps: 5
- readonly property int idx_dashboard_settings: 6
- readonly property int idx_dashboard_support: 7
- readonly property int idx_dashboard_light_ui: 8
- readonly property int idx_dashboard_privacy_mode: 9
- readonly property int idx_dashboard_fiat_ramp: 10
-
- //readonly property int idx_exchange_trade: 3
- readonly property int idx_exchange_trade: 0
- readonly property int idx_exchange_orders: 1
- readonly property int idx_exchange_history: 2
-
- property var current_ticker
-
- Layout.fillWidth: true
-
- function openLogsFolder() {
- Qt.openUrlExternally(General.os_file_prefix + API.app.settings_pg.get_log_folder())
- }
-
- readonly property var api_wallet_page: API.app.wallet_pg
- readonly property var current_ticker_infos: api_wallet_page.ticker_infos
- readonly property bool can_change_ticker: !api_wallet_page.tx_fetching_busy
-
- readonly property alias loader: loader
- readonly property alias current_component: loader.item
- property int current_page: idx_dashboard_portfolio
- onCurrent_pageChanged: {
- app.deepPage = current_page*10
- }
-
-
- readonly property bool is_dex_banned: !API.app.ip_checker.ip_authorized
-
- function inCurrentPage() {
- return app.current_page === idx_dashboard
- }
-
- property var notifications_list: ([])
-
- readonly property var portfolio_mdl: API.app.portfolio_pg.portfolio_mdl
- property var portfolio_coins: portfolio_mdl.portfolio_proxy_mdl
-
- function resetCoinFilter() {
- portfolio_coins.setFilterFixedString("")
- }
-
-
- function openTradeViewWithTicker() {
- dashboard.loader.onLoadComplete = () => {
- dashboard.current_component.openTradeView(api_wallet_page.ticker)
- }
- }
- // Al settings depends this modal
- SettingsPage.SettingModal {
- id: setting_modal
- }
-
- // Force restart modal: opened when the user has more coins enabled than specified in its configuration
- ForceRestartModal
- {
- reasonMsg: qsTr("The current number of enabled coins does not match your configuration specification. Your assets configuration will be reset.")
- Component.onCompleted:
- {
- if (API.app.portfolio_pg.portfolio_mdl.length > atomic_settings2.value("MaximumNbCoinsEnabled"))
- {
- open()
- onTimerEnded = () => { API.app.settings_pg.reset_coin_cfg() }
- }
- }
- }
-
- // Right side
- AnimatedRectangle {
- color: theme.backgroundColorDeep
- width: parent.width - sidebar.width
- height: parent.height
- x: sidebar.width
- border.color: 'transparent'
-
- // Modals
- ModalLoader {
- id: enable_coin_modal
- sourceComponent: EnableCoinModal {
- anchors.centerIn: Overlay.overlay
- }
- }
-
- Component {
- id: portfolio
-
- Portfolio {}
- }
-
- Component {
- id: wallet
-
- Wallet {}
- }
-
- Component {
- id: exchange
-
- Exchange {}
- }
-
- Component {
- id: addressbook
-
- AddressBook {}
- }
-
- Component {
- id: news
-
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- DefaultText {
- anchors.centerIn: parent
- text_value: qsTr("Content for this section will be added later. Stay tuned!")
- }
- }
- }
-
- Component {
- id: dapps
-
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- DefaultText {
- anchors.centerIn: parent
- text_value: qsTr("Content for this section will be added later. Stay tuned!")
- }
- }
- }
-
- Component {
- id: settings
-
- Settings {
- Layout.alignment: Qt.AlignCenter
- }
- }
-
- Component {
- id: support
-
- Support {
- Layout.alignment: Qt.AlignCenter
- }
- }
-
- Component {
- id: fiat_ramp
-
- FiatRamp {
-
- }
- }
-
- DefaultLoader {
- id: loader
-
- anchors.fill: parent
- transformOrigin: Item.Center
-
- sourceComponent: {
- switch(current_page) {
- case idx_dashboard_portfolio: return portfolio
- case idx_dashboard_wallet: return wallet
- case idx_dashboard_exchange: return exchange
- case idx_dashboard_addressbook: return addressbook
- case idx_dashboard_news: return news
- case idx_dashboard_dapps: return dapps
- case idx_dashboard_settings: return settings
- case idx_dashboard_support: return support
- case idx_dashboard_fiat_ramp: return fiat_ramp
- default: return undefined
- }
- }
- }
-
- Item {
- visible: !loader.visible
-
- anchors.fill: parent
-
- DefaultBusyIndicator {
- anchors.centerIn: parent
- running: !loader.visible
- }
- }
- }
-
- // Sidebar, left side
- Sidebar {
- id: sidebar
- y: -30
- }
-
- DropShadow {
- anchors.fill: sidebar
- source: sidebar
- cached: false
- horizontalOffset: 0
- verticalOffset: 0
- radius: theme.sidebarShadowRadius
- samples: 32
- spread: 0
- color: theme.colorSidebarDropShadow
- smooth: true
- }
-
- ModalLoader {
- id: add_custom_coin_modal
- sourceComponent: AddCustomCoinModal {}
- }
-
- // CEX Rates info
- ModalLoader {
- id: cex_rates_modal
- sourceComponent: CexInfoModal {}
- }
- ModalLoader {
- id: min_trade_modal
- sourceComponent: MinTradeModal {}
- }
-
- ModalLoader {
- id: restart_modal
- sourceComponent: RestartModal {}
- }
-
- function getStatusColor(status) {
- switch(status) {
- case "matching":
- return Style.colorYellow
- case "matched":
- case "ongoing":
- case "refunding":
- return Style.colorOrange
- case "successful":
- return Style.colorGreen
- case "failed":
- default:
- return Style.colorRed
- }
- }
-
- function getStatusText(status, short_text=false) {
- switch(status) {
- case "matching":
- return short_text ? qsTr("Matching") : qsTr("Order Matching")
- case "matched":
- return short_text ? qsTr("Matched") : qsTr("Order Matched")
- case "ongoing":
- return short_text ? qsTr("Ongoing") : qsTr("Swap Ongoing")
- case "successful":
- return short_text ? qsTr("Successful") : qsTr("Swap Successful")
- case "refunding":
- return short_text ? qsTr("Refunding") : qsTr("Refunding")
- case "failed":
- return short_text ? qsTr("Failed") : qsTr("Swap Failed")
- default:
- return short_text ? qsTr("Unknown") : qsTr("Unknown State")
- }
- }
-
- function isSwapDone(status) {
- switch(status) {
- case "matching":
- case "matched":
- case "ongoing":
- return false
- case "successful":
- case "refunding":
- case "failed":
- default:
- return true
- }
- }
-
- function getStatusStep(status) {
- switch(status) {
- case "matching":
- return "0/3"
- case "matched":
- return "1/3"
- case "ongoing":
- return "2/3"
- case "successful":
- return Style.successCharacter
- case "refunding":
- return Style.warningCharacter
- case "failed":
- return Style.failureCharacter
- default:
- return "?"
- }
- }
-
- function getStatusTextWithPrefix(status, short_text=false) {
- return getStatusStep(status) + " " + getStatusText(status, short_text)
- }
-
- function getEventText(event_name) {
- switch(event_name) {
- case "Started":
- return qsTr("Started")
- case "Negotiated":
- return qsTr("Negotiated")
- case "TakerFeeSent":
- return qsTr("Taker fee sent")
- case "MakerPaymentReceived":
- return qsTr("Maker payment received")
- case "MakerPaymentWaitConfirmStarted":
- return qsTr("Maker payment wait confirm started")
- case "MakerPaymentValidatedAndConfirmed":
- return qsTr("Maker payment validated and confirmed")
- case "TakerPaymentSent":
- return qsTr("Taker payment sent")
- case "TakerPaymentSpent":
- return qsTr("Taker payment spent")
- case "MakerPaymentSpent":
- return qsTr("Maker payment spent")
- case "Finished":
- return qsTr("Finished")
- case "StartFailed":
- return qsTr("Start failed")
- case "NegotiateFailed":
- return qsTr("Negotiate failed")
- case "TakerFeeValidateFailed":
- return qsTr("Taker fee validate failed")
- case "MakerPaymentTransactionFailed":
- return qsTr("Maker payment transaction failed")
- case "MakerPaymentDataSendFailed":
- return qsTr("Maker payment Data send failed")
- case "MakerPaymentWaitConfirmFailed":
- return qsTr("Maker payment wait confirm failed")
- case "TakerPaymentValidateFailed":
- return qsTr("Taker payment validate failed")
- case "TakerPaymentWaitConfirmFailed":
- return qsTr("Taker payment wait confirm failed")
- case "TakerPaymentSpendFailed":
- return qsTr("Taker payment spend failed")
- case "MakerPaymentWaitRefundStarted":
- return qsTr("Maker payment wait refund started")
- case "MakerPaymentRefunded":
- return qsTr("Maker payment refunded")
- case "MakerPaymentRefundFailed":
- return qsTr("Maker payment refund failed")
- default:
- return qsTr(event_name)
- }
- }
-}
diff --git a/atomic_defi_design/qml/Screens/FirstLaunch.qml b/atomic_defi_design/qml/Screens/FirstLaunch.qml
deleted file mode 100644
index 1ab707e5ad..0000000000
--- a/atomic_defi_design/qml/Screens/FirstLaunch.qml
+++ /dev/null
@@ -1,378 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.12
-
-import Qaterial 1.0 as Qaterial
-
-import QtQuick.Window 2.15
-
-import "../Components"
-import "../Constants"
-import "../Settings"
-
-SetupPage {
- // Override
- id: _setup
- property
- var onClickedNewUser: () => {}
- property
- var onClickedRecoverSeed: () => {}
- property
- var onClickedWallet: () => {}
-
-
- // Local
- function updateWallets() {
- wallets = API.app.wallet_mgr.get_wallets()
- }
-
- function onClickedLogin(password) {
- if (API.app.wallet_mgr.login(password, selected_wallet_name)) {
- console.log("Success: Login")
- app.currentWalletName = selected_wallet_name
- return true
- } else {
- console.log("Failed: Login")
- return false
- }
- }
- property
- var wallets: ([])
-
- image_path: (bottomDrawer.y === 0 && bottomDrawer.visible) ? "" : "file:///" + atomic_logo_path + "/" + theme.bigSidebarLogo
- image_margin: 30
- Drawer {
- id: bottomDrawer
- width: parent.width
- height: parent.height
- edge: Qt.BottomEdge
- dim: false //
- modal: false
- background: Item {
- DexRectangle {
- id: _drawerBG
- anchors.fill: parent
- radius: 0
- border.width: 0
- color: 'black'
- opacity: .8
- }
- Column {
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 250
- anchors.horizontalCenter: parent.horizontalCenter
- spacing: 20
- Image {
- /*width: 200
- height: 130*/
- source: "file:///" + atomic_logo_path + "/" + theme.bigSidebarLogo
- anchors.horizontalCenter: parent.horizontalCenter
- }
- DexLabel {
- anchors.horizontalCenter: parent.horizontalCenter
- text: "%1 wallet".arg(selected_wallet_name)
- topPadding: 10
- }
- Connections {
- target: bottomDrawer
- function onVisibleChanged() {
- _inputPassword.field.text = ""
- }
- }
-
- DexAppPasswordField {
- id: _inputPassword
- height: 50
- width: 300
- anchors.horizontalCenter: parent.horizontalCenter
- field.onAccepted: {
- if (_keyChecker.isValid()) {
- if (onClickedLogin(field.text)) {
- bottomDrawer.close()
- app.current_page = idx_initial_loading
- } else {
- error = true
- }
- } else {
- error = true
- }
- }
- }
- DexButton {
- radius: width
- width: 150
- text: qsTr("connect")
- color: theme.accentColor
- anchors.horizontalCenter: parent.horizontalCenter
- onClicked: {
- _inputPassword.field.accepted()
- }
- }
-
- DexKeyChecker {
- id: _keyChecker
- field: _inputPassword.field
- visible: false
- }
- }
- Qaterial.AppBarButton {
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 60
- anchors.horizontalCenter: parent.horizontalCenter
- width: 80
- icon.width: 40
- icon.height: 40
- icon.source: Qaterial.Icons.close
- onClicked: bottomDrawer.close()
- }
- }
-
- }
- content: ColumnLayout {
- id: content_column
- width: 400
- spacing: Style.rowSpacing
- opacity: (bottomDrawer.y === 0 && bottomDrawer.visible) ? .3 : 1
- RowLayout {
- Layout.fillWidth: true
- DexLabel {
- font: theme.textType.head6
- text_value: qsTr("Welcome")
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignVCenter
- }
- DexLanguage {
- Layout.preferredWidth: 55
- Layout.alignment: Qt.AlignVCenter
- }
- }
-
- Item {
- Layout.fillWidth: true
- }
-
- DexAppButton {
- Layout.fillWidth: true
- horizontalAlignment: Qt.AlignLeft
- Layout.minimumWidth: 350
- leftPadding: 20
- text: qsTr("New Wallet")
- Layout.preferredHeight: 50
- radius: 8
- backgroundColor: theme.accentColor
- onClicked: onClickedNewUser()
- }
-
- DexAppButton {
- text: qsTr("Recover Wallet")
- horizontalAlignment: Qt.AlignLeft
- backgroundColor: theme.accentColor
- leftPadding: 20
- radius: 8
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- onClicked: onClickedRecoverSeed()
- }
-
- // Wallets
- ColumnLayout {
- spacing: Style.rowSpacing
-
- visible: wallets.length > 0
-
- DexLabel {
- text_value: qsTr("My Wallets")
- font.pixelSize: Style.textSizeSmall2
- Layout.alignment: Qt.AlignHCenter
- }
- Item {
- height: 15
- Layout.fillWidth: true
- Rectangle {
- height: 2
- width: parent.width
- color: theme.accentColor
- Rectangle {
- anchors.centerIn: parent
- width: 9
- height: 9
- radius: 6
- color: theme.accentColor
- }
- }
- }
-
- DexRectangle {
- id: bg
- width: content_column.width
- readonly property int row_height: 40
- Layout.minimumHeight: row_height
- Layout.preferredHeight: row_height * Math.min(wallets.length, 3)
-
- DefaultListView {
- id: list
- implicitHeight: bg.Layout.preferredHeight
-
- model: wallets
-
- delegate: ClipRRect {
- radius: 0
- width: bg.width
- height: bg.row_height
- GradientRectangle {
-
- start_color: Style.applyOpacity(Style.colorWalletsHighlightGradient, mouse_area.containsMouse ? "80" : "00")
- end_color: Style.applyOpacity(Style.colorWalletsHighlightGradient)
-
- anchors.fill: parent
-
- Rectangle {
- height: parent.height
- width: mouse_area.containsMouse ? parent.width : 0
- opacity: .4
- Behavior on width {
- NumberAnimation {
- duration: 250
- }
- }
- color: theme.accentColor
- visible: mouse_area.containsMouse
- }
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- selected_wallet_name = model.modelData
- bottomDrawer.open()
- }
- }
-
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.account
- iconSize: 16
- x: 20
- }
- DefaultText {
- anchors.left: parent.left
- anchors.leftMargin: 45
-
- text_value: model.modelData
- anchors.verticalCenter: parent.verticalCenter
- font.pixelSize: Style.textSizeSmall2
- }
-
- HorizontalLine {
- visible: index !== wallets.length - 1
- width: parent.width - 4
-
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
- anchors.bottomMargin: -height / 2
- light: true
- }
- }
- Item {
- anchors.right: parent.right
- anchors.margins: 10
- height: parent.height
- width: 30
- Qaterial.ColorIcon {
- source: Qaterial.Icons.delete_
- iconSize: 18
- anchors.centerIn: parent
- opacity: .8
- color: _deleteArea.containsMouse ? theme.redColor : theme.foregroundColor
- }
- DexMouseArea {
- id: _deleteArea
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- let wallet_name = model.modelData
- let dialog = app.getText({
- "title": qsTr("Delete") + " %1 ".arg(wallet_name) + ("wallet?"),
- text: qsTr("Enter password to confirm deletion of") + " %1 ".arg(wallet_name) + qsTr("wallet") ,
- standardButtons: Dialog.Yes | Dialog.Cancel,
- warning: true,
- width: 300,
- iconColor: theme.redColor,
- isPassword: true,
- placeholderText: qsTr("Type password"),
- yesButtonText: qsTr("Delete"),
- cancelButtonText: qsTr("Cancel"),
- onAccepted: function(text) {
- if (API.app.wallet_mgr.confirm_password(wallet_name, text)) {
- API.app.wallet_mgr.delete_wallet(wallet_name);
- app.showText({
- title: qsTr("Wallet status"),
- text: "%1 ".arg(wallet_name) + qsTr("wallet deleted successfully"),
- standardButtons: Dialog.Ok
- })
- _setup.wallets = API.app.wallet_mgr.get_wallets()
- } else {
- app.showText({
- title: qsTr("Wallet status"),
- text: "%1 ".arg(wallet_name) + qsTr("wallet password entered is incorrect"),
- iconSource: Qaterial.Icons.alert,
- iconColor: theme.redColor,
- warning: true,
- standardButtons: Dialog.Ok
- })
- }
- dialog.close()
- dialog.destroy()
- }
-
- })
- }
- }
- }
- }
- }
- }
- }
-
-
-
- HorizontalLine {
- light: true
- }
-
- }
- Component.onCompleted: {
- updateWallets()
- }
- Connections {
- target: app
- function onCan_open_loginChanged() {
- console.log("LOGIN STATE changed")
- if (app.can_open_login) {
- bottomDrawer.open()
- app.can_open_login = false
- }
- }
- }
- GaussianBlur {
- anchors.fill: _setup
- visible: false
- source: _setup
- radius: 21
- deviation: 2
- }
- RecursiveBlur {
- visible: bottomDrawer.y === 0 && bottomDrawer.visible
- anchors.fill: _setup
- source: _setup
- radius: 2
- loops: 120
- }
-
-
-
- bottom_content: LinksRow {
- visible: !(bottomDrawer.y === 0 && bottomDrawer.visible)
- }
-}
\ No newline at end of file
diff --git a/atomic_defi_design/qml/Screens/InitialLoading.qml b/atomic_defi_design/qml/Screens/InitialLoading.qml
deleted file mode 100644
index 44987c65d2..0000000000
--- a/atomic_defi_design/qml/Screens/InitialLoading.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-import "../Wallet"
-import "../Exchange"
-import "../Sidebar"
-
-SetupPage {
- // Override
- property var onLoaded: () => {}
-
- readonly property string current_status: API.app.wallet_mgr.initial_loading_status
-
- onCurrent_statusChanged: {
- if(current_status === "complete")
- onLoaded()
- }
-
- image_path: "file:///"+ atomic_logo_path + "/"+ theme.bigSidebarLogo
- image_margin: 30
- backgroundColor: 'transparent'
- borderColor: 'transparent'
- content: ColumnLayout {
-
- DefaultBusyIndicator {
- Layout.preferredHeight: 100
- Layout.preferredWidth: 100
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: -15
- Layout.rightMargin: Layout.leftMargin*0.75
- scale: 0.8
- }
-
- DefaultText {
- text_value: qsTr("Loading, please wait")
- Layout.bottomMargin: 10
- }
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: (current_status === "initializing_mm2" ? qsTr("Initializing MM2") :
- current_status === "enabling_coins" ? qsTr("Enabling assets") : qsTr("Getting ready")) + "..."
- }
- }
-}
diff --git a/atomic_defi_design/qml/Screens/Login.qml b/atomic_defi_design/qml/Screens/Login.qml
deleted file mode 100644
index 55ba26c511..0000000000
--- a/atomic_defi_design/qml/Screens/Login.qml
+++ /dev/null
@@ -1,228 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-SetupPage {
- id: login
-
- // Override
- signal clickedBack()
- signal postLoginSuccess()
-
- // Local
- function reset() {
- text_error = ""
- }
-
- function onClickedLogin(password) {
- if(API.app.wallet_mgr.login(password, selected_wallet_name)) {
- console.log("Success: Login")
- app.currentWalletName = selected_wallet_name
- postLoginSuccess()
- return true
- }
- else {
- console.log("Failed: Login")
- text_error = qsTr("Incorrect Password")
- return false
- }
- }
-
- property string text_error
-
- image_scale: 0.7
- image_path: General.image_path + "setup-logs.svg"
-
- content: ColumnLayout {
- spacing: Style.rowSpacing
-
- function reset() {
- login.reset()
- input_password.reset()
- }
-
- function trySubmit() {
- if(!submit_button.enabled) return
-
- if(onClickedLogin(input_password.field.text))
- reset()
- }
-
- width: 400
-
- RowLayout {
- Layout.fillWidth: true
- spacing: 10
- Qaterial.AppBarButton {
- icon.source: Qaterial.Icons.arrowLeft
- Layout.alignment: Qt.AlignVCenter
- onClicked: {
- reset()
- onClickedBack()
- }
- }
-
- DexLabel {
- font: theme.textType.head6
- text_value: qsTr("Login")
- Layout.alignment: Qt.AlignVCenter
- }
-
- }
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 5
- }
-
- DexAppTextField {
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- background.border.width: 1
- background.radius: 25
- enabled: false
- opacity: enabled? 1 : .5
- background.border.color: field.focus ? theme.accentColor : Style.colorBorder
- field.font: theme.textType.head6
- field.horizontalAlignment: Qt.AlignLeft
- field.leftPadding: 75
- field.text: selected_wallet_name
-
- DexRectangle {
- x: 5
- height: 40
- width: 60
- radius: 20
- color: theme.accentColor
- anchors.verticalCenter: parent.verticalCenter
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- iconSize: 19
- source: Qaterial.Icons.account
- color: theme.surfaceColor
- }
-
- }
- }
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 5
- opacity: .8
-
- }
-
- DexAppTextField {
- id: _inputPassword
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- background.border.width: 1
- background.radius: 25
- background.border.color: field.focus ? theme.accentColor : Style.colorBorder
- field.echoMode: TextField.Password
- field.font: field.echoMode === TextField.Password ? field.text === "" ? theme.textType.body1 : theme.textType.head5 : theme.textType.head6
- field.horizontalAlignment: Qt.AlignLeft
- field.leftPadding: 75
- field.placeholderText: qsTr("Type password")
- field.onAccepted: trySubmit()
- DexRectangle {
- x: 5
- height: 40
- width: 60
- radius: 20
- color: theme.accentColor
- anchors.verticalCenter: parent.verticalCenter
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- iconSize: 19
- source: Qaterial.Icons.keyVariant
- color: theme.surfaceColor
- }
-
- }
- Qaterial.AppBarButton {
- opacity: .8
- icon {
- source: _inputPassword.field.echoMode === TextField.Password ? Qaterial.Icons.eyeOutline : Qaterial.Icons.eyeOffOutline
- color: theme.accentColor
- }
- anchors {
- verticalCenter: parent.verticalCenter
- right: parent.right
- rightMargin: 10
- }
- onClicked: {
- if( _inputPassword.field.echoMode === TextField.Password ) { _inputPassword.field.echoMode = TextField.Normal }
- else { _inputPassword.field.echoMode = TextField.Password }
- }
- }
- }
- PasswordForm {
- id: input_password
- confirm: false
- visible: false
- field.text: _inputPassword.field.text
- field.onAccepted: trySubmit()
- }
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
-
- RowLayout {
- Layout.preferredWidth: 400
- spacing: Style.buttonSpacing
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
-
- DexButton {
- id: _back
- text: qsTr("Back")
- visible: false
-
- }
-
- DexAppButton {
- id: submit_button
- text: qsTr("Login")
- enabled: input_password.isValid()
- onClicked: trySubmit()
- radius: 20
- backgroundColor: theme.accentColor
- Layout.preferredWidth: _nextRow.implicitWidth + 40
- Layout.preferredHeight: 45
- label.color: 'transparent'
- Row {
- id: _nextRow
- anchors.centerIn: parent
- spacing: 10
- opacity: submit_button.enabled ? 1 : .6
- DexLabel {
- text: qsTr("Connect")
- font: theme.textType.button
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.arrowRight
- iconSize: 14
- }
- }
- }
- }
-
- DefaultText {
- text_value: text_error
- color: Style.colorRed
- visible: text !== ''
- }
- }
-}
diff --git a/atomic_defi_design/qml/Screens/NewUser.qml b/atomic_defi_design/qml/Screens/NewUser.qml
deleted file mode 100644
index 96d173e824..0000000000
--- a/atomic_defi_design/qml/Screens/NewUser.qml
+++ /dev/null
@@ -1,634 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-SetupPage {
- id: new_user
-
- // Override
- signal clickedBack()
- signal postCreateSuccess()
-
- property string current_mnemonic
- property string text_error
- property string guess_text_error
-
- property bool form_is_filled: false
- property int currentStep: 0
- property int current_word_idx: 0
- property int guess_count: 1
-
- Component.onCompleted: onOpened()
-
- function onOpened() {
- current_mnemonic = API.app.get_mnemonic()
- }
-
- function getWords() {
- return current_mnemonic.split(" ")
- }
-
- function setRandomGuessWord() {
- const prev_idx = current_word_idx
- while (current_word_idx === prev_idx)
- current_word_idx = General.getRandomInt(0, getWords().length - 1)
- }
-
- function validGuessField(field) {
- return field.acceptableInput
- }
-
- function submitGuess(field) {
- if (validGuessField(field)) {
- // Check if it's correct
- if (field.text === getWords()[current_word_idx]) {
- if (isFinalGuess()) {
- return [true, true]
- } else {
- ++guess_count
- setRandomGuessWord()
- }
- field.text = ""
- guess_text_error = ""
- return [true, false]
- } else {
- guess_text_error = qsTr("Wrong word, please check again")
- }
- }
-
- return [false, false]
- }
-
- function isFinalGuess() {
- return guess_count === 3
- }
-
- // Local
- function reset() {
- current_mnemonic = ""
- text_error = ""
-
- form_is_filled = false
- guess_text_error = ""
- guess_count = 1
- }
-
- function shuffle(array) {
- var currentIndex = array.length,
- randomIndex;
-
- // While there remain elements to shuffle...
- while (0 !== currentIndex) {
-
- // Pick a remaining element...
- randomIndex = Math.floor(Math.random() * currentIndex);
- currentIndex--;
-
- // And swap it with the current element.
- [array[currentIndex], array[randomIndex]] = [
- array[randomIndex], array[currentIndex]
- ];
- }
-
- return array;
- }
-
- function getRandom4x(list, keep) {
-
- // remove keep
- const index = list.indexOf(keep);
- if (index > -1) {
- list.splice(index, 1);
- }
-
- // randomlise
- let randomList = shuffle(list)
-
- // set keeped word
- let newList = [randomList[0], randomList[1], randomList[2], keep]
-
- // randomlise again
- let finalList = shuffle(newList)
-
- // return final word list
- return finalList
- }
-
- function onClickedCreate(password, generated_seed, wallet_name) {
- if (API.app.wallet_mgr.create(password, generated_seed, wallet_name)) {
- console.log("Success: Create wallet")
- selected_wallet_name = wallet_name
- postCreateSuccess()
- return true
- } else {
- console.log("Failed: Create wallet")
- text_error = qsTr("Failed to create a wallet")
- return false
- }
- }
-
- image_scale: 0.7
- // Removed the image for now, no space
- //image_path: General.image_path + (form_is_filled ? "settings-seed.svg" : "setup-welcome-wallet.svg")
-
- content: ColumnLayout {
- spacing: Style.rowSpacing
- RowLayout {
- Layout.fillWidth: true
- spacing: 10
- Qaterial.AppBarButton {
- icon.source: Qaterial.Icons.arrowLeft
- Layout.alignment: Qt.AlignVCenter
- onClicked: {
- if (currentStep === 0) {
- reset()
- clickedBack()
- } else {
- if (currentStep == 2) {
- currentStep = 0
- _inputPassword.field.text = ""
- _inputPasswordConfirm.field.text = ""
- } else {
- input_seed_word.field.text = ""
- currentStep--
- }
-
-
- }
- }
- }
-
- DexLabel {
- font: theme.textType.head6
- text_value: if (currentStep === 0) {
- qsTr("New Wallet")
- } else if (currentStep === 1) {
- qsTr("Confirm Seed")
- } else if (currentStep === 2) {
- qsTr("Choose Password")
- }
- Layout.alignment: Qt.AlignVCenter
- }
-
- }
-
- Item {
- Layout.fillWidth: true
- }
-
- function reset() {
- new_user.reset()
- input_wallet_name.reset()
- _inputPassword.field.text = ""
- input_seed_word.field.text = ""
- input_generated_seed.text = ""
- }
-
- function completeForm() {
- if (!continue_button.enabled) return
-
- text_error = General.checkIfWalletExists(input_wallet_name.field.text)
- if (text_error !== "") return
-
- input_seed_word.field.text = ""
- guess_text_error = ""
- guess_count = 1
- setRandomGuessWord()
-
- form_is_filled = true
- }
-
- function tryGuess() {
- // Open EULA if it's the final one
- let sub = submitGuess(input_seed_word.field)
- if (sub[0] == true && sub[1] == true) {
- currentStep++
- } else if (sub[0] == true && sub[1] == false) {
- input_seed_word.field.text = ""
- } else {
- input_seed_word.field.text = ""
- input_seed_word.error = true
- setRandomGuessWord()
- mmo.model = getRandom4x(current_mnemonic.split(" "), getWords()[current_word_idx])
- }
- }
-
- ModalLoader {
- id: eula_modal
- sourceComponent: EulaModal {
- onConfirm: () => {
- if (onClickedCreate(_inputPassword.field.text,
- input_generated_seed.text,
- input_wallet_name.field.text)) reset()
- }
- }
- }
-
- ColumnLayout {
- visible: currentStep === 0
- Layout.preferredWidth: 450
- spacing: Style.rowSpacing
-
- DexAppTextField {
- id: input_wallet_name
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- opacity: enabled ? 1 : .5
- background.border.width: 1
- background.radius: 25
- background.border.color: field.focus ? theme.accentColor : Style.colorBorder
- field.onAccepted: completeForm()
- field.font: theme.textType.head6
- field.horizontalAlignment: Qt.AlignLeft
- field.leftPadding: 75
- field.placeholderText: "Wallet Name"
-
- DexRectangle {
- x: 5
- height: 40
- width: 60
- radius: 20
- color: theme.accentColor
- anchors.verticalCenter: parent.verticalCenter
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- iconSize: 19
- source: Qaterial.Icons.wallet
- color: theme.surfaceColor
- }
-
- }
- }
- DexRectangle {
- Layout.topMargin: 10
- Layout.bottomMargin: Layout.topMargin
- Layout.fillWidth: true
- color: Style.colorRed3
- height: warning_texts.height + 20
-
- Column {
- id: warning_texts
-
- anchors.centerIn: parent
- width: parent.width
-
- spacing: 10
-
- DefaultText {
- width: parent.width - 40
- horizontalAlignment: Text.AlignHCenter
- anchors.horizontalCenter: parent.horizontalCenter
- text_value: qsTr("Important: Back up your seed phrase before proceeding!")
- }
-
- DefaultText {
- width: parent.width - 40
- horizontalAlignment: Text.AlignHCenter
- anchors.horizontalCenter: parent.horizontalCenter
- text_value: qsTr("We recommend storing it offline.")
- font.pixelSize: Style.textSizeSmall4
- color: Style.colorWhite4
- }
- }
- }
- TextField {
- id: input_generated_seed
- visible: false
- text: current_mnemonic
- }
- Column {
- Layout.fillWidth: true
- spacing: 5
- RowLayout {
- width: parent.width
- DexLabel {
- text: qsTr("Generated Seed")
- font: theme.textType.body1
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignVCenter
- }
- Qaterial.AppBarButton {
- icon.source: Qaterial.Icons.contentCopy
- Layout.alignment: Qt.AlignVCenter
- onClicked: {
- input_generated_seed.selectAll()
- input_generated_seed.copy()
- toast.show(qsTr("Copied to Clipboard"), General.time_toast_basic_info, "", false)
- }
- }
- }
- Item {
- width: parent.width
- height: _insideFlow.height
- Grid {
- id: _insideFlow
- width: parent.width
- spacing: 10
- Repeater {
- model: current_mnemonic.split(" ")
- delegate: DexRectangle {
- width: (_insideFlow.width - 30) / 4
- height: _insideLabel.implicitHeight + 15
- color: theme.accentColor
- opacity: .5
- DexLabel {
- id: _insideLabel
- text: (index + 1) + ". " + modelData
- font: theme.textType.body2
- anchors.centerIn: parent
- }
- }
- }
- }
- }
- }
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
-
- RowLayout {
- Layout.preferredWidth: 400
- spacing: Style.buttonSpacing
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
- DexAppButton {
- id: nextButton
- enabled: input_wallet_name.field.text !== ""
- onClicked: {
- currentStep++
- input_seed_word.field.text = ""
- guess_count = 1
- setRandomGuessWord()
- }
- radius: 20
- opacity: enabled ? 1 : .4
- backgroundColor: theme.accentColor
- Layout.preferredWidth: _nextRow.implicitWidth + 40
- Layout.preferredHeight: 45
- label.color: 'transparent'
- Row {
- id: _nextRow
- anchors.centerIn: parent
- spacing: 10
- DexLabel {
- text: qsTr("Next")
- font: theme.textType.button
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.arrowRight
- iconSize: 14
- }
- }
- }
- }
-
- DefaultText {
- text_value: text_error
- color: Style.colorRed
- visible: text !== ''
- }
- }
-
-
- // Second page, write the seed word
- ColumnLayout {
- visible: currentStep === 1
-
- FloatingBackground {
- Layout.topMargin: 10
- Layout.bottomMargin: Layout.topMargin
- Layout.fillWidth: true
- height: 120
-
- Column {
- id: warning_texts_2
-
- anchors.centerIn: parent
- width: parent.width
-
- spacing: 5
-
- DefaultText {
- width: parent.width - 40
- anchors.horizontalCenter: parent.horizontalCenter
- text_value: qsTr("Let's double check your seed phrase")
- }
- DefaultText {
- width: parent.width - 40
- anchors.horizontalCenter: parent.horizontalCenter
- text_value: qsTr("Your seed phrase is important - that's why we like to make sure it's correct. We'll ask you three different questions about your seed phrase to make sure you'll be able to easily restore your wallet whenever you want.")
- font.pixelSize: Style.textSizeSmall4
- color: Style.colorWhite4
- }
- }
- }
-
- Column {
- Layout.fillWidth: true
- spacing: 5
- Item {
- width: parent.width - 10
- height: _insideFlow2.height
- Grid {
- id: _insideFlow2
- width: parent.width
- spacing: 10
- horizontalItemAlignment: Grid.AlignHCenter
- Repeater {
- id: mmo
- model: getRandom4x(current_mnemonic.split(" "), getWords()[current_word_idx])
- delegate: DexRectangle {
- width: (_insideFlow2.width - 30) / 4
- height: _insideLabel.implicitHeight + 15
- color: theme.accentColor
- opacity: _areaSelect.containsMouse ? 1 : .6
- DexLabel {
- id: _insideLabel
- text: modelData ?? ""
- font: theme.textType.body1
- anchors.centerIn: parent
- }
- DexMouseArea {
- id: _areaSelect
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- input_seed_word.field.text = modelData
- tryGuess()
- }
- }
- }
- }
- }
- }
- }
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 5
- }
-
- DexAppTextField {
- id: input_seed_word
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- opacity: enabled ? 1 : .5
- background.border.width: 1
- background.radius: 25
- field.font: theme.textType.head6
- field.horizontalAlignment: Qt.AlignLeft
- field.leftPadding: 75
- field.placeholderText: qsTr("Enter the %n. word", "", current_word_idx + 1)
- field.validator: RegExpValidator { regExp: /[a-z]+/ }
- field.onAccepted: tryGuess()
-
- DexRectangle {
- x: 5
- height: 40
- width: 60
- radius: 20
- color: theme.accentColor
- anchors.verticalCenter: parent.verticalCenter
- DexLabel {
- anchors.centerIn: parent
- font: theme.textType.head6
- text: current_word_idx + 1
- }
-
- }
- }
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
-
- RowLayout {
- Layout.preferredWidth: 400
- spacing: Style.buttonSpacing
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
- DexAppButton {
- enabled: validGuessField(input_seed_word.field)
- opacity: enabled ? 1 : .4
- onClicked: tryGuess()
- radius: 20
- backgroundColor: theme.accentColor
- Layout.preferredWidth: _nextRow3.implicitWidth + 40
- Layout.preferredHeight: 45
- label.color: 'transparent'
- Row {
- id: _nextRow3
- anchors.centerIn: parent
- spacing: 10
- DexLabel {
- text: qsTr("Check")
- font: theme.textType.button
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.check
- iconSize: 14
- }
- }
- }
- }
-
- DefaultText {
- text_value: guess_text_error
- color: Style.colorRed
- visible: input_seed_word.error
- DexVisibleBehavior on visible {}
- }
- }
-
- ColumnLayout {
- visible: currentStep === 2
- Layout.preferredWidth: 450
- spacing: Style.rowSpacing
-
- DexAppPasswordField {
- id: _inputPassword
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- field.onAccepted: _keyChecker.isValid() ? eula_modal.open() : undefined
- }
-
- DexKeyChecker {
- id: _keyChecker
- field: _inputPassword.field
- double_validation: true
- Layout.leftMargin: 20
- match_password: _inputPasswordConfirm.field.text
- }
-
- DexAppPasswordField {
- id: _inputPasswordConfirm
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- field.onAccepted: _keyChecker.isValid() ? eula_modal.open() : undefined
- }
-
- Item {
- Layout.fillWidth: true
- }
-
- RowLayout {
- Layout.preferredWidth: 400
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
-
- DexAppButton {
- enabled: _keyChecker.isValid()
- opacity: enabled ? 1 : .4
- onClicked: eula_modal.open()
- radius: 20
- backgroundColor: theme.accentColor
- Layout.preferredWidth: _nextRow2.implicitWidth + 40
- Layout.preferredHeight: 45
- label.color: 'transparent'
- Row {
- id: _nextRow2
- anchors.centerIn: parent
- spacing: 10
- DexLabel {
- text: qsTr("Continue")
- font: theme.textType.button
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.arrowRight
- iconSize: 14
- }
- }
- }
- }
-
- DefaultText {
- text_value: text_error
- color: Style.colorRed
- visible: text !== ''
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Screens/RecoverSeed.qml b/atomic_defi_design/qml/Screens/RecoverSeed.qml
deleted file mode 100644
index 9823a6ddfb..0000000000
--- a/atomic_defi_design/qml/Screens/RecoverSeed.qml
+++ /dev/null
@@ -1,324 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-SetupPage {
- id: recover_seed
- // Override
- signal clickedBack()
- signal postConfirmSuccess()
- property int currentStep: 0
-
- // Local
- function reset() {
- text_error = ""
- }
-
- function onClickedConfirm(password, seed, wallet_name) {
- if (API.app.wallet_mgr.create(password, seed, wallet_name)) {
- console.log("Success: Recover seed")
- selected_wallet_name = wallet_name
- postConfirmSuccess()
- return true
- } else {
- console.log("Failed: Recover seed")
- text_error = qsTr("Failed to recover the seed")
- return false
- }
- }
-
- property string text_error
-
- image_scale: 0.7
-
- // Removed the image for now, no space
- // image_path: General.image_path + "setup-wallet-restore-2.svg"
-
- content: ColumnLayout {
- spacing: Style.rowSpacing
- RowLayout {
- Layout.fillWidth: true
- spacing: 10
- Qaterial.AppBarButton {
- icon.source: Qaterial.Icons.arrowLeft
- Layout.alignment: Qt.AlignVCenter
- onClicked: {
- if (currentStep === 0) {
- reset()
- clickedBack()
- } else {
- if(text_error !== "") {
- text_error = ""
- }
- currentStep--
- }
- }
- }
-
- DexLabel {
- font: theme.textType.head6
- Layout.fillWidth: true
- rightPadding: 20
- wrapMode: Label.Wrap
- text_value: if (currentStep === 0) {
- qsTr("Recover wallet - Setup")
- } else if (currentStep === 1) {
- qsTr("Recover wallet - Choose password")
- }
- Layout.alignment: Qt.AlignVCenter
- }
-
- }
-
- function reset() {
- recover_seed.reset()
- input_wallet_name.reset()
- _seedField.field.text = ""
- _inputPassword.field.text = ""
- }
-
- function trySubmit() {
- if (!submit_button.enabled) return
-
- text_error = General.checkIfWalletExists(input_wallet_name.field.text)
- if (text_error !== "") return
-
- eula_modal.open()
- }
-
- function tryPassLevel1() {
- if (input_wallet_name.field.text == "") {
- input_wallet_name.error = true
- }
-
- if (_seedField.isValid() && input_wallet_name.field.text !== "") {
- _seedField.error = false
- _inputPassword.field.text = ""
- _inputPasswordConfirm.field.text = ""
- currentStep++
- } else {
- _seedField.error = true
- }
- }
-
-
- ModalLoader {
- id: eula_modal
- sourceComponent: EulaModal {
- onConfirm: () => {
- if (onClickedConfirm(_inputPassword.field.text, _seedField.field.text, input_wallet_name.field.text))
- reset()
- }
- }
- }
- ColumnLayout {
- visible: currentStep === 0
- Layout.preferredWidth: 450
- spacing: Style.rowSpacing
-
- DexAppTextField {
- id: input_wallet_name
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- opacity: enabled ? 1 : .5
- background.border.width: 1
- background.radius: 25
- field.font: theme.textType.head6
- field.horizontalAlignment: Qt.AlignLeft
- field.leftPadding: 75
- field.placeholderText: qsTr("Wallet Name")
- field.onAccepted: tryPassLevel1()
-
- DexRectangle {
- x: 5
- height: 40
- width: 60
- radius: 20
- color: theme.accentColor
- anchors.verticalCenter: parent.verticalCenter
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- iconSize: 19
- source: Qaterial.Icons.wallet
- color: theme.surfaceColor
- }
-
- }
- }
-
- DexLabel {
- text: qsTr("Enter seed")
- font: theme.textType.body1
- }
-
- DexAppPasswordField {
- id: _seedField
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- leftIcon: Qaterial.Icons.fileKey
- field.placeholderText: qsTr('Enter seed')
- field.onAccepted: tryPassLevel1()
- field.onTextChanged: {
- field.text = field.text.replace("\n", "")
- field.cursorPosition = field.length
- }
-
- function isValid() {
- if(!allow_custom_seed.checked) {
- _seedField.field.text = _seedField.field.text.trim().toLowerCase()
- }
- _seedField.field.text = _seedField.field.text.replace(/[^\w\s]/gi, '')
- return allow_custom_seed.checked || API.app.wallet_mgr.mnemonic_validate(_seedField.field.text)
- }
- }
-
- DexLabel {
- id: _seedError
- visible: _seedField.error
- text: qsTr("BIP39 seed validation failed, try again or select 'Allow custom seed'")
- color: theme.redColor
- Layout.preferredWidth: parent.width - 40
- wrapMode: DexLabel.Wrap
- font: theme.textType.body2
- }
-
- DefaultCheckBox {
- id: allow_custom_seed
- text: qsTr("Allow custom seed")
- }
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
-
- RowLayout {
- Layout.preferredWidth: 400
- spacing: Style.buttonSpacing
-
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
- DexAppButton {
- id: nextButton
- enabled: input_wallet_name.field.text !== "" && _seedField.field.text !== ""
- onClicked: tryPassLevel1()
- radius: 20
- opacity: enabled ? 1 : .4
- backgroundColor: theme.accentColor
- Layout.preferredWidth: _nextRow.implicitWidth + 40
- Layout.preferredHeight: 45
- label.color: 'transparent'
- Row {
- id: _nextRow
- anchors.centerIn: parent
- spacing: 10
- DexLabel {
- text: qsTr("Next")
- font: theme.textType.button
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.arrowRight
- iconSize: 14
- }
- }
- }
- }
-
- DefaultText {
- text_value: text_error
- color: Style.colorRed
- visible: text !== ''
- }
- }
-
-
- ColumnLayout {
- visible: currentStep === 1
- Layout.preferredWidth: 460
- Layout.rightMargin: 5
- spacing: Style.rowSpacing
- DexAppPasswordField {
- id: _inputPassword
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- field.onAccepted: trySubmit()
- }
-
- DexKeyChecker {
- id: _keyChecker
- double_validation: true
- field: _inputPassword.field
- match_password: _inputPasswordConfirm.field.text
- Layout.leftMargin: 20
- }
-
- DexAppPasswordField {
- id: _inputPasswordConfirm
- Layout.fillWidth: true
- Layout.preferredHeight: 50
- field.onAccepted: trySubmit()
- }
-
- Item {
- Layout.fillWidth: true
- }
-
- RowLayout {
- Layout.preferredWidth: 400
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 10
- }
-
- DexAppButton {
- id: submit_button
- enabled: _keyChecker.isValid()
- opacity: enabled ? 1 : .4
- onClicked: {
- trySubmit()
- }
- radius: 20
- backgroundColor: theme.accentColor
- Layout.preferredWidth: _nextRow2.implicitWidth + 40
- Layout.preferredHeight: 45
- label.color: 'transparent'
- Row {
- id: _nextRow2
- anchors.centerIn: parent
- spacing: 10
- DexLabel {
- text: qsTr("Continue")
- font: theme.textType.button
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.arrowRight
- iconSize: 14
- }
- }
- }
- }
- DefaultText {
- text_value: text_error
- color: Style.colorRed
- visible: text !== ''
- }
- }
-
- DefaultText {
- text_value: text_error
- color: Style.colorRed
- visible: text !== ''
- }
- }
-}
\ No newline at end of file
diff --git a/atomic_defi_design/qml/Settings/CamouflagePasswordModal.qml b/atomic_defi_design/qml/Settings/CamouflagePasswordModal.qml
deleted file mode 100644
index 885d75569a..0000000000
--- a/atomic_defi_design/qml/Settings/CamouflagePasswordModal.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- width: 1100
-
- onClosed: {
- input_password.reset()
- }
-
- ModalContent {
- title: qsTr("Setup Camouflage Password")
-
- FloatingBackground {
- id: warning_bg
- Layout.alignment: Qt.AlignHCenter
- Layout.bottomMargin: 10
-
- width: parent.width - 5
- height: warning_texts.height + 20
-
- Column {
- id: warning_texts
- anchors.centerIn: parent
- width: parent.width
- spacing: 10
-
- DefaultText {
- width: parent.width - 40
- horizontalAlignment: Text.AlignHCenter
- anchors.horizontalCenter: parent.horizontalCenter
-
- text_value: qsTr("Camouflage Password is a secret password for emergency situations.")
- font.pixelSize: Style.textSize2
- }
-
- DefaultText {
- width: parent.width - 40
- horizontalAlignment: Text.AlignHCenter
- anchors.horizontalCenter: parent.horizontalCenter
-
- text_value: qsTr("Using it to login will display your balance lower than it actually is.")
- }
-
- DefaultText {
- width: parent.width - 40
- horizontalAlignment: Text.AlignHCenter
- anchors.horizontalCenter: parent.horizontalCenter
-
- text_value: qsTr("Here you enter the suffix and at login you need to enter {real_password}{suffix}")
- }
- }
- }
-
- PasswordForm {
- id: input_password
- Layout.fillWidth: true
- field.placeholderText: qsTr("Enter a suffix")
- high_security: false
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Cancel")
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- PrimaryButton {
- text: qsTr("Save")
- Layout.fillWidth: true
- enabled: input_password.isValid()
- onClicked: {
- API.app.wallet_mgr.set_emergency_password(input_password.field.text)
- root.close()
- }
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Settings/Combo_fiat.qml b/atomic_defi_design/qml/Settings/Combo_fiat.qml
deleted file mode 100644
index 16a4a20445..0000000000
--- a/atomic_defi_design/qml/Settings/Combo_fiat.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-import Qt.labs.settings 1.0
-
-
-import QtQuick.Window 2.12
-
-import Qaterial 1.0 as Qaterial
-
-// Project Imports
-import "../Components"
-import "../Constants"
-
-
-ComboBoxWithTitle {
- id: combo_fiat
- title: qsTr("Fiat")
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
-
- model: fiats
-
- property bool initialized: false
- onCurrentIndexChanged: {
- if(initialized) {
- const new_fiat = fiats[currentIndex]
- API.app.settings_pg.current_fiat = new_fiat
- API.app.settings_pg.current_currency = new_fiat
- }
- }
- Component.onCompleted: {
- currentIndex = model.indexOf(API.app.settings_pg.current_fiat)
- initialized = true
- }
-
- RowLayout {
- Layout.topMargin: 5
- Layout.fillWidth: true
- Layout.leftMargin: 2
- Layout.rightMargin: Layout.leftMargin
-
- DefaultText {
- text: qsTr("Recommended: ")
- font.pixelSize: Style.textSizeSmall4
- }
-
- Grid {
- Layout.leftMargin: 30
- Layout.alignment: Qt.AlignVCenter
-
- clip: true
-
- columns: 6
- spacing: 25
-
- layoutDirection: Qt.LeftToRight
-
- Repeater {
- model: recommended_fiats
-
- delegate: DefaultText {
- text: modelData
- color: fiats_mouse_area.containsMouse ? Style.colorText : Style.colorText2
-
- DefaultMouseArea {
- id: fiats_mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- API.app.settings_pg.current_fiat = modelData
- API.app.settings_pg.current_currency = modelData
- combo_fiat.currentIndex = combo_fiat.model.indexOf(API.app.settings_pg.current_fiat)
- }
- }
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Settings/Languages.qml b/atomic_defi_design/qml/Settings/Languages.qml
deleted file mode 100644
index 02718f91a9..0000000000
--- a/atomic_defi_design/qml/Settings/Languages.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import "../Components"
-import "../Constants"
-
-ColumnLayout {
- property alias show_label: label.visible
-
- RowLayout {
- Layout.alignment: Qt.AlignVCenter
- spacing: 20
- DefaultText {
- id: label
- visible: false
- Layout.alignment: Qt.AlignVCenter
- text_value: qsTr("Language") + ":"
- font.pixelSize: Style.textSizeSmall2
- }
-
- Grid {
- Layout.alignment: Qt.AlignVCenter
-
- clip: true
-
- columns: 8
- spacing: 10
-
- layoutDirection: Qt.LeftToRight
-
- Repeater {
- model: API.app.settings_pg.get_available_langs()
- delegate: AnimatedRectangle {
- width: image.sourceSize.width - 4 // Current icons have too much space around them
- height: image.sourceSize.height - 2
-
- color: API.app.settings_pg.lang === model.modelData ? Style.colorTheme11 : mouse_area.containsMouse ? Style.colorTheme4 : Style.applyOpacity(Style.colorTheme4)
-
- DefaultImage {
- id: image
- anchors.centerIn: parent
- source: General.image_path + "lang/" + model.modelData + ".png"
- width: Style.textSize2
- // Click area
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- acceptedButtons: Qt.LeftButton | Qt.RightButton
- hoverEnabled: true
- onClicked: {
- API.app.settings_pg.lang = model.modelData
- }
- }
- }
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Settings/RecoverSeedModal.qml b/atomic_defi_design/qml/Settings/RecoverSeedModal.qml
deleted file mode 100644
index f65a10dbc1..0000000000
--- a/atomic_defi_design/qml/Settings/RecoverSeedModal.qml
+++ /dev/null
@@ -1,361 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- property var portfolio_model: API.app.portfolio_pg.portfolio_mdl
- property var settings_page: API.app.settings_pg
-
- property bool wrong_password: false
-
- function tryViewSeed() {
- if(!submit_button.enabled) return
-
- const result = API.app.settings_pg.retrieve_seed(API.app.wallet_mgr.wallet_default_name, input_password.field.text)
-
- if(result.length === 2) {
- seed_text.text = result[0]
- rpc_pw.text = result[1]
- wrong_password = false
- root.nextPage()
- loading.running = true
- }
- else {
- wrong_password = true
- }
- }
-
- width: 800
-
- onClosed: {
- wrong_password = false
- input_password.reset()
- seed_text.text = ""
- portfolio_model.clean_priv_keys()
- currentIndex = 0
- }
-
- ModalContent { // Password checking
- title: qsTr("View seed and private keys")
-
- ColumnLayout {
- DefaultText {
- Layout.topMargin: 10
- Layout.bottomMargin: 10
- Layout.alignment: Qt.AlignHCenter
-
- text_value: qsTr("Please enter your password to view the seed.")
- }
-
- PasswordForm {
- id: input_password
- Layout.fillWidth: true
- confirm: false
- field.onAccepted: tryViewSeed()
- }
-
- DefaultText {
- text_value: qsTr("Wrong Password")
- color: Style.colorRed
- visible: wrong_password
- }
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Cancel")
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- PrimaryButton {
- id: submit_button
- text: qsTr("View")
- Layout.fillWidth: true
- enabled: input_password.isValid()
- onClicked: tryViewSeed()
- }
- ]
- }
-
- ModalContent {
- title: qsTr("View seed and private keys")
- Layout.fillWidth: true
-
- Timer {
- id: loading
-
- repeat: true
- running: false
- onTriggered: {
- if (!settings_page.fetching_priv_keys_busy) {
- repeat = false
- busy_view.visible = false
- busy_view.enabled = false
- seed_container.visible = true
- seed_container.enabled = true
- coins_list.visible = true
- coins_list.enabled = true
- }
- }
- }
-
- DefaultBusyIndicator {
- id: busy_view
-
- Layout.alignment: Qt.AlignHCenter
- }
-
- DefaultRectangle {
- id: seed_container
- visible: false
- enabled: false
- height: 120
- width: parent.width
-
- RowLayout {
- Layout.fillWidth: true
- anchors.verticalCenter: parent.verticalCenter
-
- DefaultImage {
- Layout.leftMargin: 10
- source: General.image_path + "dex-logo-sidebar.png"
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- }
-
- DefaultText {
- Layout.leftMargin: 5
- Layout.preferredWidth: 100
- text: API.app_name
- font.pixelSize: Style.textSizeSmall5
- }
-
- ColumnLayout {
- RowLayout {
- Qaterial.RawMaterialButton {
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.qrcodeScan
-
- onClicked: {
- qrcode_modal.qrcode_svg = API.qt_utilities.get_qrcode_svg_from_string(seed_text.text)
- qrcode_modal.open()
- }
- }
-
- Qaterial.RawMaterialButton { //! Copy clipboard button
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.contentCopy
-
- onClicked: API.qt_utilities.copy_text_to_clipboard(seed_text.text)
- }
- }
- RowLayout {
- Qaterial.RawMaterialButton {
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.qrcodeScan
-
- onClicked: {
- qrcode_modal.qrcode_svg = API.qt_utilities.get_qrcode_svg_from_string(rpc_pw.text)
- qrcode_modal.open()
- }
- }
-
- Qaterial.RawMaterialButton { //! Copy clipboard button
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.contentCopy
-
- onClicked: API.qt_utilities.copy_text_to_clipboard(rpc_pw.text)
- }
- }
- }
-
- ColumnLayout {
- // Seed
- DefaultText {
- text: qsTr("Backup seed")
- color: Style.modalValueColor
- font.pixelSize: Style.textSizeSmall2
- }
- DefaultText {
- Layout.preferredWidth: 400
- id: seed_text
- font.pixelSize: Style.textSizeSmall1
- }
-
- // RPC Password
- DefaultText {
- Layout.topMargin: 10
- text: qsTr("RPC Password")
- color: Style.modalValueColor
- font.pixelSize: Style.textSizeSmall2
- }
-
- DefaultText {
- id: rpc_pw
- font.pixelSize: Style.textSizeSmall3
- }
- }
- }
- }
-
- // Search input
- DefaultTextField {
- Layout.fillWidth: true
- placeholderText: qsTr("Search a coin.")
- onTextChanged: portfolio_model.portfolio_proxy_mdl.setFilterFixedString(text)
-
- Component.onDestruction: portfolio_model.portfolio_proxy_mdl.setFilterFixedString("")
- }
-
- DefaultListView {
- id: coins_list
-
- visible: false
- enabled: false
-
- Layout.fillWidth: true
- Layout.preferredHeight: 600
- model: portfolio_mdl.portfolio_proxy_mdl
-
- delegate: DefaultRectangle {
- height: seed_container.height
- width: seed_container.width
-
- RowLayout {
- Layout.fillWidth: true
- anchors.verticalCenter: parent.verticalCenter
-
- DefaultImage {
- Layout.leftMargin: 10
- source: General.coinIcon(model.ticker)
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- }
-
- DefaultText {
- Layout.preferredWidth: 100
- Layout.leftMargin: 5
- text: model.name
- font.pixelSize: Style.textSizeSmall5
- }
-
- ColumnLayout { // QR/Copy buttons
- spacing: 3
-
- RowLayout {
- Qaterial.RawMaterialButton {
- Layout.topMargin: 2
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.qrcodeScan
-
- onClicked: {
- qrcode_modal.qrcode_svg = API.qt_utilities.get_qrcode_svg_from_string(model.public_address)
- qrcode_modal.open()
- }
- }
-
- Qaterial.RawMaterialButton { //! Copy clipboard button
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.contentCopy
-
- onClicked: API.qt_utilities.copy_text_to_clipboard(model.public_address)
- }
- }
-
- RowLayout {
- Qaterial.RawMaterialButton {
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.qrcodeScan
-
- onClicked: {
- qrcode_modal.qrcode_svg = API.qt_utilities.get_qrcode_svg_from_string(model.priv_key)
- qrcode_modal.open()
- }
- }
-
- Qaterial.RawMaterialButton { //! Copy clipboard button
- implicitWidth: 45
- backgroundColor: "transparent"
- icon.source: Qaterial.Icons.contentCopy
-
- onClicked: API.qt_utilities.copy_text_to_clipboard(model.priv_key)
- }
- }
- }
-
- ColumnLayout { // Addresses
- DefaultText {
- text: qsTr("Public Address")
- color: Style.modalValueColor
- font.pixelSize: Style.textSizeSmall2
- }
-
- DefaultText {
- text: model.public_address
- font.pixelSize: Style.textSizeSmall3
- }
-
- DefaultText {
- Layout.topMargin: 10
- text: qsTr("Private Key")
- color: Style.modalValueColor
- font.pixelSize: Style.textSizeSmall2
- }
-
- DefaultText {
- text: model.priv_key
- font.pixelSize: Style.textSizeSmall3
- }
- }
- }
- }
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Close")
- Layout.fillWidth: true
- onClicked: root.close()
- }
- ]
-
- ModalLoader {
- id: qrcode_modal
-
- property string qrcode_svg
-
- sourceComponent: Popup {
- id: popup
-
- x: (root.width - width) / 2
- y: ((root.height - height) / 2) - 250
-
- onClosed: qrcode_svg = ""
-
- background: Image {
- source: qrcode_svg
-
- sourceSize.width: 200
- sourceSize.height: 200
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Settings/SettingModal.qml b/atomic_defi_design/qml/Settings/SettingModal.qml
deleted file mode 100644
index 5321024cfd..0000000000
--- a/atomic_defi_design/qml/Settings/SettingModal.qml
+++ /dev/null
@@ -1,559 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-import Qt.labs.settings 1.0
-import QtQml 2.12
-import QtQuick.Window 2.12
-import QtQuick.Controls.Universal 2.12
-
-import Qaterial 1.0 as Qaterial
-
-// Project Imports
-import "../Components"
-import "../Constants"
-
-
-Qaterial.Dialog {
-
- function disconnect() {
-
- Qaterial.DialogManager.showDialog({title: qsTr("Confirm Logout"),text: qsTr("Are you sure you want to log out?"),iconSource: Qaterial.Icons.logout,standardButtons: Dialog.Yes | Dialog.Cancel, onAccepted: function(){
- Qaterial.DialogManager.close()
- app.currentWalletName = ""
- API.app.disconnect()
- onDisconnect()
- }})
-
- }
-
- readonly property string mm2_version: API.app.settings_pg.get_mm2_version()
- property var recommended_fiats: API.app.settings_pg.get_recommended_fiats()
- property var fiats: API.app.settings_pg.get_available_fiats()
- property var enableable_coins_count: enableable_coins_count_combo_box.currentValue
-
-
- id: setting_modal
- width: 850
- height: 650
- anchors.centerIn: parent
- dim: true
- modal: true
- title: "Settings"
- header: Item{}
- Overlay.modal: Item {
- Rectangle {
- anchors.fill: parent
- color: theme.surfaceColor
- opacity: .7
- }
- }
- background: FloatingBackground {
- color: theme.dexBoxBackgroundColor
- radius: 3
- }
- padding: 0
- topPadding: 0
- bottomPadding: 0
- Item {
- width: parent.width
- height: 60
- Qaterial.AppBarButton {
- anchors.right: parent.right
- anchors.rightMargin: 10
- foregroundColor: theme.foregroundColor
- icon.source: Qaterial.Icons.close
- anchors.verticalCenter: parent.verticalCenter
- onClicked: setting_modal.close()
- }
- Row {
- anchors.verticalCenter: parent.verticalCenter
- leftPadding: 20
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- text: "Settings"
- font: theme.textType.head6
- }
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- text: " - "+qsTr(menu_list.model[menu_list.currentIndex])
- opacity: .5
- font: theme.textType.head6
- }
- }
- Rectangle {
- anchors.bottom: parent.bottom
- color: theme.foregroundColor
- opacity: .10
- width: parent.width
- height: 1.5
- }
-
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
- }
- Item {
- width: parent.width
- height: parent.height-110
- y:60
- RowLayout {
- anchors.fill: parent
- Item {
- Layout.fillHeight: true
- Layout.preferredWidth: 240
- ListView {
- id: menu_list
- anchors.fill: parent
- anchors.topMargin: 10
- spacing: 10
- currentIndex: 0
- model: [qsTr("General"),qsTr("Language"),qsTr("User Interface"),qsTr("Security"),qsTr("About"),qsTr("Version")]
- highlight: Item {
- width: menu_list.width-20
- x: 10
- height: 45
- Rectangle {
- anchors.fill: parent
- height: 45
- radius: 5
- color: theme.hightlightColor
- }
- }
-
- delegate: DexSelectableButton {
- selected: false
- text: modelData
- onClicked: menu_list.currentIndex = index
- }
- }
- }
- Rectangle {
- Layout.fillHeight: true
- width: 2
- color: theme.foregroundColor
- opacity: .10
- }
- Item {
- Layout.fillHeight: true
- Layout.fillWidth: true
- StackLayout {
- anchors.fill: parent
- currentIndex: menu_list.currentIndex
- Item {
- anchors.margins: 10
- Column {
- anchors.fill: parent
- topPadding: 10
- spacing: 15
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 30
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Enable Desktop Notifications")
- }
- DefaultSwitch {
- Layout.alignment: Qt.AlignVCenter
- Component.onCompleted: checked = API.app.settings_pg.notification_enabled
- onCheckedChanged: API.app.settings_pg.notification_enabled = checked
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 50
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Maximum number of enabled coins")
- }
- DexComboBox {
- id: enableable_coins_count_combo_box
- model: [10, 20, 50, 75, 100, 150, 200]
- currentIndex: model.indexOf(parseInt(atomic_settings2.value("MaximumNbCoinsEnabled")))
- onCurrentIndexChanged: atomic_settings2.setValue("MaximumNbCoinsEnabled", model[currentIndex])
- delegate: ItemDelegate {
- width: enableable_coins_count_combo_box.width
- font.weight: enableable_coins_count_combo_box.currentIndex === index ? Font.DemiBold : Font.Normal
- highlighted: ListView.isCurrentItem
- enabled: parseInt(modelData) >= API.app.portfolio_pg.portfolio_mdl.length
- contentItem: DefaultText {
- color: enabled ? Style.colorWhite1 : Style.colorWhite8
- text: modelData
- }
- }
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 50
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Logs")
- }
- DexButton {
- text: qsTr("Open Folder")
- implicitHeight: 37
- onClicked: {
- openLogsFolder()
- }
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Reset assets configuration")
- }
- DexButton {
- text: qsTr("Reset")
- implicitHeight: 37
- onClicked: {
- restart_modal.open()
- restart_modal.item.onTimerEnded = () => { API.app.settings_pg.reset_coin_cfg() }
- }
- }
- }
-
- }
- }
- Item {
- Column {
- anchors.fill: parent
- topPadding: 10
- spacing: 15
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 30
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Language") + ":"
- }
- Languages {
- Layout.alignment: Qt.AlignVCenter
- }
-
- }
- Combo_fiat {
- id: combo_fiat
- }
- }
- }
-
-
- Item {
- Column {
- anchors.fill: parent
- topPadding: 10
- spacing: 15
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 30
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Current Font")
- }
- DexComboBox {
- id: dexFont
- editable: true
- Layout.alignment: Qt.AlignVCenter
- model: ["Ubuntu", "Montserrat", "Roboto"]
- Component.onCompleted: {
- let current = _font.fontFamily
- currentIndex = dexFont.model.indexOf(current)
- }
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 30
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Theme")
- }
- DexComboBox {
- id: dexTheme
- Layout.alignment: Qt.AlignVCenter
- displayText: currentText.replace(".json","")
- model: API.qt_utilities.get_themes_list()
- Component.onCompleted: {
- let current = atomic_settings2.value("CurrentTheme")
- currentIndex = model.indexOf(current)
- }
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("")
- }
- DexButton {
- text: qsTr("Apply Changes")
- implicitHeight: 37
- onClicked: {
- atomic_settings2.setValue("CurrentTheme", dexTheme.currentText)
- atomic_settings2.sync()
- app.load_theme(dexTheme.currentText.replace(".json",""))
- _font.fontFamily = dexFont.currentText
-
- }
- }
- }
- }
- }
- Item {
- Column {
- anchors.fill: parent
- topPadding: 10
- spacing: 15
- ModalLoader {
- id: view_seed_modal
- sourceComponent: RecoverSeedModal {}
- }
- ModalLoader {
- id: eula_modal
- sourceComponent: EulaModal {
- close_only: true
- }
- }
- ModalLoader {
- id: camouflage_password_modal
- sourceComponent: CamouflagePasswordModal {}
- }
-
- // Enabled 2FA option. (Disabled on Linux since the feature is not available on this platform yet)
- RowLayout {
- enabled: Qt.platform.os !== "linux" // Disable for Linux.
- Component.onCompleted: console.log(Qt.platform.os)
- visible: enabled
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignVCenter
- text: qsTr("Ask system's password before sending coins ? (2FA)")
- }
- DexSwitch {
- implicitHeight: 37
- checked: parseInt(atomic_settings2.value("2FA")) === 1
- onCheckedChanged: {
- if (checked)
- atomic_settings2.setValue("2FA", 1)
- else
- atomic_settings2.setValue("2FA", 0)
- atomic_settings2.sync()
- }
- }
- }
-
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("View seed and private keys")
- }
- DexButton {
- text: qsTr("Show")
- implicitHeight: 37
- onClicked: view_seed_modal.open()
- }
- }
-
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Setup Camouflage Password")
- }
- DexButton {
- text: qsTr("Open")
- implicitHeight: 37
- onClicked: camouflage_password_modal.open()
- }
- }
- }
- }
- Item {
- Column {
- ModalLoader {
- id: delete_wallet_modal
- sourceComponent: DeleteWalletModal {}
- }
- anchors.fill: parent
- topPadding: 10
- spacing: 15
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Disclaimer and ToS")
- }
- DexButton {
- text: qsTr("Show")
- implicitHeight: 37
- onClicked: eula_modal.open()
- }
- }
- }
- }
- Item {
- Column {
- anchors.fill: parent
- topPadding: 10
- spacing: 15
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Application version")
- }
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- text: API.app.settings_pg.get_version()
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("MM2 version")
- }
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- text: API.app.settings_pg.get_mm2_version()
- }
- }
- RowLayout {
- width: parent.width-30
- anchors.horizontalCenter: parent.horizontalCenter
- height: 60
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- text: qsTr("Qt version")
- }
- DexLabel {
- Layout.alignment: Qt.AlignVCenter
- text: qtversion
- }
- }
- }
- }
- }
- }
- }
-
- Qaterial.DebugRectangle {
- anchors.fill: parent
- visible: false
- }
- }
- Item {
- width: parent.width
- height: 50
- anchors.bottom: parent.bottom
- DexSelectableButton {
- selected: true
- anchors.right: logout_button.left
- anchors.rightMargin: 10
- anchors.horizontalCenter: undefined
- anchors.verticalCenter: parent.verticalCenter
- text: ""
- height: 40
- width: _update_row.width+20
- Row {
- id: _update_row
- anchors.centerIn: parent
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.update
- }
- spacing: 10
- DexLabel {
- text: qsTr("Search Update")
- anchors.verticalCenter: parent.verticalCenter
- font: theme.textType.button
- }
- opacity: .6
- }
- onClicked: new_update_modal.open()
- }
-
- DexSelectableButton {
- id: logout_button
- selected: true
- anchors.right: parent.right
- anchors.rightMargin: 10
- anchors.horizontalCenter: undefined
- anchors.verticalCenter: parent.verticalCenter
- text: ""
- height: 40
- width: _logout_row.width+20
- Row {
- id: _logout_row
- anchors.centerIn: parent
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.logout
- }
- spacing: 10
- DexLabel {
- text: qsTr("Logout")
- anchors.verticalCenter: parent.verticalCenter
- font: theme.textType.button
- }
- opacity: .6
- }
- onClicked: {
- disconnect()
- setting_modal.close()
- }
-
- }
-
- Rectangle {
- anchors.top: parent.top
- color: theme.foregroundColor
- opacity: .10
- width: parent.width
- height: 1.5
- }
-
- }
-}
diff --git a/atomic_defi_design/qml/Settings/Settings.qml b/atomic_defi_design/qml/Settings/Settings.qml
deleted file mode 100644
index 578a377710..0000000000
--- a/atomic_defi_design/qml/Settings/Settings.qml
+++ /dev/null
@@ -1,256 +0,0 @@
-// Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-import Qt.labs.settings 1.0
-
-
-// Project Imports
-import "../Components"
-import "../Constants"
-
-Item {
- id: root
- function disconnect() {
- API.app.disconnect()
- onDisconnect()
- }
-
- readonly property string mm2_version: API.app.settings_pg.get_mm2_version()
- property var recommended_fiats: API.app.settings_pg.get_recommended_fiats()
- property var fiats: API.app.settings_pg.get_available_fiats()
-
-
-
- InnerBackground {
- id: layout_background
- anchors.centerIn: parent
- Layout.alignment: Qt.AlignHCenter
-
- width: 650
- height: 750
-
- content: ColumnLayout {
- width: layout_background.width
- height: layout_background.height
-
- ComboBoxWithTitle {
- id: combo_fiat
- title: qsTr("Fiat")
- Layout.fillWidth: true
- Layout.leftMargin: 30
- Layout.rightMargin: Layout.leftMargin
-
- model: fiats
-
- property bool initialized: false
- onCurrentIndexChanged: {
- if(initialized) {
- const new_fiat = fiats[currentIndex]
- API.app.settings_pg.current_fiat = new_fiat
- API.app.settings_pg.current_currency = new_fiat
- }
- }
- Component.onCompleted: {
- currentIndex = model.indexOf(API.app.settings_pg.current_fiat)
- initialized = true
- }
-
- RowLayout {
- Layout.topMargin: 5
- Layout.fillWidth: true
- Layout.leftMargin: 2
- Layout.rightMargin: Layout.leftMargin
-
- DefaultText {
- text: qsTr("Recommended: ")
- font.pixelSize: Style.textSizeSmall4
- }
-
- Grid {
- Layout.leftMargin: 30
- Layout.alignment: Qt.AlignVCenter
-
- clip: true
-
- columns: 6
- spacing: 25
-
- layoutDirection: Qt.LeftToRight
-
- Repeater {
- model: recommended_fiats
-
- delegate: DefaultText {
- text: modelData
- color: fiats_mouse_area.containsMouse ? Style.colorText : Style.colorText2
-
- DefaultMouseArea {
- id: fiats_mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- API.app.settings_pg.current_fiat = modelData
- API.app.settings_pg.current_currency = modelData
- combo_fiat.currentIndex = combo_fiat.model.indexOf(API.app.settings_pg.current_fiat)
- }
- }
- }
- }
- }
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- Layout.topMargin: 10
- }
-
- Languages {
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- Layout.topMargin: 10
- }
-
- DefaultSwitch {
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- text: qsTr("Enable Desktop Notifications")
- Component.onCompleted: checked = API.app.settings_pg.notification_enabled
- onCheckedChanged: API.app.settings_pg.notification_enabled = checked
- }
- DefaultSwitch {
- property bool firstTime: true
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- checked: parseInt(atomic_settings2.value("FontMode")) === 1
- text: qsTr("Use QtTextRendering Or NativeTextRendering")
- onCheckedChanged: {
- if(checked){
- atomic_settings2.setValue("FontMode", 1)
- }else {
- atomic_settings2.setValue("FontMode", 0)
- }
- if(firstTime) {
- firstTime = false
- }else {
- restart_modal.open()
- }
-
- }
- }
-
- DefaultButton {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- text: qsTr("Open Logs Folder")
- onClicked: openLogsFolder()
- }
-
- DefaultButton {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- text: qsTr("View seed and private keys")
- onClicked: view_seed_modal.open()
- }
-
-
-
- HorizontalLine {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- }
-
- DefaultButton {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- text: qsTr("Disclaimer and ToS")
- onClicked: eula_modal.open()
- }
-
- ModalLoader {
- id: eula_modal
- sourceComponent: EulaModal {
- close_only: true
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- }
-
- DefaultButton {
- visible: !API.app.is_pin_cfg_enabled()
- text: qsTr("Setup Camouflage Password")
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- onClicked: camouflage_password_modal.open()
- }
-
- ModalLoader {
- id: camouflage_password_modal
- sourceComponent: CamouflagePasswordModal {}
- }
-
- DangerButton {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- text: qsTr("Reset assets configuration")
- onClicked: {
- restart_modal.open()
- restart_modal.item.onTimerEnded = () => { API.app.settings_pg.reset_coin_cfg() }
- }
- }
-
- DangerButton {
- text: qsTr("Delete Wallet")
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- onClicked: delete_wallet_modal.open()
- }
-
- ModalLoader {
- id: delete_wallet_modal
- sourceComponent: DeleteWalletModal {}
- }
-
- DefaultButton {
- Layout.fillWidth: true
- Layout.leftMargin: combo_fiat.Layout.leftMargin
- Layout.rightMargin: Layout.leftMargin
- text: qsTr("Log out")
- onClicked: disconnect()
- }
- }
- }
-
- DefaultText {
- anchors.right: parent.right
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 10
- anchors.rightMargin: anchors.bottomMargin
- text_value: qsTr("mm2 version") + ": " + mm2_version
- font.pixelSize: Style.textSizeSmall
- }
-}
diff --git a/atomic_defi_design/qml/Sidebar/Sidebar.qml b/atomic_defi_design/qml/Sidebar/Sidebar.qml
deleted file mode 100644
index 8f72136422..0000000000
--- a/atomic_defi_design/qml/Sidebar/Sidebar.qml
+++ /dev/null
@@ -1,178 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-
-import "../Constants"
-import "../Components"
-
-Item {
- id: sidebar
- property bool expanded: dashboard.current_page===dashboard.idx_dashboard_exchange? false : true
- readonly property alias app_logo: app_logo
-
- x: -top_rect.radius
- width: expanded? 200 - x : 80 - x
- Behavior on width {
- NumberAnimation {
- duration: 300
- }
- }
-
- height: parent.height+30
-
- // Cursor
- AnimatedRectangle {
- id: cursor
- width: 185 - cursor_round_edge.radius
- anchors.right: parent.right
- height: Style.sidebarLineHeight + top_rect.radius*2
- transformOrigin: Item.Left
- anchors.verticalCenter: cursor_round_edge.verticalCenter
-
- gradient: Gradient {
- orientation: Qt.Horizontal
-
- GradientStop {
- position: 0.0
- color: theme.navigationSideBarButtonGradient1
- }
- GradientStop {
- position: cursor_round_edge.radius / cursor.width
- color: theme.navigationSideBarButtonGradient1
- }
- GradientStop {
- position: 0.375
- color: theme.navigationSideBarButtonGradient2
- }
- GradientStop {
- position: 0.7292
- color: theme.navigationSideBarButtonGradient3
- }
- GradientStop {
- position: 1.0
- color: theme.navigationSideBarButtonGradient4
- }
- }
- }
-
- // Top Rect
- SidebarPanel {
- id: top_rect
- visible: true
- anchors.left: parent.left
- width: parent.width
- anchors.top: parent.top
- anchors.bottom: cursor_round_edge.top
-
- }
-
- // Bottom Rect
- SidebarPanel {
- id: bottom_rect
- anchors.left: parent.left
- width: parent.width
- anchors.top: cursor_round_edge.bottom
- anchors.bottom: parent.bottom
-
- }
-
-
- // Left Rect
- SidebarPanel {
- id: left_rect
- anchors.left: top_rect.left
- anchors.top: top_rect.bottom
- anchors.bottom: bottom_rect.top
- anchors.right: cursor.left
- anchors.topMargin: -top_rect.border.width
- anchors.bottomMargin: anchors.topMargin
-
- border.width: 0
- radius: 0
-
- end_pos: top_rect.width*0.95 / width
- }
-
-
- // Cursor left edge
- AnimatedRectangle {
- id: cursor_round_edge
- color: theme.navigationSideBarButtonGradient1
- width: radius*2
-
- anchors.rightMargin: -width/2
- height: Style.sidebarLineHeight
- anchors.right: cursor.left
- visible: true
- radius: theme.rectangleRadius
-
- y: {
- switch(dashboard.current_page) {
- case idx_dashboard_portfolio:
- case idx_dashboard_wallet:
- case idx_dashboard_exchange:
- case idx_dashboard_addressbook:
- case idx_dashboard_news:
- case idx_dashboard_dapps:
- return sidebar_center.y + dashboard.current_page * Style.sidebarLineHeight
- case idx_dashboard_settings:
- case idx_dashboard_support:
- return sidebar_bottom.y + (dashboard.current_page - idx_dashboard_settings) * Style.sidebarLineHeight
- }
- }
-
- Behavior on y { SmoothedAnimation { duration: Style.animationDuration; velocity: -1 } }
- }
-
- // Content
- Item {
- anchors.right: parent.right
- width: parent.width + parent.x
- height: parent.height
-
- DefaultImage {
- id: app_logo
- source: expanded? "file:///"+ atomic_logo_path + "/"+ theme.bigSidebarLogo : "file:///"+atomic_logo_path + "/"+ theme.smallSidebarLogo
- anchors.horizontalCenter: parent.horizontalCenter
- y: expanded? parent.width * 0.25 : parent.width * 0.40
- transformOrigin: Item.Center
- height: expanded? 85 : 65
- scale: expanded? 1 : .8
- }
-
- Separator {
- anchors.bottom: version_text.top
- anchors.bottomMargin: 6
- width: parent.width-10
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- DexLabel {
- id: version_text
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: parent.top
- anchors.topMargin: expanded? parent.width * 0.85 : parent.width * 1.4
- width: parent.width-5
- horizontalAlignment: DefaultText.AlignHCenter
- wrapMode: DefaultText.Wrap
- text_value: General.version_string
- font: theme.textType.caption
- color: Style.colorThemeDarkLight
- }
-
- SidebarCenter {
- id: sidebar_center
- width: parent.width
- anchors.verticalCenter: parent.verticalCenter
- }
-
- SidebarBottom {
- id: sidebar_bottom
- width: parent.width
- anchors.bottom: parent.bottom
- anchors.bottomMargin: parent.width * 0.25
- }
- }
-}
diff --git a/atomic_defi_design/qml/Sidebar/SidebarBottom.qml b/atomic_defi_design/qml/Sidebar/SidebarBottom.qml
deleted file mode 100644
index ccee298d7e..0000000000
--- a/atomic_defi_design/qml/Sidebar/SidebarBottom.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Constants"
-
-ColumnLayout {
- id: window_layout
- transformOrigin: Item.Center
- spacing: 0
- SidebarLine {
- dashboard_index: -1
- text_value: sidebar.expanded? qsTr("Settings") : ""
- image: General.image_path + "menu-settings-white.svg"
- Layout.fillWidth: true
- separator: false
- onCheckedChanged: setting_modal.open()
- }
-
- SidebarLine {
- dashboard_index: idx_dashboard_support
- text_value: sidebar.expanded? qsTr("Support") : ""
- image: General.image_path + "menu-support-white.png"
- Layout.fillWidth: true
- separator: false
- }
-
- SidebarLine {
- dashboard_index: idx_dashboard_privacy_mode
- text_value: sidebar.expanded? qsTr("Privacy") : ""
- image: ""
- Layout.fillWidth: true
- separator: false
- checked: General.privacy_mode
- }
-}
diff --git a/atomic_defi_design/qml/Sidebar/SidebarCenter.qml b/atomic_defi_design/qml/Sidebar/SidebarCenter.qml
deleted file mode 100644
index 57bc90dd0e..0000000000
--- a/atomic_defi_design/qml/Sidebar/SidebarCenter.qml
+++ /dev/null
@@ -1,102 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Constants"
-import "../Components"
-
-ColumnLayout {
- id: window_layout
-
- transformOrigin: Item.Center
- spacing: 0
-
- SidebarLine {
- dashboard_index: idx_dashboard_portfolio
- text_value:sidebar.expanded? qsTr("Dashboard") : ""
- image: General.image_path + "menu-assets-portfolio.svg"
- Layout.fillWidth: true
- separator: false
- SidebarTooltip {
- text_value: qsTr("Dashboard")
- }
-
- }
-
- SidebarLine {
- dashboard_index: idx_dashboard_wallet
- text_value: sidebar.expanded? qsTr("Wallet") : ""
- image: General.image_path + "menu-assets-white.svg"
- Layout.fillWidth: true
- SidebarTooltip {
- text_value: qsTr("Wallet")
- }
- }
-
- SidebarLine {
- id: dex_line
- section_enabled: !is_dex_banned
- dashboard_index: idx_dashboard_exchange
- text_value: sidebar.expanded? qsTr("DEX") : ""
- image: General.image_path + "menu-exchange-white.svg"
- Layout.fillWidth: true
- SidebarTooltip {
- text_value: qsTr("DEX")
- }
-
- DefaultTooltip {
- visible: dex_line.mouse_area.containsMouse && !dex_line.section_enabled
-
- contentItem: ColumnLayout {
- DefaultText {
- text_value: qsTr("DEX features are not allowed in %1", "COUNTRY").arg(API.app.ip_checker.ip_country)
- font.pixelSize: Style.textSizeSmall4
- }
- }
- }
- }
-
- SidebarLine {
- dashboard_index: idx_dashboard_addressbook
- text_value: sidebar.expanded? qsTr("Address Book") : ""
- image: General.image_path + "menu-news-white.svg"
- Layout.fillWidth: true
- SidebarTooltip {
- text_value: qsTr("Address Book")
- }
- }
-
- SidebarLine {
- section_enabled: false
- dashboard_index: idx_dashboard_fiat_ramp
- text_value: sidebar.expanded ? qsTr("Fiat") : ""
- image: General.image_path + "bill.svg"
- Layout.fillWidth: true
- SidebarTooltip {
- text_value: qsTr("Fiat")
- }
-
- DefaultTooltip {
- enabled: false
- id: fiat_coming_soon
- text: qsTr("Coming soon !")
- visible: parent.mouse_area.containsMouse
- }
- }
-
-// SidebarLine {
-// dashboard_index: idx_dashboard_news
-// text_value: qsTr("News")
-// image: General.image_path + "menu-news-white.svg"
-// Layout.fillWidth: true
-// }
-
-// SidebarLine {
-// dashboard_index: idx_dashboard_dapps
-// text_value: qsTr("Dapps")
-// image: General.image_path + "menu-dapp-white.svg"
-// Layout.fillWidth: true
-// }
-}
diff --git a/atomic_defi_design/qml/Sidebar/SidebarLine.qml b/atomic_defi_design/qml/Sidebar/SidebarLine.qml
deleted file mode 100644
index 92ca76a277..0000000000
--- a/atomic_defi_design/qml/Sidebar/SidebarLine.qml
+++ /dev/null
@@ -1,138 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import "../Components"
-import "../Constants"
-
-Item {
- id: root
-
- property bool section_enabled: true
- property alias mouse_area: mouse_area
-
- property int dashboard_index
- property alias image: img.source
- property alias text_value: txt.text
- property alias separator: separator.visible
- property alias checked: switch_input.checked
- readonly property bool selected: dashboard.current_page === dashboard_index
-
- function toggleDarkUI() {
- Style.dark_theme = !Style.dark_theme
- }
-
- function togglePrivacyMode() {
- General.privacy_mode = !General.privacy_mode
- }
-
- height: Style.sidebarLineHeight
-
- DefaultSwitch {
- id: switch_input
- visible: dashboard_index === idx_dashboard_light_ui ||
- dashboard_index === idx_dashboard_privacy_mode
- anchors.left: parent.left
- anchors.leftMargin: 7
- anchors.verticalCenter: img.verticalCenter
- scale: 0.75
- }
-
- DefaultImage {
- id: img
- height: txt.font.pixelSize * 1.4
- anchors.left: parent.left
- anchors.leftMargin: 30
- scale: 1.2
- anchors.verticalCenter: parent.verticalCenter
- visible: false
- }
- DropShadow {
- visible: selected
- anchors.fill: img
- source: img
- cached: false
- horizontalOffset: 0
- verticalOffset: 3
- radius: 3
- //scale:
- samples: 6
- antialiasing: true
- spread: 0
- color: "#40000000"
- smooth: true
- }
- DefaultColorOverlay {
- id: img_color
- visible: img.source != ""
- anchors.fill: img
- source: img
- color: txt.font.weight === Font.Medium ? Style.colorSidebarIconHighlighted : txt.color
- }
-
- DexLabel {
- id: txt
- anchors.left: parent.left
- anchors.leftMargin: 70
- anchors.verticalCenter: parent.verticalCenter
- scale: Qt.platform.os==="windows"? 1.2 : API.app.settings_pg.lang=="fr"? 0.85 : 1
- font: Qt.font({
- pixelSize: 16*_font.fontDensity*_font.languageDensity,
- letterSpacing: 0.5,
- family: _font.fontFamily,
- weight: Font.Normal
- })
- color: !section_enabled ? Style.colorTextDisabled :
- selected ? Style.colorSidebarSelectedText :
- mouse_area.containsMouse ? Style.colorThemePassiveLight :
- Style.colorThemePassive
- }
- DropShadow {
- visible: selected
- anchors.fill: txt
- source: txt
- cached: false
- horizontalOffset: 0
- verticalOffset: 3
- radius: 3
- samples: 4
- spread: 0
- scale: Qt.platform.os==="windows"? 1.2 : API.app.settings_pg.lang=="fr"? 0.85 : 1
- color: "#40000000"
- smooth: true
- }
-
- DefaultMouseArea {
- id: mouse_area
- hoverEnabled: true
- width: parent.width
- height: parent.height
- onClicked: function() {
- if (dashboard_index===-1) {
- setting_modal.open()
- return
- }
-
- if(!section_enabled) return
-
- if(dashboard_index === idx_dashboard_light_ui) {
- toggleDarkUI()
- }
- else if(dashboard_index === idx_dashboard_privacy_mode) {
- togglePrivacyMode()
- }
- else dashboard.current_page = dashboard_index
- }
- }
-
- Separator {
- id: separator
- anchors.horizontalCenter: parent.horizontalCenter
- width: parent.width - 10
- }
-}
-
-
-
-
diff --git a/atomic_defi_design/qml/Sidebar/SidebarTooltip.qml b/atomic_defi_design/qml/Sidebar/SidebarTooltip.qml
deleted file mode 100644
index 59d2abb0c2..0000000000
--- a/atomic_defi_design/qml/Sidebar/SidebarTooltip.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Constants"
-import "../Components"
-
-Qaterial.ToolTip
-{
- id: _control
- property string text_value: ""
- contentItem: DexLabel {
- text: qsTr(_control.text_value)
- font: theme.textType.caption
- padding: 5
- }
- visible: parent.mouse_area.containsMouse && !sidebar.expanded
- background: FloatingBackground {auto_set_size: false}
- position: Qaterial.Style.Position.Right
-}
diff --git a/atomic_defi_design/qml/Support/FAQLine.qml b/atomic_defi_design/qml/Support/FAQLine.qml
deleted file mode 100644
index 49dc29595e..0000000000
--- a/atomic_defi_design/qml/Support/FAQLine.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import "../Components"
-import "../Constants"
-
-TextWithTitle {
- expandable: true
- Layout.fillWidth: true
-}
diff --git a/atomic_defi_design/qml/Support/Support.qml b/atomic_defi_design/qml/Support/Support.qml
deleted file mode 100644
index 30d3daedd6..0000000000
--- a/atomic_defi_design/qml/Support/Support.qml
+++ /dev/null
@@ -1,176 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import "../Components"
-import "../Constants"
-
-Item {
- id: root
-
- DefaultFlickable {
- id: layout_background
-
- anchors.fill: parent
- anchors.leftMargin: 20
- anchors.rightMargin: anchors.leftMargin
- anchors.bottomMargin: anchors.leftMargin
-
- contentWidth: width
- contentHeight: content_layout.height
-
- ColumnLayout {
- id: content_layout
- width: parent.width
- spacing: 40
-
- Item {
- Layout.topMargin: parent.spacing
- Layout.fillWidth: true
- Layout.preferredHeight: 80
-
- LinksRow {
- anchors.left: parent.left
- anchors.verticalCenter: parent.verticalCenter
- }
-
- DefaultMouseArea {
- id: changelog_button
-
- anchors.centerIn: parent
- width: column_layout.width
- height: column_layout.height
- hoverEnabled: true
-
- onClicked: update_modal.open()
-
- ColumnLayout {
- id: column_layout
- RowLayout {
- Layout.alignment: Qt.AlignHCenter
-
- Circle {
- Layout.alignment: Qt.AlignVCenter
-
- color: Qt.lighter(update_needed ? Style.colorOrange : Style.colorGreen, changelog_button.containsMouse ? Style.hoverLightMultiplier : 1.0)
- }
-
- DefaultText {
- Layout.alignment: Qt.AlignVCenter
- text_value: update_needed ? qsTr("Update available") : qsTr("Up to date")
- color: changelog_text.color
- }
- }
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: General.version_string
- font.pixelSize: Style.textSizeSmall3
- color: changelog_text.color
- }
-
- DefaultText {
- id: changelog_text
- Layout.alignment: Qt.AlignHCenter
- text_value: General.cex_icon + ' ' + qsTr('Changelog')
- font.pixelSize: Style.textSizeSmall2
-
- color: Qt.lighter(Style.colorWhite4, changelog_button.containsMouse ? Style.hoverLightMultiplier : 1.0)
- }
- }
- }
-
- DefaultButton {
- anchors.right: parent.right
- anchors.rightMargin: 20
- anchors.verticalCenter: parent.verticalCenter
- text: qsTr("Open Logs Folder")
- onClicked: openLogsFolder()
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- }
-
- DefaultText {
- Layout.alignment: Qt.AlignHCenter
- text_value: qsTr("Frequently Asked Questions")
- font.pixelSize: Style.textSize2
- }
-
-
-
-
-
-
-
-
-
-
-
- // FAQ Lines
- FAQLine {
- title: qsTr("Do you store my private keys?")
- text: qsTr("No! %1 is non-custodial. We never store any sensitive data, including your private keys, seed phrases, or PIN. This data is only stored on the user’s device and never leaves it. You are in full control of your assets.").arg(API.app_name)
- }
-
- FAQLine {
- title: qsTr("How is trading on %1 different from trading on other DEXs?").arg(API.app_name)
- text: qsTr("Other DEXs generally only allow you to trade assets that are based on a single blockchain network, use proxy tokens, and only allow placing a single order with the same funds.
-
-%1 enables you to natively trade across two different blockchain networks without proxy tokens. You can also place multiple orders with the same funds. For example, you can sell 0.1 BTC for KMD, QTUM, or VRSC — the first order that fills automatically cancels all other orders.").arg(API.app_name)
- }
-
- FAQLine {
- title: qsTr("How long does each atomic swap take?")
- text: qsTr('Several factors determine the processing time for each swap. The block time of the traded assets depends on each network (Bitcoin typically being the slowest) Additionally, the user can customize security preferences. For example, (you can ask %1 to consider a KMD transaction as final after just 3 confirmations which makes the swap time shorter compared to waiting for a notarization.').arg(API.app_name)
- }
-
- FAQLine {
- title: qsTr("Do I need to be online for the duration of the swap?")
- text: qsTr("Yes. You must remain connected to the internet and have your app running to successfully complete each atomic swap (very short breaks in connectivity are usually fine). Otherwise, there is risk of trade cancellation if you are a maker, and risk of loss of funds if you are a taker.
-The atomic swap protocol requires both participants to stay online and monitor the involved blockchains for the process to stay atomic.
-If you go offline, so will your orders, and any that are in progress will fail, leading to potential loss of trade / transaction fees, and a wait for the swap to timeout and issue a refund. It may also negatively affect your wallet's reputation score for future trade matching.
-When you come back online, your orders will begin to broadcast again at the price you set before you went offline. If there has been significant price movement in the meantime, you might unintentionally offer someone a bargain!
-For this reason, we recommend cancelling orders before closing %1, or reviewing and revising your prices when restarting %1.").arg(API.app_name)
- }
-
- FAQLine {
- title: qsTr("How are the fees on %1 calculated?").arg(API.app_name)
- text: qsTr("There are two fee categories to consider when trading on %1.
-
-1. %1 charges approximately 0.13% (1/777 of trading volume but not lower than 0.0001) as the trading fee for taker orders, and maker orders have zero fees.
-2. Both makers and takers will need to pay normal network fees to the involved blockchains when making atomic swap transactions.
-
-Network fees can vary greatly depending on your selected trading pair.").arg(API.app_name)
- }
-
- FAQLine {
- title: qsTr("Do you provide user support?")
- text: qsTr('Yes! %1 offers support through the %1 Discord server. The team and the community are always happy to help!').arg(API.app_name).arg(API.app_discord_url)
- }
-
- FAQLine {
- title: qsTr("Who is behind %1?").arg(API.app_name)
- text: qsTr("%1 is developed by the Komodo team. Komodo is one of the most established blockchain projects working on innovative solutions like atomic swaps, Delayed Proof of Work, and an interoperable multi-chain architecture.").arg(API.app_name)
- }
-
- FAQLine {
- title: qsTr("Is it possible to develop my own white-label exchange on %1?").arg(API.app_name)
- text: qsTr("Absolutely! You can read our developer documentation for more details or contact us with your partnership inquiries. Have a specific technical question? The %1 developer community is always ready to help!").arg(API.app_name)
- }
-
- FAQLine {
- title: qsTr("Which devices can I use %1 on?").arg(API.app_name)
- text: qsTr('%1 is available for mobile on both Android and iPhone, and for desktop on Windows, Mac, and Linux operating systems.').arg(API.app_name).arg(API.app_website_url)
- }
-
- FAQLine {
- title: qsTr("Compliance Info")
- text: qsTr("Due to regulatory and legal circumstances the citizens of certain jurisdictions including, but not limited to, the United States of America, Canada, Hong Kong, Israel, Singapore, Sudan, Austria, Iran and any other state, country or other jurisdiction that is embargoed by the United States of America or the European Union are not allowed to use this application.")
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBook.qml b/atomic_defi_design/qml/Wallet/AddressBook.qml
deleted file mode 100644
index 51adac4b3d..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBook.qml
+++ /dev/null
@@ -1,267 +0,0 @@
-// Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.0
-
-// Deps Imports
-import Qaterial 1.0 as Qaterial
-
-// Project Imports
-import "../Components"
-import "../Constants"
-
-ColumnLayout {
- id: root
- Layout.fillWidth: true
- Layout.fillHeight: true
- //spacing: 20
-
- readonly property var addressbook_pg: API.app.addressbook_pg
-
- // Page header
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 100
-
- DefaultText { // Title
- anchors.left: parent.left
- anchors.leftMargin: 15
- anchors.top: parent.top
- anchors.topMargin: 10
-
- text_value: qsTr("Address Book")
- font.weight: Font.Medium
- font.pixelSize: Style.textSize3
- }
-
- DefaultTextField { // Search input
- id: searchbar
- width: 400
- anchors.left: parent.left
- anchors.leftMargin: 20
- anchors.bottom: parent.bottom
- anchors.topMargin: 10
-
- Layout.fillWidth: true
- placeholderText: qsTr("Search a contact by name or tags")
- onTextChanged: addressbook_pg.model.proxy.search_exp = text
-
- Component.onDestruction: addressbook_pg.model.proxy.search_exp = ""
- }
-
- PrimaryButton { // New Contact Button
- anchors.right: parent.right
- anchors.rightMargin: 30
- anchors.verticalCenter: parent.verticalCenter
-
- text: qsTr("New Contact")
-
- onClicked: new_contact_modal.open()
- }
- }
-
- // Contact List Header
- Item {
- Layout.fillWidth: true
- Layout.preferredHeight: 30
-
- HorizontalLine {
- anchors.top: parent.top
- width: parent.width
- color: Style.colorWhite5
- }
-
- DefaultText {
- id: header_name_column
- anchors.left: parent.left
- anchors.leftMargin: 20
- anchors.verticalCenter: parent.verticalCenter
- color: Style.colorWhite4
- text: qsTr("Name")
- }
-
- DefaultText {
- id: header_tags_column
- anchors.left: header_name_column.right
- anchors.leftMargin: 180
- anchors.verticalCenter: parent.verticalCenter
- color: Style.colorWhite4
- text: qsTr("Tags (first 6)")
- }
-
- DefaultText {
- anchors.right: parent.right
- anchors.rightMargin: parent.width * 0.138
- anchors.verticalCenter: parent.verticalCenter
- color: Style.colorWhite4
- text: qsTr("Actions")
- }
-
- HorizontalLine {
- width: parent.width
- color: Style.colorWhite5
- anchors.bottom: parent.bottom
- }
- }
-
- // Contact List
- DefaultListView {
- id: contact_list
- Layout.fillWidth: true
- Layout.fillHeight: true
-
- model: addressbook_pg.model.proxy
-
- // Contact Card
- delegate: AnimatedRectangle {
- id: contact_card
-
- property var contact: modelData
-
- color: Qt.lighter(index % 2 == 0 ? Style.colorTheme6 : Style.colorTheme7, 1.0)
- width: root.width
- height: 55
-
- DefaultText { // Contact Name
- id: contact_name
- anchors.left: parent.left
- anchors.leftMargin: 20
- anchors.verticalCenter: parent.verticalCenter
-
- width: 160
-
- text: modelData.name
- elide: Text.ElideRight
- }
-
- VerticalLine {
- anchors.left: contact_name.right
- anchors.leftMargin: 25
- height: parent.height
- width: 1
- }
-
- Flow { // Contact First 6 Tags
- id: contact_tags_list
- flow: GridLayout.LeftToRight
-
- readonly property int length: 6 // Number of displayed tags
- readonly property int tagButtonWidth: 150 // Width of a tag button
-
- width: length * tagButtonWidth
-
- anchors.left: contact_name.right
- anchors.leftMargin: 50
- anchors.verticalCenter: parent.verticalCenter
-
- Repeater {
- model: contact_card.contact.categories
-
- delegate: Qaterial.OutlineButton {
- width: contact_tags_list.tagButtonWidth
- visible: index < contact_tags_list.length && index < contact_card.contact.categories.length
- outlined: false
- text: modelData
- icon.source: Qaterial.Icons.tag
- //elide: Text.ElideRight
-
- onClicked: searchbar.text = modelData
- }
- }
- }
-
- VerticalLine {
- anchors.right: edit_contact_button.left
- anchors.rightMargin: 30
- height: parent.height
- width: 1
- }
-
- DefaultButton { // Edit Button
- id: edit_contact_button
-
- anchors.right: remove_contact_button.left
- anchors.rightMargin: 5
- anchors.verticalCenter: parent.verticalCenter
-
- text: qsTr("Edit")
- font.pixelSize: Style.textSizeSmall3
- width: 120
-
- onClicked: {
- edit_contact_modal.contactModel = modelData
- edit_contact_modal.open()
- }
- }
-
- DangerButton { // Remove Button
- id: remove_contact_button
-
- anchors.right: parent.right
- anchors.rightMargin: 30
- anchors.verticalCenter: parent.verticalCenter
-
- text: qsTr("Remove")
- font.pixelSize: Style.textSizeSmall3
- width: 120
-
- onClicked: {
- remove_contact_modal.contactName = modelData.name
- remove_contact_modal.open()
- }
- }
- }
-
-
- // Create Contact Modal
- ModalLoader {
- id: new_contact_modal
- sourceComponent: AddressBookNewContactModal {}
- }
-
- // Edit Contact Modal
- ModalLoader {
- id: edit_contact_modal
-
- property var contactModel
-
- onLoaded: item.contactModel = contactModel
-
- sourceComponent: AddressBookEditContactModal {}
- }
-
- // Delete Contact Modal
- ModalLoader {
- property string contactName
-
- id: remove_contact_modal
-
- sourceComponent: BasicModal {
- width: 500
-
- ModalContent {
- Layout.fillWidth: true
- title: qsTr("Do you want to remove this contact ?")
-
- RowLayout {
- DangerButton {
- text: qsTr("Yes")
-
- onClicked: {
- remove_contact_modal.close()
- addressbook_pg.model.remove_contact(contactName)
- }
- }
-
- DefaultButton {
- text: qsTr("No")
-
- onClicked: remove_contact_modal.close()
- }
- }
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookAddContactAddressModal.qml b/atomic_defi_design/qml/Wallet/AddressBookAddContactAddressModal.qml
deleted file mode 100644
index 801de305bd..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookAddContactAddressModal.qml
+++ /dev/null
@@ -1,152 +0,0 @@
-// Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15 //> ToolTip
-
-// Project Imports
-import "../Constants"
-import "../Components"
-
-// Contact address entry creation/edition modal
-BasicModal {
- id: root
-
- property var contactModel
-
- // Address Creation (false) or Edition (true) mode.
- property bool isEdition: false
-
- property alias walletType: wallet_type_list_modal.selected_wallet_type // The selected wallet type that will be associated this new address entry.
- property alias key: contact_new_address_key.text // The entered key that will be associated to this new address entry.
- property alias value: contact_new_address_value.text // The entered address value that will be associated to this new address entry.
-
- // These properties are required in edition mode since we need to wipe out old address entry.
- property string oldWalletType
- property string oldKey
- property string oldValue
-
- width: 400
-
- ModalContent {
- Layout.topMargin: 5
- Layout.fillWidth: true
-
- title: isEdition ? qsTr("Edit address entry") : qsTr("Create a new address")
-
- // Wallet Type Selector
- DexButton
- {
- Layout.alignment: Qt.AlignHCenter
- Layout.fillWidth: true
-
- onClicked: wallet_type_list_modal.open()
-
- DexLabel
- {
- anchors.centerIn: parent
-
- width: 320
-
- elide: Text.ElideRight
- wrapMode: Text.NoWrap
-
- font: parent.font
- text: qsTr("Selected wallet: %1").arg(walletType !== "" ? walletType : qsTr("NONE"))
-
- ToolTip.text: text
- ToolTip.visible: parent.containsMouse
- }
- }
-
- // Address Key Field
- DefaultTextField {
- id: contact_new_address_key
-
- Layout.topMargin: 5
- implicitWidth: parent.width
-
- placeholderText: qsTr("Enter a name")
-
- onTextChanged: {
- const max_length = 30
- if (text.length > max_length)
- text = text.substring(0, max_length)
- }
-
- // Error tooltip when key already exists.
- DefaultTooltip {
- id: key_already_exists_tooltip
- visible: false
- contentItem: DefaultText {
- text_value: qsTr("This key already exists.")
- }
- }
- }
-
- // Address Value Field
- DefaultTextField {
- id: contact_new_address_value
-
- Layout.topMargin: 5
- implicitWidth: parent.width
-
- placeholderText: qsTr("Enter the address")
-
- onTextChanged: {
- const max_length = 50
- if (text.length > max_length)
- text = text.substring(0, max_length)
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- }
-
- RowLayout {
- PrimaryButton {
- text: qsTr("Validate")
-
- onClicked: {
- if (isEdition) { // Removes old address entry before if we are in edition mode.
- console.debug("AddressBook: Replacing address %1:%2:%3 of contact %4"
- .arg(oldWalletType).arg(oldKey).arg(oldValue).arg(contactModel.name))
- contactModel.remove_address_entry(oldWalletType, oldKey);
- }
-
- var create_address_result = contactModel.add_address_entry(walletType, key, value);
- if (create_address_result === true) {
- console.debug("AddressBook: Address %1:%2:%3 created for contact %4"
- .arg(walletType).arg(key).arg(value).arg(contactModel.name))
- root.close()
- }
- else {
- console.debug("AddressBook: Failed to create address for contact %1: %2 key already exists"
- .arg(contactModel.name).arg(key))
- key_already_exists_tooltip.visible = true
- }
- }
-
- enabled: key.length > 0 && value.length > 0 && walletType !== ""
- }
-
- DefaultButton {
- text: qsTr("Cancel")
-
- onClicked: root.close()
- }
- }
-
-
- ModalLoader {
- id: wallet_type_list_modal
-
- property string selected_wallet_type: ""
-
- sourceComponent: AddressBookWalletTypeListModal
- {
- onSelected_wallet_typeChanged: wallet_type_list_modal.selected_wallet_type = selected_wallet_type
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookEditContactModal.qml b/atomic_defi_design/qml/Wallet/AddressBookEditContactModal.qml
deleted file mode 100644
index 67fdda5562..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookEditContactModal.qml
+++ /dev/null
@@ -1,497 +0,0 @@
-// Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Universal 2.15
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-
-// Deps Imports
-import Qaterial 1.0 as Qaterial
-
-// Project Imports
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- property var contactModel
-
- function trySend(wallet_type, address) {
- // Checks if the selected wallet type is a coin type instead of a coin.
- if (API.app.portfolio_pg.global_cfg_mdl.is_coin_type(wallet_type)) {
- send_selector.coin_type = wallet_type
- send_selector.address = address
- send_selector.open()
- }
-
- // Checks if the coin is currently enabled.
- else if (!API.app.portfolio_pg.is_coin_enabled(wallet_type)) {
- enable_coin_modal.coin_name = wallet_type
- enable_coin_modal.open()
- }
-
- // Checks if the coin has balance.
- else if (parseFloat(API.app.get_balance(wallet_type)) === 0) {
- cannot_send_modal.open()
- }
-
- // If the coin has balance and is enabled, opens the send modal.
- else {
- API.app.wallet_pg.ticker = wallet_type
- send_modal.address = address
- send_modal.open()
- }
- }
-
- width: 700
-
- onClosed: contactModel.reload()
-
- ModalContent {
- Layout.topMargin: 5
- Layout.fillWidth: true
-
- title: qsTr("Edit contact")
-
- // Contact name section
- TextFieldWithTitle {
- id: name_input
- width: 30
- title: qsTr("Contact Name")
- field.placeholderText: qsTr("Enter a contact name")
- field.text: contactModel.name
- field.onTextChanged: {
- const max_length = 50
- if (field.text.length > max_length)
- field.text = field.text.substring(0, max_length)
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- color: Style.colorWhite8
- }
-
- // Wallets Information
- ColumnLayout {
- Layout.fillWidth: true
-
- // Title
- TitleText { text: qsTr("Address List") }
-
- DefaultTextField {
- Layout.topMargin: 10
- Layout.fillWidth: true
-
- placeholderText: qsTr("Search for an address entry.")
-
- onTextChanged: contactModel.proxy_filter.search_expression = text
- Component.onDestruction: contactModel.proxy_filter.search_expression = ""
- }
-
- // Addresses Table
- TableView {
- id: wallet_info_table
-
- model: contactModel.proxy_filter
-
- Layout.topMargin: 15
- Layout.fillWidth: true
-
- backgroundVisible: false
- frameVisible: false
-
- headerDelegate: RowLayout {
- Layout.preferredWidth: styleData.column === 0 ? 90 :
- styleData.column === 1 ? 100 :
- styleData.column === 2 ? 320 :
- 60
-
- AnimatedRectangle {
- Layout.fillWidth: true
- height: 20
-
- color: Style.colorRectangleBorderGradient1
-
- DefaultText {
- Layout.topMargin: 5
- Layout.leftMargin: 1
- text: styleData.value
- }
-
- VerticalLine {
- visible: styleData.column !== 3
- Layout.alignment: Qt.AlignRight
- Layout.fillHeight: true
- }
- }
- }
-
- rowDelegate: DefaultRectangle {
- height: 37
- radius: 0
- color: styleData.selected ? Style.colorBlue : styleData.alternate ? Style.colorRectangle : Style.colorRectangleBorderGradient2
- }
-
- TableViewColumn { // Type Column
- width: 90
-
- role: "address_type"
- title: qsTr("Type")
-
- resizable: false
- movable: false
-
- delegate: RowLayout {
- DefaultText {
- Layout.leftMargin: 3
- text: styleData.row >= 0 ? styleData.value : ""
- font.pixelSize: Style.textSizeSmall3
- }
-
- VerticalLine {
- Layout.alignment: Qt.AlignRight
- Layout.fillHeight: true
- }
- }
- }
-
- TableViewColumn { // Key Column
- width: 100
-
- role: "address_key"
- title: qsTr("Key")
-
- resizable: false
- movable: false
-
- delegate: RowLayout {
- DefaultText {
- Layout.leftMargin: 3
- text: styleData.row >= 0 ? styleData.value : ""
- font.pixelSize: Style.textSizeSmall3
- }
-
- VerticalLine {
- Layout.alignment: Qt.AlignRight
- Layout.fillHeight: true
- }
- }
- }
-
- TableViewColumn { // Address Column
- width: 320
-
- role: "address_value"
- title: qsTr("Address")
-
- resizable: false
- movable: false
-
- delegate: RowLayout {
- DefaultText {
- Layout.leftMargin: 3
- text: styleData.row >= 0 ? styleData.value : ""
- font.pixelSize: Style.textSizeSmall3
- color: Style.colorText
- }
-
- VerticalLine {
- Layout.alignment: Qt.AlignRight
- Layout.fillHeight: true
- }
- }
- }
-
- TableViewColumn { // Actions Column
- width: 80
- title: qsTr("Actions")
-
- resizable: false
- movable: false
-
- delegate: Row {
- spacing: 0
-
- Qaterial.OutlineButton { // Edit Address Button
- implicitHeight: 35
- implicitWidth: 35
-
- outlined: false
-
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- source: Qaterial.Icons.leadPencil
- color: theme.foregroundColor
- opacity: .8
- }
-
- onClicked: {
- address_edition_modal.walletType = model.address_type
- address_edition_modal.key = model.address_key
- address_edition_modal.value = model.address_value
- address_edition_modal.open()
- }
- }
-
- Qaterial.OutlineButton { // Delete Button
- implicitHeight: 35
- implicitWidth: 35
- outlined: false
-
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- source: Qaterial.Icons.trashCan
- color: theme.redColor
- opacity: .8
- }
- onClicked: contactModel.remove_address_entry(model.address_type, model.address_key)
- }
-
- Qaterial.OutlineButton { // Copy Clipboard Button
- implicitHeight: 35
- implicitWidth: 35
-
- outlined: false
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- source: Qaterial.Icons.contentCopy
- color: theme.foregroundColor
- opacity: .8
- }
-
- onClicked: API.qt_utilities.copy_text_to_clipboard(model.address_value)
- }
-
- Qaterial.OutlineButton { // Send Button
- implicitHeight: 35
- implicitWidth: 35
-
- outlined: false
- Qaterial.ColorIcon {
- anchors.centerIn: parent
- source: Qaterial.Icons.send
- color: theme.foregroundColor
- opacity: .8
- }
-
- onClicked: trySend(model.address_type, model.address_value)
- }
- }
- }
- }
-
- RowLayout {
- PrimaryButton { // New Address Button
- text: qsTr("New Address")
-
- onClicked: address_creation_modal.open();
- }
- }
-
- ModalLoader {
- id: address_creation_modal
- sourceComponent: AddressBookAddContactAddressModal {
- contactModel: root.contactModel
- }
- }
-
- ModalLoader {
- id: address_edition_modal
-
- property string walletType
- property string key
- property string value
-
- onLoaded: {
- item.oldWalletType = walletType
- item.walletType = walletType
-
- item.oldKey = key
- item.key = key
-
- item.oldValue = value
- item.value = value
- }
-
- sourceComponent: AddressBookAddContactAddressModal {
- contactModel: root.contactModel
- isEdition: true
- }
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- color: Style.colorWhite8
- }
-
- // Categories Section Title
- TitleText {
- text: qsTr("Tags")
- }
-
- // Categories (Tags) List
- Flow {
- Layout.fillWidth: true
-
- Repeater {
- id: category_repeater
- model: contactModel.categories
-
- Qaterial.OutlineButton {
- Layout.alignment: Qt.AlignLeft
- Layout.leftMargin: 4
-
- text: modelData
- icon.source: Qaterial.Icons.closeOctagon
-
- onClicked: contactModel.remove_category(modelData);
- }
- }
-
- // Category adding form opening button
- Qaterial.OutlineButton {
- Layout.leftMargin: 10
-
- text: qsTr("+")
-
- onClicked: add_category_modal.open()
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- color: Style.colorWhite8
- }
-
- // Actions on current contact
- RowLayout {
- Layout.alignment: Qt.AlignBottom | Qt.AlignRight
- Layout.rightMargin: 15
-
- PrimaryButton { // Validate (Save) Changes
- text: qsTr("Confirm")
- onClicked: {
- contactModel.name = name_input.field.text
- contactModel.save()
- root.close();
- }
- }
-
- DefaultButton { // Cancel Changes
- text: qsTr("Cancel")
- onClicked: root.close()
- }
- }
-
- // Wallet Type List Modal
- ModalLoader {
- id: wallet_type_list_modal
-
- property string selected_wallet_type: ""
-
- sourceComponent: AddressBookWalletTypeListModal {
- onSelected_wallet_typeChanged: wallet_type_list_modal.selected_wallet_type = selected_wallet_type
- }
- }
-
- // Enable Coin Modal
- ModalLoader {
- property string coin_name
-
- id: enable_coin_modal
-
- sourceComponent: BasicModal {
- ModalContent {
- Layout.fillWidth: true
- title: qsTr("Enable " + coin_name)
-
- DefaultText {
- text: qsTr("The selected address belongs to a disabled coin, you need to enabled it before sending.")
- }
-
- Row {
- // Enable button
- PrimaryButton {
- text: qsTr("Enable")
-
- onClicked: {
- API.app.enable_coin(coin_name)
- enable_coin_modal.close()
- }
- }
-
- // Cancel button
- DefaultButton {
- Layout.rightMargin: 5
- text: qsTr("Cancel")
-
- onClicked: enable_coin_modal.close()
- }
- }
- }
- }
- }
-
- // Send Selector modal
- ModalLoader {
- id: send_selector
-
- property string coin_type
- property string address
-
- onLoaded: {
- item.coin_type = coin_type
- item.address = address
- }
-
- sourceComponent: AddressBookSendWalletSelector {}
- }
-
- // Send Modal
- ModalLoader {
- property string address
-
- id: send_modal
-
- onLoaded: item.address_field.text = address
-
- sourceComponent: SendModal {
- address_field.enabled: false
- }
- }
-
- // Cannot Send Modal
- ModalLoader {
- id: cannot_send_modal
-
- sourceComponent: BasicModal {
- ModalContent {
- title: qsTr("Cannot send to this address")
-
- DefaultText {
- text: qsTr("Your balance is empty")
- }
-
- DefaultButton {
- text: qsTr("Ok")
-
- onClicked: cannot_send_modal.close()
- }
- }
- }
- }
-
- // Category (Tag) Adding Modal
- ModalLoader {
- id: add_category_modal
-
- onLoaded: item.contactModel = root.contactModel
-
- sourceComponent: AddressBookNewContactCategoryModal {}
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookNewContactCategoryModal.qml b/atomic_defi_design/qml/Wallet/AddressBookNewContactCategoryModal.qml
deleted file mode 100644
index e5f56ddd40..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookNewContactCategoryModal.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-//! New category form
-BasicModal {
- id: root
- width: 500
-
- property var contactModel
-
- ModalContent {
- Layout.fillWidth: true
- title: qsTr("Add a new tag")
-
- RowLayout {
- //! Category name input.
- DefaultTextField {
- id: name_input
- placeholderText: qsTr("Enter the tag name")
- onTextChanged: {
- const max_length = 14
- if(text.length > max_length)
- text = text.substring(0, max_length)
- }
-
- //! Error tooltip when category name already exists.
- DefaultTooltip {
- id: alrady_exists_tooltip
- visible: false
- contentItem: DefaultText {
- text_value: qsTr("This contact already has this tag")
- }
- }
- }
-
- //! Add
- PrimaryButton {
- Layout.leftMargin: 90
- text: qsTr("Add")
- onClicked: {
- if (!contactModel.add_category(name_input.text))
- {
- alrady_exists_tooltip.visible = true
- }
- else
- {
- name_input.text = ""
- add_category_modal.close()
- }
- }
- }
-
- //! Cancel
- DefaultButton {
- text: qsTr("Cancel")
- onClicked: {
- name_input.text = ""
- add_category_modal.close()
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookNewContactModal.qml b/atomic_defi_design/qml/Wallet/AddressBookNewContactModal.qml
deleted file mode 100644
index 0e05ff9d0d..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookNewContactModal.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
- width: 500
-
- ModalContent {
- Layout.topMargin: 5
- Layout.fillWidth: true
-
- title: qsTr("Create a new contact")
-
- // Contact name input.
- DefaultTextField {
- id: name_input
- placeholderText: qsTr("Enter the contact name")
- width: 150
- onTextChanged: {
- const max_length = 50
- if(text.length > max_length)
- text = text.substring(0, max_length)
- }
-
- // Error tooltip when contact name already exists.
- DefaultTooltip {
- id: contact_alrady_exists_tooltip
- visible: false
- contentItem: DefaultText {
- text_value: qsTr("This contact name already exists.")
- }
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- color: Style.colorWhite8
- }
-
- // Footer
- RowLayout {
- Layout.alignment: Qt.AlignBottom | Qt.AlignRight
-
- // Validate button.
- PrimaryButton {
- text: qsTr("Confirm")
- enabled: name_input.text.length > 0
- onClicked: {
- if (name_input.text.length == 0)
- {
- return;
- }
-
- var create_contact_result = API.app.addressbook_pg.model.add_contact(name_input.text.toString());
-
- if (create_contact_result === false)
- {
- contact_alrady_exists_tooltip.visible = true;
- }
- else
- {
- root.close();
- }
- }
- }
-
- // Cancel button.
- DefaultButton {
- text: qsTr("Cancel")
-
- onClicked: root.close()
- }
- }
- }
-
- onClosed: name_input.text = ""
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookSendWalletSelector.qml b/atomic_defi_design/qml/Wallet/AddressBookSendWalletSelector.qml
deleted file mode 100644
index 6f71afd195..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookSendWalletSelector.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- property string coin_type
- property string address
-
- width: 400
-
- ModalContent {
- Layout.fillWidth: true
- title: qsTr("Choose a valid ") + coin_type + qsTr(" coin")
-
- Repeater {
- model: coin_type == "QRC-20" ? API.app.portfolio_pg.global_cfg_mdl.all_qrc20_proxy :
- coin_type == "ERC-20" ? API.app.portfolio_pg.global_cfg_mdl.all_erc20_proxy :
- coin_type == "BEP-20" ? API.app.portfolio_pg.global_cfg_mdl.all_bep20_proxy :
- API.app.portfolio_pg.global_cfg_mdl.all_smartchains_proxy
-
- delegate: AddressBookWalletTypeListRow {
- Layout.preferredHeight: height
- Layout.rightMargin: 30
- Layout.fillWidth: true
-
- ticker: model.ticker
- name: model.name
-
- onClicked: {
- trySend(model.ticker, address)
- close()
- }
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookWalletTypeList.qml b/atomic_defi_design/qml/Wallet/AddressBookWalletTypeList.qml
deleted file mode 100644
index 8d83af03d1..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookWalletTypeList.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.impl 2.15
-import QtQuick.Controls.Universal 2.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-Qaterial.Expandable
-{
- id: _root
-
- property string title
-
- property string type_title
- property string type: ""
- property string typeIcon: type
-
- property var model
-
- header: Qaterial.ItemDelegate
- {
- id: _header
-
- icon.source: General.image_path + "arrow_down.svg"
-
- text: title
-
- onClicked: () => _root.expanded = !_root.expanded
- }
-
- delegate: Column
- {
- AddressBookWalletTypeListRow
- {
- enabled: type !== ""
- visible: type !== ""
-
- icon_source: General.coinTypeIcon(typeIcon)
-
- width: _root.width
-
- name: type_title
- ticker: type_title
-
- onClicked: onTypeSelect(type)
- }
-
- Repeater
- {
- model: _root.model
-
- delegate: AddressBookWalletTypeListRow
- {
- width: _root.width
-
- name: model.name
- ticker: model.ticker
-
- onClicked: onTypeSelect(ticker)
- }
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookWalletTypeListModal.qml b/atomic_defi_design/qml/Wallet/AddressBookWalletTypeListModal.qml
deleted file mode 100644
index 060892cb42..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookWalletTypeListModal.qml
+++ /dev/null
@@ -1,133 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-
-import Qaterial 1.0 as Qaterial
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- readonly property var glbCoinsCfgModel: API.app.portfolio_pg.global_cfg_mdl
- property alias selected_wallet_type: wallet_list.selected_wallet_type
-
- function resetModal()
- {
- _searchbar.text = ""
- filterWallets(_searchbar.text)
- }
-
- function filterWallets(text)
- {
- _qrc20Expandable.model.setFilterFixedString(text)
- _erc20Expandable.model.setFilterFixedString(text)
- _bep20Expandable.model.setFilterFixedString(text)
- _scExpandable.model.setFilterFixedString(text)
- _utxoExpandable.model.setFilterFixedString(text)
-
- // Expands type lists if searchbar is not empty
- _qrc20Expandable.expanded = text !== ""
- _erc20Expandable.expanded = text !== ""
- _bep20Expandable.expanded = text !== ""
- _scExpandable.expanded = text !== ""
- _utxoExpandable.expanded = text !== ""
- }
-
- function onTypeSelect(type_or_ticker)
- {
- selected_wallet_type = type_or_ticker
- close()
- }
-
- width: 400
-
- onOpened: _searchbar.forceActiveFocus()
- onClosed: resetModal()
-
- ModalContent
- {
- id: wallet_list
-
- property string selected_wallet_type: ""
-
- title: qsTr("Select wallet type")
-
- // Search input
- DefaultTextField
- {
- Layout.rightMargin: 10
- id: _searchbar
-
- Layout.fillWidth: true
- placeholderText: qsTr("Search")
-
- onTextChanged: filterWallets(text)
- }
-
- AddressBookWalletTypeList
- {
- id: _qrc20Expandable
-
- Layout.rightMargin: 10
- Layout.fillWidth: true
-
- title: "QRC-20 coins"
- type_title: "QRC-20"
- type: "QRC-20"
-
- model: glbCoinsCfgModel.all_qrc20_proxy
- }
-
- AddressBookWalletTypeList
- {
- id: _erc20Expandable
- Layout.rightMargin: 10
- Layout.fillWidth: true
-
- title: "ERC-20 coins"
- type_title: "ERC-20"
- type: "ERC-20"
-
- model: glbCoinsCfgModel.all_erc20_proxy
- }
-
- AddressBookWalletTypeList
- {
- id: _bep20Expandable
- Layout.rightMargin: 10
- Layout.fillWidth: true
-
- title: "BEP-20 coins"
- type_title: "BEP-20"
- type: "BEP-20"
- typeIcon: "BNB"
-
- model: glbCoinsCfgModel.all_bep20_proxy
- }
-
- AddressBookWalletTypeList
- {
- id: _scExpandable
- Layout.rightMargin: 10
- Layout.fillWidth: true
-
- title: "Smart Chain coins"
- type_title: "Smart Chain"
- type: "Smart Chain"
-
- model: glbCoinsCfgModel.all_smartchains_proxy
- }
-
- AddressBookWalletTypeList
- {
- id: _utxoExpandable
-
- Layout.rightMargin: 10
- Layout.fillWidth: true
-
- title: "UTXO coins"
- type_title: "UTXO"
-
- model: glbCoinsCfgModel.all_utxo_proxy
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressBookWalletTypeListRow.qml b/atomic_defi_design/qml/Wallet/AddressBookWalletTypeListRow.qml
deleted file mode 100644
index 0248f334a0..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressBookWalletTypeListRow.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-ItemDelegate {
- property string ticker
- property string name
-
- property alias icon_source: icon.source
-
- height: 50
-
- RowLayout {
- DefaultImage {
- id: icon
- Layout.topMargin: 10
- Layout.leftMargin: 30
- Layout.alignment: Qt.AlignVCenter
- source: General.coinIcon(ticker)
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- }
-
- DefaultText {
- Layout.topMargin: 10
- text: " " + name + " (" + ticker + ")"
- }
- }
-
-}
diff --git a/atomic_defi_design/qml/Wallet/AddressList.qml b/atomic_defi_design/qml/Wallet/AddressList.qml
deleted file mode 100644
index aba4bd4607..0000000000
--- a/atomic_defi_design/qml/Wallet/AddressList.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-ColumnLayout {
- property alias title: title.text
- property alias model: list.model
-
- Layout.fillWidth: true
-
- TitleText {
- id: title
- }
-
- ListView {
- id: list
- Layout.fillWidth: true
- Layout.fillHeight: true
- implicitHeight: contentItem.childrenRect.height
-
- clip: true
-
- // Row
- delegate: DefaultTextEdit {
- text_value: model.modelData
- color: Style.modalValueColor
- privacy: true
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/ClaimFaucetResultModal.qml b/atomic_defi_design/qml/Wallet/ClaimFaucetResultModal.qml
deleted file mode 100644
index d8b70ef8e5..0000000000
--- a/atomic_defi_design/qml/Wallet/ClaimFaucetResultModal.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- readonly property var claiming_faucet_rpc_result: api_wallet_page.claiming_faucet_rpc_data
-
- id: root
- width: 1200
-
- ModalContent {
- id: status
-
- title: claiming_faucet_rpc_result && claiming_faucet_rpc_result.status ?
- claiming_faucet_rpc_result.status : ""
-
- DefaultText {
- id: message
-
- text_value: claiming_faucet_rpc_result && claiming_faucet_rpc_result.message ?
- claiming_faucet_rpc_result.message : ""
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/ClaimRewardsModal.qml b/atomic_defi_design/qml/Wallet/ClaimRewardsModal.qml
deleted file mode 100644
index 07544ec91d..0000000000
--- a/atomic_defi_design/qml/Wallet/ClaimRewardsModal.qml
+++ /dev/null
@@ -1,447 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- readonly property bool empty_data: !prepare_claim_rewards_result || !prepare_claim_rewards_result.withdraw_answer
- readonly property bool positive_claim_amount: empty_data ? false :
- parseFloat(prepare_claim_rewards_result.withdraw_answer.my_balance_change) > 0
- readonly property bool has_eligible_utxo: {
- if(empty_data) return false
- const utxos = prepare_claim_rewards_result.kmd_rewards_info.result
- if(!utxos) return false
-
- for(let i = 0; i < utxos.length; ++i)
- if(!utxos[i].accrued_rewards.NotAccruedReason)
- return true
-
- return false
- }
-
- readonly property var default_prepare_claim_rewards_result: ({
- "kmd_rewards_info": {
- "result": [
- {
- "accrue_start_at": 1596785618,
- "accrue_stop_at": 1599460418,
- "accrue_start_at_human_date": "7 Aug 2020, 08:33",
- "accrue_stop_at_human_date": "7 Sep 2020, 08:33",
- "accrued_rewards": {
- "Accrued": "0"
- },
- "amount": "0",
- "output_index": 0
- }
- ]
- },
- "withdraw_answer": {
- "fee_details": {
- "amount": "0.00001"
- },
- "date": "7 Aug 2020, 08:33",
- "my_balance_change": "0",
- "tx_hash": "",
- "tx_hex": ""
- }
- })
- property var prepare_claim_rewards_result: General.clone(default_prepare_claim_rewards_result)
-
- // Override
- property var postClaim: () => {}
-
- // Local
- readonly property bool can_confirm: positive_claim_amount && has_eligible_utxo && !is_broadcast_busy
-
- readonly property bool can_claim: current_ticker_infos.is_claimable && !api_wallet_page.is_claiming_busy
- readonly property var claim_rpc_result: api_wallet_page.claiming_rpc_data
-
- readonly property bool is_broadcast_busy: api_wallet_page.is_broadcast_busy
- readonly property string broadcast_result: api_wallet_page.broadcast_rpc_data
-
- onClaim_rpc_resultChanged: {
- prepare_claim_rewards_result = General.clone(claim_rpc_result)
- if(!prepare_claim_rewards_result.withdraw_answer) {
- reset()
- return
- }
-
- console.log("Claim rewards result changed:", JSON.stringify(prepare_claim_rewards_result))
-
- if(prepare_claim_rewards_result.error_code) {
- toast.show(qsTr("Failed to prepare to claim rewards"), General.time_toast_important_error, prepare_claim_rewards_result.error_message)
- root.close()
- }
- }
-
- onBroadcast_resultChanged: {
- if(root.visible && broadcast_result !== "") {
- root.currentIndex = 1
- postClaim()
- }
- }
-
- function prepareClaimRewards() {
- if(!can_claim) return
-
- root.currentIndex = 0
- reset()
-
- api_wallet_page.claim_rewards()
- }
-
- function claimRewards() {
- api_wallet_page.broadcast(prepare_claim_rewards_result.withdraw_answer.tx_hex, true, false, "0")
- }
-
- function reset() {
- prepare_claim_rewards_result = General.clone(default_prepare_claim_rewards_result)
- }
-
- // Inside modal
- width: 1200
- ModalContent {
- title: qsTr("Claim your %1 reward?", "TICKER").arg(api_wallet_page.ticker)
-
- DefaultBusyIndicator {
- visible: !can_claim || is_broadcast_busy
- Layout.alignment: Qt.AlignCenter
- }
-
- RowLayout {
- visible: can_claim
-
- Layout.fillWidth: true
- DefaultText {
- Layout.fillWidth: true
- color: can_confirm ? Style.colorText : Style.colorRed
- text_value: !has_eligible_utxo ? ("❌ " + qsTr("No UTXOs eligible for claiming")) :
- !positive_claim_amount ? ("❌ " + qsTr("Transaction fee is higher than the reward!")) :
-
- qsTr("You will receive %1", "AMT TICKER").arg(General.formatCrypto("", prepare_claim_rewards_result.withdraw_answer.my_balance_change, api_wallet_page.ticker))
- }
-
- PrimaryButton {
- text: qsTr("Refresh")
- onClicked: prepareClaimRewards()
-
- enabled: can_claim
- }
- }
-
- DefaultText {
- text_value: General.cex_icon + ' ' + qsTr('Read more about KMD active users rewards') + ''
- font.pixelSize: Style.textSizeSmall2
- }
-
- // List header
- Item {
- visible: can_claim
-
- Layout.topMargin: 25
- Layout.fillWidth: true
-
- height: 40
-
- // Price
- DefaultText {
- id: utxo_header
- font.pixelSize: Style.textSizeSmall4
-
- text_value: qsTr("UTXO")
-
- font.weight: Font.Medium
- horizontalAlignment: Text.AlignLeft
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.000
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Amount
- DefaultText {
- id: amount_header
-
- text_value: qsTr("Amount")
-
- font.pixelSize: utxo_header.font.pixelSize
- font.weight: utxo_header.font.weight
- horizontalAlignment: utxo_header.horizontalAlignment
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.060
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Reward
- DefaultText {
- id: reward_header
-
- text_value: qsTr("Reward")
-
- font.pixelSize: utxo_header.font.pixelSize
- font.weight: utxo_header.font.weight
- horizontalAlignment: Text.AlignLeft
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.225
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Accruing start
- DefaultText {
- id: accruing_start_header
-
- text_value: qsTr("Accruing Start")
-
- font.pixelSize: utxo_header.font.pixelSize
- font.weight: utxo_header.font.weight
- horizontalAlignment: Text.AlignLeft
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.400
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Accruing Stop
- DefaultText {
- id: accruing_stop_header
-
- text_value: qsTr("Accruing Stop")
-
- font.pixelSize: utxo_header.font.pixelSize
- font.weight: utxo_header.font.weight
- horizontalAlignment: Text.AlignLeft
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.550
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Time Left
- DefaultText {
- id: time_left_header
-
- text_value: qsTr("Time Left")
-
- font.pixelSize: utxo_header.font.pixelSize
- font.weight: utxo_header.font.weight
- horizontalAlignment: Text.AlignLeft
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.700
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Error
- DefaultText {
- id: error_header
-
- text_value: qsTr("Error")
-
- font.pixelSize: utxo_header.font.pixelSize
- font.weight: utxo_header.font.weight
- horizontalAlignment: Text.AlignLeft
-
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.820
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Line
- HorizontalLine {
- width: parent.width
- color: Style.colorWhite5
- anchors.bottom: parent.bottom
- }
- }
-
- DefaultListView {
- visible: can_claim
-
- id: list
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.maximumHeight: 500
- clip: true
-
- model: empty_data ? [] :
- prepare_claim_rewards_result.kmd_rewards_info.result
-
- delegate: Item {
- width: root.width
- height: utxo_value.font.pixelSize * 1.5
-
- // UTXO
- DefaultText {
- id: utxo_value
-
- anchors.left: parent.left
- anchors.leftMargin: utxo_header.anchors.leftMargin
-
- font.pixelSize: utxo_header.font.pixelSize
-
- text_value: "#" + (index + 1)
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Amount
- DefaultText {
- id: amount_value
-
- anchors.left: parent.left
- anchors.leftMargin: amount_header.anchors.leftMargin
-
- font.pixelSize: utxo_value.font.pixelSize
-
- text_value: modelData.amount
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Reward
- DefaultText {
- id: reward_value
-
- anchors.left: parent.left
- anchors.leftMargin: reward_header.anchors.leftMargin
-
- font.pixelSize: utxo_value.font.pixelSize
-
- text_value: modelData.accrued_rewards.Accrued || "-"
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Accruing Start
- DefaultText {
- id: accruing_start_value
-
- anchors.left: parent.left
- anchors.leftMargin: accruing_start_header.anchors.leftMargin
-
- font.pixelSize: utxo_value.font.pixelSize
-
- text_value: modelData.accrue_start_at_human_date || "-"
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Accruing Stop
- DefaultText {
- id: accruing_stop_value
-
- anchors.left: parent.left
- anchors.leftMargin: accruing_stop_header.anchors.leftMargin
-
- font.pixelSize: utxo_value.font.pixelSize
-
- text_value: modelData.accrue_stop_at_human_date || "-"
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Time Left
- DefaultText {
- id: time_left_value
-
- anchors.left: parent.left
- anchors.leftMargin: time_left_header.anchors.leftMargin
-
- font.pixelSize: utxo_value.font.pixelSize
-
- text_value: modelData.accrue_stop_at ? General.secondsToTimeLeft(Date.now()/1000, modelData.accrue_stop_at) : '-'
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Error
- DefaultText {
- id: error_value
-
- anchors.left: parent.left
- anchors.leftMargin: error_header.anchors.leftMargin
-
- font.pixelSize: utxo_value.font.pixelSize
-
- text_value: {
- let val = modelData.accrued_rewards.NotAccruedReason
- if(val === null || val === undefined) return "-"
-
- switch(val) {
- case "LocktimeNotSet":
- val = qsTr("Locktime is not set")
- break
- case "LocktimeLessThanThreshold":
- val = qsTr("Locktime is less than the threshold")
- break
- case "UtxoHeightGreaterThanEndOfEra":
- val = qsTr("UTXO height is greater than end of the era")
- break
- case "UtxoAmountLessThanTen":
- val = qsTr("UTXO amount is less than 10")
- break
- case "OneHourNotPassedYet":
- val = qsTr("One hour did not pass yet")
- break
- case "TransactionInMempool":
- val = qsTr("Transaction is in mempool")
- break
- default:
- val = qsTr("Unknown problem")
- break
- }
-
- return "❌ " + val
- }
-
- anchors.verticalCenter: parent.verticalCenter
- }
-
- // Line
- HorizontalLine {
- visible: empty_data ? false :
- prepare_claim_rewards_result.kmd_rewards_info.result &&
- index !== prepare_claim_rewards_result.kmd_rewards_info.result.length - 1
- width: parent.width
- color: Style.colorWhite9
- anchors.bottom: parent.bottom
- }
- }
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Cancel")
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- PrimaryButton {
- text: qsTr("Confirm")
- Layout.fillWidth: true
- onClicked: claimRewards()
- enabled: can_confirm
- }
- ]
- }
-
- // Result Page
- SendResult {
- result: ({
- balance_change: empty_data ? "" : prepare_claim_rewards_result.withdraw_answer.my_balance_change,
- fees: empty_data ? "" : prepare_claim_rewards_result.withdraw_answer.fee_details.amount,
- date: empty_data ? "" : prepare_claim_rewards_result.withdraw_answer.date
- })
- tx_hash: broadcast_result
-
- function onClose() { root.close() }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/EnableCoinModal.qml b/atomic_defi_design/qml/Wallet/EnableCoinModal.qml
deleted file mode 100644
index 8684ef59f5..0000000000
--- a/atomic_defi_design/qml/Wallet/EnableCoinModal.qml
+++ /dev/null
@@ -1,182 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import AtomicDEX.CoinType 1.0
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- property var coin_cfg_model: API.app.portfolio_pg.global_cfg_mdl
-
- function setCheckState(checked) {
- coin_cfg_model.all_disabled_proxy.set_all_state(checked)
- }
-
- function filterCoins(text) {
- coin_cfg_model.all_disabled_proxy.setFilterFixedString(text === undefined ? input_coin_filter.text : text)
- }
-
- width: 500
-
- onOpened: {
- filterCoins()
- setCheckState(false)
- input_coin_filter.forceActiveFocus()
- }
-
- onClosed: filterCoins("")
-
- ModalContent {
- title: qsTr("Enable assets")
-
- DefaultButton {
- Layout.fillWidth: true
- text: qsTr("Add a custom asset to the list")
- onClicked: {
- root.close()
- add_custom_coin_modal.open()
- }
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- }
-
- // Search input
- DefaultTextField {
- id: input_coin_filter
-
- Layout.fillWidth: true
- placeholderText: qsTr("Search")
-
- onTextChanged: filterCoins()
- }
-
- DefaultCheckBox {
- text: qsTr("Select all assets")
- visible: list.visible
-
- // Handle updates
- property bool updated_from_backend: false
- property int checked_count: coin_cfg_model.checked_nb
- property int target_parent_state: coin_cfg_model.all_disabled_proxy.length === checked_count ? Qt.Checked :
- checked_count > 0 ? Qt.PartiallyChecked : Qt.Unchecked
- onTarget_parent_stateChanged: {
- if(target_parent_state !== checkState) {
- updated_from_backend = true
- checkState = target_parent_state
- }
- }
- onCheckStateChanged: {
- // Avoid binding loop
- if(!updated_from_backend) setCheckState(checked)
- else updated_from_backend = false
- }
- }
-
- DefaultListView {
- id: list
- visible: coin_cfg_model.all_disabled_proxy.length > 0
- model: coin_cfg_model.all_disabled_proxy
-
- Layout.preferredHeight: 375
- Layout.fillWidth: true
-
- delegate: DefaultCheckBox {
- text: " " + model.name + " (" + model.ticker + ")"
-
- leftPadding: indicator.width
-
- readonly property bool backend_checked: model.checked
- onBackend_checkedChanged: if(checked !== backend_checked) checked = backend_checked
- onCheckStateChanged: {
- if(checked !== backend_checked)
- {
- var data_index = coin_cfg_model.all_disabled_proxy.index(index, 0)
- if ((coin_cfg_model.all_disabled_proxy.setData(data_index, checked, Qt.UserRole + 11)) === false)
- {
- checked = false
- }
- }
- }
-
- // Icon
- DefaultImage {
- id: icon
- anchors.left: parent.left
- anchors.leftMargin: parent.leftPadding + 28
- anchors.verticalCenter: parent.verticalCenter
- source: General.coinIcon(model.ticker)
- width: Style.textSize2
- }
-
- CoinTypeTag {
- anchors.left: parent.right
- anchors.verticalCenter: parent.verticalCenter
-
- type: model.type
- }
- }
- }
-
- // Info text
- DefaultText {
- visible: coin_cfg_model.all_disabled_proxy.length === 0
-
- text_value: qsTr("All assets are already enabled!")
- }
-
- HorizontalLine {
- Layout.fillWidth: true
- }
-
- DefaultRectangle {
- Layout.fillWidth: true
- Layout.preferredHeight: 20
- border.width: 0
-
- DefaultText {
- anchors.centerIn: parent
- text: qsTr("You can still enable %1 assets. Selected: %2.")
- .arg(setting_modal.enableable_coins_count - API.app.portfolio_pg.portfolio_mdl.length)
- .arg(coin_cfg_model.checked_nb)
- }
- }
-
- // Buttons
- footer: [
- DexButton {
- property var enableable_coins_count: setting_modal.enableable_coins_count;
- text: qsTr("Change assets limit")
- onClicked: setting_modal.open()
- textScale: API.app.settings_pg.lang=="fr"? 0.82 : 0.99
- onEnableable_coins_countChanged: setCheckState(false)
- },
-
- DexButton {
- text: qsTr("Close")
- textScale: API.app.settings_pg.lang=="fr"? 0.82 : 0.99
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- DexButton {
- visible: coin_cfg_model.length > 0
- enabled: coin_cfg_model.checked_nb > 0
- textScale: API.app.settings_pg.lang=="fr"? 0.82 : 0.99
- text: qsTr("Enable")
- Layout.fillWidth: true
- onClicked: {
- API.app.enable_coins(coin_cfg_model.get_checked_coins())
- setCheckState(false)
- coin_cfg_model.checked_nb = 0
- root.close()
- }
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/Main.qml b/atomic_defi_design/qml/Wallet/Main.qml
deleted file mode 100644
index 3b1547ef55..0000000000
--- a/atomic_defi_design/qml/Wallet/Main.qml
+++ /dev/null
@@ -1,588 +0,0 @@
-// Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtCharts 2.3
-import QtWebEngine 1.8
-import QtGraphicalEffects 1.0
-
-import Qaterial 1.0 as Qaterial
-
-// Project Imports
-import "../Components"
-import "../Constants"
-import "../Exchange/Trade"
-
-// Right side, main
-Item {
- property alias send_modal: send_modal
- readonly property int layout_margin: 30
- function loadingPercentage(remaining) {
- return General.formatPercent((100 * (1 - parseFloat(remaining)/parseFloat(current_ticker_infos.current_block))).toFixed(3), false)
- }
-
- readonly property var transactions_mdl: api_wallet_page.transactions_mdl
-
- Layout.fillHeight: true
- Layout.fillWidth: true
-
- ColumnLayout {
- id: wallet_layout
-
- width: parent.width
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: parent.top
- anchors.topMargin: layout_margin
- anchors.bottom: parent.bottom
-
- spacing: 30
-
- // Balance box
- FloatingBackground {
- id: balance_box
- Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
- Layout.fillWidth: true
- Layout.leftMargin: layout_margin
- Layout.rightMargin: layout_margin
-
- content: RowLayout {
- width: balance_box.width
-
- RowLayout {
- Layout.alignment: Qt.AlignLeft
- Layout.topMargin: 12
- Layout.bottomMargin: Layout.topMargin
- Layout.leftMargin: 15
- spacing: 15
- // Icon
- DefaultImage {
- source: General.coinIcon(api_wallet_page.ticker)
- Layout.preferredHeight: 60
- Layout.preferredWidth: Layout.preferredHeight
- }
-
- // Name and crypto amount
- ColumnLayout {
- id: balance_layout
- spacing: 3
-
- DexLabel {
- id: name
- text_value: current_ticker_infos.name
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: Style.textSizeMid
- }
-
- DexLabel {
- id: name_value
- text_value: General.formatCrypto("", current_ticker_infos.balance, api_wallet_page.ticker)
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- privacy: true
- }
- }
- }
-
- // Wallet Balance
- ColumnLayout {
- Layout.alignment: Qt.AlignHCenter
- spacing: balance_layout.spacing
- DexLabel {
- text_value: qsTr("Wallet Balance")
- Layout.alignment: Qt.AlignLeft
- font.pixelSize: name.font.pixelSize
- color: price.color
- }
-
- DexLabel {
- text_value: General.formatFiat("", current_ticker_infos.fiat_amount, API.app.settings_pg.current_currency)
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- privacy: true
- }
- }
-
- VerticalLine {
- Layout.alignment: Qt.AlignHCenter
- Layout.rightMargin: 30
- height: balance_layout.height * 0.8
- color: Style.colorThemeDarkLight
- }
-
- // Price
- ColumnLayout {
- Layout.alignment: Qt.AlignHCenter
- spacing: balance_layout.spacing
- DexLabel {
- id: price
- text_value: qsTr("Price")
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- color: Style.colorText2
- }
-
- DexLabel {
- text_value: General.formatFiat('', current_ticker_infos.current_currency_ticker_price, API.app.settings_pg.current_currency)
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- }
- }
-
- // Change 24h
- ColumnLayout {
- Layout.alignment: Qt.AlignHCenter
- spacing: balance_layout.spacing
- DexLabel {
- text_value: qsTr("Change 24h")
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- color: price.color
- }
-
- DexLabel {
- text_value: {
- const v = parseFloat(current_ticker_infos.change_24h)
- return v === 0 ? '-' : General.formatPercent(v)
- }
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- color: Style.getValueColor(current_ticker_infos.change_24h)
- }
- }
-
- // Portfolio %
- ColumnLayout {
- Layout.alignment: Qt.AlignHCenter
- spacing: balance_layout.spacing
- DexLabel {
- text_value: qsTr("Portfolio %")
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- color: price.color
- }
-
- DexLabel {
- text_value: {
- const fiat_amount = parseFloat(current_ticker_infos.fiat_amount)
- const portfolio_balance = parseFloat(API.app.portfolio_pg.balance_fiat_all)
- if(fiat_amount <= 0 || portfolio_balance <= 0) return "-"
-
- return General.formatPercent((100 * fiat_amount/portfolio_balance).toFixed(2), false)
- }
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: name.font.pixelSize
- privacy: true
- }
- }
- }
- }
-
- // Address Book, Send, Receive buttons
- RowLayout {
- Layout.leftMargin: layout_margin
- Layout.rightMargin: layout_margin
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignHCenter
- spacing: 25
- Item {
- Layout.fillWidth: true
- Layout.preferredWidth: 100
- Layout.preferredHeight: send_button.height
- DexButton {
- id: send_button
- enabled: API.app.wallet_pg.send_available
- text: qsTr("Send")
- text_obj.leftPadding: API.app.wallet_pg.send_availability_state !== ""? 25 : 0
- onClicked: {
- if (API.app.wallet_pg.current_ticker_fees_coin_enabled) send_modal.open()
- else enable_fees_coin_modal.open()
- }
- width: parent.width
- anchors.top: parent.top
- font.pixelSize: Style.textSize
- Arrow {
- id: arrow_send
- up: true
- color: Style.colorRed
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 12
- }
- }
-
- Image {
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- anchors.horizontalCenterOffset: -45
- visible: API.app.wallet_pg.send_availability_state !== ""
- source: Qaterial.Icons.alert
- ToolTip.visible: send_alert_mouse_area.containsMouse
- ToolTip.text: API.app.wallet_pg.send_availability_state
- DefaultColorOverlay {
- anchors.fill: parent
- source: parent
- color: "yellow"
- }
- MouseArea {
- id: send_alert_mouse_area
- anchors.fill: parent
- hoverEnabled: true
- }
- }
- }
-
- ModalLoader {
- id: send_modal
- sourceComponent: SendModal {}
- }
-
- Component {
- id: enable_fees_coin_comp
- BasicModal {
- id: root
- width: 300
- ModalContent {
- title: qsTr("Enable %1 ?").arg(coin_to_enable_ticker)
- RowLayout {
- Layout.fillWidth: true
- DefaultButton {
- Layout.fillWidth: true
- text: qsTr("Yes")
- onClicked: {
- if (API.app.enable_coin(coin_to_enable_ticker) === false)
- {
- enable_fees_coin_failed_modal.open()
- }
- close()
- }
- }
- DefaultButton {
- Layout.fillWidth: true
- text: qsTr("No")
- onClicked: close()
- }
- }
- }
- }
- }
-
- ModalLoader {
- property string coin_to_enable_ticker: API.app.wallet_pg.ticker_infos.fee_ticker
- id: enable_fees_coin_modal
- sourceComponent: enable_fees_coin_comp
- }
-
- ModalLoader {
- id: enable_fees_coin_failed_modal
- sourceComponent: CannotEnableCoinModal { coin_to_enable_ticker: API.app.wallet_pg.ticker_infos.fee_ticker }
- }
-
- DexButton {
- text: qsTr("Receive")
- onClicked: receive_modal.open()
- Layout.fillWidth: true
- font.pixelSize: send_button.font.pixelSize
-
- Arrow {
- up: false
- color: Style.colorGreen
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: arrow_send.anchors.rightMargin
- }
- }
-
- ModalLoader {
- id: receive_modal
- sourceComponent: ReceiveModal {}
- }
-
- DexButton {
- visible: !is_dex_banned
- text: qsTr("Swap")
- onClicked: onClickedSwap()
- Layout.fillWidth: true
- font.pixelSize: send_button.font.pixelSize
- Arrow {
- up: true
- color: Style.colorRed
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: arrow_send.anchors.rightMargin
- }
-
- Arrow {
- up: false
- color: Style.colorGreen
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: arrow_send.anchors.rightMargin
- }
- }
-
- DexButton {
- id: button_claim_rewards
- text: qsTr("Claim Rewards")
- Layout.fillWidth: true
- font.pixelSize: send_button.font.pixelSize
-
- visible: current_ticker_infos.is_claimable && !API.app.is_pin_cfg_enabled()
- enabled: parseFloat(current_ticker_infos.balance) > 0
- onClicked: {
- claim_rewards_modal.open()
- claim_rewards_modal.item.prepareClaimRewards()
- }
- }
-
- ModalLoader {
- id: claim_rewards_modal
- sourceComponent: ClaimRewardsModal {}
- }
-
- DexButton {
- id: button_claim_faucet
- text: qsTr("Faucet")
- Layout.fillWidth: true
- font.pixelSize: send_button.font.pixelSize
- visible: enabled && current_ticker_infos.is_smartchain_test_coin
-
- onClicked: api_wallet_page.claim_faucet()
- }
-
- Component.onCompleted: api_wallet_page.claimingFaucetRpcDataChanged.connect(onClaimFaucetRpcResultChanged)
- Component.onDestruction: api_wallet_page.claimingFaucetRpcDataChanged.disconnect(onClaimFaucetRpcResultChanged)
- function onClaimFaucetRpcResultChanged() { claim_faucet_result_modal.open() }
-
- ModalLoader {
- id: claim_faucet_result_modal
- sourceComponent: ClaimFaucetResultModal {}
- }
- }
-
- // Price Graph
- InnerBackground {
- id: price_graph_bg
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.leftMargin: layout_margin
- Layout.rightMargin: layout_margin
- Layout.bottomMargin: -parent.spacing*0.5
- implicitHeight: wallet.height*0.6
-
- content: Item {
- property bool ticker_supported: false
- readonly property bool is_fetching: chart.loadProgress < 100
- readonly property string chartTheme: Style.dark_theme ? "dark" : "light"
- property color backgroundColor: theme.chartTradingLineBackgroundColor
- property var ticker: api_wallet_page.ticker
-
- function loadChart() {
- const pair = atomic_qt_utilities.retrieve_main_ticker(ticker) + "/" + atomic_qt_utilities.retrieve_main_ticker(API.app.settings_pg.current_currency)
- const pair_reversed = atomic_qt_utilities.retrieve_main_ticker(API.app.settings_pg.current_currency) + "/" + atomic_qt_utilities.retrieve_main_ticker(ticker)
- const pair_usd = atomic_qt_utilities.retrieve_main_ticker(ticker) + "/" + "USD"
- const pair_usd_reversed = "USD" + "/" + atomic_qt_utilities.retrieve_main_ticker(ticker)
- const pair_busd = atomic_qt_utilities.retrieve_main_ticker(ticker) + "/" + "BUSD"
- const pair_busd_reversed = "BUSD" + "/" + atomic_qt_utilities.retrieve_main_ticker(ticker)
-
- // Normal pair
- let symbol = General.supported_pairs[pair]
- if (!symbol) {
- console.log("Symbol not found for", pair)
- symbol = General.supported_pairs[pair_reversed]
- }
-
- // Reversed pair
- if (!symbol) {
- console.log("Symbol not found for", pair_reversed)
- symbol = General.supported_pairs[pair_usd]
- }
-
- // Pair with USD
- if (!symbol) {
- console.log("Symbol not found for", pair_usd)
- symbol = General.supported_pairs[pair_usd_reversed]
- }
-
- // Reversed pair with USD
- if (!symbol) {
- console.log("Symbol not found for", pair_usd_reversed)
- symbol = General.supported_pairs[pair_busd]
- }
-
- // Pair with BUSD
- if (!symbol) {
- console.log("Symbol not found for", pair_busd)
- symbol = General.supported_pairs[pair_busd_reversed]
- }
-
- // Reversed pair with BUSD
- if (!symbol) {
- console.log("Symbol not found for", pair_busd_reversed)
- ticker_supported = false
- return
- }
-
- ticker_supported = true
-
- console.debug("Wallet: Loading chart for %1".arg(symbol))
-
- chart.loadHtml(`
-
-
-
- `.arg(theme.backgroundColor).arg(theme.chartTradingLineColor).arg(theme.chartTradingLineBackgroundColor))
- }
-
- width: price_graph_bg.width
- height: price_graph_bg.height
-
- onTickerChanged: loadChart()
- onChartThemeChanged: loadChart()
- onBackgroundColorChanged: loadChart()
-
- RowLayout {
- visible: ticker_supported && !chart.visible
- anchors.centerIn: parent
-
- DefaultBusyIndicator {
- Layout.alignment: Qt.AlignHCenter
- Layout.leftMargin: -15
- Layout.rightMargin: Layout.leftMargin*0.75
- scale: 0.5
- }
-
- DexLabel {
- text_value: qsTr("Loading market data") + "..."
- }
- }
-
- DexLabel {
- visible: !ticker_supported
- text_value: qsTr("There is no chart data for this ticker yet")
- anchors.centerIn: parent
- }
-
- WebEngineView {
- id: chart
- anchors.fill: parent
- anchors.margins: -1
- backgroundColor: price_graph_bg.color
- visible: !is_fetching && ticker_supported
- }
- }
- }
-
- // Transactions or loading
- Item {
- id: loading_tx
- visible: current_ticker_infos.tx_state === "InProgress"
- Layout.alignment: Qt.AlignHCenter
- Layout.fillWidth: true
- implicitHeight: 100
-
- ColumnLayout {
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
- DexLabel {
- text_value: qsTr("Loading")
- Layout.alignment: Qt.AlignHCenter
- font.pixelSize: Style.textSize2
- }
-
- DefaultBusyIndicator {
- Layout.alignment: Qt.AlignHCenter
- }
-
- DexLabel {
- text_value: General.isTokenType(current_ticker_infos.type) ?
- (qsTr("Scanning blocks for TX History...") + " " + loadingPercentage(current_ticker_infos.blocks_left)) :
- (qsTr("Syncing TX History...") + " " + loadingPercentage(current_ticker_infos.transactions_left))
-
- Layout.alignment: Qt.AlignHCenter
- }
- }
- }
-
- // Separator line
- HorizontalLine {
- visible: loading_tx.visible && transactions_mdl.length > 0
- width: 720
- Layout.alignment: Qt.AlignHCenter
- }
-
- InnerBackground {
- id: transactions_bg
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.leftMargin: layout_margin
- Layout.rightMargin: layout_margin
- Layout.bottomMargin: !fetching_text_row.visible ? layout_margin : undefined
-
- implicitHeight: wallet.height*0.54
-
- content: Item {
- width: transactions_bg.width
- height: transactions_bg.height
-
- DefaultText {
- anchors.centerIn: parent
- visible: current_ticker_infos.tx_state !== "InProgress" && transactions_mdl.length === 0
- text_value: api_wallet_page.tx_fetching_busy ? (qsTr("Refreshing") + "...") : qsTr("No transactions")
- font.pixelSize: Style.textSize
- color: Style.colorWhite4
- }
-
- Transactions {
- width: parent.width
- height: parent.height
- model: transactions_mdl.proxy_mdl
- }
- }
- }
-
- RowLayout {
- id: fetching_text_row
- visible: api_wallet_page.tx_fetching_busy
- Layout.preferredHeight: fetching_text.font.pixelSize * 1.5
-
- Layout.topMargin: -layout_margin*0.5
- Layout.bottomMargin: layout_margin*0.5
-
- Layout.alignment: Qt.AlignHCenter
- spacing: 10
- DefaultBusyIndicator {
- Layout.alignment: Qt.AlignVCenter
- Layout.preferredWidth: Style.textSizeSmall3
- Layout.preferredHeight: Layout.preferredWidth
- }
-
- DefaultText {
- id: fetching_text
- Layout.alignment: Qt.AlignVCenter
- text_value: qsTr("Fetching transactions") + "..."
- font.pixelSize: Style.textSizeSmall3
- }
- }
-
- implicitHeight: Math.min(contentItem.childrenRect.height, wallet.height*0.5)
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/PriceGraph.qml b/atomic_defi_design/qml/Wallet/PriceGraph.qml
deleted file mode 100644
index be50d2c368..0000000000
--- a/atomic_defi_design/qml/Wallet/PriceGraph.qml
+++ /dev/null
@@ -1,173 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtCharts 2.3
-import "../Components"
-import "../Constants"
-
-// List
-ChartView {
- readonly property bool has_data: series.count > 0
-
- AreaSeries {
- id: series_area2
- color: Style.colorTheme10
-
- onHovered: updateValueText(state, point.y, axisYRight.labelsColor, 0)
-
- borderWidth: series_area.borderWidth
- opacity: series_area.opacity
-
- axisX: series2.axisX
- axisYRight: series2.axisYRight
- upperSeries: series2
- }
-
- // Other, back
- LineSeries {
- id: series2
- color: Style.colorTheme10
-
- style: series.style
- width: series.width
-
- onHovered: updateValueText(state, point.y, axisYRight.labelsColor, 0)
-
- axisX: DateTimeAxis {
- visible: false
- titleVisible: series.axisX.titleVisible
- lineVisible: series.axisX.lineVisible
- labelsFont: series.axisX.labelsFont
- gridLineColor: series.axisX.gridLineColor
- labelsColor: series.axisX.labelsColor
- format: "MMM d"
- }
- axisYRight: ValueAxis {
- visible: true
- titleVisible: series.axisY.titleVisible
- lineVisible: series.axisY.lineVisible
- labelsFont: series.axisY.labelsFont
- gridLineColor: series.axisY.gridLineColor
- labelsColor: series2.color
- labelFormat: "%." + General.getRecommendedPrecision(has_data ? parseFloat(historical[historical.length-1].volume_24h / 1000000) : 2, 3) + "f M"
- }
- }
-
- AreaSeries {
- id: series_area
- color: Style.colorTheme1
- onHovered: updateValueText(state, point.y, axisY.labelsColor, 2)
-
- borderWidth: 0
- opacity: 0.15
-
- axisX: series.axisX
- axisY: series.axisY
- upperSeries: series
- }
-
- // Price, front
- LineSeries {
- id: series
- color: Style.colorGreen
-
- style: Qt.SolidLine
- width: 1.5
-
- onHovered: updateValueText(state, point.y, axisY.labelsColor, 2)
-
- axisX: DateTimeAxis {
- titleVisible: false
- lineVisible: false
- labelsFont.family: Style.font_family
- labelsFont.weight: Font.Bold
- labelsFont.pixelSize: Style.textSizeSmall3
- gridLineColor: Style.colorThemeDark2
- labelsColor: Style.colorThemeDark3
- format: "
MMM d"
- }
- axisY: ValueAxis {
- titleVisible: series.axisX.titleVisible
- lineVisible: series.axisX.lineVisible
- labelsFont: series.axisX.labelsFont
- gridLineColor: series.axisX.gridLineColor
- labelsColor: series.color
- labelFormat: "%." + General.getRecommendedPrecision(has_data ? parseInt(historical[historical.length-1].price) : 2, 6) + "f"
- }
- }
-
- function updateValueText(state, value, color, precision) {
- value_text.visible = state
- value_text.text = General.formatDouble(value, precision)
- value_text.color = color
- }
-
- DefaultText {
- id: value_text
- anchors.top: parent.top
- anchors.left: parent.left
- anchors.topMargin: 50
- anchors.leftMargin: anchors.topMargin * 2
- font.pixelSize: Style.textSizeSmall3
- }
-
-
- function updateChart(historical) {
- series.clear()
- series2.clear()
-
- if(historical === undefined) return
-
- if(historical.length > 0) {
- let min_price = Infinity
- let max_price = -Infinity
- let min_other = Infinity
- let max_other = -Infinity
-
- for(let i = 0; i < historical.length; ++i) {
- const price = historical[i].price
- const other = historical[i].volume_24h / 1000000
-
- series.append(General.timestampToDouble(historical[i].timestamp), price)
- series2.append(General.timestampToDouble(historical[i].timestamp), other)
-
- min_price = Math.min(min_price, price)
- max_price = Math.max(max_price, price)
- min_other = Math.min(min_other, other)
- max_other = Math.max(max_other, other)
- }
-
- // Date
- series.axisX.min = historical[0].timestamp
- series.axisX.max = historical[historical.length-1].timestamp
- series.axisX.tickCount = 7
-
- series2.axisX.min = series.axisX.min
- series2.axisX.max = series.axisX.max
- series2.axisX.tickCount = series.axisX.tickCount
-
- const y_margin = 0.05
-
- // Price
- series.axisY.min = min_price * (1 - y_margin)
- series.axisY.max = max_price * (1 + y_margin)
-
- // Other
- series2.axisYRight.min = min_other * (1 - y_margin)
- series2.axisYRight.max = max_other * (1 + y_margin)
- }
- }
-
- property var historical: current_ticker_infos.trend_7d
- onHistoricalChanged: {
- updateChart(historical)
- }
-
- id: chart
- antialiasing: true
-
- legend.visible: false
-
- backgroundColor: "transparent"
-}
diff --git a/atomic_defi_design/qml/Wallet/ReceiveModal.qml b/atomic_defi_design/qml/Wallet/ReceiveModal.qml
deleted file mode 100644
index b8d6e5966e..0000000000
--- a/atomic_defi_design/qml/Wallet/ReceiveModal.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- function reset() {
-
- }
-
- width: 500
-
- ModalContent {
- title: qsTr("Receive")
-
- // Receive address
- TextAreaWithTitle {
- title: qsTr("Only send %1 to this address", "TICKER").arg(api_wallet_page.ticker)
- field.text: current_ticker_infos.address
- field.readOnly: true
- field.wrapMode: TextEdit.NoWrap
- copyable: true
- }
-
- Image {
- Layout.alignment: Qt.AlignHCenter
-
- source: current_ticker_infos.qrcode_address
-
- sourceSize.width: 200
- sourceSize.height: 200
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Close")
- Layout.fillWidth: true
- onClicked: root.close()
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/SendModal.qml b/atomic_defi_design/qml/Wallet/SendModal.qml
deleted file mode 100644
index 5b8ced0fb2..0000000000
--- a/atomic_defi_design/qml/Wallet/SendModal.qml
+++ /dev/null
@@ -1,498 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- readonly property bool empty_data: !send_result || !send_result.withdraw_answer
-
- property alias address_field: input_address.field
- property alias amount_field: input_amount.field
- property bool needFix: false
- property bool errorView: false
- property var address_data
-
-
- onClosed: reset()
- closePolicy: Popup.NoAutoClose
-
- // Local
- readonly property var default_send_result: ({ has_error: false, error_message: "",
- withdraw_answer: {
- total_amount_fiat: "", tx_hex: "", date: "", "fee_details": { total_fee: "" }
- },
- explorer_url: "", max: false })
- property var send_result: default_send_result
-
-
- readonly property bool is_send_busy: api_wallet_page.is_send_busy
- property var send_rpc_result: api_wallet_page.send_rpc_data
- readonly property bool is_validate_address_busy: api_wallet_page.validate_address_busy
- readonly property bool is_convert_address_busy: api_wallet_page.convert_address_busy
- readonly property string address: api_wallet_page.converted_address
- onIs_validate_address_busyChanged: {
- console.log("Address busy changed to === %1".arg(is_validate_address_busy))
- if(!is_validate_address_busy) {
- address_data = api_wallet_page.validate_address_data
- if (address_data.reason!=="") {
- errorView = true
- reason.text = address_data.reason
- }else {
- errorView = false
- }
- if(address_data.convertible) {
- reason.text = address_data.reason
- if(needFix!==true)
- needFix = true
- }
- }
- }
- onIs_convert_address_busyChanged: {
- if(!is_convert_address_busy){
- if(needFix===true) {
- needFix = false
- input_address.field.text = api_wallet_page.converted_address
- }
- }
- }
-
- readonly property bool auth_succeeded: api_wallet_page.auth_succeeded
-
- readonly property bool is_broadcast_busy: api_wallet_page.is_broadcast_busy
- property string broadcast_result: api_wallet_page.broadcast_rpc_data
- property bool async_param_max: false
-
- onSend_rpc_resultChanged: {
- if (is_send_busy === false) {
- return
- }
-
- // Local var, faster
- const result = General.clone(send_rpc_result)
-
- if(result.error_code) {
- root.close()
- console.log("Send Error:", result.error_code, " Message:", result.error_message)
- toast.show(qsTr("Failed to send"), General.time_toast_important_error, result.error_message)
- }
- else {
- if(!result || !result.withdraw_answer) {
- reset()
- return
- }
-
- const max = async_param_max
- send_result.withdraw_answer.max = max
-
- if(max) input_amount.field.text = API.app.is_pin_cfg_enabled() ? General.absString(result.withdraw_answer.my_balance_change) : result.withdraw_answer.total_amount
-
- // Change page
- root.currentIndex = 1
- }
-
- send_result = result
- }
-
- onAuth_succeededChanged: {
- if (!auth_succeeded) {
- console.log("Double verification failed, cannot confirm sending.")
- }
- else {
- console.log("Double verification succeeded, validate sending.");
- }
- }
-
- onBroadcast_resultChanged: {
- if (is_broadcast_busy === false) {
- return
- }
-
- if(root.visible && broadcast_result !== "") {
- if(broadcast_result.indexOf("error") !== -1) {
- reset()
- showError(qsTr("Failed to Send"), General.prettifyJSON(broadcast_result))
- }
- else root.currentIndex = 2
- }
- }
-
- function prepareSendCoin(address, amount, with_fees, fees_amount, is_special_token, gas_limit, gas_price) {
- let max = input_max_amount.checked || parseFloat(current_ticker_infos.balance) === parseFloat(amount)
-
- // Save for later check
- async_param_max = max
-
- if(with_fees && max === false && !is_special_token)
- max = parseFloat(amount) + parseFloat(fees_amount) >= parseFloat(current_ticker_infos.balance)
-
- const fees_info = {
- fees_amount,
- gas_price,
- gas_limit: gas_limit === "" ? 0 : parseInt(gas_limit)
- }
-
- console.log("Passing fees info: ", JSON.stringify(fees_info))
- api_wallet_page.send(address, amount, max, with_fees, fees_info)
- }
-
- function sendCoin() {
- api_wallet_page.broadcast(send_result.withdraw_answer.tx_hex, false, send_result.withdraw_answer.max, input_amount.field.text)
- }
-
- function isSpecialToken() {
- return General.isTokenType(current_ticker_infos.type)
- }
-
- function isERC20() {
- return current_ticker_infos.type === "ERC-20" || current_ticker_infos.type === "BEP-20"
- }
-
- function hasErc20CaseIssue(addr) {
- if(!isERC20()) return false
- if(addr.length <= 2) return false
-
- addr = addr.substring(2) // Remove 0x
- return addr === addr.toLowerCase() || addr === addr.toUpperCase()
- }
-
- function reset() {
- send_result = default_send_result
- input_address.field.text = ""
- input_amount.field.text = ""
- input_custom_fees.field.text = ""
- input_custom_fees_gas.field.text = ""
- input_custom_fees_gas_price.field.text = ""
- custom_fees_switch.checked = false
- input_max_amount.checked = false
- root.currentIndex = 0
- }
-
- function feeIsHigherThanAmount() {
- if(!custom_fees_switch.checked) return false
- if(input_max_amount.checked) return false
-
- const amt = parseFloat(input_amount.field.text)
- const fee_amt = parseFloat(input_custom_fees.field.text)
-
- return amt < fee_amt
- }
-
- function hasFunds() {
- if(input_max_amount.checked) return true
-
- if(!General.hasEnoughFunds(true, api_wallet_page.ticker, "", "", input_amount.field.text))
- return false
-
- if(custom_fees_switch.checked) {
- if(isSpecialToken()) {
- const gas_limit = parseFloat(input_custom_fees_gas.field.text)
- const gas_price = parseFloat(input_custom_fees_gas_price.field.text)
-
- const unit = current_ticker_infos.type === "ERC-20" ? 1000000000 : 100000000
- const fee_parent_token = (gas_limit * gas_price)/unit
-
- const parent_ticker = current_ticker_infos.type === "ERC-20" ? "ETH" : "QTUM"
- if(api_wallet_page.ticker === parent_ticker) {
- const amount = parseFloat(input_amount.field.text)
- const total_needed = amount + fee_parent_token
- if(!General.hasEnoughFunds(true, parent_ticker, "", "", total_needed.toString()))
- return false
- }
- else {
- if(!General.hasEnoughFunds(true, parent_ticker, "", "", fee_parent_token.toString()))
- return false
- }
- }
- else {
- if(feeIsHigherThanAmount()) return false
-
- if(!General.hasEnoughFunds(true, api_wallet_page.ticker, "", "", input_custom_fees.field.text))
- return false
- }
- }
-
- return true
- }
-
- function feesAreFilled() {
- return (!custom_fees_switch.checked || (
- (!isSpecialToken() && input_custom_fees.field.acceptableInput) ||
- (isSpecialToken() && input_custom_fees_gas.field.acceptableInput && input_custom_fees_gas_price.field.acceptableInput &&
- parseFloat(input_custom_fees_gas.field.text) > 0 && parseFloat(input_custom_fees_gas_price.field.text) > 0)
- )
- )
- }
-
- function fieldAreFilled() {
- return input_address.field.text != "" &&
- (input_max_amount.checked || (input_amount.field.text != "" && input_amount.field.acceptableInput && parseFloat(input_amount.field.text) > 0)) &&
- feesAreFilled()
- }
-
- function setMax() {
- input_amount.field.text = current_ticker_infos.balance
- }
-
- // Inside modal
- // width: stack_layout.children[root.currentIndex].width + horizontalPadding * 2
- width: 650
-
- // Prepare Page
- ModalContent {
- Layout.fillWidth: true
-
- title: qsTr("Prepare to send ") + current_ticker_infos.name
-
- // Send address
- RowLayout {
- spacing: Style.buttonSpacing
-
- AddressFieldWithTitle {
- id: input_address
- Layout.alignment: Qt.AlignLeft
- title: qsTr("Recipient's address")
- field.placeholderText: qsTr("Enter address of the recipient")
- field.enabled: !root.is_send_busy
- field.onTextChanged: {
- api_wallet_page.validate_address(field.text)
- }
- }
-
- DefaultButton {
- Layout.alignment: Qt.AlignRight | Qt.AlignBottom
- text: qsTr("Address Book")
- onClicked: contact_list.open()
- enabled: !root.is_send_busy
- }
- }
-
- // ERC-20 Lowercase issue
- RowLayout {
- Layout.fillWidth: true
- visible: errorView && input_address.field.text!=="" //isERC20() && input_address.field.text != "" && hasErc20CaseIssue(input_address.field.text)
- DefaultText {
- id: reason
- Layout.fillWidth: true
- wrapMode: Label.Wrap
- Layout.alignment: Qt.AlignLeft
- color: Style.colorRed
- text_value: qsTr("The address has to be mixed case.")
- }
-
- DefaultButton {
- visible: needFix
- Layout.preferredWidth: 70
- Layout.alignment: Qt.AlignRight
- text: qsTr("Fix")
- onClicked: {
- api_wallet_page.convert_address(input_address.field.text, address_data.to_address_format)
- }
- enabled: !root.is_send_busy
- }
- }
-
- RowLayout {
- spacing: Style.buttonSpacing
-
- // Amount input
- AmountField {
- id: input_amount
-
- field.visible: !input_max_amount.checked
- title: qsTr("Amount to send")
- field.placeholderText: qsTr("Enter the amount to send")
- field.enabled: !root.is_send_busy
- }
-
- DefaultSwitch {
- id: input_max_amount
- Layout.alignment: Qt.AlignRight | Qt.AlignBottom
- text: qsTr("MAX")
- onCheckedChanged: input_amount.field.text = ""
- enabled: !root.is_send_busy
- }
- }
-
- // Custom fees switch
- DefaultSwitch {
- id: custom_fees_switch
- text: qsTr("Enable Custom Fees")
- onCheckedChanged: input_custom_fees.field.text = ""
- enabled: !root.is_send_busy
- }
-
- // Custom Fees section
- ColumnLayout {
- visible: custom_fees_switch.checked
-
- DefaultText {
- font.pixelSize: Style.textSize
- color: Style.colorRed
- text_value: qsTr("Only use custom fees if you know what you are doing!")
- }
-
- // Normal coins, Custom fees input
- AmountField {
- visible: !isSpecialToken()
-
- id: input_custom_fees
- title: qsTr("Custom Fee") + " [" + api_wallet_page.ticker + "]"
- field.placeholderText: qsTr("Enter the custom fee")
- field.enabled: !root.is_send_busy
- }
-
- // Token coins
- ColumnLayout {
- visible: isSpecialToken()
-
- // Gas input
- AmountIntField {
- id: input_custom_fees_gas
- title: qsTr("Gas Limit") + " [" + General.tokenUnitName(current_ticker_infos.type) + "]"
- field.placeholderText: qsTr("Enter the gas limit")
- field.enabled: !root.is_send_busy
- }
-
- // Gas price input
- AmountIntField {
- id: input_custom_fees_gas_price
- title: qsTr("Gas Price") + " [" + General.tokenUnitName(current_ticker_infos.type) + "]"
- field.placeholderText: qsTr("Enter the gas price")
- field.enabled: !root.is_send_busy
- }
- }
- }
-
-
- // Fee is higher than amount error
- DefaultText {
- id: fee_error
- wrapMode: Text.Wrap
- visible: feeIsHigherThanAmount()
-
- color: Style.colorRed
-
- text_value: qsTr("Custom Fee can't be higher than the amount")
- }
-
- // Not enough funds error
- DefaultText {
- wrapMode: Text.Wrap
- visible: !fee_error.visible && fieldAreFilled() && !hasFunds()
-
- color: Style.colorRed
-
- text_value: qsTr("Not enough funds.") + "\n" + qsTr("You have %1", "AMT TICKER").arg(General.formatCrypto("", API.app.get_balance(api_wallet_page.ticker), api_wallet_page.ticker))
- }
-
- DefaultBusyIndicator {
- visible: root.is_send_busy
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Close")
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- PrimaryButton {
- text: qsTr("Prepare")
- Layout.fillWidth: true
-
- enabled: fieldAreFilled() && hasFunds() && !errorView && !root.is_send_busy
-
- onClicked: prepareSendCoin(input_address.field.text, input_amount.field.text, custom_fees_switch.checked, input_custom_fees.field.text,
- isSpecialToken(), input_custom_fees_gas.field.text, input_custom_fees_gas_price.field.text)
- }
- ]
-
- ModalLoader { // Modal to pick up a contact's address.
- id: contact_list
- sourceComponent: SendModalContactList {
- onClosed: {
- if (selected_address === "") {
- return
- }
- input_address.field.text = selected_address
- selected_address = ""
- console.debug("SendModal: Selected %1 address from addressbook.".arg(input_address.field.text))
- }
- }
- }
- }
-
- // Send Page
- ModalContent {
- title: qsTr("Send")
-
- // Address
- TextEditWithTitle {
- title: qsTr("Recipient's address")
- text: input_address.field.text
- }
-
- // Amount
- TextEditWithTitle {
- title: qsTr("Amount")
- text: empty_data ? "" : "%1 %2 (%3 %4)".arg(api_wallet_page.ticker).arg(input_amount.field.text).arg(API.app.settings_pg.current_fiat_sign).arg(send_result.withdraw_answer.total_amount_fiat)
- //General.formatCrypto("", input_amount.field.text, api_wallet_page.ticker, send_result.withdraw_answer.total_amount_fiat, API.app.settings_pg.current_currency)
- }
-
- // Fees
- TextEditWithTitle {
- title: qsTr("Fees")
- text: empty_data ? "" : "%1 %2 (%3 %4)".arg(current_ticker_infos.fee_ticker).arg(send_result.withdraw_answer.fee_details.amount).arg(API.app.settings_pg.current_fiat_sign).arg(send_result.withdraw_answer.fee_details.amount_fiat)
- //General.formatCrypto("", send_result.withdraw_answer.fee_details.amount, current_ticker_infos.fee_ticker, send_result.withdraw_answer.fee_details.amount_fiat, API.app.settings_pg.current_fiat_sign)
- }
-
- // Date
- TextEditWithTitle {
- title: qsTr("Date")
- text: empty_data ? "" :
- send_result.withdraw_answer.date
- }
-
- DefaultBusyIndicator {
- visible: root.is_broadcast_busy
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Back")
- Layout.fillWidth: true
- onClicked: root.currentIndex = 0
- enabled: !root.is_broadcast_busy
- },
-
- PrimaryButton {
- text: qsTr("Send")
- Layout.fillWidth: true
- onClicked: sendCoin()
- enabled: !root.is_broadcast_busy
- }
- ]
- }
-
- // Result Page
- SendResult {
- result: ({
- balance_change: empty_data ? "" : send_result.withdraw_answer.my_balance_change,
- fees: empty_data ? "" : send_result.withdraw_answer.fee_details.amount,
- date: empty_data ? "" : send_result.withdraw_answer.date
- })
- address: input_address.field.text
- tx_hash: broadcast_result
- custom_amount: input_amount.field.text
-
- function onClose() {
- root.close()
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/SendModalContactList.qml b/atomic_defi_design/qml/Wallet/SendModalContactList.qml
deleted file mode 100644
index 123efb68e2..0000000000
--- a/atomic_defi_design/qml/Wallet/SendModalContactList.qml
+++ /dev/null
@@ -1,220 +0,0 @@
-// Qt Imports
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-// Project Imports
-import "../Components"
-import "../Constants"
-
-BasicModal {
- id: root
-
- width: 500
- height: 400
-
- property string ticker: api_wallet_page.ticker
- property var selected_address: ""
-
- ModalContent {
- title: qsTr("Select a contact with an %1 address").arg(ticker)
-
- DefaultTextField { // Searchbar
- Layout.fillWidth: true
- placeholderText: qsTr("Search for contacts...")
- onTextChanged: API.app.addressbook_pg.model.proxy.search_exp = text
- Component.onDestruction: API.app.addressbook_pg.model.proxy.search_exp = ""
- }
-
- // Contact List
- InnerBackground { // Contact List Background
- id: contact_list_bg
-
- Layout.fillWidth: true
-
- content: DefaultListView { // Contact List
- readonly property int rowHeight: 30 // Visual height of a row.
-
- height: rowHeight * 6
- Component.onCompleted: {
- API.app.addressbook_pg.model.proxy.type_filter = ticker
- console.debug("SendModal: Show contact list of given ticker %1 and of size %2"
- .arg(API.app.addressbook_pg.model.proxy.type_filter)
- .arg(count))
- }
- Component.onDestruction: {
- API.app.addressbook_pg.model.proxy.type_filter = ""
- console.debug("SendModal: Destroying contact list")
- }
- model: API.app.addressbook_pg.model.proxy
- delegate: AnimatedRectangle {
- property int addressesCount
- property var contactModel: modelData
-
- Component.onCompleted: {
- modelData.proxy_filter.filter_type = ticker
- addressesCount = modelData.proxy_filter.rowCount()
- console.debug("SendModal: Apply %1 filter to contact %2. It has %3 %4 addresses"
- .arg(ticker)
- .arg(modelData.name)
- .arg(addressesCount)
- .arg(modelData.proxy_filter.filter_type))
- }
-
- Component.onDestruction: {
- contactModel.proxy_filter.filter_type = ""
- console.debug("SendModal: Remove %1 filter to contact %2"
- .arg(ticker)
- .arg(contactModel.name))
- }
- implicitWidth: contact_list_bg.width
- height: 30
- color: Style.colorOnlyIf(mouse_area.containsMouse, Style.colorTheme6)
- radius: contact_list_bg.radius
-
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- addresses_view.contactModel = modelData
- root.currentIndex = 1
- }
- }
-
- DefaultText { // Contact Name
- width: 400
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: 10
- text: modelData.name
- elide: Qt.ElideRight
- }
-
- DefaultText { // Contact Addresses Count
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 18
- text: addressesCount > 1 ? qsTr("%1 addresses").arg(addressesCount) :
- qsTr("1 address")
- }
-
- HorizontalLine {
- width: parent.width
- height: 2
- anchors.bottom: parent.bottom
- }
- }
- }
- }
-
- DefaultButton { // Back to Send Modal Button
- Layout.fillWidth: true
- text: qsTr("Back")
- onClicked: close()
- }
- }
-
- ModalContent {
- id: addresses_view
-
- readonly property var defaultContactModel:
- {
- "proxy_filter":
- {
- "filter_type": ""
- },
- "name": ""
- }
- property var contactModel: defaultContactModel
-
- title: qsTr("Choose an %1 address of %2")
- .arg(contactModel.proxy_filter.filter_type)
- .arg(contactModel.name)
-
- RowLayout {
- Layout.fillWidth: true
-
- DefaultText {
- Layout.leftMargin: 5
- Layout.preferredWidth: 210
- text: qsTr("Name")
- color: Style.colorWhite4
- }
-
- DefaultText {
- text: qsTr("Address")
- color: Style.colorWhite4
- }
- }
-
- // Address List
- InnerBackground { // Address List Background
- id: address_list_bg
-
- Layout.fillWidth: true
-
- content: DefaultListView { // Address List
- readonly property int rowHeight: 30 // Visual height of a row.
-
- height: rowHeight * 6
- model: addresses_view.contactModel.proxy_filter
- delegate: AnimatedRectangle { // Address Row
- implicitWidth: address_list_bg.width
- height: 30
- color: Style.colorOnlyIf(address_mouse_area.containsMouse, Style.colorTheme6)
- radius: address_list_bg.radius
-
- DefaultMouseArea {
- id: address_mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- selected_address = model.address_value
- close()
- }
- }
-
- DefaultText { // Address Key
- width: 150
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: 10
- text: model.address_key
- elide: Qt.ElideRight
- }
-
- DefaultText { // Address Value
- width: 220
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 10
- text: model.address_value
- elide: Qt.ElideRight
-
- VerticalLine {
- height: parent.parent.height
- width: 2
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.left
- anchors.rightMargin: 3
- }
- }
-
- HorizontalLine {
- width: parent.width
- height: 2
- anchors.bottom: parent.bottom
- }
- }
- }
- }
-
- DefaultButton {
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignBottom
- text: qsTr("Back")
- onClicked: currentIndex = 0
- }
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/SendResult.qml b/atomic_defi_design/qml/Wallet/SendResult.qml
deleted file mode 100644
index 4cabec397d..0000000000
--- a/atomic_defi_design/qml/Wallet/SendResult.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-ModalContent {
- property var result: ({ balance_change:"", fees: "", date: "", explorer_url: "" })
- property alias address: address.text
- property string custom_amount
- property alias tx_hash: tx_hash.text
-
- function onClose() {}
-
- title: qsTr("Transaction Complete!")
-
- // Address
- TextEditWithTitle {
- id: address
- title: qsTr("Recipient's address")
- visible: text !== ""
- }
-
- // Amount
- TextEditWithTitle {
- title: qsTr("Amount")
- text: General.formatCrypto("", custom_amount !== "" ? custom_amount : result.balance_change, api_wallet_page.ticker)
- }
-
- // Fees
- TextEditWithTitle {
- title: qsTr("Fees")
- text: General.formatCrypto("", result.fees, current_ticker_infos.fee_ticker)
- }
-
- // Date
- TextEditWithTitle {
- title: qsTr("Date")
- text: result.date
- }
-
- // Transaction Hash
- TextEditWithTitle {
- id: tx_hash
- title: qsTr("Transaction Hash")
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Close")
- Layout.fillWidth: true
- onClicked: onClose()
- },
-
- PrimaryButton {
- text: qsTr("View on Explorer")
- Layout.fillWidth: true
- onClicked: General.viewTxAtExplorer(api_wallet_page.ticker, tx_hash.text)
- }
- ]
-}
diff --git a/atomic_defi_design/qml/Wallet/Sidebar.qml b/atomic_defi_design/qml/Wallet/Sidebar.qml
deleted file mode 100644
index 99336b3fe6..0000000000
--- a/atomic_defi_design/qml/Wallet/Sidebar.qml
+++ /dev/null
@@ -1,222 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import QtGraphicalEffects 1.0
-import "../Components"
-import "../Constants"
-
-// Coins bar at left side
-Item {
- id: root
-
- function reset() {
- resetted()
- }
-
- signal resetted()
-
- Layout.alignment: Qt.AlignLeft
- width: 175
- Layout.fillHeight: true
- Layout.topMargin: -40
-
- // Background
- SidebarPanel {
- id: background
- anchors.right: parent.right
- width: sidebar.width + parent.width
-
- height: parent.height+40
-
- // Panel contents
- Item {
- id: coins_bar
- width: 175
- height: parent.height
- anchors.right: parent.right
-
- VerticalLine {
- anchors.left: parent.left
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 1
- opacity: .3
- anchors.topMargin: anchors.bottomMargin
- color: theme.backgroundColorDeep
- }
-
- InnerBackground {
- id: search_row_bg
- anchors.top: parent.top
- anchors.topMargin: 30
- width: list_bg.width
- color: theme.backgroundColor
- anchors.horizontalCenter: list_bg.horizontalCenter
-
- content: RowLayout {
- id: search_row
-
- width: search_row_bg.width
-
- // Search button
- Item {
- Layout.alignment: Qt.AlignLeft
- Layout.leftMargin: search_button.width
- Layout.rightMargin: -Layout.leftMargin
- width: search_button.width
- height: search_button.height
- DefaultImage {
- id: search_button
-
- source: General.image_path + "exchange-search.svg"
-
- width: input_coin_filter.font.pixelSize; height: width
-
- visible: false
- }
- DefaultColorOverlay {
- id: search_button_overlay
-
- anchors.fill: search_button
- source: search_button
- color: theme.foregroundColor
- }
- }
-
- // Search input
- DefaultTextField {
- id: input_coin_filter
-
- Connections {
- target: root
-
- function onResetted() {
- if(input_coin_filter.text === "") resetCoinFilter()
- else input_coin_filter.text = ""
-
- //portfolio_coins.sort_by_name(true)
- }
- }
-
- onTextChanged: portfolio_coins.setFilterFixedString(text)
- font.pixelSize: Style.textSizeSmall3
-
- background: null
-
- Layout.fillWidth: true
- }
- }
- }
-
- // Add button
- PlusButton {
- id: add_coin_button
- onClicked: enable_coin_modal.open()
-
- anchors.bottom: parent.bottom
- anchors.bottomMargin: parent.width * 0.5 - height * 0.5
- anchors.horizontalCenter: parent.horizontalCenter
- }
-
- // Coins list
- InnerBackground {
- id: list_bg
- width: 145
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
-
- content: DefaultListView {
- id: list
- implicitHeight: Math.min(contentItem.childrenRect.height, coins_bar.height - 250)
-
- model: portfolio_coins
-
- delegate: GradientRectangle {
- width: list_bg.width - list_bg.border.width*2 - 2
- height: 44
- radius: Style.rectangleCornerRadius
-
- start_color: Style.applyOpacity(Style.colorCoinListHighlightGradient)
- end_color: api_wallet_page.ticker === ticker ? theme.hightlightColor : mouse_area.containsMouse ? Style.colorWhite8 : start_color
-
- // Click area
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- hoverEnabled: true
-
- acceptedButtons: Qt.LeftButton | Qt.RightButton
- onClicked: {
- if(!can_change_ticker) return
-
- if (mouse.button === Qt.RightButton) context_menu.popup()
- else api_wallet_page.ticker = ticker
- }
- onPressAndHold: {
- if(!can_change_ticker) return
-
- if (mouse.source === Qt.MouseEventNotSynthesized) context_menu.popup()
- }
- }
-
- // Right click menu
- CoinMenu {
- id: context_menu
- }
-
- readonly property double side_margin: 16
-
- // Icon
- DefaultImage {
- id: icon
- anchors.left: parent.left
- anchors.leftMargin: side_margin - scrollbar_margin
-
- source: General.coinIcon(ticker)
- width: Style.textSizeSmall4*2
- anchors.verticalCenter: parent.verticalCenter
- }
-
- ColumnLayout {
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: side_margin + scrollbar_margin
-
- // Ticker
- DefaultText {
- Layout.alignment: Qt.AlignRight
- text_value: ticker
- font.pixelSize: text.length > 6 ? Style.textSizeSmall2 : Style.textSizeSmall4
- }
-
- DefaultTooltip {
- visible: mouse_area.containsMouse
-
- contentItem: ColumnLayout {
- DefaultText {
- text_value: name.replace(" (TESTCOIN)", "")
- font.pixelSize: Style.textSizeSmall4
- }
- }
- }
- }
- }
- }
- }
- }
- }
-
- DropShadow {
- anchors.fill: background
- source: background
- cached: false
- horizontalOffset: 0
- verticalOffset: 0
- radius: 32
- samples: 32
- spread: 0
- color: Style.colorWalletsSidebarDropShadow
- smooth: true
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/TransactionDetailsModal.qml b/atomic_defi_design/qml/Wallet/TransactionDetailsModal.qml
deleted file mode 100644
index 23783f683b..0000000000
--- a/atomic_defi_design/qml/Wallet/TransactionDetailsModal.qml
+++ /dev/null
@@ -1,138 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-// Open Transaction Details Modal
-BasicModal {
- id: root
-
- function reset() {
-
- }
-
- property var details
-
- onClosed: {
- if(notes.field.enabled) notes.save_button.clicked()
- details = undefined
- }
-
- ModalContent {
- title: qsTr("Transaction Details")
-
- // Amount
- TextEditWithTitle {
- title: qsTr("Amount")
- text: !details ? "" :
- General.formatCrypto(!details.am_i_sender, details.amount, api_wallet_page.ticker, details.amount_fiat, API.app.settings_pg.current_currency)
- value_color: !details ? "white" :
- details.am_i_sender ? Style.colorRed : Style.colorGreen
- privacy: true
- }
-
- // Fees
- TextEditWithTitle {
- title: qsTr("Fees")
- text: !details ? "" :
- General.formatCrypto(parseFloat(details.fees) < 0, Math.abs(parseFloat(details.fees)), current_ticker_infos.fee_ticker, details.fees_amount_fiat, API.app.settings_pg.current_currency)
- value_color: !details ? "white" :
- parseFloat(details.fees) > 0 ? Style.colorRed : Style.colorGreen
- privacy: true
- }
-
- // Date
- TextEditWithTitle {
- title: qsTr("Date")
- text: !details ? "" :
- details.timestamp === 0 ? qsTr("Unconfirmed"): details.date
- }
-
- // Transaction Hash
- TextEditWithTitle {
- title: qsTr("Transaction Hash")
- text: !details ? "" :
- details.tx_hash
- privacy: true
- }
-
- // Confirmations
- TextEditWithTitle {
- title: qsTr("Confirmations")
- text: !details ? "" :
- details.confirmations
- }
-
- // Block Height
- TextEditWithTitle {
- title: qsTr("Block Height")
- text: !details ? "" :
- details.blockheight
- }
-
- AddressList {
- title: qsTr("From")
- model: !details ? [] :
- details.from
- }
-
- AddressList {
- title: qsTr("To")
- model: !details ? [] :
- details.to
- }
-
- // Notes
- TextAreaWithTitle {
- id: notes
- title: qsTr("Notes")
- remove_newline: false
- field.text: !details ? "" :
- details.transaction_note
-
-
- property string prev_text: ""
- field.onTextChanged: {
- if(field.text.length > 500)
- field.text = prev_text
- else prev_text = field.text
- }
-
- onSaved: details.transaction_note = field.text
- saveable: true
- }
-
- // Buttons
- footer: [
- DefaultButton {
- text: qsTr("Close")
- Layout.fillWidth: true
- onClicked: root.close()
- },
-
- DangerButton {
- visible: !details ? false :
- !details.am_i_sender
-
- text: qsTr("Refund")
- Layout.fillWidth: true
- onClicked: {
- const address = details.from[0]
- const amount = details.amount
- root.close()
- send_modal.open()
- send_modal.item.address_field.text = address
- send_modal.item.amount_field.text = amount
- }
- },
-
- PrimaryButton {
- text: qsTr("View on Explorer")
- Layout.fillWidth: true
- onClicked: General.viewTxAtExplorer(api_wallet_page.ticker, details.tx_hash, false)
- }
- ]
- }
-}
diff --git a/atomic_defi_design/qml/Wallet/Transactions.qml b/atomic_defi_design/qml/Wallet/Transactions.qml
deleted file mode 100644
index dfdb60bc20..0000000000
--- a/atomic_defi_design/qml/Wallet/Transactions.qml
+++ /dev/null
@@ -1,119 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-
-import "../Components"
-import "../Constants"
-
-DefaultListView {
- id: list
-
- readonly property int row_height: 45
-
- ModalLoader {
- id: tx_details_modal
- sourceComponent: TransactionDetailsModal {}
- }
-
- // Row
- delegate: AnimatedRectangle {
- id: rectangle
- implicitWidth: list.width
- height: row_height
-
- color: mouse_area.containsMouse? theme.hightlightColor : 'transparent'
-
- DefaultMouseArea {
- id: mouse_area
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- tx_details_modal.open()
- tx_details_modal.item.details = model
- }
- }
-
- Circle {
- id: note_tag
- width: 6
- color: Style.colorOrange
- anchors.left: parent.left
- anchors.leftMargin: 15
- anchors.verticalCenter: parent.verticalCenter
- visible: transaction_note !== ""
- }
-
- Arrow {
- id: received_icon
- up: am_i_sender ? true : false
- color: !am_i_sender ? Style.colorGreen : Style.colorRed
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: note_tag.right
- anchors.leftMargin: 10
- }
-
- // Description
- DefaultText {
- id: description
- text_value: am_i_sender ? qsTr("Sent") : qsTr("Received")
- font.pixelSize: Style.textSizeSmall3
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: received_icon.right
- anchors.leftMargin: 10
- }
-
- // Crypto
- DefaultText {
- id: crypto_amount
- text_value: General.formatCrypto(!am_i_sender, amount, api_wallet_page.ticker)
- font.pixelSize: description.font.pixelSize
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.2
- color: am_i_sender ? Style.colorRed : Style.colorGreen
- privacy: true
- }
-
- // Fiat
- DefaultText {
- text_value: General.formatFiat(!am_i_sender, amount_fiat, API.app.settings_pg.current_currency)
- font.pixelSize: description.font.pixelSize
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.4
- color: crypto_amount.color
- privacy: true
- }
-
- // Fee
- DefaultText {
- text_value: General.formatCrypto(!(parseFloat(fees) > 0), Math.abs(parseFloat(fees)),
- current_ticker_infos.fee_ticker + " " + qsTr("fees"))
- font.pixelSize: description.font.pixelSize
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.leftMargin: parent.width * 0.575
- privacy: true
- }
-
- // Date
- DefaultText {
- font.pixelSize: description.font.pixelSize
- text_value: !date || unconfirmed ? qsTr("Unconfirmed") : date
- anchors.verticalCenter: parent.verticalCenter
- anchors.right: parent.right
- anchors.rightMargin: 20
- privacy: true
- }
-
- HorizontalLine {
- visible: index !== transactions_mdl.length -1
- width: parent.width - 4
-
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.bottom: parent.bottom
- anchors.bottomMargin: -height/2
- light: true
- }
- }
-}
diff --git a/atomic_defi_design/qml/main.qml b/atomic_defi_design/qml/main.qml
deleted file mode 100644
index 5c6910d3dd..0000000000
--- a/atomic_defi_design/qml/main.qml
+++ /dev/null
@@ -1,331 +0,0 @@
-//! Qt Imports
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Controls.Universal 2.15
-import QtQuick.Layouts 1.12
-
-//! 3rdParty Imports
-import Qaterial 1.0 as Qaterial
-
-//! Project Imports
-import App 1.0
-import "Screens"
-import "Components"
-
-DexWindow
-{
- id: window
-
- property alias application: app
- property int previousX: 0
- property int previousY: 0
- property int real_visibility
- property bool isOsx: Qt.platform.os == "osx"
- property bool logged: false
-
- title: API.app_name
- visible: true
-
- minimumWidth: General.minimumWidth
- minimumHeight: General.minimumHeight
-
- Universal.theme: Style.dark_theme ? Universal.Dark : Universal.Light
- Universal.accent: Style.colorQtThemeAccent
- Universal.foreground: Style.colorQtThemeForeground
- Universal.background: Style.colorQtThemeBackground
-
- background: DexRectangle
- {
- anchors.fill: parent
- color: "transparent"
- border.color: app.globalTheme.dexBoxBackgroundColor
- border.width: 1
- radius: 0
- }
-
- onVisibilityChanged:
- {
- // 3 is minimized, ignore that
- if (visibility !== 3)
- real_visibility = visibility
-
- API.app.change_state(visibility)
-
- }
-
- DexWindowControl { visible: !isOsx }
-
- DexRectangle {
- radius: 0
- width: parent.width-2
- height: 30
- anchors.horizontalCenter: parent.horizontalCenter
- color: app.globalTheme.surfaceColor
- visible: isOsx
- }
-
- App {
- id: app
- anchors.fill: parent
- anchors.topMargin: 30
- anchors.margins: 2
- }
- DexPopup
- {
- id: userMenu
-
- spacing: 8
- padding: 2
- backgroundColor: app.globalTheme.dexBoxBackgroundColor
-
- contentItem: Item
- {
- implicitWidth: 130
- implicitHeight: 30
- Rectangle {
- width: parent.width-10
- height: parent.height-5
- anchors.centerIn: parent
- color: logout_area.containsMouse? app.globalTheme.surfaceColor : app.globalTheme.dexBoxBackgroundColor
- Row {
- anchors.centerIn: parent
- Qaterial.ColorIcon {
- anchors.verticalCenter: parent.verticalCenter
- source: Qaterial.Icons.logout
- iconSize: 11
- }
- spacing: 5
- DexLabel {
- anchors.verticalCenter: parent.verticalCenter
- color: app.globalTheme.foregroundColor
- text: qsTr('Logout')
- }
- }
- DexMouseArea {
- id: logout_area
- hoverEnabled: true
- anchors.fill: parent
- onClicked: {
- Qaterial.DialogManager.showDialog({title: qsTr("Confirm Logout"),text: qsTr("Are you sure you want to log out?"),iconSource: Qaterial.Icons.logout,standardButtons: Dialog.Yes | Dialog.Cancel, onAccepted: function() {
- Qaterial.DialogManager.close()
- userMenu.close()
- app.currentWalletName = ""
- API.app.disconnect()
- app.onDisconnect()
- }})
- }
- }
- }
- }
- }
-
- DexMacControl { visible: isOsx }
- Row {
- height: 30
- leftPadding: 8
- anchors.right: isOsx? parent.right : undefined
- anchors.rightMargin: isOsx? 8 : 0
- layoutDirection: isOsx? Qt.RightToLeft : Qt.LeftToRight
- spacing: 5
-
- Image {
- source: "qrc:/atomic_defi_design/assets/images/dex-tray-icon.png"
- width: 15
- height: 15
- smooth: true
- antialiasing: true
- visible: !_label.visible
- anchors.verticalCenter: parent.verticalCenter
- }
- DexLabel {
- text: atomic_app_name
- font.family: 'Montserrat'
- font.weight: Font.Medium
- opacity: .5
- leftPadding: 5
- color: app.globalTheme.foregroundColor
- visible: !_label.visible
- anchors.verticalCenter: parent.verticalCenter
- }
-
- }
- Item {
- width: _row.width
- height: 30
- Behavior on x {
- NumberAnimation {
- duration: 200
- }
- }
- anchors.right: parent.right
- anchors.rightMargin: isOsx? 10 : 120
-
- Row {
- id: _row
- anchors.verticalCenter: parent.verticalCenter
- layoutDirection: Qt.RightToLeft
- spacing: 6
- DexLabel {
- text: " | "
- opacity: .1
- font.family: 'Montserrat'
- font.weight: Font.Medium
- visible: _label.visible & !isOsx
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- leftPadding: 2
- }
- Rectangle {
- width: __row.width + 10
- height: __row.height + 5
- anchors.verticalCenter: parent.verticalCenter
- //visible: _label.visible
- radius: 3
- color: _area.containsMouse? app.globalTheme.dexBoxBackgroundColor : "transparent"
- Row {
- id: __row
- anchors.centerIn: parent
- layoutDirection: isOsx? Qt.RightToLeft : Qt.LeftToRight
- spacing: 6
- Qaterial.ColorIcon {
- source: Qaterial.Icons.accountCircle
- iconSize: 18
- visible: _label.visible
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- }
- DexLabel {
- id: _label
- text: API.app.wallet_mgr.wallet_default_name?? ""
- font.family: 'Montserrat'
- font.weight: Font.Medium
- opacity: .7
- visible: window.logged
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- }
- Qaterial.ColorIcon {
- source: Qaterial.Icons.menuDown
- iconSize: 14
- visible: _label.visible
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- }
- }
- DexMouseArea {
- id: _area
- anchors.fill: parent
- onClicked: {
- if(userMenu.visible){
- userMenu.close()
- }else {
- userMenu.openAt(mapToItem(Overlay.overlay, width / 2, height), Item.Top)
- }
- }
- }
- }
- DexLabel {
- text: " | "
- opacity: .1
- font.family: 'Montserrat'
- font.weight: Font.Medium
- visible: _label.visible
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- leftPadding: 2
- }
- Row {
- anchors.verticalCenter: parent.verticalCenter
- spacing: 6
-
- DexLabel {
- leftPadding: 2
- text: qsTr("Balance")
- font.family: 'Montserrat'
- font.weight: Font.Medium
- opacity: .7
- visible: _label.visible
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- }
- DexLabel {
- text: ":"
- opacity: .7
- font.family: 'Montserrat'
- font.weight: Font.Medium
- visible: _label.visible
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- }
- DexLabel {
- text_value: General.formatFiat("", API.app.portfolio_pg.balance_fiat_all,API.app.settings_pg.current_currency)
- font.family: 'lato'
- font.weight: Font.Medium
- visible: _label.visible
- color: window.application.globalTheme.accentColor
- privacy: true
- anchors.verticalCenter: parent.verticalCenter
- DexMouseArea {
- anchors.fill: parent
- onClicked: {
- const current_fiat = API.app.settings_pg.current_currency
- const available_fiats = API.app.settings_pg.get_available_currencies()
- const current_index = available_fiats.indexOf(
- current_fiat)
- const next_index = (current_index + 1)
- % available_fiats.length
- const next_fiat = available_fiats[next_index]
- API.app.settings_pg.current_currency = next_fiat
- }
- }
- }
- }
- DexLabel {
- text: " | "
- opacity: .1
- font.family: 'Montserrat'
- font.weight: Font.Medium
- visible: _label.visible
- color: app.globalTheme.foregroundColor
- anchors.verticalCenter: parent.verticalCenter
- leftPadding: 2
- }
- DexIconButton {
- opacity: containsMouse? 1 : .8
- anchors.verticalCenter: parent.verticalCenter
- color: active? app.globalTheme.accentColor : containsMouse? app.globalTheme.accentColor : app.globalTheme.foregroundColor
- iconSize: 22
- icon: Qaterial.Icons.bellOutline
- visible: _label.visible
- active: app.notification_modal.opened
- AnimatedRectangle {
- z: 1
- anchors.right: parent.right
- anchors.rightMargin: -3
- y: -3
- radius: width/2
- width: count_text.height * 1.4
- height: width
- visible: app.notifications_list.length > 0
- color: app.globalTheme.redColor
-
- DefaultText {
- id: count_text
- anchors.centerIn: parent
- text_value: _label.visible ? app.notifications_list.length ?? 0 : 0
- font.pixelSize: 8
- font.family: 'Lato'
- color: app.globalTheme.foregroundColor
- }
- }
- onClicked: {
- if(app.notification_modal.visible) {
- app.notification_modal.close()
- }else {
- app.notification_modal.openAt(mapToItem(Overlay.overlay, -165, 18), Item.Top)
- }
- }
- }
- }
- }
-}
diff --git a/qtquickcontrols2.conf b/atomic_defi_design/qtquickcontrols2.conf
similarity index 100%
rename from qtquickcontrols2.conf
rename to atomic_defi_design/qtquickcontrols2.conf
diff --git a/ci_tools_atomic_dex/README.md b/ci_tools_atomic_dex/README.md
index ccd2ff8e1f..366d249015 100644
--- a/ci_tools_atomic_dex/README.md
+++ b/ci_tools_atomic_dex/README.md
@@ -1,4 +1,4 @@
-# AtomicDEX Pro alpha build instructions
+# Komodo Wallet Pro alpha build instructions
## Prerequisites
@@ -68,7 +68,7 @@ git checkout curl-7_70_0
make install
```
-Installling libbitcoin:
+Installing libbitcoin:
```
git clone --depth 1 --branch version5 --single-branch "https://github.com/KomodoPlatform/secp256k1"
@@ -140,7 +140,7 @@ mv packages_commandline.json packages_official.json
cd -
```
-## Build AtomicDEX Pro
+## Build Komodo Wallet Pro
Please clone with submodules initialization : `git clone --recurse-submodules --remote-submodules https://github.com/KomodoPlatform/atomicDEX-Pro.git`
@@ -176,7 +176,7 @@ nimble build
./ci_tools_atomic_dex build release
```
-## Bundle AtomicDEX Pro
+## Bundle Komodo Wallet Pro
### Windows
@@ -202,7 +202,7 @@ nimble build
-## Create AtomicDEX Pro Installer
+## Create Komodo Wallet Pro Installer
### Windows
@@ -229,7 +229,7 @@ chmod +x QtInstallerFramework-linux-x64.run
e.g.: In `.bashrc` add: `export QT_IFW_PATH=~/Qt/QtIFW-3.2.2`
-- Build AtomicDex Pro `./ci_tools_atomic_dex build release`
+- Build Komodo Wallet Pro `./ci_tools_atomic_dex build release`
- Run `ci_tools_atomic_dex\create_installer_linux.sh` script, pass build type as argument to script
diff --git a/ci_tools_atomic_dex/ci_scripts/ATOMICDEXinstaller_script.iss b/ci_tools_atomic_dex/ci_scripts/ATOMICDEXinstaller_script.iss
index 17d94e2837..e050f2f114 100644
--- a/ci_tools_atomic_dex/ci_scripts/ATOMICDEXinstaller_script.iss
+++ b/ci_tools_atomic_dex/ci_scripts/ATOMICDEXinstaller_script.iss
@@ -1,11 +1,11 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-#define MyAppName "AtomicDEX-Desktop"
+#define MyAppName "Komodo-Wallet"
#define MyAppVersion "0.5.0"
#define MyAppPublisher "Komodo Platform"
#define MyAppURL "https://www.komodoplatform.com/"
-#define MyAppExeName "atomicdex-desktop.exe"
+#define MyAppExeName "komodo-wallet.exe"
#define MyUserName "smk"
#define CommitHash "b2ce1cc"
@@ -27,8 +27,8 @@ DisableProgramGroupPage=yes
;PrivilegesRequired=lowest
;PrivilegesRequiredOverridesAllowed=dialog
OutputDir=C:\Users\{#MyUserName}\Documents\temp
-OutputBaseFilename=atomicdex-desktop-{#MyAppVersion}-windows-installer
-SetupIconFile=C:\Users\{#MyUserName}\Downloads\atomicdex-desktop-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\assets\logo\dex-logo.ico
+OutputBaseFilename=komodo-wallet-{#MyAppVersion}-windows-installer
+SetupIconFile=C:\Users\{#MyUserName}\Downloads\komodo-wallet-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\assets\logo\dex-logo.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
@@ -43,8 +43,8 @@ Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
-Source: "C:\Users\{#MyUserName}\Downloads\atomicdex-desktop-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\{#MyUserName}\Downloads\atomicdex-desktop-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\Users\{#MyUserName}\Downloads\komodo-wallet-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Users\{#MyUserName}\Downloads\komodo-wallet-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]
diff --git a/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss b/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss
index 9620861cdb..a2db7159fe 100644
--- a/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss
+++ b/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss
@@ -4,7 +4,7 @@
#define MyAppName "GleecDEX-Desktop"
#define MyAppVersion "0.5.0"
#define MyAppPublisher "Komodo Platform"
-#define MyAppURL "https://github.com/KomodoPlatform/atomicDEX-Desktop"
+#define MyAppURL "https://github.com/KomodoPlatform/komodo-wallet-desktop"
#define MyAppExeName "GleecDEX.exe"
#define MyUserName "smk"
#define CommitHash "cc57ab3"
diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh
index 3e4f0b8310..95d20d4f4a 100755
--- a/ci_tools_atomic_dex/ci_scripts/linux_script.sh
+++ b/ci_tools_atomic_dex/ci_scripts/linux_script.sh
@@ -2,8 +2,8 @@
sudo apt-get update # prevents repo404 errors on apt-remove below
sudo apt-get remove php* msodbcsql17 mysql*
-sudo apt-get update
-sudo ACCEPT_EULA=Y apt-get upgrade -y
+#sudo apt-get update
+#sudo ACCEPT_EULA=Y apt-get upgrade -y
# base deps
sudo apt-get install build-essential \
libgl1-mesa-dev \
@@ -54,7 +54,7 @@ sudo cp -r * /usr/local/
cmake --version
# get libwally
-git clone https://github.com/KomodoPlatform/libwally-core.git
+git clone https://github.com/KomodoPlatform/libwally-core.git --recurse-submodules
cd libwally-core
./tools/autogen.sh
./configure --disable-shared
@@ -62,10 +62,11 @@ sudo make -j3 install
cd ..
## tar
-wget https://ftp.gnu.org/gnu/tar/tar-1.32.tar.gz
+wget --timeout=10 --tries=3 https://ftp.gnu.org/gnu/tar/tar-1.32.tar.gz || wget --timeout=10 --tries=3 https://mirrors.sjtug.sjtu.edu.cn/gnu/tar/tar-1.32.tar.gz
tar xvf tar-1.32.tar.gz
cd tar-1.32
export FORCE_UNSAFE_CONFIGURE=1
./configure
sudo make -j install
+sudo ln -s /bin/tar /usr/local/bin/tar
sudo update-alternatives --install /usr/bin/tar tar /usr/local/bin/tar 777
diff --git a/ci_tools_atomic_dex/ci_scripts/mt_wrapper.ps1 b/ci_tools_atomic_dex/ci_scripts/mt_wrapper.ps1
new file mode 100644
index 0000000000..948c66ae37
--- /dev/null
+++ b/ci_tools_atomic_dex/ci_scripts/mt_wrapper.ps1
@@ -0,0 +1,17 @@
+$input=$args[0]
+$output=$args[1]
+
+
+$path=${Env:ProgramFiles(x86)}
+$kit_path=$path+"\Windows Kits"
+Get-ChildItem $kit_path -recurse -include "mt.exe" | Foreach-Object {
+ if($_.FullName -like '*x86\*')
+ {
+ echo $_.FullName
+ $target=(get-item $_.FullName).Directory.FullName
+ echo "Adding to path: $target"
+ $env:Path += ";$target"
+ }
+}
+
+mt.exe -manifest $input -outputresource:$output;
\ No newline at end of file
diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh
index d8a242472f..f47910cab6 100755
--- a/ci_tools_atomic_dex/ci_scripts/osx_script.sh
+++ b/ci_tools_atomic_dex/ci_scripts/osx_script.sh
@@ -1,9 +1,13 @@
#!/bin/bash
brew update
+
+brew unlink libtool
+wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb
+brew install libtool.rb
+
brew install autoconf \
automake \
- libtool \
pkgconfig \
wget \
nim \
@@ -16,7 +20,7 @@ brew install autoconf \
pip3 install yq
export CC=clang
export CXX=clang++
-export MACOSX_DEPLOYMENT_TARGET=10.14
+export MACOSX_DEPLOYMENT_TARGET=10.15
# get curl
#git clone https://github.com/KomodoPlatform/curl.git
@@ -27,7 +31,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.14
#make -j3 install
#cd ../
-git clone https://github.com/KomodoPlatform/libwally-core.git
+git clone https://github.com/KomodoPlatform/libwally-core.git --recurse-submodules
cd libwally-core
./tools/autogen.sh
./configure --disable-shared
diff --git a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1 b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1
index 075c4d16fc..e22db59635 100644
--- a/ci_tools_atomic_dex/ci_scripts/windows_script.ps1
+++ b/ci_tools_atomic_dex/ci_scripts/windows_script.ps1
@@ -1,16 +1,12 @@
Set-ExecutionPolicy RemoteSigned -scope CurrentUser
-$DWFILE = ($PWD | select -exp Path) + '\nim-1.2.6.zip'
-(New-Object System.Net.WebClient).DownloadFile('https://github.com/KomodoPlatform/nim_kmd_package_list/raw/master/nim-1.2.6_x64.zip', $DWFILE)
-$DWFOLDER = ($PWD | select -exp Path)
-Expand-Archive -LiteralPath $DWFILE -DestinationPath $DWFOLDER
-$ENV:PATH=$ENV:PATH+';'+($PWD | select -exp Path)+'\nim-1.2.6\bin;'+$ENV:UserProfile+'.nimble\bin'
-& $DWFOLDER\nim-1.2.6\finish.exe -y
+iwr -useb 'https://raw.githubusercontent.com/scoopinstaller/install/master/install.ps1' -outfile 'install.ps1'
+.\install.ps1 -RunAsAdmin
-Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+#Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') -RunAsAdmin
scoop install llvm --global
scoop install ninja --global
-scoop install cmake@3.20.5 --global
+scoop install cmake@3.26.3 --global
scoop install git --global
scoop install 7zip --global
scoop cache rm 7zip
@@ -18,14 +14,16 @@ scoop cache rm git
scoop cache rm cmake
scoop cache rm ninja
scoop cache rm llvm
-scoop cache rm nim
+
$Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\$Env:QT_VERSION\msvc2019_64"
$Env:QT_ROOT = "C:\Qt"
-cd ci_tools_atomic_dex
-#$file = 'src\generate.nim'
-#$regex = '(?<=g_vcpkg_cmake_script_path & ")[^"]*'
-#(Get-Content $file) -replace $regex, ' -DVCPKG_TARGET_TRIPLET=x64-windows ' | Set-Content $file
-nimble build -y
-#cmd /c '.\ci_tools_atomic_dex.exe build release 2>&1'
-cmd /c '.\ci_tools_atomic_dex.exe bundle release 2>&1'
-#ls bundle-Release/bundle.zip
+
+git clone https://github.com/KomodoPlatform/coins/ -b master
+mkdir -p atomic_defi_design\assets\images\coins
+Get-Item -Path "coins\icons\*.png" | Move-Item -Destination "atomic_defi_design\assets\images\coins"
+
+mkdir b
+cd b
+
+Invoke-Expression "cmake -DCMAKE_BUILD_TYPE=$Env:CMAKE_BUILD_TYPE -GNinja ../"
+ninja install
diff --git a/ci_tools_atomic_dex/ci_tools_atomic_dex.nimble b/ci_tools_atomic_dex/ci_tools_atomic_dex.nimble
index b684a5b138..189a9d0ac4 100644
--- a/ci_tools_atomic_dex/ci_tools_atomic_dex.nimble
+++ b/ci_tools_atomic_dex/ci_tools_atomic_dex.nimble
@@ -2,7 +2,7 @@
version = "0.1.0"
author = "romanszterg"
-description = "AtomicDex CI utilities"
+description = "Komodo Wallet CI utilities"
license = "MIT"
srcDir = "src"
bin = @["ci_tools_atomic_dex"]
diff --git a/ci_tools_atomic_dex/dmg-packager/package.sh b/ci_tools_atomic_dex/dmg-packager/package.sh
index ae2b254077..138c354509 100755
--- a/ci_tools_atomic_dex/dmg-packager/package.sh
+++ b/ci_tools_atomic_dex/dmg-packager/package.sh
@@ -119,12 +119,15 @@ echo '
sync
-# unmount it
-hdiutil detach "${DEVICE}"
+# unmount it (5 chances, with some sleep to catch up)
+for i in {1..5}; do hdiutil detach "${DEVICE}" && break || echo "unmount attempt $i" && sleep 15; done
-# now make the final image a compressed disk image
+
+
+# now make the final image a compressed disk image (5 chances, with some sleep to catch up)
echo "Creating compressed image"
-hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL}"
+for i in {1..5}; do hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL}" && break || echo "convert attempt $i" && sleep 15; done
+
# clean up
rm -rf "${DMG_TMP}"
@@ -132,4 +135,4 @@ rm -rf "${STAGING_DIR}"
echo 'Done.'
-exit
\ No newline at end of file
+exit
diff --git a/ci_tools_atomic_dex/installer/osx/config/config.xml.in b/ci_tools_atomic_dex/installer/osx/config/config.xml.in
index 1f06280e9b..3662ef3bc5 100644
--- a/ci_tools_atomic_dex/installer/osx/config/config.xml.in
+++ b/ci_tools_atomic_dex/installer/osx/config/config.xml.in
@@ -1,7 +1,7 @@
${DEX_DISPLAY_NAME}
- 0.4.3
+ @DEX_VERSION@
${DEX_DISPLAY_NAME} Installer
${DEX_WEBSITE}
${DEX_COMPANY}
@@ -14,4 +14,4 @@
install_icon
install_icon.png
Mac
-
\ No newline at end of file
+
diff --git a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in
index 5d995a7c33..a9487a11ad 100644
--- a/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in
+++ b/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,11 +2,11 @@
${DEX_DISPLAY_NAME}
Install ${DEX_DISPLAY_NAME}.
- 0.4.3
- 2021-05-10
+ ${DEX_VERSION}
+ 2023-11-06
true
-
\ No newline at end of file
+
diff --git a/ci_tools_atomic_dex/installer/windows/config/config.xml.in b/ci_tools_atomic_dex/installer/windows/config/config.xml.in
index 29f1fbc777..bf4f0848fa 100644
--- a/ci_tools_atomic_dex/installer/windows/config/config.xml.in
+++ b/ci_tools_atomic_dex/installer/windows/config/config.xml.in
@@ -1,12 +1,12 @@
@DEX_DISPLAY_NAME@
- 0.4.3
+ @DEX_VERSION@
@DEX_DISPLAY_NAME@ Installer
@DEX_WEBSITE@
@DEX_COMPANY@
@DEX_INSTALL_TARGET_DIR_WIN64@/@DEX_DISPLAY_NAME@
- @DEX_TARGET_DIR@/@DEX_PROJECT_NAME@.exe
+ @DEX_TARGET_DIR@/bin/@DEX_PROJECT_NAME@.exe
Run @DEX_DISPLAY_NAME@ now.
@DEX_DISPLAY_NAME@
@DEX_MAINTENANCE_TOOL_NAME@
@@ -14,4 +14,4 @@
install_icon
install_icon.png
Mac
-
\ No newline at end of file
+
diff --git a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/installscript.qs.in b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/installscript.qs.in
index cc11201d0d..106dd0af5e 100644
--- a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/installscript.qs.in
+++ b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/installscript.qs.in
@@ -1,26 +1,26 @@
function Component()
{
-
-}
+ // installer.gainAdminRights();
+ component.loaded.connect(this, this.installerLoaded);
+}
Component.prototype.createOperations = function()
{
component.createOperations();
-
if (installer.value("os") === "win") {
// Start Menu Shortcut
component.addOperation("CreateShortcut",
- "@DEX_TARGET_DIR@/@DEX_PROJECT_NAME@.exe",
+ "@DEX_TARGET_DIR@/bin/@DEX_PROJECT_NAME@.exe",
"@DEX_START_MENU_DIR@/@DEX_DISPLAY_NAME@.lnk",
- "workingDirectory=@DEX_TARGET_DIR@",
+ "workingDirectory=@DEX_TARGET_DIR@/bin",
"iconPath=@DEX_ICON_DIR@", "iconId=0",
"description=Start @DEX_DISPLAY_NAME@");
// Desktop Shortcut
component.addOperation("CreateShortcut",
- "@DEX_TARGET_DIR@/@DEX_PROJECT_NAME@.exe",
+ "@DEX_TARGET_DIR@/bin/@DEX_PROJECT_NAME@.exe",
"@DEX_DESKTOP_DIR@/@DEX_DISPLAY_NAME@.lnk",
- "workingDirectory=@DEX_TARGET_DIR@",
+ "workingDirectory=@DEX_TARGET_DIR@/bin",
"iconPath=@DEX_ICON_DIR@", "iconId=0",
"description=Start @DEX_DISPLAY_NAME@");
@@ -32,4 +32,48 @@ Component.prototype.createOperations = function()
"iconPath=@DEX_ICON_DIR@", "iconId=0",
"description=Start @DEX_MAINTENANCE_TOOL_NAME@");
}
+}
+
+Component.prototype.installerLoaded = function()
+{
+ installer.setDefaultPageVisible(QInstaller.TargetDirectory, false);
+ installer.addWizardPage(component, "TargetWidget", QInstaller.TargetDirectory);
+
+ targetDirectoryPage = gui.pageWidgetByObjectName("DynamicTargetWidget");
+ targetDirectoryPage.windowTitle = "Choose Installation Directory";
+ targetDirectoryPage.description.setText("Please select where the app will be installed:");
+ targetDirectoryPage.targetDirectory.textChanged.connect(this, this.targetDirectoryChanged);
+ targetDirectoryPage.targetDirectory.setText(installer.value("TargetDir"));
+ targetDirectoryPage.targetChooser.released.connect(this, this.targetChooserClicked);
+
+ gui.pageById(QInstaller.ComponentSelection).entered.connect(this, this.componentSelectionPageEntered);
+}
+
+Component.prototype.targetChooserClicked = function()
+{
+ var dir = QFileDialog.getExistingDirectory("", targetDirectoryPage.targetDirectory.text);
+ targetDirectoryPage.targetDirectory.setText(dir);
+}
+
+Component.prototype.targetDirectoryChanged = function()
+{
+ var dir = targetDirectoryPage.targetDirectory.text;
+ if (installer.fileExists(dir) && installer.fileExists(dir + "/maintenancetool.exe")) {
+ targetDirectoryPage.warning.setText("Existing installation detected and will be overwritten.
");
+ }
+ else if (installer.fileExists(dir)) {
+ targetDirectoryPage.warning.setText("Installing in existing directory. It will be wiped on uninstallation.
");
+ }
+ else {
+ targetDirectoryPage.warning.setText("");
+ }
+ installer.setValue("TargetDir", dir);
+}
+
+Component.prototype.componentSelectionPageEntered = function()
+{
+ var dir = installer.value("TargetDir");
+ if (installer.fileExists(dir) && installer.fileExists(dir + "/maintenancetool.exe")) {
+ installer.execute(dir + "/maintenancetool.exe", ["purge", "-c"]);
+ }
}
\ No newline at end of file
diff --git a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in
index 5d995a7c33..090e2c430f 100644
--- a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in
+++ b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/package.xml.in
@@ -2,11 +2,14 @@
${DEX_DISPLAY_NAME}
Install ${DEX_DISPLAY_NAME}.
- 0.4.3
- 2021-05-10
+ ${DEX_VERSION}
+ 2023-11-06
true
-
\ No newline at end of file
+
+ targetwidget.ui
+
+
diff --git a/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/targetwidget.ui b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/targetwidget.ui
new file mode 100644
index 0000000000..6237332046
--- /dev/null
+++ b/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/meta/targetwidget.ui
@@ -0,0 +1,113 @@
+
+
+ TargetWidget
+
+
+
+ 0
+ 0
+ 491
+ 190
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 491
+ 190
+
+
+
+ Form
+
+
+ -
+
+
+
+
+
+
+ -
+
+
-
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ ...
+
+
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ true
+
+
+ TextLabel
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 122
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ci_tools_atomic_dex/src/ci_tools_atomic_dex.nim b/ci_tools_atomic_dex/src/ci_tools_atomic_dex.nim
index feb24df7e3..ab8425ffa5 100644
--- a/ci_tools_atomic_dex/src/ci_tools_atomic_dex.nim
+++ b/ci_tools_atomic_dex/src/ci_tools_atomic_dex.nim
@@ -16,11 +16,11 @@ Atomic Dex CI Tools.
Usage:
ci_tools_atomic_dex --install_vcpkg
ci_tools_atomic_dex --install_dependencies
- ci_tools_atomic_dex build (release|debug) [--osx_sdk=] [--compiler=]
+ ci_tools_atomic_dex build (Release|Debug) [--osx_sdk=] [--compiler=]
ci_tools_atomic_dex clean (full|dependencies|build_dir)
- ci_tools_atomic_dex generate (release|debug) [--osx_sdk=] [--compiler=]
- ci_tools_atomic_dex bundle (release|debug) [--osx_sdk=] [--compiler=]
- ci_tools_atomic_dex tests (release|debug) [--osx_sdk=] [--compiler=]
+ ci_tools_atomic_dex generate (Release|Debug) [--osx_sdk=] [--compiler=]
+ ci_tools_atomic_dex bundle (Release|Debug) [--osx_sdk=] [--compiler=]
+ ci_tools_atomic_dex tests (Release|Debug) [--osx_sdk=] [--compiler=]
ci_tools_atomic_dex --version
ci_tools_atomic_dex (-h | --help)
@@ -32,30 +32,37 @@ Options:
proc main() =
let args = docopt(doc, version = "Atomic Dex CI Tools 0.0.1")
vcpkg_prepare()
+
if args["--install_vcpkg"]:
install_vcpkg()
+
elif args["--install_dependencies"]:
download_packages()
+
elif args["generate"]:
- if args["release"]:
+ if args["Release"]:
generate_solution("Release", $args["--osx_sdk"], $args["--compiler"])
- elif args["debug"]:
+ elif args["Debug"]:
generate_solution("Debug", $args["--osx_sdk"], $args["--compiler"])
+
elif args["build"]:
- if args["release"]:
+ if args["Release"]:
build_atomic_qt("Release", $args["--osx_sdk"], $args["--compiler"])
- elif args["debug"]:
+ elif args["Debug"]:
build_atomic_qt("Debug", $args["--osx_sdk"], $args["--compiler"])
+
elif args["bundle"]:
- if args["release"]:
+ if args["Release"]:
bundle("Release", $args["--osx_sdk"], $args["--compiler"])
- elif args["debug"]:
+ elif args["Debug"]:
bundle("Debug", $args["--osx_sdk"], $args["--compiler"])
+
elif args["tests"]:
- if args["release"]:
+ if args["Release"]:
run_tests("Release", $args["--osx_sdk"], $args["--compiler"])
- elif args["debug"]:
+ elif args["Debug"]:
run_tests("Debug", $args["--osx_sdk"], $args["--compiler"])
+
elif args["clean"]:
if args["full"]:
clean("full")
diff --git a/ci_tools_atomic_dex/src/clean.nim b/ci_tools_atomic_dex/src/clean.nim
index a84a1ad28d..888368a376 100644
--- a/ci_tools_atomic_dex/src/clean.nim
+++ b/ci_tools_atomic_dex/src/clean.nim
@@ -1,13 +1,13 @@
import os
proc remove_vcpkg()=
- if os.existsDir("vcpkg-repo"):
+ if os.dirExists("vcpkg-repo"):
os.removeDir("vcpkg-repo")
proc remove_build()=
- if os.existsDir("build-Debug"):
+ if os.dirExists("build-Debug"):
os.removeDir("build-Debug")
- if os.existsDir("build-Release"):
+ if os.dirExists("build-Release"):
os.removeDir("build-Release")
proc clean*(clean_type: string) =
diff --git a/ci_tools_atomic_dex/src/generate.nim b/ci_tools_atomic_dex/src/generate.nim
index 22cbb68233..d53b6a1ff8 100644
--- a/ci_tools_atomic_dex/src/generate.nim
+++ b/ci_tools_atomic_dex/src/generate.nim
@@ -6,7 +6,7 @@ import dependencies
proc generate_solution*(build_type: string, osx_sdk_path: string, compiler_path: string) =
download_packages()
var full_name = "build-" & build_type
- if not os.existsDir(os.getCurrentDir().joinPath(full_name)):
+ if not os.dirExists(os.getCurrentDir().joinPath(full_name)):
echo "creating directory: " & full_name
os.createDir(full_name)
else:
@@ -16,7 +16,7 @@ proc generate_solution*(build_type: string, osx_sdk_path: string, compiler_path:
var cmd_line = "cmake -GNinja -DCMAKE_BUILD_TYPE=" & build_type & " " &
os.getCurrentDir().parentDir().parentDir()
when defined(osx):
- if not osx_sdk_path.isNil() and osx_sdk_path != "nil":
- cmd_line = cmd_line & " -DCMAKE_OSX_SYSROOT=" & osx_sdk_path & " -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DPREFER_BOOST_FILESYSTEM=ON"
+ if os.dirExists(osx_sdk_path):
+ cmd_line = cmd_line & " -DCMAKE_OSX_SYSROOT=" & osx_sdk_path & " -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
echo "cmd line: " & cmd_line
discard execCmd(cmd_line)
diff --git a/ci_tools_atomic_dex/src/tests.nim b/ci_tools_atomic_dex/src/tests.nim
index 0b8240610a..0508b9cabb 100644
--- a/ci_tools_atomic_dex/src/tests.nim
+++ b/ci_tools_atomic_dex/src/tests.nim
@@ -12,22 +12,40 @@ proc run_tests*(build_type: string, osx_sdk_path: string, compiler_path: string)
generate_solution(build_type, osx_sdk_path, compiler_path)
when defined(osx):
+ echo "CURRENT OSX FOLDER"
echo os.getCurrentDir()
- os.setCurrentDir(os.getCurrentDir().joinPath("bin").joinPath(os.getEnv("DEX_PROJECT_NAME") & "_tests.app").joinPath("Contents").joinPath("MacOS"))
- echo "Running AtomicDex Pro Unit tests"
+ discard osproc.execCmd("ls")
+ os.setCurrentDir(os.getCurrentDir().joinPath("bin"))
+ echo "CURRENT OSX FOLDER"
+ echo os.getCurrentDir()
+ discard osproc.execCmd("ls")
+ os.setCurrentDir(os.getCurrentDir().joinPath(os.getEnv("DEX_PROJECT_NAME") & "_tests.app"))
+ echo "CURRENT OSX FOLDER"
+ echo os.getCurrentDir()
+ discard osproc.execCmd("ls")
+ os.setCurrentDir(os.getCurrentDir().joinPath("Contents"))
+ echo "CURRENT OSX FOLDER"
+ echo os.getCurrentDir()
+ discard osproc.execCmd("ls")
+ os.setCurrentDir(os.getCurrentDir().joinPath("MacOS"))
+ echo "CURRENT OSX FOLDER"
+ echo os.getCurrentDir()
+ discard osproc.execCmd("ls")
+ # os.setCurrentDir(os.getCurrentDir().joinPath("bin").joinPath(os.getEnv("DEX_PROJECT_NAME") & "_tests.app").joinPath("Contents").joinPath("MacOS"))
+ echo "Running Komodo Wallet Pro Unit tests"
discard osproc.execCmd("./" & os.getEnv("DEX_PROJECT_NAME") & "_tests --reporters=xml --out=" & os.getEnv("DEX_PROJECT_NAME") & "-tests-result.xml -s")
echo "Successfully Generated", os.getEnv("DEX_PROJECT_NAME"), "-tests-result.xml"
when defined(linux):
echo os.getCurrentDir()
os.setCurrentDir(os.getCurrentDir().joinPath("bin").joinPath("AntaraAtomicDexTestsAppDir").joinPath("usr").joinPath("bin"))
- echo "Running AtomicDex Pro Unit tests"
+ echo "Running Komodo Wallet Pro Unit tests"
discard osproc.execCmd("./" & os.getEnv("DEX_PROJECT_NAME") & "_tests --reporters=xml --out=" & os.getEnv("DEX_PROJECT_NAME") & "-tests-result.xml -s")
echo "Successfully Generated", os.getEnv("DEX_PROJECT_NAME"), "-tests-result.xml"
when defined(windows):
echo os.getCurrentDir()
os.setCurrentDir(os.getCurrentDir().joinPath("bin"))
- echo "Running AtomicDex Pro Unit tests"
+ echo "Running Komodo Wallet Pro Unit tests"
discard osproc.execCmd(".\\" & os.getEnv("DEX_PROJECT_NAME") & "_tests --reporters=xml --out=" & os.getEnv("DEX_PROJECT_NAME") & "-tests-result.xml -s")
echo "Successfully Generated", os.getEnv("DEX_PROJECT_NAME"), "-tests-result.xml"
diff --git a/ci_tools_atomic_dex/src/vcpkg.nim b/ci_tools_atomic_dex/src/vcpkg.nim
index c679f29a8e..fca94fc080 100644
--- a/ci_tools_atomic_dex/src/vcpkg.nim
+++ b/ci_tools_atomic_dex/src/vcpkg.nim
@@ -5,10 +5,10 @@ var g_vcpkg_local_path* = ""
var g_vcpkg_cmake_script_path* = ""
proc check_if_vcpkg_exists*(): bool =
- result = os.existsDir("vcpkg-repo")
+ result = os.dirExists("vcpkg-repo")
proc build_vcpkg() =
- if not os.existsFile(g_vcpkg_local_path):
+ if not os.fileExists(g_vcpkg_local_path):
echo "building vcpkg"
os.setCurrentDir("vcpkg-repo")
when defined(windows):
diff --git a/ci_tools_atomic_dex/util/compare_themes.py b/ci_tools_atomic_dex/util/compare_themes.py
new file mode 100755
index 0000000000..714b833282
--- /dev/null
+++ b/ci_tools_atomic_dex/util/compare_themes.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+import json
+import requests
+
+'''
+Purpose: Scans the light and dark theme json files for a list of whitelabel
+ branches, and compares them with the dev branch to identify theme
+ selectors which are obsolete or not present in the whitelabel branch.
+
+Usage: `./compare_themes.py`
+'''
+
+REPO_URL = "https://raw.githubusercontent.com/KomodoPlatform/komodo-wallet-desktop"
+BRANCHES = ['smartdex', 'GleecDEX', 'shibadex']
+
+
+def get_theme_url(branch, theme):
+ '''Returns a github url for a branch theme.'''
+ path = f"assets/themes/Default%20-%20{theme.title()}"
+ return f"{REPO_URL}/{branch}/{path}/colors.json"
+
+
+def get_themes_data(branches):
+ '''Returns a dict of dark/light theme data for each branch.'''
+ themes = {}
+ for branch in branches+['dev']:
+ themes.update({branch: {}})
+ for theme in ['light', 'dark']:
+ url = get_theme_url(branch, theme)
+ themes[branch].update({
+ theme: requests.get(url).json()
+ })
+ return themes
+
+
+def get_selectors(themes, branch='dev'):
+ '''Returns a list of selectors within each theme for a branch.'''
+ return {
+ 'light': set(themes[branch]['light'].keys()),
+ 'dark': set(themes[branch]['dark'].keys())
+ }
+
+
+def compare_branch_themes(branches, show_results=True):
+ '''Scans whitelabel theme data to identify missing/obsolete selectors.'''
+ themes = get_themes_data(branches)
+ dev_selectors = get_selectors(themes, 'dev')
+
+ for branch in branches:
+ for theme in ['light', 'dark']:
+ selectors = set(themes[branch][theme].keys())
+ missing = dev_selectors[theme].difference(selectors)
+ themes[branch].update({
+ f"missing_{theme}": missing,
+ f"obsolete_{theme}": selectors.difference(dev_selectors[theme])
+ })
+ if show_results:
+ output_results(themes, branch, theme)
+
+
+def output_results(themes, branch, theme):
+ '''Outputs results for a branch to the console.'''
+ print(f"\n#### {branch} {theme} ####")
+ if len(themes[branch][f"obsolete_{theme}"]) == 0:
+ print(f"No obsolete selectors")
+ else:
+ for i in themes[branch][f"obsolete_{theme}"]:
+ print(f"Obsolete selector: {i}...")
+
+ if len(themes[branch][f"missing_{theme}"]) == 0:
+ print(f"No obsolete selectors")
+ else:
+ for i in themes[branch][f"missing_{theme}"]:
+ dev_color = themes['dev'][theme][i]
+ for j in themes['dev'][theme]:
+ if dev_color == themes['dev'][theme][j]:
+ if j in themes[branch][theme]:
+ print(f"Missing {i}... Try {themes[branch][theme][j]}")
+ break
+
+
+if __name__ == '__main__':
+ compare_branch_themes(BRANCHES, True)
diff --git a/ci_tools_atomic_dex/vcpkg-custom-ports b/ci_tools_atomic_dex/vcpkg-custom-ports
index 19453b682d..f20c053d1b 160000
--- a/ci_tools_atomic_dex/vcpkg-custom-ports
+++ b/ci_tools_atomic_dex/vcpkg-custom-ports
@@ -1 +1 @@
-Subproject commit 19453b682d43a354235b20809f59761d899a50ee
+Subproject commit f20c053d1b47957af9c50aa34be45c69dfdcc1a4
diff --git a/ci_tools_atomic_dex/vcpkg-repo b/ci_tools_atomic_dex/vcpkg-repo
index 3426db05b9..1712ed5174 160000
--- a/ci_tools_atomic_dex/vcpkg-repo
+++ b/ci_tools_atomic_dex/vcpkg-repo
@@ -1 +1 @@
-Subproject commit 3426db05b996481ca31e95fff3734cf23e0f51bc
+Subproject commit 1712ed51743a2e739c2f2c3855cd1d16fbbb6873
diff --git a/cmake/cfg_hash.cmake b/cmake/cfg_hash.cmake
index 7179dc15d9..3c1c7af15c 100644
--- a/cmake/cfg_hash.cmake
+++ b/cmake/cfg_hash.cmake
@@ -1,5 +1,5 @@
#if (UNIX)
-# execute_process(COMMAND bash -c "git ls-remote https://github.com/KomodoPlatform/atomicdex-desktop-generics refs/heads/main | cut -f 1 | tr -d '\n'"
+# execute_process(COMMAND bash -c "git ls-remote https://github.com/KomodoPlatform/komodo-wallet-desktop-generics refs/heads/main | cut -f 1 | tr -d '\n'"
# OUTPUT_VARIABLE GENERICS_VERSION_ID
# )
# if (NOT EXISTS ${GENERICS_VERSION_ID}.cfg_hash)
diff --git a/cmake/compiler_prerequisites.cmake b/cmake/compiler_prerequisites.cmake
index 41579fed1f..847dc1a911 100644
--- a/cmake/compiler_prerequisites.cmake
+++ b/cmake/compiler_prerequisites.cmake
@@ -7,14 +7,4 @@ endif ()
if (WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-endif ()
-
-if (PREFER_BOOST_FILESYSTEM)
- message(STATUS "Boost filesystem over std::filesystem")
- add_compile_definitions(PREFER_BOOST_FILESYSTEM)
-endif ()
-
-#if (PREFER_BOOST_OPTIONAL)
-# message(STATUS "Boost optional over std::optional")
-# add_compile_definitions(PREFER_BOOST_OPTIONAL)
-#endif()
\ No newline at end of file
+endif ()
\ No newline at end of file
diff --git a/cmake/compiler_targets.cmake b/cmake/compiler_targets.cmake
index 2793d91d09..ecbe4a273b 100644
--- a/cmake/compiler_targets.cmake
+++ b/cmake/compiler_targets.cmake
@@ -52,7 +52,7 @@ target_compile_definitions(antara_optimize_settings INTERFACE
$<$,$,$>:NDEBUG>
$<$,$,$>:DEBUG>
$<$,$,$>:NDEBUG>
- $<$,$,$>:-DEBUG>
+ $<$,$,$>:DEBUG>
$<$,$,$>:NDEBUG>
$<$,$,$>:DEBUG>
)
diff --git a/cmake/dex_generate_qrc.cmake b/cmake/dex_generate_qrc.cmake
new file mode 100644
index 0000000000..e242abb7d3
--- /dev/null
+++ b/cmake/dex_generate_qrc.cmake
@@ -0,0 +1,40 @@
+function(dex_generate_qrc directory output)
+ cmake_parse_arguments(
+ GENERATE_QRC
+ ""
+ "PATH_PREFIX"
+ "FILES_TO_EXCLUDE;FILES"
+ ${ARGN}
+ )
+
+ set(resources)
+ file(GLOB_RECURSE resources ${directory}/* ${directory}/*/*)
+
+ file(WRITE ${directory}/qml.qrc "\n")
+ file(APPEND ${directory}/qml.qrc " \n")
+ foreach(res ${resources})
+ set(excluded FALSE)
+ foreach(file_to_exclude ${GENERATE_QRC_FILES_TO_EXCLUDE})
+ set(find_res)
+ string(FIND ${res} ${file_to_exclude} find_res)
+ if (${find_res} GREATER -1)
+ set(excluded TRUE)
+ break()
+ endif ()
+ endforeach()
+ if (excluded)
+ continue()
+ endif ()
+ string(REPLACE ${directory}/ "" res ${res})
+ file(APPEND ${directory}/qml.qrc " ${res}\n")
+ endforeach()
+ foreach(res ${GENERATE_QRC_FILES})
+ string(REPLACE ${directory}/ "" res ${res})
+ file(APPEND ${directory}/qml.qrc " ${res}\n")
+ endforeach()
+ file(APPEND ${directory}/qml.qrc " \n")
+ file(APPEND ${directory}/qml.qrc "\n")
+
+ set(${output} ${directory}/qml.qrc PARENT_SCOPE)
+
+endfunction()
\ No newline at end of file
diff --git a/cmake/install/linux/linux_post_install.cmake b/cmake/install/linux/linux_post_install.cmake
index 38cfbbc11f..23eae65e00 100644
--- a/cmake/install/linux/linux_post_install.cmake
+++ b/cmake/install/linux/linux_post_install.cmake
@@ -5,20 +5,26 @@ execute_process(COMMAND bash -c "echo -n `git rev-parse --short HEAD`"
OUTPUT_VARIABLE VERSION_ID
)
+message(STATUS "PROJECT_ROOT_DIR (before readjusting) -> ${PROJECT_ROOT_DIR}")
+
get_filename_component(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
-if (EXISTS ${PROJECT_ROOT_DIR}/build-Release)
+if (EXISTS ${PROJECT_ROOT_DIR}/build-Release OR EXISTS ${PROJECT_ROOT_DIR}/build-Debug)
message(STATUS "from ci tools, readjusting")
get_filename_component(PROJECT_ROOT_DIR ${PROJECT_ROOT_DIR} DIRECTORY)
endif ()
-message(STATUS "PROJECT_ROOT_DIR -> ${PROJECT_ROOT_DIR}")
-set(PROJECT_QML_DIR ${PROJECT_ROOT_DIR}/atomic_defi_design/qml)
-message(STATUS "PROJECT_QML_DIR -> ${PROJECT_QML_DIR}")
+set(PROJECT_QML_DIR ${PROJECT_ROOT_DIR}/atomic_defi_design/Dex)
set(PROJECT_APP_DIR AntaraAtomicDexAppDir)
set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}/bin/${PROJECT_APP_DIR})
set(PROJECT_BIN_PATH ${PROJECT_APP_PATH}/usr/bin/${DEX_PROJECT_NAME})
set(PROJECT_LIB_PATH ${PROJECT_APP_PATH}/usr/lib)
set(TARGET_APP_PATH ${PROJECT_ROOT_DIR}/bundled/linux)
+
+message(STATUS "VCPKG package manager enabled")
+message(STATUS "PROJECT_ROOT_DIR (after readjusting) -> ${PROJECT_ROOT_DIR}")
+message(STATUS "PROJECT_QML_DIR -> ${PROJECT_QML_DIR}")
+message(STATUS "VERSION_ID -> ${VERSION_ID}")
+
if (EXISTS ${PROJECT_APP_PATH})
message(STATUS "PROJECT_APP_PATH path is -> ${PROJECT_APP_PATH}")
message(STATUS "PROJECT_BIN_PATH path is -> ${PROJECT_BIN_PATH}")
@@ -28,16 +34,13 @@ else ()
message(FATAL_ERROR "Didn't find ${PROJECT_APP_PATH}")
endif ()
-message(STATUS "VCPKG package manager enabled")
set(LINUX_DEPLOY_PATH ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/linux_misc/linuxdeployqt-7-x86_64.AppImage)
-
if (EXISTS ${LINUX_DEPLOY_PATH})
message(STATUS "linuxdeployqt path is -> ${LINUX_DEPLOY_PATH}")
else ()
message(FATAL_ERROR "Didn't find ${LINUX_DEPLOY_PATH}")
endif ()
-
message(STATUS "Copying required libraries for QtWebEngine")
list(APPEND LIST_LIBS
"/usr/lib/x86_64-linux-gnu/libsmime3.so"
@@ -49,26 +52,35 @@ list(APPEND LIST_LIBS
"/usr/lib/x86_64-linux-gnu/nss/libnssdbm3.so"
"/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.chk"
"/usr/lib/x86_64-linux-gnu/nss/libsoftokn3.so")
+
file(COPY ${PROJECT_APP_PATH}/usr/share/icons/default/64x64/apps/dex-logo-64.png DESTINATION ${PROJECT_APP_PATH})
file(COPY ${PROJECT_APP_PATH}/usr/share/applications/dex.desktop DESTINATION ${PROJECT_APP_PATH})
+
foreach (current_lib ${LIST_LIBS})
message(STATUS "copying ${current_lib} to ${PROJECT_LIB_PATH}")
file(COPY ${current_lib} DESTINATION ${PROJECT_LIB_PATH})
endforeach ()
+
message(STATUS "Executing linuxdeployqt to fix dependencies")
-message(STATUS "Executing cmd: [${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs="libnss3.so,libnssutil3.so" -unsupported-allow-new-glibc -no-copy-copyright-files -verbose=1 -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage]")
-execute_process(COMMAND ${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs="libnss3.so,libnssutil3.so" -unsupported-allow-new-glibc -no-copy-copyright-files -verbose=1 -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage
+message(STATUS "Executing cmd: [${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs='libnss3.so,libnssutil3.so' -unsupported-allow-new-glibc -no-copy-copyright-files -verbose=1 -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage]")
+execute_process(COMMAND ${LINUX_DEPLOY_PATH} ${PROJECT_BIN_PATH} -qmldir=${PROJECT_QML_DIR} -bundle-non-qt-libs -exclude-libs='libnss3.so,libnssutil3.so' -unsupported-allow-new-glibc -no-copy-copyright-files -verbose=1 -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
+
+message(STATUS "Renaming ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-${VERSION_ID}-x86_64.AppImage to ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage")
+file(RENAME ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-${VERSION_ID}-x86_64.AppImage ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage)
+
message(STATUS "Copying ${PROJECT_APP_PATH} to ${TARGET_APP_PATH}/${PROJECT_APP_DIR}")
file(COPY ${PROJECT_APP_PATH} DESTINATION ${TARGET_APP_PATH})
execute_process(COMMAND zip -r ${DEX_PROJECT_NAME}-linux-${VERSION_ID}.zip AntaraAtomicDexAppDir
WORKING_DIRECTORY ${TARGET_APP_PATH}
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
+
execute_process(COMMAND tar --zstd -cf ${DEX_PROJECT_NAME}-linux-${VERSION_ID}.tar.zst AntaraAtomicDexAppDir
WORKING_DIRECTORY ${TARGET_APP_PATH}
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
-file(COPY ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-${VERSION_ID}-x86_64.AppImage DESTINATION ${TARGET_APP_PATH})
\ No newline at end of file
+
+file(COPY ${CMAKE_SOURCE_DIR}/${DEX_PROJECT_NAME}-linux-${VERSION_ID}-x86_64.AppImage DESTINATION ${TARGET_APP_PATH})
diff --git a/cmake/install/macos/Packaging_CMakeDMGSetup.scpt b/cmake/install/macos/Packaging_CMakeDMGSetup.scpt
index b816533e58..f06196f7f3 100644
--- a/cmake/install/macos/Packaging_CMakeDMGSetup.scpt
+++ b/cmake/install/macos/Packaging_CMakeDMGSetup.scpt
@@ -39,7 +39,7 @@ on run argv
set statusbar visible to false
set toolbar visible to false
set the bounds to { 400, 100, 900, 465 }
- set position of item "atomicdex-desktop.app" to { 133, 200 }
+ set position of item "komodo-wallet.app" to { 133, 200 }
set position of item "Applications" to { 378, 200 }
end tell
update without registering applications
diff --git a/cmake/install/macos/dex_install.cmake b/cmake/install/macos/dex_install.cmake
index 3dfda7315a..8b27af7e9b 100644
--- a/cmake/install/macos/dex_install.cmake
+++ b/cmake/install/macos/dex_install.cmake
@@ -1,11 +1,13 @@
if (APPLE)
message(STATUS "ICON ->>>> ${ICON}")
+ message(STATUS "PROJECT_NAME ->>>> ${PROJECT_NAME}")
+ message(STATUS "DEX_VERSION ->>>> ${DEX_VERSION}")
set_target_properties(${PROJECT_NAME} PROPERTIES
MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
RESOURCE ${ICON}
MACOSX_BUNDLE_ICON_FILE dex-logo
- MACOSX_BUNDLE_SHORT_VERSION_STRING 0.5.0
- MACOSX_BUNDLE_LONG_VERSION_STRING 0.5.0
+ MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}
+ MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION}
MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in")
add_custom_command(TARGET ${PROJECT_NAME}
POST_BUILD COMMAND
diff --git a/cmake/install/macos/macos_notarize.sh b/cmake/install/macos/macos_notarize.sh
index 0b68c86797..4413004d0a 100755
--- a/cmake/install/macos/macos_notarize.sh
+++ b/cmake/install/macos/macos_notarize.sh
@@ -20,7 +20,7 @@ if ! command -v xq >/dev/null ; then
fi
OPTS=-h
-LONGOPTS=app-specific-password:,apple-id:,primary-bundle-id:,target-binary:,help
+LONGOPTS=app-specific-password:,apple-id:,primary-bundle-id:,target-binary:,asc-public-id:,help
! PARSED=$(getopt --options=$OPTS --longoptions=$LONGOPTS --name "$0" -- "$@" )
if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
@@ -51,6 +51,10 @@ while true; do
TARGET_BINARY=$2
shift 2
;;
+ --asc-public-id)
+ ASC_PUBLIC_ID=$2
+ shift 2
+ ;;
-h|--help)
echo "Usage: $0 --app-specific-password= --apple-id= --primary-bundle-id= --target-binary="
echo "Example: $0 --app-specific-password=\$DDEV_MACOS_APP_PASSWORD --apple-id=accounts@drud.com --primary-bundle-id=com.ddev.ddev --target-binary=.gotmp/bin/darwin_amd64/ddev"
@@ -72,7 +76,7 @@ fi
echo "before xcrun"
# Submit the zipball and get REQUEST_UUID
-SUBMISSION_INFO=$(xcrun altool --notarize-app --primary-bundle-id=${PRIMARY_BUNDLE_ID} -u ${APPLE_ID} -p ${APP_SPECIFIC_PASSWORD} --file ${TARGET_BINARY}.zip 2>&1) ;
+SUBMISSION_INFO=$(xcrun altool --notarize-app --primary-bundle-id=${PRIMARY_BUNDLE_ID} --asc-public-id=${ASC_PUBLIC_ID} -u ${APPLE_ID} -p ${APP_SPECIFIC_PASSWORD} --file ${TARGET_BINARY}.zip) ;
if [ $? != 0 ]; then
printf "Submission failed: $SUBMISSION_INFO \n"
diff --git a/cmake/install/macos/osx_post_install.cmake b/cmake/install/macos/osx_post_install.cmake
index 3c27d12717..96c0f9f259 100644
--- a/cmake/install/macos/osx_post_install.cmake
+++ b/cmake/install/macos/osx_post_install.cmake
@@ -1,36 +1,42 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../project.metadata.cmake)
+message(STATUS "OSX POST INSTALL CMAKE")
+message(STATUS "PROJECT_ROOT_DIR (before readjusting) -> ${PROJECT_ROOT_DIR}")
+
get_filename_component(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
if (EXISTS ${PROJECT_ROOT_DIR}/build-Release OR EXISTS ${PROJECT_ROOT_DIR}/build-Debug)
message(STATUS "from ci tools, readjusting")
get_filename_component(PROJECT_ROOT_DIR ${PROJECT_ROOT_DIR} DIRECTORY)
endif ()
-message(STATUS "PROJECT_ROOT_DIR -> ${PROJECT_ROOT_DIR}")
-set(PROJECT_QML_DIR ${PROJECT_ROOT_DIR}/atomic_defi_design/qml)
-message(STATUS "PROJECT_QML_DIR -> ${PROJECT_QML_DIR}")
-message(STATUS "bin dir -> ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+set(BIN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
set(TARGET_APP_PATH ${PROJECT_ROOT_DIR}/bundled/osx/)
set(PROJECT_APP_DIR ${DEX_PROJECT_NAME}.app)
-set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}/bin/${PROJECT_APP_DIR})
-if (EXISTS ${PROJECT_APP_PATH})
- message(STATUS "PROJECT_APP_PATH path is -> ${PROJECT_APP_PATH}")
-else ()
- message(FATAL_ERROR "Didn't find PROJECT_APP_PATH -> ${PROJECT_APP_PATH}")
-endif ()
-
+set(PROJECT_APP_PATH ${BIN_DIR}/${PROJECT_APP_DIR})
+set(PROJECT_QML_DIR ${PROJECT_ROOT_DIR}/atomic_defi_design/Dex)
+set(MAC_DEPLOY_PATH $ENV{QT_ROOT}/clang_64/bin/macdeployqt)
message(STATUS "VCPKG package manager enabled")
+message(STATUS "QT_ROOT -> ${QT_ROOT}")
+message(STATUS "BIN_DIR -> ${BIN_DIR}")
+message(STATUS "TARGET_APP_PATH -> ${TARGET_APP_PATH}")
+message(STATUS "PROJECT_APP_DIR -> ${PROJECT_APP_DIR}")
+message(STATUS "PROJECT_QML_DIR -> ${PROJECT_QML_DIR}")
+message(STATUS "PROJECT_ROOT_DIR (after readjusting) -> ${PROJECT_ROOT_DIR}")
-message(STATUS "Using QT tools from $HOME/QT")
-set(MAC_DEPLOY_PATH $ENV{QT_ROOT}/clang_64/bin/macdeployqt)
+if (EXISTS ${PROJECT_APP_PATH})
+ message(STATUS "PROJECT_APP_PATH -> ${PROJECT_APP_PATH}")
+else ()
+ message(FATAL_ERROR "Didn't find PROJECT_APP_PATH")
+endif ()
if (EXISTS ${MAC_DEPLOY_PATH})
- message(STATUS "macdeployqt path is -> ${MAC_DEPLOY_PATH}")
+ message(STATUS "MAC_DEPLOY_PATH -> ${MAC_DEPLOY_PATH}")
else ()
- message(FATAL_ERROR "Didn't find macdeployqt")
+ message(FATAL_ERROR "Didn't find MAC_DEPLOY_PATH")
endif ()
+message(STATUS "CREATING DMG")
if (NOT EXISTS ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg)
##-------------------------------------------
message(STATUS "${MAC_DEPLOY_PATH} ${PROJECT_APP_PATH} -qmldir=${PROJECT_QML_DIR} -always-overwrite -verbose=3")
@@ -41,9 +47,6 @@ if (NOT EXISTS ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg)
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE
)
- ##-------------------------------------------
-
- ##-------------------------------------------
message(STATUS "Fixing QTWebengineProcess")
set(QTWEBENGINE_BUNDLED_PATH ${PROJECT_APP_PATH}/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess)
message(STATUS "Executing: [install_name_tool -add_rpath @executable_path/../../../../../../Frameworks ${QTWEBENGINE_BUNDLED_PATH}]")
@@ -52,23 +55,22 @@ if (NOT EXISTS ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg)
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
- #execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${PROJECT_APP_PATH}/Contents/Resources/assets/tools/mm2/mm2
- # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- # ECHO_OUTPUT_VARIABLE
- # ECHO_ERROR_VARIABLE)
+ execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${PROJECT_APP_PATH}/Contents/Resources/assets/tools/mm2/${DEX_API}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ ECHO_OUTPUT_VARIABLE
+ ECHO_ERROR_VARIABLE)
- #execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${PROJECT_APP_PATH}
- # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- # ECHO_OUTPUT_VARIABLE
- # ECHO_ERROR_VARIABLE)
+ execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${PROJECT_APP_PATH}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ ECHO_OUTPUT_VARIABLE
+ ECHO_ERROR_VARIABLE)
- #message(STATUS "Fixing QtWebEngineProcess signature codesign --force --verify --verbose --sign \"$ENV{MAC_SIGN_IDENTITY}\" --entitlements ${PROJECT_ROOT_DIR}/cmake/install/macos/QtWebEngineProcess.entitlements --options runtime --timestamp ${PROJECT_APP_PATH}/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess")
- #execute_process(COMMAND codesign --force --verify --verbose --sign "$ENV{MAC_SIGN_IDENTITY}" --entitlements ${PROJECT_ROOT_DIR}/cmake/install/macos/QtWebEngineProcess.entitlements --options runtime --timestamp ${PROJECT_APP_PATH}/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
- # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- # ECHO_OUTPUT_VARIABLE
- # ECHO_ERROR_VARIABLE)
+ message(STATUS "Fixing QtWebEngineProcess signature codesign --force --verify --verbose --sign \"$ENV{MAC_SIGN_IDENTITY}\" --entitlements ${PROJECT_ROOT_DIR}/cmake/install/macos/QtWebEngineProcess.entitlements --options runtime --timestamp ${PROJECT_APP_PATH}/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess")
+ execute_process(COMMAND codesign --force --verify --verbose --sign "$ENV{MAC_SIGN_IDENTITY}" --entitlements ${PROJECT_ROOT_DIR}/cmake/install/macos/QtWebEngineProcess.entitlements --options runtime --timestamp ${PROJECT_APP_PATH}/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ ECHO_OUTPUT_VARIABLE
+ ECHO_ERROR_VARIABLE)
- ##-------------------------------------------
message(STATUS "Packaging the DMG")
set(PACKAGER_PATH ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/dmg-packager/package.sh)
if (EXISTS ${PACKAGER_PATH})
@@ -82,34 +84,78 @@ if (NOT EXISTS ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg)
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
- #execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg
- # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- # ECHO_OUTPUT_VARIABLE
- # ECHO_ERROR_VARIABLE)
+ execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ ECHO_OUTPUT_VARIABLE
+ ECHO_ERROR_VARIABLE)
- #execute_process(COMMAND ${PROJECT_ROOT_DIR}/cmake/install/macos/macos_notarize.sh --app-specific-password=$ENV{APPLE_ATOMICDEX_PASSWORD} --apple-id=$ENV{APPLE_ID} --primary-bundle-id=com.komodoplatform.atomicdex --target-binary=${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg
- # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- # ECHO_OUTPUT_VARIABLE
- # ECHO_ERROR_VARIABLE)
+ execute_process(COMMAND ${PROJECT_ROOT_DIR}/cmake/install/macos/macos_notarize.sh --asc-public-id=$ENV{ASC_PUBLIC_ID} --app-specific-password=$ENV{APPLE_ATOMICDEX_PASSWORD} --apple-id=$ENV{APPLE_ID} --primary-bundle-id=com.komodoplatform.atomicdex --target-binary=${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ ECHO_OUTPUT_VARIABLE
+ ECHO_ERROR_VARIABLE)
else()
message(STATUS "dmg already generated - skipping")
endif ()
file(COPY ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg DESTINATION ${TARGET_APP_PATH})
-get_filename_component(QT_ROOT_DIR $ENV{QT_ROOT} DIRECTORY)
-set(IFW_BINDIR ${QT_ROOT_DIR}/Tools/QtInstallerFramework/4.1/bin)
-message(STATUS "IFW_BIN PATH IS ${IFW_BINDIR}")
+get_filename_component(QT_ROOT_DIR $ENV{QT_ROOT} DIRECTORY)
+set(IFW_ROOT ${QT_ROOT_DIR}/Tools/QtInstallerFramework)
+message(STATUS "IFW_ROOT PATH IS ${IFW_ROOT}")
+execute_process(COMMAND ls ${IFW_ROOT})
+
+# Find all subdirectories
+file(GLOB subdirs "${IFW_ROOT}/*")
+# Initialize variables to track the highest version and folder
+set(IFW_VERSION "")
+# Loop through the subdirectories
+foreach(subdir ${subdirs})
+ get_filename_component(folder_name ${subdir} NAME)
+ message(STATUS "scanning: ${subdir} [${folder_name}]")
+ # Use string manipulation to extract version from folder name
+ string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" version ${folder_name})
+ # Check if the extracted version is higher than the current highest
+ # TODO: For some reason this var fails to populate in windows
+ if(version STREQUAL "")
+ continue()
+ elseif(version STRGREATER IFW_VERSION)
+ set(IFW_VERSION ${version})
+ endif()
+endforeach()
+# Fallback to last scanned subfolder if variable empty. Usually there is only one folder.
+if(version STREQUAL "")
+ set(IFW_VERSION ${folder_name})
+endif()
+
+message(STATUS "===========================================")
+message(STATUS "Creating Installer")
+set(IFW_BINDIR ${IFW_ROOT}/${IFW_VERSION}/bin)
+message(STATUS ">>>> IFW_BIN PATH IS ${IFW_BINDIR}")
+execute_process(COMMAND ls "${IFW_BINDIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${PROJECT_APP_PATH}")
+execute_process(COMMAND ls "${PROJECT_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${TARGET_APP_PATH}")
+execute_process(COMMAND ls "${TARGET_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/bin")
+message(STATUS "===========================================")
if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z)
- message(STATUS "Generating ${DEX_PROJECT_NAME}.7z with [${IFW_BINDIR}/archivegen ${DEX_PROJECT_NAME}.7z ${DEX_PROJECT_NAME}.app] from directory: ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+ message(STATUS "command is: [${IFW_BINDIR}/archivegen ${DEX_PROJECT_NAME}.7z ${PROJECT_APP_PATH} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin]")
execute_process(COMMAND
- ${IFW_BINDIR}/archivegen ${DEX_PROJECT_NAME}.7z ${DEX_PROJECT_NAME}.app
+ ${IFW_BINDIR}/archivegen ${DEX_PROJECT_NAME}.7z ${PROJECT_APP_PATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
else()
message(STATUS "${DEX_PROJECT_NAME}.7z already created - skipping")
endif()
+message(STATUS "===========================================")
+execute_process(COMMAND ls ${CMAKE_CURRENT_SOURCE_DIR}/bin )
+message(STATUS "Copying ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z TO ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/data")
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z DESTINATION ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/data)
@@ -118,19 +164,22 @@ execute_process(COMMAND ${IFW_BINDIR}/binarycreator -c ./config/config.xml -p ./
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
-#execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/${DEX_PROJECT_NAME}_installer.app
-# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-# ECHO_OUTPUT_VARIABLE
-# ECHO_ERROR_VARIABLE)
+execute_process(COMMAND codesign --deep --force -v -s "$ENV{MAC_SIGN_IDENTITY}" -o runtime --timestamp ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/${DEX_PROJECT_NAME}_installer.app
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ ECHO_OUTPUT_VARIABLE
+ ECHO_ERROR_VARIABLE)
-#execute_process(COMMAND ${PROJECT_ROOT_DIR}/cmake/install/macos/macos_notarize.sh --app-specific-password=$ENV{APPLE_ATOMICDEX_PASSWORD} --apple-id=$ENV{APPLE_ID} --primary-bundle-id=com.komodoplatform.atomicdex --target-binary=${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/${DEX_PROJECT_NAME}_installer.app
-# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-# ECHO_OUTPUT_VARIABLE
-# ECHO_ERROR_VARIABLE)
+execute_process(COMMAND ${PROJECT_ROOT_DIR}/cmake/install/macos/macos_notarize.sh --asc-public-id=$ENV{ASC_PUBLIC_ID} --app-specific-password=$ENV{APPLE_ATOMICDEX_PASSWORD} --apple-id=$ENV{APPLE_ID} --primary-bundle-id=com.komodoplatform.atomicdex --target-binary=${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/${DEX_PROJECT_NAME}_installer.app
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ ECHO_OUTPUT_VARIABLE
+ ECHO_ERROR_VARIABLE)
file(COPY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/${DEX_PROJECT_NAME}_installer.app DESTINATION ${TARGET_APP_PATH})
-execute_process(COMMAND ${IFW_BINDIR}/archivegen ${DEX_PROJECT_NAME}_installer.7z ${DEX_PROJECT_NAME}_installer.app
+
+execute_process(COMMAND ${IFW_BINDIR}/archivegen ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/${DEX_PROJECT_NAME}_installer.7z ${DEX_PROJECT_NAME}_installer.app
WORKING_DIRECTORY ${TARGET_APP_PATH}
ECHO_OUTPUT_VARIABLE
- ECHO_ERROR_VARIABLE)
\ No newline at end of file
+ ECHO_ERROR_VARIABLE)
+
+file(COPY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/${DEX_PROJECT_NAME}_installer.7z DESTINATION ${TARGET_APP_PATH})
diff --git a/cmake/install/windows/windows_post_install.cmake b/cmake/install/windows/windows_post_install.cmake
index bf547ddee4..a8c5731415 100644
--- a/cmake/install/windows/windows_post_install.cmake
+++ b/cmake/install/windows/windows_post_install.cmake
@@ -1,25 +1,32 @@
include(${CMAKE_CURRENT_LIST_DIR}/../../project.metadata.cmake)
+message(STATUS "===== Starting Windows Post Install =====")
+message(STATUS "PROJECT_ROOT_DIR (before readjusting) -> ${PROJECT_ROOT_DIR}")
get_filename_component(PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
-if (EXISTS ${PROJECT_ROOT_DIR}/build-Release)
+if (EXISTS ${PROJECT_ROOT_DIR}/build-Release OR EXISTS ${PROJECT_ROOT_DIR}/build-Debug)
message(STATUS "from ci tools, readjusting")
get_filename_component(PROJECT_ROOT_DIR ${PROJECT_ROOT_DIR} DIRECTORY)
endif ()
+message(STATUS "PROJECT_ROOT_DIR (after readjusting) -> ${PROJECT_ROOT_DIR}")
-message(STATUS "PROJECT_ROOT_DIR -> ${PROJECT_ROOT_DIR}")
-
-set(PROJECT_APP_DIR bin)
-set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}/${PROJECT_APP_DIR})
+set(PROJECT_APP_PATH ${CMAKE_SOURCE_DIR}/bin)
set(TARGET_APP_PATH ${PROJECT_ROOT_DIR}/bundled/windows)
+message(STATUS "VCPKG package manager enabled")
+message(STATUS "PROJECT_QML_DIR -> ${PROJECT_QML_DIR}")
+message(STATUS "CMAKE_SOURCE_DIR -> ${CMAKE_SOURCE_DIR}")
+message(STATUS "CMAKE_CURRENT_SOURCE_DIR -> ${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS "DEX_PROJECT_NAME -> ${DEX_PROJECT_NAME}")
+
if (EXISTS ${PROJECT_APP_PATH})
- message(STATUS "PROJECT_APP_PATH path is -> ${PROJECT_APP_PATH}")
- message(STATUS "TARGET_APP_PATH path is -> ${TARGET_APP_PATH}")
+ message(STATUS "PROJECT_APP_PATH path -> ${PROJECT_APP_PATH}")
+ message(STATUS "TARGET_APP_PATH path -> ${TARGET_APP_PATH}")
else ()
message(FATAL_ERROR "Didn't find ${PROJECT_APP_PATH}")
endif ()
if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bin.zip)
+ message(STATUS "Creating bin.zip...")
execute_process(COMMAND powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('bin', 'bin.zip'); }"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
ECHO_OUTPUT_VARIABLE
@@ -31,30 +38,117 @@ endif()
if (NOT EXISTS ${TARGET_APP_PATH}/bin.zip)
message(STATUS "Copying ${CMAKE_SOURCE_DIR}/bin.zip to ${TARGET_APP_PATH}/${DEX_PROJECT_NAME}.zip")
- file(COPY ${CMAKE_SOURCE_DIR}/bin.zip DESTINATION ${TARGET_APP_PATH})
+ file(COPY ${CMAKE_SOURCE_DIR}/bin.zip DESTINATION ${TARGET_APP_PATH}/${DEX_PROJECT_NAME}.zip)
else()
message(STATUS "${TARGET_APP_PATH}/${DEX_PROJECT_NAME}.zip exists - skipping")
endif()
+message(STATUS "Embedding the manifest")
+if (NOT EXISTS ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data/${DEX_PROJECT_NAME}.exe.manifest)
+ message(WARNING "${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data/${DEX_PROJECT_NAME}.exe.manifest doesn't exist - aborting")
+endif()
+file(COPY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data/${DEX_PROJECT_NAME}.exe.manifest DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+
+#FILE(GLOB CURDIR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/bin/*)
+
+message(STATUS "curdir: ${CURDIR}")
+
+#message(STATUS "Executing: [mt.exe -manifest \"${DEX_PROJECT_NAME}.exe.manifest\" -outputresource:\"${DEX_PROJECT_NAME}.exe\";\#1] from directory: ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+
+set(DEX_OUT "${CMAKE_CURRENT_SOURCE_DIR}\\bin\\${DEX_PROJECT_NAME}.exe")
+set(DEX_IN "${CMAKE_CURRENT_SOURCE_DIR}\\bin\\${DEX_PROJECT_NAME}.exe.manifest")
+cmake_path(CONVERT ${DEX_OUT} TO_NATIVE_PATH_LIST DEX_OUT_NATIVE)
+cmake_path(CONVERT ${DEX_IN} TO_NATIVE_PATH_LIST DEX_IN_NATIVE)
+
+#message(STATUS "mt.exe -manifest ${DEX_IN_NATIVE} -outputresource:${DEX_OUT_NATIVE}")
+
+execute_process(COMMAND powershell.exe -File ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/ci_scripts/mt_wrapper.ps1 ${DEX_IN} ${DEX_OUT}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
+ ECHO_ERROR_VARIABLE
+ RESULT_VARIABLE MANIFEST_RESULT
+ OUTPUT_VARIABLE MANIFEST_OUTPUT
+ ERROR_VARIABLE MANIFEST_ERROR)
+message(STATUS "manifest output: ${MANIFEST_RESULT} ${MANIFEST_OUTPUT} ${MANIFEST_ERROR}")
+
+# Set the path to the ifw root directory
+set(IFW_ROOT "$ENV{QT_ROOT}/Tools/QtInstallerFramework")
+message(STATUS "IFW_ROOT PATH IS ${IFW_ROOT}")
+execute_process(COMMAND ls "${IFW_ROOT}")
+# Find all subdirectories
+file(GLOB subdirs "${IFW_ROOT}/*")
+# Initialize variables to track the highest version and folder
+set(IFW_VERSION "")
+# Loop through the subdirectories
+foreach(subdir ${subdirs})
+ get_filename_component(folder_name ${subdir} NAME)
+ message(STATUS "scanning: ${subdir} [${folder_name}]")
+ # Use string manipulation to extract version from folder name
+ string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" version ${folder_name})
+ # Check if the extracted version is higher than the current highest
+ # TODO: For some reason this var fails to populate in windows
+ if(version STREQUAL "")
+ continue()
+ elseif(version STRGREATER IFW_VERSION)
+ set(IFW_VERSION ${version})
+ endif()
+endforeach()
+# Fallback to last scanned subfolder if variable empty. Usually there is only one folder.
+if(version STREQUAL "")
+ set(IFW_VERSION ${folder_name})
+endif()
+
+message(STATUS "===========================================")
message(STATUS "Creating Installer")
-set(IFW_BINDIR $ENV{QT_ROOT}/Tools/QtInstallerFramework/4.1/bin)
+set(IFW_BINDIR ${IFW_ROOT}/${IFW_VERSION}/bin)
+message(STATUS ">>>> IFW_BIN PATH IS ${IFW_BINDIR}")
+execute_process(COMMAND ls "${IFW_BINDIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${PROJECT_APP_PATH}")
+execute_process(COMMAND ls "${PROJECT_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${TARGET_APP_PATH}")
+execute_process(COMMAND ls "${TARGET_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/bin")
+message(STATUS "===========================================")
+set(IFW_BINDIR ${IFW_ROOT}/${IFW_VERSION}/bin)
message(STATUS "IFW_BIN PATH IS ${IFW_BINDIR}")
-if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z)
- execute_process(COMMAND ${IFW_BINDIR}/archivegen.exe ${DEX_PROJECT_NAME}.7z .
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin
+execute_process(COMMAND ls "${IFW_BINDIR}")
+if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${DEX_PROJECT_NAME}.7z)
+ message(STATUS "Contents of folder: ls ${CMAKE_CURRENT_SOURCE_DIR}")
+ execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}")
+ message(STATUS "Contents of folder: ls ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+ execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/bin")
+ message(STATUS "Contents of folder: ls ${CMAKE_CURRENT_SOURCE_DIR}/bundled")
+ execute_process(COMMAND ls "${PROJECT_ROOT_DIR}/bundled")
+ message(STATUS "command is: [${IFW_BINDIR}/archivegen.exe ${DEX_PROJECT_NAME}.7z ${PROJECT_APP_PATH} WORKING_DIRECTORY ${PROJECT_ROOT_DIR}/bundled]")
+ execute_process(COMMAND
+ ${IFW_BINDIR}/archivegen.exe ${DEX_PROJECT_NAME}.7z ${PROJECT_APP_PATH}
+ WORKING_DIRECTORY ${PROJECT_ROOT_DIR}/bundled
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE
RESULT_VARIABLE ARCHIVE_RESULT
OUTPUT_VARIABLE ARCHIVE_OUTPUT
ERROR_VARIABLE ARCHIVE_ERROR)
+ message(STATUS "archivegen output: ${ARCHIVE_OUTPUT} ${ARCHIVE_ERROR}")
else()
message(STATUS "${DEX_PROJECT_NAME}.7z already exists skipping")
endif()
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z DESTINATION ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data)
+message(STATUS "Contents of folder: ls ${PROJECT_APP_PATH}")
+execute_process(COMMAND ls "${PROJECT_APP_PATH}")
+
+file(COPY ${PROJECT_ROOT_DIR}/bundled/${DEX_PROJECT_NAME}.7z DESTINATION ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/packages/com.komodoplatform.atomicdex/data)
execute_process(COMMAND ${IFW_BINDIR}/binarycreator.exe -c ./config/config.xml -p ./packages/ ${DEX_PROJECT_NAME}_installer.exe
WORKING_DIRECTORY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows
ECHO_OUTPUT_VARIABLE
ECHO_ERROR_VARIABLE)
-file(COPY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/${DEX_PROJECT_NAME}_installer.exe DESTINATION ${TARGET_APP_PATH})
\ No newline at end of file
+file(COPY ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/windows/${DEX_PROJECT_NAME}_installer.exe DESTINATION ${TARGET_APP_PATH})
+
+message(STATUS "Contents of folder: ls ${TARGET_APP_PATH}")
+execute_process(COMMAND ls "${TARGET_APP_PATH}")
+
+message(STATUS "===== Windows Post Install Complete =====")
\ No newline at end of file
diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake
index d92ff2818e..c10036df7b 100644
--- a/cmake/project.metadata.cmake
+++ b/cmake/project.metadata.cmake
@@ -1,4 +1,7 @@
# Default project values
+set(DEX_API "mm2-gleecdex")
+set(DEX_RPCPORT 7983)
+set(DEX_RPC "http://127.0.0.1:7983")
set(DEX_PROJECT_NAME "GleecDEX")
set(DEX_DISPLAY_NAME "GleecDEX")
set(DEX_MAINTENANCE_TOOL_NAME "GleecDEX Maintenance Tool")
@@ -7,24 +10,31 @@ set(DEX_WEBSITE "https://gleec.com/")
set(DEX_SUPPORT_PAGE "https://support.komodoplatform.com/support/home")
set(DEX_DISCORD "")
set(DEX_TWITTER "https://twitter.com/GleecOfficial")
-set(DEX_PRIMARY_COIN "BTC") ## Main coin of the DEX, will enable it by default and will be the default left ticker for trading
-set(DEX_SECOND_PRIMARY_COIN "GLEEC") ## Second main coin of the DEX, will enable it by default and will be the default right ticker for trading
+set(DEX_PRIMARY_COIN "GLEEC") ## Main coin of the DEX, will enable it by default and will be the default left ticker for trading
+set(DEX_SECOND_PRIMARY_COIN "KMD") ## Second main coin of the DEX, will enable it by default and will be the default right ticker for trading
option(DISABLE_GEOBLOCKING "Enable to disable geoblocking (for dev purpose)" ON)
set(DEX_REPOSITORY_OWNER ${DEX_COMPANY})
-set(DEX_REPOSITORY_NAME "atomicDEX-Desktop")
-set(DEX_CHECKSUM_API_URL "https://komodo.live/static/checksum.json")
+set(DEX_REPOSITORY_NAME "komodo-wallet-desktop")
+set(DEX_CHECKSUM_API_URL "https://komodo.earth/static/checksum.json")
if (APPLE)
set(DEX_APPDATA_FOLDER "GleecDEX")
else ()
set(DEX_APPDATA_FOLDER "GleecDEX")
endif ()
-message(STATUS "APPDATA folder is ${DEX_APPDATA_FOLDER}")
-
if (UNIX AND NOT APPLE)
set(DEX_LINUX_APP_ID "dex.desktop")
endif ()
# Erases default project values with environment variables if they exist.
+if (DEFINED ENV{DEX_API})
+ set(DEX_API $ENV{DEX_API})
+endif ()
+if (DEFINED ENV{DEX_RPCPORT})
+ set(DEX_RPCPORT $ENV{DEX_RPCPORT})
+endif ()
+if (DEFINED ENV{DEX_RPC})
+ set(DEX_RPC $ENV{DEX_RPC})
+endif ()
if (DEFINED ENV{DEX_PROJECT_NAME})
set(DEX_PROJECT_NAME $ENV{DEX_PROJECT_NAME})
endif ()
@@ -37,9 +47,35 @@ endif ()
if (DEFINED ENV{DEX_WEBSITE})
set(DEX_WEBSITE $ENV{DEX_WEBSITE})
endif ()
+if (DEFINED ENV{DEX_VERSION})
+ set(DEX_VERSION $ENV{DEX_VERSION})
+endif ()
+if (DEFINED ENV{PROJECT_ROOT})
+ set(PROJECT_ROOT $ENV{PROJECT_ROOT})
+else ()
+ set(PROJECT_ROOT ${CMAKE_SOURCE_DIR})
+endif ()
+if (DEFINED ENV{CMAKE_BUILD_TYPE})
+ set(CMAKE_BUILD_TYPE $ENV{CMAKE_BUILD_TYPE})
+endif ()
+if (DEFINED ENV{PROJECT_QML_DIR})
+ set(PROJECT_QML_DIR $ENV{PROJECT_QML_DIR})
+endif ()
+
# Shows project metadata
-message(STATUS "Project Metadata: ${DEX_PROJECT_NAME}.${DEX_DISPLAY_NAME}.${DEX_COMPANY}.${DEX_WEBSITE}")
+message(STATUS "Project Metadata:")
+message(STATUS "DEX_APPDATA_FOLDER --> ${DEX_APPDATA_FOLDER}")
+message(STATUS "CMAKE_BUILD_TYPE --> ${CMAKE_BUILD_TYPE}")
+message(STATUS "DEX_PROJECT_NAME --> ${DEX_PROJECT_NAME}")
+message(STATUS "DEX_DISPLAY_NAME --> ${DEX_DISPLAY_NAME}")
+message(STATUS "DEX_COMPANY --> ${DEX_COMPANY}")
+message(STATUS "DEX_VERSION --> ${DEX_VERSION}")
+message(STATUS "DEX_WEBSITE --> ${DEX_WEBSITE}")
+message(STATUS "CMAKE_SOURCE_DIR --> ${CMAKE_SOURCE_DIR}")
+message(STATUS "PROJECT_ROOT --> ${PROJECT_ROOT}")
+
+
# Generates files which need to be configured with custom variables from env/CMake.
macro(generate_dex_project_metafiles)
@@ -52,12 +88,10 @@ macro(generate_dex_project_metafiles)
generate_linux_metafiles()
endif ()
- configure_file(${CMAKE_CURRENT_LIST_DIR}/assets/logo/dex-logo-sidebar.png
- ${CMAKE_CURRENT_LIST_DIR}/atomic_defi_design/assets/images/dex-logo-sidebar.png COPYONLY)
+ configure_file(${CMAKE_CURRENT_LIST_DIR}/assets/logo/dex-logo-big.png
+ ${CMAKE_CURRENT_LIST_DIR}/atomic_defi_design/assets/images/dex-logo-big.png COPYONLY)
configure_file(${CMAKE_CURRENT_LIST_DIR}/assets/logo/dex-logo.png
${CMAKE_CURRENT_LIST_DIR}/atomic_defi_design/assets/images/logo/dex-logo.png COPYONLY)
- configure_file(${CMAKE_CURRENT_LIST_DIR}/assets/logo/dex-logo-sidebar-dark.png
- ${CMAKE_CURRENT_LIST_DIR}/atomic_defi_design/assets/images/dex-logo-sidebar-dark.png COPYONLY)
configure_file(${CMAKE_CURRENT_LIST_DIR}/assets/logo/dex-tray-icon.png
${CMAKE_CURRENT_LIST_DIR}/atomic_defi_design/assets/images/dex-tray-icon.png COPYONLY)
endmacro()
diff --git a/qml.qrc b/qml.qrc
deleted file mode 100644
index 20ddf7a2f2..0000000000
--- a/qml.qrc
+++ /dev/null
@@ -1,536 +0,0 @@
-
-
- atomic_defi_design/assets/fonts/Ubuntu-B.ttf
- atomic_defi_design/assets/fonts/Ubuntu-BI.ttf
- atomic_defi_design/assets/fonts/Ubuntu-L.ttf
- atomic_defi_design/assets/fonts/Ubuntu-LI.ttf
- atomic_defi_design/assets/fonts/Ubuntu-M.ttf
- atomic_defi_design/assets/fonts/Ubuntu-MI.ttf
- atomic_defi_design/assets/fonts/Ubuntu-R.ttf
- atomic_defi_design/assets/fonts/Ubuntu-RI.ttf
- atomic_defi_design/assets/fonts/Ubuntu-Th.ttf
- atomic_defi_design/assets/images/arrow-down.svg
- atomic_defi_design/assets/images/arrow-up.svg
- atomic_defi_design/assets/images/arrow_down.svg
- atomic_defi_design/assets/images/arrow_up.svg
- atomic_defi_design/assets/images/bill.svg
- atomic_defi_design/assets/images/circle-failed.png
- atomic_defi_design/assets/images/circle-success.png
- atomic_defi_design/assets/images/coins/1inch.png
- atomic_defi_design/assets/images/coins/aave.png
- atomic_defi_design/assets/images/coins/aby.png
- atomic_defi_design/assets/images/coins/ada.png
- atomic_defi_design/assets/images/coins/adx.png
- atomic_defi_design/assets/images/coins/agi.png
- atomic_defi_design/assets/images/coins/ankr.png
- atomic_defi_design/assets/images/coins/ant.png
- atomic_defi_design/assets/images/coins/arpa.png
- atomic_defi_design/assets/images/coins/atom.png
- atomic_defi_design/assets/images/coins/aur.png
- atomic_defi_design/assets/images/coins/ava.png
- atomic_defi_design/assets/images/coins/avax.png
- atomic_defi_design/assets/images/coins/awc.png
- atomic_defi_design/assets/images/coins/axe.png
- atomic_defi_design/assets/images/coins/babydoge.png
- atomic_defi_design/assets/images/coins/bal.png
- atomic_defi_design/assets/images/coins/band.png
- atomic_defi_design/assets/images/coins/band.png
- atomic_defi_design/assets/images/coins/bat.png
- atomic_defi_design/assets/images/coins/bch.png
- atomic_defi_design/assets/images/coins/best.png
- atomic_defi_design/assets/images/coins/bet.png
- atomic_defi_design/assets/images/coins/bidr.png
- atomic_defi_design/assets/images/coins/blk.png
- atomic_defi_design/assets/images/coins/bnb.png
- atomic_defi_design/assets/images/coins/bnbt.png
- atomic_defi_design/assets/images/coins/bnt.png
- atomic_defi_design/assets/images/coins/bots.png
- atomic_defi_design/assets/images/coins/bsty.png
- atomic_defi_design/assets/images/coins/btc.png
- atomic_defi_design/assets/images/coins/btch.png
- atomic_defi_design/assets/images/coins/btcz.png
- atomic_defi_design/assets/images/coins/btt.png
- atomic_defi_design/assets/images/coins/btu.png
- atomic_defi_design/assets/images/coins/busd.png
- atomic_defi_design/assets/images/coins/bte.png
- atomic_defi_design/assets/images/coins/cake.png
- atomic_defi_design/assets/images/coins/cdn.png
- atomic_defi_design/assets/images/coins/ccl.png
- atomic_defi_design/assets/images/coins/cel.png
- atomic_defi_design/assets/images/coins/cennz.png
- atomic_defi_design/assets/images/coins/chips.png
- atomic_defi_design/assets/images/coins/ciphs.png
- atomic_defi_design/assets/images/coins/chsb.png
- atomic_defi_design/assets/images/coins/chz.png
- atomic_defi_design/assets/images/coins/clc.png
- atomic_defi_design/assets/images/coins/comp.png
- atomic_defi_design/assets/images/coins/coqui.png
- atomic_defi_design/assets/images/coins/cro.png
- atomic_defi_design/assets/images/coins/crv.png
- atomic_defi_design/assets/images/coins/crypto.png
- atomic_defi_design/assets/images/coins/cvc.png
- atomic_defi_design/assets/images/coins/cvt.png
- atomic_defi_design/assets/images/coins/dai.png
- atomic_defi_design/assets/images/coins/dash.png
- atomic_defi_design/assets/images/coins/dex.png
- atomic_defi_design/assets/images/coins/dgb.png
- atomic_defi_design/assets/images/coins/dgc.png
- atomic_defi_design/assets/images/coins/dia.png
- atomic_defi_design/assets/images/coins/dimi.png
- atomic_defi_design/assets/images/coins/dodo.png
- atomic_defi_design/assets/images/coins/doge.png
- atomic_defi_design/assets/images/coins/dot.png
- atomic_defi_design/assets/images/coins/dp.png
- atomic_defi_design/assets/images/coins/dx.png
- atomic_defi_design/assets/images/coins/eca.png
- atomic_defi_design/assets/images/coins/efl.png
- atomic_defi_design/assets/images/coins/egld.png
- atomic_defi_design/assets/images/coins/elf.png
- atomic_defi_design/assets/images/coins/emc2.png
- atomic_defi_design/assets/images/coins/enj.png
- atomic_defi_design/assets/images/coins/eos.png
- atomic_defi_design/assets/images/coins/erc-20.png
- atomic_defi_design/assets/images/coins/etc.png
- atomic_defi_design/assets/images/coins/eth.png
- atomic_defi_design/assets/images/coins/ethr.png
- atomic_defi_design/assets/images/coins/eurs.png
- atomic_defi_design/assets/images/coins/fil.png
- atomic_defi_design/assets/images/coins/firo.png
- atomic_defi_design/assets/images/coins/fjc.png
- atomic_defi_design/assets/images/coins/ftc.png
- atomic_defi_design/assets/images/coins/ftm.png
- atomic_defi_design/assets/images/coins/gleec.png
- atomic_defi_design/assets/images/coins/gno.png
- atomic_defi_design/assets/images/coins/grs.png
- atomic_defi_design/assets/images/coins/hex.png
- atomic_defi_design/assets/images/coins/hlc.png
- atomic_defi_design/assets/images/coins/hodl.png
- atomic_defi_design/assets/images/coins/hot.png
- atomic_defi_design/assets/images/coins/hpy.png
- atomic_defi_design/assets/images/coins/ht.png
- atomic_defi_design/assets/images/coins/husd.png
- atomic_defi_design/assets/images/coins/il8p.png
- atomic_defi_design/assets/images/coins/iln.png
- atomic_defi_design/assets/images/coins/inj.png
- atomic_defi_design/assets/images/coins/ink.png
- atomic_defi_design/assets/images/coins/iota.png
- atomic_defi_design/assets/images/coins/iotx.png
- atomic_defi_design/assets/images/coins/jrt.png
- atomic_defi_design/assets/images/coins/jstr.png
- atomic_defi_design/assets/images/coins/jumblr.png
- atomic_defi_design/assets/images/coins/kmd.png
- atomic_defi_design/assets/images/coins/knc.png
- atomic_defi_design/assets/images/coins/koin.png
- atomic_defi_design/assets/images/coins/labs.png
- atomic_defi_design/assets/images/coins/lbc.png
- atomic_defi_design/assets/images/coins/lcc.png
- atomic_defi_design/assets/images/coins/leo.png
- atomic_defi_design/assets/images/coins/link.png
- atomic_defi_design/assets/images/coins/lrc.png
- atomic_defi_design/assets/images/coins/lstr.png
- atomic_defi_design/assets/images/coins/ltc.png
- atomic_defi_design/assets/images/coins/lynx.png
- atomic_defi_design/assets/images/coins/mana.png
- atomic_defi_design/assets/images/coins/matic.png
- atomic_defi_design/assets/images/coins/mcl.png
- atomic_defi_design/assets/images/coins/mesh.png
- atomic_defi_design/assets/images/coins/mgw.png
- atomic_defi_design/assets/images/coins/mkr.png
- atomic_defi_design/assets/images/coins/mln.png
- atomic_defi_design/assets/images/coins/mm.png
- atomic_defi_design/assets/images/coins/mona.png
- atomic_defi_design/assets/images/coins/morty.png
- atomic_defi_design/assets/images/coins/mshark.png
- atomic_defi_design/assets/images/coins/nav.png
- atomic_defi_design/assets/images/coins/near.png
- atomic_defi_design/assets/images/coins/nmc.png
- atomic_defi_design/assets/images/coins/nvc.png
- atomic_defi_design/assets/images/coins/oc.png
- atomic_defi_design/assets/images/coins/ocean.png
- atomic_defi_design/assets/images/coins/okb.png
- atomic_defi_design/assets/images/coins/omg.png
- atomic_defi_design/assets/images/coins/ont.png
- atomic_defi_design/assets/images/coins/oot.png
- atomic_defi_design/assets/images/coins/pangea.png
- atomic_defi_design/assets/images/coins/pax.png
- atomic_defi_design/assets/images/coins/paxg.png
- atomic_defi_design/assets/images/coins/pnk.png
- atomic_defi_design/assets/images/coins/powr.png
- atomic_defi_design/assets/images/coins/put.png
- atomic_defi_design/assets/images/coins/qbt.png
- atomic_defi_design/assets/images/coins/qc.png
- atomic_defi_design/assets/images/coins/qi.png
- atomic_defi_design/assets/images/coins/qiair.png
- atomic_defi_design/assets/images/coins/qkc.png
- atomic_defi_design/assets/images/coins/qnt.png
- atomic_defi_design/assets/images/coins/qrc-20.png
- atomic_defi_design/assets/images/coins/qrc20.png
- atomic_defi_design/assets/images/coins/qtum.png
- atomic_defi_design/assets/images/coins/ren.png
- atomic_defi_design/assets/images/coins/rep.png
- atomic_defi_design/assets/images/coins/rev.png
- atomic_defi_design/assets/images/coins/revs.png
- atomic_defi_design/assets/images/coins/rick.png
- atomic_defi_design/assets/images/coins/rlc.png
- atomic_defi_design/assets/images/coins/rsr.png
- atomic_defi_design/assets/images/coins/rvn.png
- atomic_defi_design/assets/images/coins/s4f.png
- atomic_defi_design/assets/images/coins/sfusd.png
- atomic_defi_design/assets/images/coins/shr.png
- atomic_defi_design/assets/images/coins/skl.png
- atomic_defi_design/assets/images/coins/smart-chain.png
- atomic_defi_design/assets/images/coins/smtf.png
- atomic_defi_design/assets/images/coins/snt.png
- atomic_defi_design/assets/images/coins/snx.png
- atomic_defi_design/assets/images/coins/soulja.png
- atomic_defi_design/assets/images/coins/sca.png
- atomic_defi_design/assets/images/coins/space.png
- atomic_defi_design/assets/images/coins/spc.png
- atomic_defi_design/assets/images/coins/srm.png
- atomic_defi_design/assets/images/coins/stfiro.png
- atomic_defi_design/assets/images/coins/storj.png
- atomic_defi_design/assets/images/coins/supernet.png
- atomic_defi_design/assets/images/coins/sushi.png
- atomic_defi_design/assets/images/coins/sxp.png
- atomic_defi_design/assets/images/coins/sys.png
- atomic_defi_design/assets/images/coins/tbtc.png
- atomic_defi_design/assets/images/coins/thc.png
- atomic_defi_design/assets/images/coins/thx.png
- atomic_defi_design/assets/images/coins/tmtg.png
- atomic_defi_design/assets/images/coins/tqtum.png
- atomic_defi_design/assets/images/coins/trac.png
- atomic_defi_design/assets/images/coins/trc.png
- atomic_defi_design/assets/images/coins/trx.png
- atomic_defi_design/assets/images/coins/tryb.png
- atomic_defi_design/assets/images/coins/tsl.png
- atomic_defi_design/assets/images/coins/ttt.png
- atomic_defi_design/assets/images/coins/tusd.png
- atomic_defi_design/assets/images/coins/ubt.png
- atomic_defi_design/assets/images/coins/uis.png
- atomic_defi_design/assets/images/coins/uma.png
- atomic_defi_design/assets/images/coins/uni.png
- atomic_defi_design/assets/images/coins/uno.png
- atomic_defi_design/assets/images/coins/uos.png
- atomic_defi_design/assets/images/coins/uqc.png
- atomic_defi_design/assets/images/coins/usdc.png
- atomic_defi_design/assets/images/coins/usdt.png
- atomic_defi_design/assets/images/coins/utk.png
- atomic_defi_design/assets/images/coins/val.png
- atomic_defi_design/assets/images/coins/vgx.png
- atomic_defi_design/assets/images/coins/vite.png
- atomic_defi_design/assets/images/coins/vra.png
- atomic_defi_design/assets/images/coins/vrm.png
- atomic_defi_design/assets/images/coins/vrsc.png
- atomic_defi_design/assets/images/coins/wbtc.png
- atomic_defi_design/assets/images/coins/wcn.png
- atomic_defi_design/assets/images/coins/wlc.png
- atomic_defi_design/assets/images/coins/wsb.png
- atomic_defi_design/assets/images/coins/xlm.png
- atomic_defi_design/assets/images/coins/xmy.png
- atomic_defi_design/assets/images/coins/xor.png
- atomic_defi_design/assets/images/coins/xpm.png
- atomic_defi_design/assets/images/coins/xrp.png
- atomic_defi_design/assets/images/coins/xtz.png
- atomic_defi_design/assets/images/coins/xvc.png
- atomic_defi_design/assets/images/coins/xvs.png
- atomic_defi_design/assets/images/coins/yfi.png
- atomic_defi_design/assets/images/coins/yfii.png
- atomic_defi_design/assets/images/coins/zec.png
- atomic_defi_design/assets/images/coins/zer.png
- atomic_defi_design/assets/images/coins/zet.png
- atomic_defi_design/assets/images/coins/zil.png
- atomic_defi_design/assets/images/coins/zilla.png
- atomic_defi_design/assets/images/coins/zrx.png
- atomic_defi_design/assets/images/dashboard-copy.svg
- atomic_defi_design/assets/images/dashboard-eye-hide.svg
- atomic_defi_design/assets/images/dashboard-eye.svg
- atomic_defi_design/assets/images/dashboard-info.svg
- atomic_defi_design/assets/images/dex-logo-sidebar-dark.png
- atomic_defi_design/assets/images/dex-logo-sidebar.png
- atomic_defi_design/assets/images/dex-tray-icon.png
- atomic_defi_design/assets/images/exchange-exchange.svg
- atomic_defi_design/assets/images/exchange-search.svg
- atomic_defi_design/assets/images/exchange-trade-complete.svg
- atomic_defi_design/assets/images/guide_coingecko_id.gif
- atomic_defi_design/assets/images/guide_contract_address_erc.gif
- atomic_defi_design/assets/images/guide_contract_address_qrc.gif
- atomic_defi_design/assets/images/guide_contract_address_bep.gif
- atomic_defi_design/assets/images/icon-discord.png
- atomic_defi_design/assets/images/icon-email.png
- atomic_defi_design/assets/images/icon-support.png
- atomic_defi_design/assets/images/icon-twitter.png
- atomic_defi_design/assets/images/komodo-icon.png
- atomic_defi_design/assets/images/lang/en.png
- atomic_defi_design/assets/images/lang/fr.png
- atomic_defi_design/assets/images/lang/ru.png
- atomic_defi_design/assets/images/lang/tr.png
- atomic_defi_design/assets/images/logo/dex-logo.png
- atomic_defi_design/assets/images/menu-assets-portfolio.svg
- atomic_defi_design/assets/images/menu-assets-white.svg
- atomic_defi_design/assets/images/menu-dapp-white.svg
- atomic_defi_design/assets/images/menu-exchange-white.svg
- atomic_defi_design/assets/images/menu-news-white.svg
- atomic_defi_design/assets/images/menu-settings-white.svg
- atomic_defi_design/assets/images/menu-support-white.png
- atomic_defi_design/assets/images/settings-seed.svg
- atomic_defi_design/assets/images/setup-logs.svg
- atomic_defi_design/assets/images/setup-wallet-restore-2.svg
- atomic_defi_design/assets/images/setup-welcome-wallet.svg
- atomic_defi_design/assets/images/shadowed_circle_blue.svg
- atomic_defi_design/assets/images/shadowed_circle_green.svg
- atomic_defi_design/assets/images/trade_icon.svg
- atomic_defi_design/assets/languages/atomic_defi_en.qm
- atomic_defi_design/assets/languages/atomic_defi_fr.qm
- atomic_defi_design/assets/languages/atomic_defi_ru.qm
- atomic_defi_design/assets/languages/atomic_defi_tr.qm
- atomic_defi_design/qml/App.qml
- atomic_defi_design/qml/Components/AddressField.qml
- atomic_defi_design/qml/Components/AddressFieldWithTitle.qml
- atomic_defi_design/qml/Components/AmountField.qml
- atomic_defi_design/qml/Components/AmountFieldWithInfo.qml
- atomic_defi_design/qml/Components/AmountIntField.qml
- atomic_defi_design/qml/Components/AnimatedRectangle.qml
- atomic_defi_design/qml/Components/Arrow.qml
- atomic_defi_design/qml/Components/BasicModal.qml
- atomic_defi_design/qml/Components/Blank.qml
- atomic_defi_design/qml/Components/CannotEnableCoinModal.qml
- atomic_defi_design/qml/Components/CexInfoModal.qml
- atomic_defi_design/qml/Components/CexInfoTrigger.qml
- atomic_defi_design/qml/Components/Circle.qml
- atomic_defi_design/qml/Components/ClipRRect.qml
- atomic_defi_design/qml/Components/CoinMenu.qml
- atomic_defi_design/qml/Components/CoinTypeTag.qml
- atomic_defi_design/qml/Components/ColumnHeader.qml
- atomic_defi_design/qml/Components/ComboBoxWithTitle.qml
- atomic_defi_design/qml/Components/ComponentWithTitle.qml
- atomic_defi_design/qml/Components/CopyFieldButton.qml
- atomic_defi_design/qml/Components/DangerButton.qml
- atomic_defi_design/qml/Components/DefaultAnimatedImage.qml
- atomic_defi_design/qml/Components/DefaultBusyIndicator.qml
- atomic_defi_design/qml/Components/DefaultButton.qml
- atomic_defi_design/qml/Components/DefaultCheckBox.qml
- atomic_defi_design/qml/Components/DefaultColorOverlay.qml
- atomic_defi_design/qml/Components/DefaultComboBox.qml
- atomic_defi_design/qml/Components/DefaultFlickable.qml
- atomic_defi_design/qml/Components/DefaultImage.qml
- atomic_defi_design/qml/Components/DefaultInnerShadow.qml
- atomic_defi_design/qml/Components/DefaultListView.qml
- atomic_defi_design/qml/Components/DefaultLoader.qml
- atomic_defi_design/qml/Components/DefaultModal.qml
- atomic_defi_design/qml/Components/DefaultMouseArea.qml
- atomic_defi_design/qml/Components/DefaultRangeSlider.qml
- atomic_defi_design/qml/Components/DefaultRectangle.qml
- atomic_defi_design/qml/Components/DefaultScrollBar.qml
- atomic_defi_design/qml/Components/DefaultSlider.qml
- atomic_defi_design/qml/Components/DefaultSplitView.qml
- atomic_defi_design/qml/Components/DefaultSubstractRectangle.qml
- atomic_defi_design/qml/Components/DefaultSweetComboBox.qml
- atomic_defi_design/qml/Components/DefaultSwitch.qml
- atomic_defi_design/qml/Components/DefaultText.qml
- atomic_defi_design/qml/Components/DefaultTextArea.qml
- atomic_defi_design/qml/Components/DefaultTextEdit.qml
- atomic_defi_design/qml/Components/DefaultTextField.qml
- atomic_defi_design/qml/Components/DefaultTooltip.qml
- atomic_defi_design/qml/Components/DexAnimatedImage.qml
- atomic_defi_design/qml/Components/DexAmountField.qml
- atomic_defi_design/qml/Components/DexAppButton.qml
- atomic_defi_design/qml/Components/DexAppTextField.qml
- atomic_defi_design/qml/Components/DexAppPasswordField.qml
- atomic_defi_design/qml/Components/DexBox.qml
- atomic_defi_design/qml/Components/DexBoxManager.qml
- atomic_defi_design/qml/Components/DexBusyIndicator.qml
- atomic_defi_design/qml/Components/DexButton.qml
- atomic_defi_design/qml/Components/DexCheckBox.qml
- atomic_defi_design/qml/Components/DexCheckEye.qml
- atomic_defi_design/qml/Components/DexColorOverlay.qml
- atomic_defi_design/qml/Components/DexComboBox.qml
- atomic_defi_design/qml/Components/DexDialogManager.qml
- atomic_defi_design/qml/Components/DexDialogTextField.qml
- atomic_defi_design/qml/Components/DexFadebehavior.qml
- atomic_defi_design/qml/Components/DexVisibleBehavior.qml
- atomic_defi_design/qml/Components/DexFlickable.qml
- atomic_defi_design/qml/Components/DexIconButton.qml
- atomic_defi_design/qml/Components/DexImage.qml
- atomic_defi_design/qml/Components/DexInnerShadow.qml
- atomic_defi_design/qml/Components/DexItemBox.qml
- atomic_defi_design/qml/Components/DexLabel.qml
- atomic_defi_design/qml/Components/DexLabelUnlinked.qml
- atomic_defi_design/qml/Components/DexLanguage.qml
- atomic_defi_design/qml/Components/DexListView.qml
- atomic_defi_design/qml/Components/DexLoader.qml
- atomic_defi_design/qml/Components/DexKeyChecker.qml
- atomic_defi_design/qml/Components/DexMacControl.qml
- atomic_defi_design/qml/Components/DexModal.qml
- atomic_defi_design/qml/Components/DexModalHeader.qml
- atomic_defi_design/qml/Components/DexMouseArea.qml
- atomic_defi_design/qml/Components/DexPaginator.qml
- atomic_defi_design/qml/Components/DexPopup.qml
- atomic_defi_design/qml/Components/DexRangeSlider.qml
- atomic_defi_design/qml/Components/DexRectangle.qml
- atomic_defi_design/qml/Components/DexScrollBar.qml
- atomic_defi_design/qml/Components/DexSelectableButton.qml
- atomic_defi_design/qml/Components/DexSlider.qml
- atomic_defi_design/qml/Components/DexSplitView.qml
- atomic_defi_design/qml/Components/DexSubstractRectangle.qml
- atomic_defi_design/qml/Components/DexSweetComboBox.qml
- atomic_defi_design/qml/Components/DexSwitch.qml
- atomic_defi_design/qml/Components/DexText.qml
- atomic_defi_design/qml/Components/DexAppTextArea.qml
- atomic_defi_design/qml/Components/DexTextArea.qml
- atomic_defi_design/qml/Components/DexTextEdit.qml
- atomic_defi_design/qml/Components/DexTextField.qml
- atomic_defi_design/qml/Components/DexTooltip.qml
- atomic_defi_design/qml/Components/DexTradeBox.qml
- atomic_defi_design/qml/Components/DexWindow.qml
- atomic_defi_design/qml/Components/DexWindowControl.qml
- atomic_defi_design/qml/Components/DexWindowHeaderControl.qml
- atomic_defi_design/qml/Components/DexMacosHeaderControl.qml
- atomic_defi_design/qml/Components/EulaModal.qml
- atomic_defi_design/qml/Components/FloatingBackground.qml
- atomic_defi_design/qml/Components/ForceRestartModal.qml
- atomic_defi_design/qml/Components/GradientRectangle.qml
- atomic_defi_design/qml/Components/HelpModal.qml
- atomic_defi_design/qml/Components/HideFieldButton.qml
- atomic_defi_design/qml/Components/HorizontalLine.qml
- atomic_defi_design/qml/Components/InnerBackground.qml
- atomic_defi_design/qml/Components/ItemBox.qml
- atomic_defi_design/qml/Components/LinkIcon.qml
- atomic_defi_design/qml/Components/LinksRow.qml
- atomic_defi_design/qml/Components/LoaderBusyIndicator.qml
- atomic_defi_design/qml/Components/LogModal.qml
- atomic_defi_design/qml/Components/MinTradeModal.qml
- atomic_defi_design/qml/Components/ModalContent.qml
- atomic_defi_design/qml/Components/ModalHeader.qml
- atomic_defi_design/qml/Components/ModalLoader.qml
- atomic_defi_design/qml/Components/Pagination.qml
- atomic_defi_design/qml/Components/PaginationButton.qml
- atomic_defi_design/qml/Components/PasswordField.qml
- atomic_defi_design/qml/Components/PasswordForm.qml
- atomic_defi_design/qml/Components/PlusButton.qml
- atomic_defi_design/qml/Components/PrimaryButton.qml
- atomic_defi_design/qml/Components/RestartModal.qml
- atomic_defi_design/qml/Components/RightClickMenu.qml
- atomic_defi_design/qml/Components/Separator.qml
- atomic_defi_design/qml/Components/SetupPage.qml
- atomic_defi_design/qml/Components/SidebarPanel.qml
- atomic_defi_design/qml/Components/SwapIcon.qml
- atomic_defi_design/qml/Components/TextAreaWithTitle.qml
- atomic_defi_design/qml/Components/TextEditWithTitle.qml
- atomic_defi_design/qml/Components/TextFieldWithTitle.qml
- atomic_defi_design/qml/Components/TextWithTitle.qml
- atomic_defi_design/qml/Components/TitleText.qml
- atomic_defi_design/qml/Components/Toast.qml
- atomic_defi_design/qml/Components/ToastManager.qml
- atomic_defi_design/qml/Components/VerticalLine.qml
- atomic_defi_design/qml/Components/VerticalLineBasic.qml
- atomic_defi_design/qml/Components/WalletNameField.qml
- atomic_defi_design/qml/Constants
- atomic_defi_design/qml/Constants/API.qml
- atomic_defi_design/qml/Constants/General.qml
- atomic_defi_design/qml/Constants/Style.qml
- atomic_defi_design/qml/Dashboard/FatalErrorModal.qml
- atomic_defi_design/qml/Dashboard/NewUpdateModal.qml
- atomic_defi_design/qml/Dashboard/UpdateInvalidChecksum.qml
- atomic_defi_design/qml/Dashboard/NotificationsModal.qml
- atomic_defi_design/qml/Exchange/Exchange.qml
- atomic_defi_design/qml/Exchange/History/History.qml
- atomic_defi_design/qml/Exchange/Orders/Orders.qml
- atomic_defi_design/qml/Exchange/Trade/BestOrder/Header.qml
- atomic_defi_design/qml/Exchange/Trade/BestOrder/List.qml
- atomic_defi_design/qml/Exchange/Trade/BestOrder/ListDelegate.qml
- atomic_defi_design/qml/Exchange/Trade/CandleStickChart.qml
- atomic_defi_design/qml/Exchange/Trade/ConfirmMultiOrderTradeModal.qml
- atomic_defi_design/qml/Exchange/Trade/ConfirmTradeModal.qml
- atomic_defi_design/qml/Exchange/Trade/DefaultSweetModal.qml
- atomic_defi_design/qml/Exchange/Trade/DexComboBoxLine.qml
- atomic_defi_design/qml/Exchange/Trade/FeeIcon.qml
- atomic_defi_design/qml/Exchange/Trade/MultiOrder.qml
- atomic_defi_design/qml/Exchange/Trade/OrderBook/Header.qml
- atomic_defi_design/qml/Exchange/Trade/OrderBook/Horizontal.qml
- atomic_defi_design/qml/Exchange/Trade/OrderBook/List.qml
- atomic_defi_design/qml/Exchange/Trade/OrderBook/ListDelegate.qml
- atomic_defi_design/qml/Exchange/Trade/OrderBook/Vertical.qml
- atomic_defi_design/qml/Exchange/Trade/Orders/OrderContent.qml
- atomic_defi_design/qml/Exchange/Trade/Orders/OrderLine.qml
- atomic_defi_design/qml/Exchange/Trade/Orders/OrderList.qml
- atomic_defi_design/qml/Exchange/Trade/Orders/OrderModal.qml
- atomic_defi_design/qml/Exchange/Trade/Orders/OrdersPage.qml
- atomic_defi_design/qml/Exchange/Trade/Orders/SwapProgress.qml
- atomic_defi_design/qml/Exchange/Trade/PriceLine.qml
- atomic_defi_design/qml/Exchange/Trade/ProView.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/List.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/Main.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/Main.js
- atomic_defi_design/qml/Exchange/Trade/SimpleView/Trade.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/CoinsListModal.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/BestOrdersModal.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/OrderRemovedModal.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/SubBestOrder.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/SubCoinSelector.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/SubOrders.qml
- atomic_defi_design/qml/Exchange/Trade/SimpleView/SubHistory.qml
- atomic_defi_design/qml/Exchange/Trade/SweetDexComboBox.qml
- atomic_defi_design/qml/Exchange/Trade/TickerSelector.qml
- atomic_defi_design/qml/Exchange/Trade/Trade.qml
- atomic_defi_design/qml/Exchange/Trade/TradeBox/BuyBox.qml
- atomic_defi_design/qml/Exchange/Trade/TradeBox/OrderForm.qml
- atomic_defi_design/qml/Exchange/Trade/TradeBox/SellBox.qml
- atomic_defi_design/qml/Exchange/Trade/Trading/Items/FeeInfo.qml
- atomic_defi_design/qml/Exchange/Trade/Trading/Items/TotalView.qml
- atomic_defi_design/qml/Exchange/Trade/Trading/TradeViewHeader.qml
- atomic_defi_design/qml/Fiat/FiatRamp.qml
- atomic_defi_design/qml/NoConnection.qml
- atomic_defi_design/qml/Portfolio/Portfolio.qml
- atomic_defi_design/qml/Screens/Dashboard.qml
- atomic_defi_design/qml/Screens/FirstLaunch.qml
- atomic_defi_design/qml/Screens/InitialLoading.qml
- atomic_defi_design/qml/Screens/Login.qml
- atomic_defi_design/qml/Screens/NewUser.qml
- atomic_defi_design/qml/Screens/RecoverSeed.qml
- atomic_defi_design/qml/Settings/AddCustomCoinModal.qml
- atomic_defi_design/qml/Settings/CamouflagePasswordModal.qml
- atomic_defi_design/qml/Settings/Combo_fiat.qml
- atomic_defi_design/qml/Settings/DeleteWalletModal.qml
- atomic_defi_design/qml/Settings/Languages.qml
- atomic_defi_design/qml/Settings/RecoverSeedModal.qml
- atomic_defi_design/qml/Settings/SettingModal.qml
- atomic_defi_design/qml/Settings/Settings.qml
- atomic_defi_design/qml/Sidebar/Sidebar.qml
- atomic_defi_design/qml/Sidebar/SidebarBottom.qml
- atomic_defi_design/qml/Sidebar/SidebarCenter.qml
- atomic_defi_design/qml/Sidebar/SidebarLine.qml
- atomic_defi_design/qml/Sidebar/SidebarTooltip.qml
- atomic_defi_design/qml/Support/FAQLine.qml
- atomic_defi_design/qml/Support/Support.qml
- atomic_defi_design/qml/Wallet/AddressBook.qml
- atomic_defi_design/qml/Wallet/AddressBookAddContactAddressModal.qml
- atomic_defi_design/qml/Wallet/AddressBookEditContactModal.qml
- atomic_defi_design/qml/Wallet/AddressBookNewContactCategoryModal.qml
- atomic_defi_design/qml/Wallet/AddressBookNewContactModal.qml
- atomic_defi_design/qml/Wallet/AddressBookSendWalletSelector.qml
- atomic_defi_design/qml/Wallet/AddressBookWalletTypeList.qml
- atomic_defi_design/qml/Wallet/AddressBookWalletTypeListModal.qml
- atomic_defi_design/qml/Wallet/AddressBookWalletTypeListRow.qml
- atomic_defi_design/qml/Wallet/AddressList.qml
- atomic_defi_design/qml/Wallet/ClaimFaucetResultModal.qml
- atomic_defi_design/qml/Wallet/ClaimRewardsModal.qml
- atomic_defi_design/qml/Wallet/EnableCoinModal.qml
- atomic_defi_design/qml/Wallet/Main.qml
- atomic_defi_design/qml/Wallet/PriceGraph.qml
- atomic_defi_design/qml/Wallet/ReceiveModal.qml
- atomic_defi_design/qml/Wallet/SendModal.qml
- atomic_defi_design/qml/Wallet/SendModalContactList.qml
- atomic_defi_design/qml/Wallet/SendResult.qml
- atomic_defi_design/qml/Wallet/Sidebar.qml
- atomic_defi_design/qml/Wallet/TransactionDetailsModal.qml
- atomic_defi_design/qml/Wallet/Transactions.qml
- atomic_defi_design/qml/Wallet/Wallet.qml
- atomic_defi_design/qml/Portfolio/AmountChart.qml
- atomic_defi_design/qml/Portfolio/AssetPieChart.qml
- atomic_defi_design/qml/Portfolio/PieItem.qml
- atomic_defi_design/qml/Portfolio/SmartChartView.qml
- atomic_defi_design/qml/Portfolio/TableDex.qml
- atomic_defi_design/qml/main.qml
- qtquickcontrols2.conf
-
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b1f257f307..5d33a981a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
include(DEX_NEW_LIB)
+include(dex_generate_qrc)
# Core target
DEX_NEW_LIB(core INTERFACE
@@ -10,17 +11,19 @@ DEX_NEW_LIB(core INTERFACE
INTERFACE_DEFS
$<$,$>:QT_QML_DEBUG> $<$:HAS_REMOTE_API>
$<$:AUTO_DOWNLOAD>
+ $<$:NOMINMAX>
$<$:SPDLOG_WCHAR_TO_UTF8_SUPPORT>
_TURN_OFF_PLATFORM_STRING
- DEX_NAME="${DEX_DISPLAY_NAME}" DEX_WEBSITE_URL="${DEX_WEBSITE}"
+ DEX_API="${DEX_API}" DEX_RPC="${DEX_RPC}" DEX_RPCPORT="${DEX_RPCPORT}" DEX_NAME="${DEX_DISPLAY_NAME}" DEX_WEBSITE_URL="${DEX_WEBSITE}"
DEX_SUPPORT_URL="${DEX_SUPPORT_PAGE}" DEX_DISCORD_URL="${DEX_DISCORD}" DEX_TWITTER_URL="${DEX_TWITTER}"
DEX_PRIMARY_COIN="${DEX_PRIMARY_COIN}" DEX_SECOND_PRIMARY_COIN="${DEX_SECOND_PRIMARY_COIN}" #DEX_COMMON_DATA_FOLDER="${DEX_COMMON_DATA_FOLDER}"
- DEX_PROJECT_NAME="${DEX_PROJECT_NAME}" DEX_COMPANY_NAME="${DEX_COMPANY_NAME}"
+ DEX_PROJECT_NAME="${DEX_PROJECT_NAME}" DEX_COMPANY_NAME="${DEX_COMPANY_NAME}" DEX_VERSION="${DEX_VERSION}"
DEX_REPOSITORY_OWNER="${DEX_REPOSITORY_OWNER}" DEX_REPOSITORY_NAME="${DEX_REPOSITORY_NAME}"
DEX_CHECKSUM_API_URL="${DEX_CHECKSUM_API_URL}" DEX_APPDATA_FOLDER="${DEX_APPDATA_FOLDER}"
INTERFACE_DEFS
ENTT_API_EXPORT)
target_precompile_headers(${PROJECT_NAME}_core INTERFACE core/atomicdex/pch.hpp)
+
if (APPLE)
set_source_files_properties(core/atomicdex/platform/osx/manager.mm PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
macro(adex_add_framework fwname appname)
@@ -50,17 +53,30 @@ set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM TRUE)
set(TS_FILES
${CMAKE_SOURCE_DIR}/atomic_defi_design/assets/languages/atomic_defi_en.ts
${CMAKE_SOURCE_DIR}/atomic_defi_design/assets/languages/atomic_defi_fr.ts
+ ${CMAKE_SOURCE_DIR}/atomic_defi_design/assets/languages/atomic_defi_de.ts
+ ${CMAKE_SOURCE_DIR}/atomic_defi_design/assets/languages/atomic_defi_es.ts
${CMAKE_SOURCE_DIR}/atomic_defi_design/assets/languages/atomic_defi_tr.ts
${CMAKE_SOURCE_DIR}/atomic_defi_design/assets/languages/atomic_defi_ru.ts)
set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION ${CMAKE_SOURCE_DIR}/atomic_defi_design/assets/languages)
qt5_create_translation(QM_FILES
- ${PROJECT_SOURCE_DIR}/atomic_defi_design/qml
+ ${PROJECT_SOURCE_DIR}/atomic_defi_design/Dex
${PROJECT_SOURCE_DIR}/src
${TS_FILES}
OPTIONS -source-language en_US -no-obsolete)
message(STATUS "QM FILES -> ${QM_FILES}")
message(STATUS "TS FILES -> ${TS_FILES}")
+set(qml_qrc)
+set(assets_qrc)
+set(imports_qrc ${CMAKE_SOURCE_DIR}/atomic_defi_design/imports/qml.qrc)
+dex_generate_qrc(${CMAKE_SOURCE_DIR}/atomic_defi_design/Dex qml_qrc
+ PATH_PREFIX "Dex"
+ FILES_TO_EXCLUDE ".gitignore;.DS_Store;.qrc")
+dex_generate_qrc(${CMAKE_SOURCE_DIR}/atomic_defi_design/assets assets_qrc
+ PATH_PREFIX "assets"
+ FILES_TO_EXCLUDE ".gitignore;.DS_Store;CONTRIBUTING.txt;FONTLOG.txt;LICENCE-FAQ.txt;LICENCE.txt;README.txt;TRADEMARKS.txt;.ts;.qm;.qrc"
+ FILES "languages/atomic_defi_en.qm;languages/atomic_defi_es.qm;languages/atomic_defi_de.qm;languages/atomic_defi_fr.qm;languages/atomic_defi_ru.qm;languages/atomic_defi_tr.qm")
+
# Main executable
add_executable(${PROJECT_NAME}
MACOSX_BUNDLE
@@ -72,7 +88,9 @@ add_executable(${PROJECT_NAME}
${CMAKE_SOURCE_DIR}/cmake/install/windows/dex.rc
##! QRC
- ${CMAKE_SOURCE_DIR}/qml.qrc
+ ${qml_qrc}
+ ${assets_qrc}
+ ${imports_qrc}
##! Linguistic
${QM_FILES}
@@ -83,25 +101,37 @@ set_target_properties(${PROJECT_NAME}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
-set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD ON)
+#set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD ON)
if (APPLE)
set_property(SOURCE core/atomicdex/platform/osx/manager.mm PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
endif ()
# Testing executable
add_executable(${PROJECT_NAME}_tests MACOSX_BUNDLE ${ICON}
+ tests/atomic.dex.qt.utilities.tests.cpp
+ tests/atomic.dex.provider.cex.prices.api.tests.cpp
+ tests/atomic.dex.provider.cex.prices.tests.cpp
tests/atomic.dex.tests.cpp
tests/atomic.dex.wallet.config.tests.cpp
- tests/atomic.dex.provider.cex.prices.tests.cpp
- tests/atomic.dex.qt.utilities.tests.cpp
+ ##! API
+ tests/api/coingecko/coingecko.tests.cpp
+ tests/api/komodo_prices/komodo.prices.tests.cpp
+ tests/api/mm2/mm2.api.format.address.tests.cpp
+ tests/api/mm2/mm2.api.utxo.merge.params.tests.cpp
+ tests/api/mm2/mm2.api.balance.infos.tests.cpp
+ tests/api/mm2/mm2.fraction.tests.cpp
+ tests/api/mm2/mm2.rpc.trade.preimage.tests.cpp
+
+ ##! CFG
tests/config/coins.cfg.tests.cpp
+
##! API
tests/api/coingecko/coingecko.tests.cpp
+ tests/api/komodo_prices/komodo.prices.tests.cpp
tests/api/mm2/mm2.rpc.trade.preimage.tests.cpp
tests/api/mm2/mm2.fraction.tests.cpp
- #tests/api/github/github.api.tests.cpp
- #tests/api/checksum/checksum.api.tests.cpp
+ tests/api/mm2/enable_bch_with_tokens_rpc_tests.cpp
##! Utilities
tests/utilities/qt.utilities.tests.cpp
@@ -113,7 +143,10 @@ add_executable(${PROJECT_NAME}_tests MACOSX_BUNDLE ${ICON}
##! Models
tests/models/qt.addressbook.contact.model.tests.cpp
- tests/atomic.dex.provider.cex.prices.api.tests.cpp)
+ ##! Utilities
+ tests/utilities/qt.utilities.tests.cpp
+ tests/utilities/global.utilities.tests.cpp)
+
target_link_libraries(${PROJECT_NAME}_tests
PUBLIC
${PROJECT_NAME}::core
@@ -181,10 +214,10 @@ if (WIN32)
add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/ci_tools_atomic_dex/windows_misc $)
- message(STATUS "${WINDEPLOYQT_PATH} ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}.exe --qmldir ${CMAKE_SOURCE_DIR}/atomic_defi_design/qml")
+ message(STATUS "${WINDEPLOYQT_PATH} ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}.exe --qmldir ${CMAKE_SOURCE_DIR}/atomic_defi_design/Dex")
add_custom_command(TARGET ${PROJECT_NAME}
POST_BUILD
- COMMAND ${WINDEPLOYQT_PATH} ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}.exe --qmldir ${CMAKE_SOURCE_DIR}/atomic_defi_design/qml
+ COMMAND ${WINDEPLOYQT_PATH} ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}.exe --qmldir ${CMAKE_SOURCE_DIR}/atomic_defi_design/Dex
)
include(${CMAKE_SOURCE_DIR}/cmake/install/windows/dex_install.cmake)
diff --git a/src/app/app.cpp b/src/app/app.cpp
index e37536b2d6..d7cd93d9a7 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright © 2013-2021 The Komodo Platform Developers. *
+ * Copyright © 2013-2022 The Komodo Platform Developers. *
* *
* See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at *
* the top-level directory of this distribution for the individual copyright *
@@ -17,10 +17,12 @@
//! Deps
#include
#include
+#include
//! QT
#include
#include
+#include
#include
#include
#include
@@ -39,10 +41,9 @@
#include "app.hpp"
#include "atomicdex/services/exporter/exporter.service.hpp"
#include "atomicdex/services/mm2/auto.update.maker.order.service.hpp"
-#include "atomicdex/services/price/coingecko/coingecko.provider.hpp"
+#include "atomicdex/services/price/komodo_prices/komodo.prices.provider.hpp"
#include "atomicdex/services/price/coingecko/coingecko.wallet.charts.hpp"
#include "atomicdex/services/price/coinpaprika/coinpaprika.provider.hpp"
-#include "atomicdex/services/price/oracle/band.provider.hpp"
#include "atomicdex/services/price/orderbook.scanner.service.hpp"
namespace
@@ -52,8 +53,7 @@ namespace
namespace atomic_dex
{
- void
- atomic_dex::application::change_state([[maybe_unused]] int visibility)
+ void atomic_dex::application::change_state([[maybe_unused]] int visibility)
{
/*#ifdef __APPLE__
{
@@ -64,8 +64,7 @@ namespace atomic_dex
#endif*/
}
- bool
- atomic_dex::application::enable_coins(const QStringList& coins)
+ bool atomic_dex::application::enable_coins(const QStringList& coins)
{
auto enableable_coins_count = entity_registry_.template ctx().value("MaximumNbCoinsEnabled").toULongLong();
if (enableable_coins_count < coins.size() + get_portfolio_page()->get_global_cfg()->get_enabled_coins().size())
@@ -77,54 +76,66 @@ namespace atomic_dex
coins_std.reserve(coins.size());
atomic_dex::mm2_service& mm2 = get_mm2();
std::unordered_set extra_coins;
- for (auto&& coin: coins) {
+ for (auto&& coin : coins)
+ {
auto coin_info = mm2.get_coin_info(coin.toStdString());
- if (coin_info.has_parent_fees_ticker && coin_info.ticker != coin_info.fees_ticker)
+
+ if (coin_info.has_parent_fees_ticker &&
+ coin_info.ticker != coin_info.fees_ticker &&
+ !coins.contains(QString::fromStdString(coin_info.fees_ticker)))
{
auto coin_parent_info = mm2.get_coin_info(coin_info.fees_ticker);
- if (extra_coins.insert(coin_parent_info.ticker).second)
+ // todo: why can it be empty when it has been found ?
+ // refactor coins enabling logic!!!
+ if (coin_parent_info.ticker != "")
{
- SPDLOG_INFO("Adding extra coin: {} to enable", coin_parent_info.ticker);
+ if (!coin_parent_info.currently_enabled && !coin_parent_info.active && extra_coins.insert(coin_parent_info.ticker).second)
+ {
+ SPDLOG_INFO("Adding extra coin: {} to enable", coin_parent_info.ticker);
+ }
}
}
coins_std.push_back(coin.toStdString());
}
-
for (auto&& extra_coin : extra_coins)
{
coins_std.push_back(extra_coin);
}
- mm2.enable_multiple_coins(coins_std);
-
+ mm2.enable_coins(coins_std);
return true;
}
- bool
- atomic_dex::application::enable_coin(const QString& coin)
+ bool atomic_dex::application::enable_coin(const QString& coin)
{
return enable_coins(QStringList{coin});
}
- bool
- application::disable_coins(const QStringList& coins)
+ bool application::disable_coins(const QStringList& coins)
{
QString primary_coin = QString::fromStdString(g_primary_dex_coin);
QString secondary_coin = QString::fromStdString(g_second_primary_dex_coin);
QStringList coins_copy;
const auto& mm2 = system_manager_.get_system();
- for (auto&& coin: coins)
+ for (auto&& coin : coins)
{
const auto coin_info = mm2.get_coin_info(coin.toStdString());
bool has_parent_fees = coin_info.has_parent_fees_ticker;
if (not get_orders()->swap_is_in_progress(coin) && coin != primary_coin && coin != secondary_coin)
{
- if (has_parent_fees)
+ if (!get_mm2().is_zhtlc_coin_ready(coin.toStdString()))
{
- coins_copy.push_front(coin);
+ this->dispatcher_.trigger(coin.toStdString(), "Can't disable until fully activated.");
}
else
{
- coins_copy.push_back(coin);
+ if (has_parent_fees)
+ {
+ coins_copy.push_front(coin);
+ }
+ else
+ {
+ coins_copy.push_back(coin);
+ }
}
}
}
@@ -135,7 +146,7 @@ namespace atomic_dex
system_manager_.get_system().disable_coins(coins_copy);
system_manager_.get_system().disable_coins(coins_copy);
coins_std.reserve(coins_copy.size());
- for (auto&& coin: coins_copy)
+ for (auto&& coin : coins_copy)
{
if (QString::fromStdString(get_mm2().get_current_ticker()) == coin && m_primary_coin_fully_enabled)
{
@@ -150,14 +161,164 @@ namespace atomic_dex
return true;
}
- bool
- atomic_dex::application::first_run()
+ bool application::disable_no_balance_coins()
+ {
+ auto* portfolio_page = get_portfolio_page();
+ auto* portfolio_mdl = portfolio_page->get_portfolio();
+ auto portfolio_data = portfolio_mdl->get_underlying_data();
+ QStringList coins_to_disable{};
+
+ for (auto& coin : portfolio_data)
+ {
+ if (coin.balance.toFloat() == 0)
+ {
+ coins_to_disable.push_back(coin.ticker);
+ }
+ }
+ return disable_coins(coins_to_disable);
+ }
+
+ bool application::has_coins_with_balance()
+ {
+ // TODO: Does this ignore test coins?
+ // Simple view on fresh wallet with only test coins from faucet returns `no tradable assets`
+ auto* portfolio_page = get_portfolio_page();
+ auto* portfolio_mdl = portfolio_page->get_portfolio();
+ auto portfolio_data = portfolio_mdl->get_underlying_data();
+
+ auto functor = [](const auto& coin) { return coin.balance.toFloat() > 0; };
+ return ranges::any_of(portfolio_data, functor);
+ }
+
+ bool atomic_dex::application::first_run()
{
return qt_wallet_manager::get_wallets().empty();
}
- void
- application::launch()
+ void atomic_dex::application::reset_coin_cfg()
+ {
+ using namespace std::string_literals;
+ const std::string wallet_name = qt_wallet_manager::get_default_wallet_name().toStdString();
+ const std::string wallet_cfg_file = std::string(atomic_dex::get_raw_version()) + "-coins"s + "."s + wallet_name + ".json"s;
+ std::string wallet_custom_cfg_filename = "custom-tokens."s + wallet_name + ".json"s;
+ const fs::path wallet_custom_cfg_path{utils::get_atomic_dex_config_folder() / wallet_custom_cfg_filename};
+ const fs::path wallet_cfg_path{utils::get_atomic_dex_config_folder() / wallet_cfg_file};
+ const fs::path mm2_coins_file_path{atomic_dex::utils::get_current_configs_path() / "coins.json"};
+ const fs::path ini_file_path = atomic_dex::utils::get_current_configs_path() / "cfg.ini";
+ const fs::path cfg_json_file_path = atomic_dex::utils::get_current_configs_path() / "cfg.json";
+ const fs::path logo_path = atomic_dex::utils::get_logo_path();
+ const fs::path theme_path = atomic_dex::utils::get_themes_path();
+
+ const auto functor_remove = [](auto&& path_to_remove)
+ {
+ if (fs::exists(path_to_remove))
+ {
+ std::error_code ec;
+ if (fs::is_directory(path_to_remove))
+ {
+ fs::remove_all(path_to_remove, ec);
+ }
+ else
+ {
+ fs::remove(path_to_remove, ec);
+ }
+ if (ec)
+ {
+ LOG_PATH("error when removing {}", path_to_remove);
+ SPDLOG_ERROR("error: {}", ec.message());
+ }
+ else
+ {
+ LOG_PATH("Successfully removed {}", path_to_remove);
+ }
+ }
+ };
+
+ if (fs::exists(wallet_cfg_path))
+ {
+ nlohmann::json coin_config_json_data;
+ std::unordered_set active_coins_registry;
+ QFile coins_file;
+ coins_file.setFileName(std_path_to_qstring(wallet_cfg_path));
+ coins_file.open(QIODevice::ReadOnly | QIODevice::Text);
+
+ //! Read Contents
+ coin_config_json_data = nlohmann::json::parse(QString(coins_file.readAll()).toStdString());
+ coins_file.close();
+
+ //! Get the active coins
+ for (auto&& [key, value]: coin_config_json_data.items())
+ {
+ if (value["active"]) { active_coins_registry.insert(key); }
+ }
+
+ // remove old coins file
+ functor_remove(std::move(wallet_cfg_path));
+
+ //! Copy default coins file
+ const auto cfg_path = ag::core::assets_real_path() / "config";
+ std::string filename = std::string(atomic_dex::get_raw_version()) + "-coins.json";
+ fs::copy(cfg_path / filename, wallet_cfg_path);
+ QFile default_coins_file;
+
+ //! Open coins file
+ default_coins_file.setFileName(std_path_to_qstring(wallet_cfg_path));
+ default_coins_file.open(QIODevice::ReadOnly | QIODevice::Text);
+
+ //! Read default coins contents
+ nlohmann::json default_coin_config_json_data;
+ default_coin_config_json_data = nlohmann::json::parse(QString(default_coins_file.readAll()).toStdString());
+ default_coins_file.close();
+
+ //! set active coins again
+ for (auto&& key: active_coins_registry)
+ {
+ try
+ {
+ if (default_coin_config_json_data.contains(key))
+ {
+ default_coin_config_json_data[key]["active"] = true;
+ }
+ }
+ catch (const std::exception& error)
+ {
+ SPDLOG_ERROR("Exception caught: {}", error.what());
+ }
+ }
+
+ //! Write
+ QFile output_coins_file;
+ //SPDLOG_DEBUG("Data written: ", default_coin_config_json_data.dump(4));
+ output_coins_file.setFileName(std_path_to_qstring(wallet_cfg_path));
+ output_coins_file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+ output_coins_file.write(QString::fromStdString(default_coin_config_json_data.dump(4)).toUtf8());
+ output_coins_file.close();
+ }
+
+ if (fs::exists(wallet_custom_cfg_path))
+ {
+ nlohmann::json custom_config_json_data = utils::read_json_file(wallet_custom_cfg_path);
+
+ //! Modify
+ for (auto&& [key, value]: custom_config_json_data.items()) { value["active"] = false; }
+
+ //! Write
+ QFile file;
+ file.setFileName(std_path_to_qstring(wallet_custom_cfg_path));
+ file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+ file.write(QString::fromStdString(custom_config_json_data.dump()).toUtf8());
+ file.close();
+ }
+ functor_remove(std::move(mm2_coins_file_path));
+ functor_remove(std::move(cfg_json_file_path));
+ functor_remove(std::move(logo_path));
+ functor_remove(std::move(theme_path));
+ // Uncomment if you want to reset fiat/language/theme
+ // functor_remove(std::move(ini_file_path));
+ atomic_dex::application::restart();
+ }
+
+ void application::launch()
{
SPDLOG_INFO("Launch the application");
this->system_manager_.start();
@@ -166,8 +327,7 @@ namespace atomic_dex
timer->start(g_timeout_q_timer_ms);
}
- QString
- atomic_dex::application::get_mnemonic()
+ QString atomic_dex::application::get_mnemonic()
{
std::array data{};
boost::random_device device;
@@ -180,8 +340,7 @@ namespace atomic_dex
return output;
}
- void
- application::tick()
+ void application::tick()
{
this->process_one_frame();
if (m_event_actions[events_action::need_a_full_refresh_of_mm2])
@@ -189,7 +348,7 @@ namespace atomic_dex
system_manager_.create_system(system_manager_);
// system_manager_.create_system(system_manager_);
- system_manager_.create_system(system_manager_);
+ // system_manager_.create_system(system_manager_);
connect_signals();
m_event_actions[events_action::need_a_full_refresh_of_mm2] = false;
}
@@ -200,6 +359,7 @@ namespace atomic_dex
while (not m_portfolio_queue.empty())
{
const char* ticker_cstr = nullptr;
+ bool add_to_init(true);
m_portfolio_queue.pop(ticker_cstr);
std::string ticker(ticker_cstr);
if (ticker == g_primary_dex_coin)
@@ -210,7 +370,14 @@ namespace atomic_dex
{
this->m_secondary_coin_fully_enabled = true;
}
- to_init.push_back(ticker);
+ //! TODO: figure out why sometimes ZHTLC coins end up in here twice. When they do, without this check it crashes.
+ if (std::find(to_init.begin(), to_init.end(), ticker) != to_init.end()) {
+ // SPDLOG_DEBUG("Ticker {} is already in vector", ticker);
+ add_to_init = false;
+ }
+ if (add_to_init) {
+ to_init.push_back(ticker);
+ }
std::free((void*)ticker_cstr);
}
@@ -262,32 +429,27 @@ namespace atomic_dex
}
}
- mm2_service&
- application::get_mm2()
+ mm2_service& application::get_mm2()
{
return this->system_manager_.get_system();
}
- entt::dispatcher&
- application::get_dispatcher()
+ entt::dispatcher& application::get_dispatcher()
{
return this->dispatcher_;
}
- const entt::registry&
- application::get_registry() const
+ const entt::registry& application::get_registry() const
{
return this->entity_registry_;
}
- entt::registry&
- application::get_registry()
+ entt::registry& application::get_registry()
{
return this->entity_registry_;
}
- void
- application::post_handle_settings()
+ void application::post_handle_settings()
{
QSettings& settings = get_registry().ctx();
if (settings.value("AutomaticUpdateOrderBot", false).toBool())
@@ -305,7 +467,7 @@ namespace atomic_dex
application::application(QObject* pParent) : QObject(pParent)
{
- fs::path settings_path = (atomic_dex::utils::get_current_configs_path() / "cfg.ini");
+ std::filesystem::path settings_path = (atomic_dex::utils::get_current_configs_path() / "cfg.ini");
#if defined(_WIN32) || defined(WIN32)
this->entity_registry_.set(QString::fromStdWString(settings_path.wstring()), QSettings::IniFormat);
#else
@@ -338,15 +500,18 @@ namespace atomic_dex
system_manager_.create_system(system_manager_, this);
system_manager_.create_system(system_manager_, settings_page_system.get_cfg());
system_manager_.create_system(system_manager_);
- system_manager_.create_system();
- // system_manager_.create_system(system_manager_);
- system_manager_.create_system(system_manager_);
- system_manager_.create_system().disable();
+ //system_manager_.create_system(system_manager_);
+ //system_manager_.create_system(system_manager_);
+ system_manager_.create_system();
+ system_manager_.create_system();
system_manager_.create_system(system_manager_);
system_manager_.create_system(system_manager_);
system_manager_.create_system(
system_manager_, m_event_actions.at(events_action::about_to_exit_app), portfolio_system.get_portfolio(), this);
+
+ system_manager_.create_system(system_manager_, this->dispatcher_, this);
+
connect_signals();
if (qt_wallet_manager::is_there_a_default_wallet())
{
@@ -372,36 +537,37 @@ namespace atomic_dex
}
}
- bool
- application::do_i_have_enough_funds(const QString& ticker, const QString& amount) const
+ bool application::do_i_have_enough_funds(const QString& ticker, const QString& amount) const
{
t_float_50 amount_f = safe_float(amount.toStdString());
return get_mm2().do_i_have_enough_funds(ticker.toStdString(), amount_f);
}
- const mm2_service&
- application::get_mm2() const
+ const mm2_service& application::get_mm2() const
{
return this->system_manager_.get_system();
}
- QString
- application::get_balance(const QString& coin)
+ QJsonObject application::get_zhtlc_status(const QString& coin)
+ {
+ QJsonObject res = nlohmann_json_object_to_qt_json_object(get_mm2().get_zhtlc_status(coin.toStdString()));
+ return res;
+ }
+
+ QString application::get_balance(const QString& coin)
{
std::error_code ec;
auto res = get_mm2().my_balance(coin.toStdString(), ec);
return QString::fromStdString(res);
}
- void
- application::on_mm2_initialized_event([[maybe_unused]] const mm2_initialized& evt)
+ void application::on_mm2_initialized_event([[maybe_unused]] const mm2_initialized& evt)
{
SPDLOG_DEBUG("{} l{}", __FUNCTION__, __LINE__);
system_manager_.get_system().set_status("enabling_coins");
}
- void
- application::refresh_orders_and_swaps()
+ void application::refresh_orders_and_swaps()
{
auto& mm2 = get_mm2();
if (mm2.is_mm2_running())
@@ -410,11 +576,8 @@ namespace atomic_dex
}
}
- bool
- application::disconnect()
+ bool application::disconnect()
{
- SPDLOG_INFO("disconnecting every models");
-
//! Clears pending events
while (not this->m_actions_queue.empty())
{
@@ -440,13 +603,14 @@ namespace atomic_dex
orders->reset();
system_manager_.get_system().get_portfolio()->reset();
+ system_manager_.get_system().set_current_balance_fiat_all("0");
system_manager_.get_system().clear_models();
get_wallet_page()->get_transactions_mdl()->reset();
+
//! Mark systems
system_manager_.mark_system();
- // system_manager_.mark_system();
- system_manager_.mark_system();
+ //system_manager_.mark_system();
//! Disconnect signals
get_trading_page()->disconnect_signals();
@@ -457,7 +621,6 @@ namespace atomic_dex
dispatcher_.sink().disconnect<&application::on_coin_fully_initialized_event>(*this);
dispatcher_.sink().disconnect<&application::on_mm2_initialized_event>(*this);
dispatcher_.sink().disconnect<&application::on_process_orders_and_swaps_finished_event>(*this);
- // dispatcher_.sink().disconnect<&application::on_process_swaps_finished_event>(*this);
m_event_actions[events_action::need_a_full_refresh_of_mm2] = true;
@@ -465,14 +628,13 @@ namespace atomic_dex
auto& wallet_manager = this->system_manager_.get_system();
wallet_manager.just_set_wallet_name("");
- this->m_secondary_coin_fully_enabled = false;
this->m_primary_coin_fully_enabled = false;
+ this->m_secondary_coin_fully_enabled = false;
system_manager_.get_system().set_status("None");
- return fs::remove(utils::get_atomic_dex_config_folder() / "default.wallet");
+ return std::filesystem::remove(utils::get_atomic_dex_config_folder() / "default.wallet");
}
- void
- application::connect_signals()
+ void application::connect_signals()
{
SPDLOG_INFO("connecting signals");
qobject_cast(m_manager_models.at("notifications"))->connect_signals();
@@ -486,8 +648,7 @@ namespace atomic_dex
// get_dispatcher().sink().connect<&application::on_process_swaps_finished_event>(*this);
}
- void
- application::set_qt_app(std::shared_ptr app, QQmlApplicationEngine* engine)
+ void application::set_qt_app(std::shared_ptr app, QQmlApplicationEngine* engine)
{
this->m_app = app;
connect(m_app.get(), SIGNAL(aboutToQuit()), this, SLOT(exit_handler()));
@@ -497,12 +658,11 @@ namespace atomic_dex
settings_system.init_lang();
}
- QString
- application::recover_fund(const QString& uuid)
+ QString application::recover_fund(const QString& uuid)
{
QString result;
- ::mm2::api::recover_funds_of_swap_request request{.swap_uuid = uuid.toStdString()};
+ mm2::recover_funds_of_swap_request request{.swap_uuid = uuid.toStdString()};
auto res = get_mm2().get_mm2_client().rpc_recover_funds(std::move(request));
result = QString::fromStdString(res.raw_result);
@@ -549,16 +709,23 @@ namespace atomic_dex
void
application::on_ticker_balance_updated_event(const ticker_balance_updated& evt)
{
- SPDLOG_DEBUG("on_ticker_balance_updated_event");
- if (not m_event_actions[events_action::about_to_exit_app])
+ SPDLOG_DEBUG("Ticker balance is about to be updated.");
+ if (m_event_actions[events_action::about_to_exit_app])
{
- if (not evt.tickers.empty())
- {
- if (get_portfolio_page()->get_portfolio()->update_balance_values(evt.tickers))
- {
- this->dispatcher_.trigger(false);
- }
- }
+ SPDLOG_DEBUG("Ticker balance not updated because app is exiting.");
+ }
+ else if (evt.tickers.empty())
+ {
+ SPDLOG_DEBUG("Ticker balance not updated because there are not tickers to update");
+ }
+ else if (get_portfolio_page()->get_portfolio()->update_balance_values(evt.tickers))
+ {
+ this->dispatcher_.trigger(false);
+ SPDLOG_DEBUG("Ticker balance updated.");
+ }
+ else
+ {
+ SPDLOG_ERROR("Ticker balance not updated, tickers not found in the registry: {}", fmt::join(evt.tickers, ", "));
}
}
} // namespace atomic_dex
@@ -654,7 +821,7 @@ namespace atomic_dex
trading_page*
application::get_trading_page() const
{
- trading_page* ptr = const_cast(std::addressof(system_manager_.get_system()));
+ auto ptr = const_cast(std::addressof(system_manager_.get_system()));
assert(ptr != nullptr);
return ptr;
}
@@ -719,10 +886,20 @@ namespace atomic_dex
//! update checker
namespace atomic_dex
{
- self_update_service*
- application::get_self_update_service() const
+ update_checker_service* application::get_update_checker_service() const
+ {
+ auto ptr = const_cast(std::addressof(system_manager_.get_system()));
+ assert(ptr != nullptr);
+ return ptr;
+ }
+} // namespace atomic_dex
+
+//! update checker
+namespace atomic_dex
+{
+ zcash_params_service* application::get_zcash_params_service() const
{
- auto ptr = const_cast(std::addressof(system_manager_.get_system()));
+ auto ptr = const_cast(std::addressof(system_manager_.get_system()));
assert(ptr != nullptr);
return ptr;
}
@@ -781,8 +958,6 @@ namespace atomic_dex
if (appimage == nullptr || not QString(appimage).contains(DEX_PROJECT_NAME))
{
- // qDebug() << qApp->arguments();
- // SPDLOG_INFO("arg: {}, dir path: {}", qApp->arguments()[0].toStdString(), qApp->applicationDirPath().toStdString());
bool res = QProcess::startDetached(qApp->arguments()[0], qApp->arguments(), qApp->applicationDirPath());
if (!res)
{
diff --git a/src/app/app.hpp b/src/app/app.hpp
index 68c14e8702..297f25150d 100644
--- a/src/app/app.hpp
+++ b/src/app/app.hpp
@@ -48,7 +48,9 @@
#include "atomicdex/services/ip/ip.checker.service.hpp"
#include "atomicdex/services/mm2/mm2.service.hpp"
#include "atomicdex/services/price/global.provider.hpp"
-#include "atomicdex/services/update/self.update.service.hpp"
+#include "atomicdex/services/update/update.checker.service.hpp"
+#include "atomicdex/services/update/zcash.params.service.hpp"
+#include "atomicdex/utilities/qt.utilities.hpp"
namespace ag = antara::gaming;
@@ -62,7 +64,7 @@ namespace atomic_dex
Q_OBJECT
//! Properties
- Q_PROPERTY(addressbook_page* addressbook_pg READ get_addressbook_page NOTIFY addressbookPageChanged)
+ Q_PROPERTY(addressbook_page* addressbookPg READ get_addressbook_page NOTIFY addressbookPageChanged)
Q_PROPERTY(orders_model* orders_mdl READ get_orders NOTIFY ordersChanged)
Q_PROPERTY(portfolio_page_ptr portfolio_pg READ get_portfolio_page NOTIFY portfolioPageChanged)
Q_PROPERTY(notification_manager* notification_mgr READ get_notification_manager)
@@ -73,7 +75,8 @@ namespace atomic_dex
Q_PROPERTY(wallet_page* wallet_pg READ get_wallet_page NOTIFY walletPageChanged)
Q_PROPERTY(settings_page* settings_pg READ get_settings_page NOTIFY settingsPageChanged)
Q_PROPERTY(qt_wallet_manager* wallet_mgr READ get_wallet_mgr NOTIFY walletMgrChanged)
- Q_PROPERTY(self_update_service* self_update_service READ get_self_update_service NOTIFY selfUpdateServiceChanged)
+ Q_PROPERTY(update_checker_service* updateCheckerService READ get_update_checker_service NOTIFY updateCheckerServiceChanged)
+ Q_PROPERTY(zcash_params_service* zcash_params READ get_zcash_params_service NOTIFY zcashParamsServiceChanged)
//! Private function
void connect_signals();
@@ -102,65 +105,57 @@ namespace atomic_dex
std::atomic_bool m_primary_coin_fully_enabled{false};
public:
- //! Deleted operation
application(application& other) = delete;
application(application&& other) = delete;
application& operator=(application& other) = delete;
application& operator=(application&& other) = delete;
- //! Constructor
explicit application(QObject* pParent = nullptr) ;
- ~application() final = default;
+ ~application() final = default;
- //! Post constructor
void post_handle_settings();
- //! entt::dispatcher events
- void on_ticker_balance_updated_event(const ticker_balance_updated&) ;
- void on_fiat_rate_updated(const fiat_rate_updated&) ;
- void on_coin_fully_initialized_event(const coin_fully_initialized&) ;
- void on_mm2_initialized_event(const mm2_initialized&) ;
- void on_process_orders_and_swaps_finished_event(const process_swaps_and_orders_finished&) ;
-
- //! Properties Getter
- mm2_service& get_mm2() ;
- [[nodiscard]] const mm2_service& get_mm2() const ;
- entt::dispatcher& get_dispatcher() ;
- const entt::registry& get_registry() const ;
- entt::registry& get_registry() ;
- [[nodiscard]] addressbook_page* get_addressbook_page() const ;
- [[nodiscard]] portfolio_page* get_portfolio_page() const ;
- [[nodiscard]] wallet_page* get_wallet_page() const ;
- orders_model* get_orders() const ;
- notification_manager* get_notification_manager() const ;
- trading_page* get_trading_page() const ;
- settings_page* get_settings_page() const ;
- qt_wallet_manager* get_wallet_mgr() const ;
- internet_service_checker* get_internet_checker() const ;
- ip_service_checker* get_ip_checker() const ;
- self_update_service* get_self_update_service() const;
- exporter_service* get_exporter_service() const ;
-
- //! Properties Setter
- void set_qt_app(std::shared_ptr app, QQmlApplicationEngine* qml_engine) ;
-
- //! Launch the internal loop for the SDK.
+ void on_ticker_balance_updated_event(const ticker_balance_updated&);
+ void on_fiat_rate_updated(const fiat_rate_updated&);
+ void on_coin_fully_initialized_event(const coin_fully_initialized&);
+ void on_mm2_initialized_event(const mm2_initialized&);
+ void on_process_orders_and_swaps_finished_event(const process_swaps_and_orders_finished&);
+
+ mm2_service& get_mm2();
+ [[nodiscard]] const mm2_service& get_mm2() const;
+ entt::dispatcher& get_dispatcher();
+ const entt::registry& get_registry() const;
+ entt::registry& get_registry();
+ [[nodiscard]] addressbook_page* get_addressbook_page() const;
+ [[nodiscard]] portfolio_page* get_portfolio_page() const;
+ [[nodiscard]] wallet_page* get_wallet_page() const;
+ orders_model* get_orders() const;
+ notification_manager* get_notification_manager() const;
+ trading_page* get_trading_page() const;
+ settings_page* get_settings_page() const;
+ qt_wallet_manager* get_wallet_mgr() const;
+ internet_service_checker* get_internet_checker() const;
+ ip_service_checker* get_ip_checker() const;
+ update_checker_service* get_update_checker_service() const;
+ [[nodiscard]] zcash_params_service* get_zcash_params_service() const;
+ exporter_service* get_exporter_service() const;
+
+ void set_qt_app(std::shared_ptr app, QQmlApplicationEngine* qml_engine);
+
void launch();
- //! Bind to the QML Worlds
Q_INVOKABLE static void restart();
- //! Wallet Manager QML API Bindings, this internally call the `atomic_dex::qt_wallet_manager`
+ // Wallet Manager QML API Bindings, this internally call the `atomic_dex::qt_wallet_manager`
Q_INVOKABLE bool is_pin_cfg_enabled() const ;
- //! Misc
Q_INVOKABLE static QString to_eth_checksum_qt(const QString& eth_lowercase_address);
Q_INVOKABLE static void change_state(int visibility);
//! Portfolio QML API Bindings
Q_INVOKABLE QString recover_fund(const QString& uuid);
- //! Others
+ Q_INVOKABLE void reset_coin_cfg();
Q_INVOKABLE void refresh_orders_and_swaps();
Q_INVOKABLE static QString get_mnemonic();
Q_INVOKABLE static bool first_run();
@@ -168,12 +163,14 @@ namespace atomic_dex
Q_INVOKABLE bool enable_coins(const QStringList& coins);
Q_INVOKABLE bool enable_coin(const QString& coin);
Q_INVOKABLE QString get_balance(const QString& coin);
+ Q_INVOKABLE QJsonObject get_zhtlc_status(const QString& coin);
Q_INVOKABLE [[nodiscard]] bool do_i_have_enough_funds(const QString& ticker, const QString& amount) const;
Q_INVOKABLE bool disable_coins(const QStringList& coins);
+ Q_INVOKABLE bool disable_no_balance_coins();
+ Q_INVOKABLE bool has_coins_with_balance();
Q_INVOKABLE QString get_fiat_from_amount(const QString& ticker, const QString& amount);
signals:
- //! Signals to the QML Worlds
void walletMgrChanged();
void coinInfoChanged();
void onWalletDefaultNameChanged();
@@ -182,7 +179,8 @@ namespace atomic_dex
void portfolioPageChanged();
void walletPageChanged();
void ordersChanged();
- void selfUpdateServiceChanged();
+ void updateCheckerServiceChanged();
+ void zcashParamsServiceChanged();
void tradingPageChanged();
void settingsPageChanged();
void internetCheckerChanged();
diff --git a/src/app/main.prerequisites.hpp b/src/app/main.prerequisites.hpp
index fd1bfc532c..1cf9cc9d09 100644
--- a/src/app/main.prerequisites.hpp
+++ b/src/app/main.prerequisites.hpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright © 2013-2021 The Komodo Platform Developers. *
+ * Copyright © 2013-2023 The Komodo Platform Developers. *
* *
* See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at *
* the top-level directory of this distribution for the individual copyright *
@@ -57,10 +57,11 @@
//! Project Headers
#include "app.hpp"
#include "atomicdex/constants/qt.wallet.enums.hpp"
+#include "atomicdex/constants/dex.constants.hpp"
#include "atomicdex/models/qt.portfolio.model.hpp"
#include "atomicdex/utilities/kill.hpp"
#include "atomicdex/utilities/qt.utilities.hpp"
-
+#include "atomicdex/filesystem.qml.hpp"
#include "atomicdex/utilities/log.prerequisites.hpp"
#ifdef __APPLE__
@@ -104,7 +105,7 @@ static void
signal_handler(int signal)
{
SPDLOG_ERROR("sigabort received, cleaning mm2");
- atomic_dex::kill_executable("mm2");
+ atomic_dex::kill_executable(atomic_dex::g_dex_api);
#if defined(linux) || defined(__APPLE__)
boost::stacktrace::safe_dump_to("./backtrace.dump");
std::ifstream ifs("./backtrace.dump");
@@ -119,7 +120,7 @@ connect_signals_handler()
{
SPDLOG_INFO("connecting signal SIGABRT to the signal handler");
#if defined(linux) || defined(__APPLE__)
- if (fs::exists("./backtrace.dump"))
+ if (std::filesystem::exists("./backtrace.dump"))
{
// there is a backtrace
std::ifstream ifs("./backtrace.dump");
@@ -129,7 +130,7 @@ connect_signals_handler()
// cleaning up
ifs.close();
- fs::remove("./backtrace.dump");
+ std::filesystem::remove("./backtrace.dump");
}
#endif
std::signal(SIGABRT, &signal_handler);
@@ -158,20 +159,37 @@ static void
clean_previous_run()
{
SPDLOG_INFO("cleaning previous mm2 instance");
- atomic_dex::kill_executable("mm2");
+ atomic_dex::kill_executable(atomic_dex::g_dex_api);
}
-static void
-init_logging()
+static void init_logging()
{
- auto logger = atomic_dex::utils::register_logger();
- if (spdlog::get("log_mt") == nullptr)
- {
- spdlog::register_logger(logger);
- spdlog::set_default_logger(logger);
- spdlog::set_level(spdlog::level::trace);
- spdlog::set_pattern("[%T] [%^%l%$] [%s:%#] [%t]: %v");
- }
+ constexpr size_t qsize_spdlog = 10240;
+ constexpr size_t spdlog_thread_count = 2;
+ constexpr size_t spdlog_max_file_size = 7777777;
+ constexpr size_t spdlog_max_file_rotation = 3;
+
+ std::filesystem::path path = atomic_dex::utils::get_atomic_dex_current_log_file();
+ spdlog::init_thread_pool(qsize_spdlog, spdlog_thread_count);
+ auto tp = spdlog::thread_pool();
+ auto stdout_sink = std::make_shared();
+
+#if defined(_WIN32) || defined(WIN32)
+ auto rotating_sink = std::make_shared(path.wstring(), spdlog_max_file_size, spdlog_max_file_rotation);
+#else
+ auto rotating_sink = std::make_shared(path.string(), spdlog_max_file_size, spdlog_max_file_rotation);
+#endif
+
+#if defined(DEBUG) || defined(_WIN32) || defined(WIN32)
+ std::vector sinks{stdout_sink, rotating_sink};
+#else
+ std::vector sinks{rotating_sink};
+#endif
+ auto logger = std::make_shared("log_mt", sinks.begin(), sinks.end(), tp, spdlog::async_overflow_policy::block);
+ spdlog::register_logger(logger);
+ spdlog::set_default_logger(logger);
+ spdlog::set_level(spdlog::level::trace);
+ spdlog::set_pattern("[%T] [%^%l%$] [%s:%#] [%t]: %v");
}
static void
@@ -224,7 +242,7 @@ init_timezone_db()
try
{
using namespace std::string_literals;
- auto install_db_tz_path = std::make_unique(ag::core::assets_real_path() / "tools" / "timezone" / "tzdata");
+ auto install_db_tz_path = std::make_unique(ag::core::assets_real_path() / "tools" / "timezone" / "tzdata");
date::set_install(install_db_tz_path->string());
SPDLOG_INFO("Timezone db successfully initialized");
}
@@ -238,54 +256,49 @@ init_timezone_db()
static void
setup_default_themes()
{
- const fs::path theme_path = atomic_dex::utils::get_themes_path();
- fs::path original_theme_path{ag::core::assets_real_path() / "themes"};
- fs_error_code ec;
+ const std::filesystem::path theme_path = atomic_dex::utils::get_themes_path();
+ std::filesystem::path original_theme_path{ag::core::assets_real_path() / "themes"};
+ std::error_code ec;
LOG_PATH_CMP("Checking for setup default themes - theme_path: {} original_theme_path: {}", theme_path, original_theme_path);
- if (fs::is_empty(theme_path, ec))
- {
- LOG_PATH("{} is empty, copying default themes into this directory", theme_path);
- fs::copy(original_theme_path, theme_path, ec);
- }
+ LOG_PATH("copying default themes into directory: {}", theme_path);
+ //std::filesystem::remove_all(theme_path);
+ std::filesystem::copy(original_theme_path, theme_path, std::filesystem::copy_options::recursive | std::filesystem::copy_options::overwrite_existing, ec);
if (ec)
{
- SPDLOG_ERROR("fs::error: {}", ec.message());
+ SPDLOG_ERROR("std::filesystem::error: {}", ec.message());
}
ec.clear();
//! Logo
{
- const fs::path logo_path = atomic_dex::utils::get_logo_path();
- fs::path original_logo_path{ag::core::assets_real_path() / "logo"};
+ const std::filesystem::path logo_path = atomic_dex::utils::get_logo_path();
+ std::filesystem::path original_logo_path{ag::core::assets_real_path() / "logo"};
LOG_PATH_CMP("Checking for setup default logo - logo_path: {} original_logo_path: {}", logo_path, original_logo_path);
-
- if (fs::is_empty(logo_path, ec))
- {
- LOG_PATH("{} is empty, copying default logo into this directory", logo_path);
- fs::copy(original_logo_path, logo_path, ec);
- }
+ //std::filesystem::remove_all(logo_path);
+ std::filesystem::copy(original_logo_path, logo_path, std::filesystem::copy_options::recursive | std::filesystem::copy_options::overwrite_existing, ec);
+ LOG_PATH("copying default logo into directory: {}", logo_path);
if (ec)
{
- SPDLOG_ERROR("fs::error: {}", ec.message());
+ SPDLOG_ERROR("std::filesystem::error: {}", ec.message());
}
}
}
static void
-check_settings_reconfiguration(const fs::path& path)
+check_settings_reconfiguration(const std::filesystem::path& path)
{
SPDLOG_INFO("Checking for settings ini reconfiguration");
using namespace atomic_dex::utils;
using namespace atomic_dex;
- const fs::path previous_path = get_atomic_dex_data_folder() / get_precedent_raw_version() / "configs" / "cfg.ini";
- if (fs::exists(previous_path) && !fs::exists(path))
+ const std::filesystem::path previous_path = get_atomic_dex_data_folder() / get_precedent_raw_version() / "configs" / "cfg.ini";
+ if (std::filesystem::exists(previous_path) && !std::filesystem::exists(path))
{
- fs_error_code ec;
+ std::error_code ec;
LOG_PATH_CMP("Copying {} to {}", previous_path, path);
- fs::copy(previous_path, path, ec);
+ std::filesystem::copy(previous_path, path, ec);
if (ec)
{
SPDLOG_ERROR("error occured when copying previous cfg.ini : {}", ec.message());
@@ -293,7 +306,7 @@ check_settings_reconfiguration(const fs::path& path)
SPDLOG_INFO("Deleting previous cfg after reconfiguring it");
ec.clear();
- fs::remove_all(get_atomic_dex_data_folder() / get_precedent_raw_version(), ec);
+ std::filesystem::remove_all(get_atomic_dex_data_folder() / get_precedent_raw_version(), ec);
if (ec)
{
SPDLOG_ERROR("error occured when deleting previous path");
@@ -318,19 +331,22 @@ handle_settings(QSettings& settings)
}
};
SPDLOG_INFO("file name settings: {}", settings.fileName().toStdString());
- create_settings_functor("CurrentTheme", QString("Dark.json"));
+ create_settings_functor("CurrentTheme", QString("Default - Dark"));
#if defined(_WIN32) || defined(WIN32)
create_settings_functor("ThemePath", QString::fromStdWString(atomic_dex::utils::get_themes_path().wstring()));
#else
create_settings_functor("ThemePath", QString::fromStdString(atomic_dex::utils::get_themes_path().string()));
#endif
+ using namespace std::chrono;
+ int timestamp = duration_cast(system_clock::now().time_since_epoch()).count() - 86400 * 2;
create_settings_functor("AutomaticUpdateOrderBot", QVariant(false));
create_settings_functor("WalletChartsCategory", qint32(WalletChartsCategories::OneMonth));
- create_settings_functor("AvailableLang", QStringList{"en", "fr", "tr", "ru"});
+ create_settings_functor("AvailableLang", QStringList{"en", "es", "fr", "de", "tr", "ru"});
create_settings_functor("CurrentLang", QString("en"));
create_settings_functor("2FA", 0);
create_settings_functor("MaximumNbCoinsEnabled", 50);
+ create_settings_functor("PirateSyncDate", timestamp);
create_settings_functor("DefaultTradingMode", TradingMode::Simple);
create_settings_functor("FontMode", QQuickWindow::TextRenderType::QtTextRendering);
}
@@ -339,10 +355,10 @@ inline int
run_app(int argc, char** argv)
{
#if !defined(ATOMICDEX_HOT_RELOAD)
- SPDLOG_INFO("Installing qt_message_handler");
+ SPDLOG_DEBUG("Installing qt_message_handler");
qInstallMessageHandler(&qt_message_handler);
#endif
- SPDLOG_INFO(
+ SPDLOG_DEBUG(
"SSL: {} {} {}", QSslSocket::supportsSsl(), QSslSocket::sslLibraryBuildVersionString().toStdString(),
QSslSocket::sslLibraryVersionString().toStdString());
@@ -351,11 +367,11 @@ run_app(int argc, char** argv)
qputenv("QT_ENABLE_GLYPH_CACHE_WORKAROUND", "1");
qputenv("QML_USE_GLYPHCACHE_WORKAROUND", "1");
- fs::path old_path = fs::path(std::getenv("HOME")) / ".atomic_qt";
- fs::path target_path = atomic_dex::utils::get_atomic_dex_data_folder();
- SPDLOG_INFO("{} exists -> {}", old_path.string(), fs::exists(old_path));
- SPDLOG_INFO("{} exists -> {}", target_path.string(), fs::exists(target_path));
- if (fs::exists(old_path) && !fs::exists(target_path))
+ std::filesystem::path old_path = std::filesystem::path(std::getenv("HOME")) / ".atomic_qt";
+ std::filesystem::path target_path = atomic_dex::utils::get_atomic_dex_data_folder();
+ SPDLOG_INFO("{} exists -> {}", old_path.string(), std::filesystem::exists(old_path));
+ SPDLOG_INFO("{} exists -> {}", target_path.string(), std::filesystem::exists(target_path));
+ if (std::filesystem::exists(old_path) && !std::filesystem::exists(target_path))
{
SPDLOG_INFO("Renaming: {} to {}", old_path.string(), target_path.string());
QDir dir;
@@ -373,7 +389,7 @@ run_app(int argc, char** argv)
init_sodium();
clean_previous_run();
setup_default_themes();
- fs::path settings_path = (atomic_dex::utils::get_current_configs_path() / "cfg.ini");
+ std::filesystem::path settings_path = (atomic_dex::utils::get_current_configs_path() / "cfg.ini");
check_settings_reconfiguration(settings_path);
init_dpi();
@@ -387,13 +403,14 @@ run_app(int argc, char** argv)
//! Qt utilities declaration.
atomic_dex::qt_utilities qt_utilities;
+ atomic_dex::filesystem qml_filesystem;
//! QT
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
QtWebEngine::initialize();
std::shared_ptr app = std::make_shared(argc, argv);
- app->setWindowIcon(QIcon(":/atomic_defi_design/assets/images/logo/dex-logo.png"));
+ app->setWindowIcon(QIcon(":/assets/images/logo/dex-logo.png"));
app->setOrganizationName("KomodoPlatform");
app->setOrganizationDomain("com");
QQmlApplicationEngine engine;
@@ -441,6 +458,7 @@ run_app(int argc, char** argv)
engine.rootContext()->setContextProperty("atomic_settings", &settings);
engine.rootContext()->setContextProperty("dex_current_version", QString::fromStdString(atomic_dex::get_version()));
engine.rootContext()->setContextProperty("qtversion", QString(qVersion()));
+ engine.rootContext()->setContextProperty("DexFilesystem", &qml_filesystem);
SPDLOG_INFO("QML context properties created");
// Load Qaterial.
@@ -450,11 +468,13 @@ run_app(int argc, char** argv)
// SPDLOG_INFO("{}", QQuickStyle::ge))
SPDLOG_INFO("Qaterial type created");
- engine.addImportPath("qrc:/atomic_defi_design/imports");
- engine.addImportPath("qrc:/atomic_defi_design/Constants");
- qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/General.qml"), "App", 1, 0, "General");
- qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/Style.qml"), "App", 1, 0, "Style");
- qmlRegisterSingletonType(QUrl("qrc:/atomic_defi_design/qml/Constants/API.qml"), "App", 1, 0, "API");
+ engine.addImportPath("qrc:/imports");
+ engine.addImportPath("qrc:/Constants");
+ qmlRegisterSingletonType(QUrl("qrc:/Dex/Constants/DexTheme.qml"), "App", 1, 0, "DexTheme");
+ qmlRegisterSingletonType(QUrl("qrc:/Dex/Constants/DexTypo.qml"), "App", 1, 0, "DexTypo");
+ qmlRegisterSingletonType(QUrl("qrc:/Dex/Constants/General.qml"), "App", 1, 0, "General");
+ qmlRegisterSingletonType(QUrl("qrc:/Dex/Constants/Style.qml"), "App", 1, 0, "Style");
+ qmlRegisterSingletonType(QUrl("qrc:/Dex/Constants/API.qml"), "App", 1, 0, "API");
qRegisterMetaType("PortfolioRoles");
SPDLOG_INFO("QML singleton created");
@@ -471,7 +491,7 @@ run_app(int argc, char** argv)
#else
SPDLOG_INFO("Load qml engine");
engine.rootContext()->setContextProperty("debug_bar", QVariant(false));
- const QUrl url(QStringLiteral("qrc:/atomic_defi_design/qml/main.qml"));
+ const QUrl url(QStringLiteral("qrc:/Dex/main.qml"));
QObject::connect(
&engine, &QQmlApplicationEngine::objectCreated, app.get(),
[url](QObject* obj, const QUrl& objUrl)
diff --git a/src/core/atomicdex/api/api.call.hpp b/src/core/atomicdex/api/api.call.hpp
new file mode 100644
index 0000000000..9f824ed8cc
--- /dev/null
+++ b/src/core/atomicdex/api/api.call.hpp
@@ -0,0 +1,28 @@
+/******************************************************************************
+ * Copyright © 2013-2022 The Komodo Platform Developers. *
+ * *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at *
+ * the top-level directory of this distribution for the individual copyright *
+ * holder information and the developer policies on copyright and licensing. *
+ * *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the *
+ * Komodo Platform software, including this file may be copied, modified, *
+ * propagated or distributed except according to the terms contained in the *
+ * LICENSE file *
+ * *
+ * Removal or modification of this copyright notice is prohibited. *
+ * *
+ ******************************************************************************/
+
+#pragma once
+
+namespace atomic_dex
+{
+ template
+ concept api_call = requires(T t)
+ {
+ T::endpoint || t.endpoint;
+ typename T::expected_request_type; t.request;
+ typename T::expected_answer_type; t.answer;
+ };
+}
\ No newline at end of file
diff --git a/src/core/atomicdex/api/coingecko/coingecko.cpp b/src/core/atomicdex/api/coingecko/coingecko.cpp
index fff54a825f..673a9253cb 100644
--- a/src/core/atomicdex/api/coingecko/coingecko.cpp
+++ b/src/core/atomicdex/api/coingecko/coingecko.cpp
@@ -15,15 +15,16 @@
namespace
{
//! Constants
- constexpr const char* g_coingecko_endpoint = "https://api.coingecko.com/api/v3";
- constexpr const char* g_coingecko_base_uri{"/coins/markets"};
- web::http::client::http_client_config g_cfg{[]() {
- web::http::client::http_client_config cfg;
- cfg.set_validate_certificates(false);
- cfg.set_timeout(std::chrono::seconds(30));
- return cfg;
- }()};
- t_http_client_ptr g_coingecko_client = std::make_unique(FROM_STD_STR(g_coingecko_endpoint), g_cfg);
+ constexpr const char* g_coingecko_endpoint = "https://api.coingecko.com/api/v3";
+ constexpr const char* g_coingecko_base_uri{"/coins/markets"};
+ web::http::client::http_client_config g_cfg{[]()
+ {
+ web::http::client::http_client_config cfg;
+ cfg.set_validate_certificates(false);
+ cfg.set_timeout(std::chrono::seconds(30));
+ return cfg;
+ }()};
+ t_http_client_ptr g_coingecko_client = std::make_unique(FROM_STD_STR(g_coingecko_endpoint), g_cfg);
} // namespace
@@ -58,7 +59,8 @@ namespace atomic_dex::coingecko::api
uri.append("&ids=");
using ranges::views::ints;
using ranges::views::zip;
- auto fill_list_functor = [](auto&& container, auto& uri) {
+ auto fill_list_functor = [](auto&& container, auto& uri)
+ {
for (auto&& [cur_quote, idx]: zip(container, ints(0u, ranges::unreachable)))
{
uri.append(cur_quote);
@@ -71,7 +73,8 @@ namespace atomic_dex::coingecko::api
}
};
- auto fill_single_field_functor = [&uri](const std::string& field_name, auto&& value) {
+ auto fill_single_field_functor = [&uri](const std::string& field_name, auto&& value)
+ {
uri.append(field_name);
if constexpr (std::is_same_v>>)
{
@@ -124,13 +127,34 @@ namespace atomic_dex::coingecko::api
void
from_json(const nlohmann::json& j, single_infos_answer& answer)
{
- answer.current_price = std::to_string(j.at("current_price").get());
+ if (!j.at("current_price").is_null())
+ {
+ answer.current_price = std::to_string(j.at("current_price").get());
+ }
+ else
+ {
+ answer.current_price = "0";
+ }
boost::algorithm::replace_all(answer.current_price, ",", ".");
- answer.total_volume = std::to_string(j.at("total_volume").get());
+ if (!j.at("total_volume").is_null())
+ {
+ answer.total_volume = std::to_string(j.at("total_volume").get());
+ }
+ else
+ {
+ answer.total_volume = "0";
+ }
boost::algorithm::replace_all(answer.total_volume, ",", ".");
- std::ostringstream ss;
- ss << std::setprecision(2) << j.at("price_change_percentage_24h").get();
- answer.price_change_24h = ss.str();
+ if (!j.at("price_change_percentage_24h").is_null())
+ {
+ std::ostringstream ss;
+ ss << std::setprecision(2) << j.at("price_change_percentage_24h").get();
+ answer.price_change_24h = ss.str();
+ }
+ else
+ {
+ answer.price_change_24h = "0";
+ }
boost::algorithm::replace_all(answer.price_change_24h, ",", ".");
j.at("sparkline_in_7d").at("price").get_to(answer.sparkline_in_7d);
}
@@ -147,7 +171,7 @@ namespace atomic_dex::coingecko::api
}
catch (const std::exception& error)
{
- // SPDLOG_ERROR("Error when treating coingecko answer: {} - error: {}", cur_json_obj.dump(1), error.what());
+ SPDLOG_ERROR("Error when treating coingecko answer: {} - error: {}", cur_json_obj.dump(1), error.what());
}
}
}
diff --git a/src/core/atomicdex/api/faucet/faucet.cpp b/src/core/atomicdex/api/faucet/faucet.cpp
index 2fb699ceb1..06e2e44cb3 100644
--- a/src/core/atomicdex/api/faucet/faucet.cpp
+++ b/src/core/atomicdex/api/faucet/faucet.cpp
@@ -23,7 +23,7 @@
namespace
{
- constexpr const char* g_faucet_api_endpoint = "https://faucet.komodo.live/faucet/";
+ constexpr const char* g_faucet_api_endpoint = "https://faucet.komodo.earth/faucet/";
const auto g_faucet_api_client = std::make_unique(FROM_STD_STR(g_faucet_api_endpoint));
} // namespace
diff --git a/src/core/atomicdex/api/github/github.api.cpp b/src/core/atomicdex/api/github/github.api.cpp
deleted file mode 100644
index 81da7421fb..0000000000
--- a/src/core/atomicdex/api/github/github.api.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//! 3rdParty
-#include
-
-//! Project
-#include "github.api.hpp"
-
-namespace atomic_dex::github_api
-{
- const std::string api_remote_url{"https://api.github.com/"};
- const auto api_client = std::make_unique(FROM_STD_STR(api_remote_url));
- const std::string github_url{"https://github.com/"};
- const auto github_client = std::make_unique(FROM_STD_STR(github_url));
-
- pplx::task get_repository_releases_async(const repository_releases_request& request)
- {
- web::http::http_request http_request;
- web::uri_builder uri_builder;
-
- uri_builder.append_path(FROM_STD_STR("repos"));
- uri_builder.append_path(FROM_STD_STR(request.owner));
- uri_builder.append_path(FROM_STD_STR(request.repository));
- uri_builder.append_path(FROM_STD_STR("releases"));
- http_request.set_request_uri(uri_builder.to_uri());
- http_request.set_method(web::http::methods::GET);
- return api_client->request(http_request);
- }
-
- // Returns the asset element of the release which corresponds to your OS.
- const auto get_matching_os_asset = [](const nlohmann::json& answer)
- {
- for (auto& asset : answer.at("assets"))
- {
- std::string asset_download_url = asset.at("browser_download_url");
-
- if (asset_download_url.find(
-#ifdef __APPLE__
- "osx.dmg"
-#elif __linux__
- "linux.AppImage"
-#elif _WIN32
- "windows.zip"
-#endif
- ) != std::string::npos)
- {
- return asset;
- }
- }
- throw std::runtime_error("get_repository_releases_from_http_response: Cannot found a proper download url.");
- };
-
- std::vector get_repository_releases_from_http_response(const web::http::http_response& resp)
- {
- std::vector result{};
- const auto json_answer = nlohmann::json::parse(TO_STD_STR(resp.extract_string(true).get()));
-
- result.reserve(json_answer.size());
- for (auto& release_obj : json_answer)
- {
- const auto asset = get_matching_os_asset(release_obj);
-
- result.push_back(repository_release{
- .url = asset.at("browser_download_url"),
- .assets_url = release_obj.at("assets_url"),
- .name = asset.at("name"),
- .tag_name = release_obj.at("tag_name")});
- }
- return result;
- }
-
- repository_release get_last_repository_release_from_http_response(const web::http::http_response& resp)
- {
- const std::string string_answer = TO_STD_STR(resp.extract_string(true).get());
- const auto json_answer = nlohmann::json::parse(string_answer);
-
- if (json_answer.empty())
- {
- return repository_release{};
- }
-
- const auto asset = get_matching_os_asset(json_answer.at(0));
-
- return repository_release{.url = asset.at("browser_download_url"), .assets_url = json_answer.at(0).at("assets_url"),
- .name = asset.at("name"), .tag_name = json_answer.at(0).at("tag_name")};
- }
-}
diff --git a/src/core/atomicdex/api/github/github.api.hpp b/src/core/atomicdex/api/github/github.api.hpp
deleted file mode 100644
index 67e71fad2d..0000000000
--- a/src/core/atomicdex/api/github/github.api.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-//! Std
-#include //> std::string
-#include //> std::vector
-
-//! Project
-#include "atomicdex/utilities/cpprestsdk.utilities.hpp"
-
-namespace atomic_dex::github_api
-{
- // Request sent to fetch a GitHub repository's releases.
- struct repository_releases_request
- {
- std::string owner;
- std::string repository;
- };
-
- // Sends a request to GitHub to fetch every existing release of a valid repository.
- [[nodiscard]] pplx::task get_repository_releases_async(const repository_releases_request& request);
-
- // GitHub repository release information.
- struct repository_release
- {
- std::string url;
- std::string assets_url;
- std::string name;
- std::string tag_name;
- };
-
- // Parses the http response returned by `get_repository_releases_async`. Be careful, resp must have returned 200.
- [[nodiscard]] std::vector get_repository_releases_from_http_response(const web::http::http_response& resp);
-
- // Parses only the first release returned by `get_repository_releases_async`. Be careful, resp must have returned 200.
- [[nodiscard]] repository_release get_last_repository_release_from_http_response(const web::http::http_response& resp);
-
- struct download_repository_release_request
- {
- std::string owner;
- std::string repository;
- std::string tag_name;
- std::string name;
- };
-}
diff --git a/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp b/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp
new file mode 100644
index 0000000000..f0616ad4d6
--- /dev/null
+++ b/src/core/atomicdex/api/komodo_prices/komodo.prices.cpp
@@ -0,0 +1,82 @@
+//
+// Created by Sztergbaum Roman on 09/09/2021.
+//
+
+//! Deps
+#include
+
+//! Project Headers
+#include "atomicdex/api/komodo_prices/komodo.prices.hpp"
+
+namespace
+{
+ constexpr const char* g_komodo_prices_endpoint = "https://prices.komodo.earth";
+ constexpr const char* g_komodo_prices_endpoint_fallback = "https://prices.cipig.net:1717";
+
+ web::http::client::http_client_config g_komodo_prices_cfg{[]()
+ {
+ web::http::client::http_client_config cfg;
+ cfg.set_validate_certificates(false);
+ cfg.set_timeout(std::chrono::seconds(30));
+ return cfg;
+ }()};
+ t_http_client_ptr g_komodo_prices_client = std::make_unique(FROM_STD_STR(g_komodo_prices_endpoint), g_komodo_prices_cfg);
+ t_http_client_ptr g_komodo_prices_client_fallback = std::make_unique(FROM_STD_STR(g_komodo_prices_endpoint_fallback), g_komodo_prices_cfg);
+} // namespace
+
+namespace atomic_dex::komodo_prices::api
+{
+ void
+ from_json(const nlohmann::json& j, komodo_ticker_infos& x)
+ {
+ x.ticker = j.at("ticker").get();
+ x.last_price = j.at("last_price").get();
+ x.last_updated = j.at("last_updated").get();
+ x.last_updated_timestamp = j.at("last_updated_timestamp").get();
+ x.volume24_h = j.at("volume24h").get();
+ x.price_provider = j.at("price_provider").get();
+ x.volume_provider = j.at("volume_provider").get
+
+
+
+
+ 
