Merge pull request #2132 from KomodoPlatform/fix_ts

Confirm modal translations
KomodoPlatform · Dec 4, 2022 · 5511d63 · 5511d63
2 parents 530b4cf + 4cbf9ff
commit 5511d63
Show file tree

Hide file tree

Showing 9 changed files with 659 additions and 790 deletions.
diff --git a/atomic_defi_design/Dex/Components/DexCheckBox.qml b/atomic_defi_design/Dex/Components/DexCheckBox.qml
@@ -53,7 +53,6 @@ CheckBox
     {
         id: _content
         Layout.alignment: Qt.AlignVCenter
-        Layout.preferredWidth: labelWidth
         height: _label.height
         spacing: 0
 
@@ -63,8 +62,6 @@ CheckBox
             text: control.text
             font: control.font
             color: control.textColor
-            Layout.alignment: Qt.AlignVCenter
-            Layout.fillWidth: true
             verticalAlignment: Text.AlignVCenter
             leftPadding: control.indicator.width + control.spacing
             wrapMode: Label.Wrap

diff --git a/atomic_defi_design/Dex/Constants/General.qml b/atomic_defi_design/Dex/Constants/General.qml
@@ -374,16 +374,10 @@ QtObject {
     }
 
     function getFeesDetailText(feetype, amount, ticker) {
-        return qsTr("%1 %2 %3 (%4)"
-            ).arg(
-                feetype
-            ).arg(
-                formatDouble(amount, 8, false)
-            ).arg(
-                ticker
-            ).arg(
-                General.getFiatText(amount, ticker, false)
-            )
+        if ([feetype, amount, ticker].includes(undefined)) return ""
+        let fiat_text = General.getFiatText(amount, ticker, false)
+        amount = formatDouble(amount, 8, false).toString()
+        return feetype + " " + amount + " " + ticker + " (" + fiat_text + ")"
     }
 
     function getSimpleFromPlaceholder(selectedTicker, selectedOrder, sell_ticker_balance) {

diff --git a/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml b/atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml
@@ -73,12 +73,12 @@ MultipageModal
                 Layout.fillWidth: true
                 Layout.alignment: Qt.AlignHCenter
 
-                // Large margin Warning
+                // Large margin warning
                 FloatingBackground
                 {
                     Layout.alignment: Qt.AlignCenter
-                    width: 425
-                    height: 30
+                    width: childrenRect.width
+                    height: childrenRect.height
                     color: Style.colorRed2
                     visible: Math.abs(parseFloat(API.app.trading_pg.cex_price_diff)) >= 50
 
@@ -95,14 +95,12 @@ MultipageModal
                             textColor: Style.colorWhite0
                             visible:  Math.abs(parseFloat(API.app.trading_pg.cex_price_diff)) >= 50
                             spacing: 2
-                            boxWidth: 20
-                            boxHeight: 20
-                            labelWidth: 400
+                            boxWidth: 16
+                            boxHeight: 16
                             label.wrapMode: Label.NoWrap
                             text: qsTr("Trade price is more than 50% different to CEX! Confirm?")
+                            font: DexTypo.caption
                         }
-
-                        Item { width: 3 }
                     }
                 }
 
@@ -200,7 +198,7 @@ MultipageModal
 
                     Repeater
                     {
-                        model: root.fees.hasOwnProperty('base_transaction_fees_ticker') ? root.fees.total_fees : []
+                        model: root.fees.hasOwnProperty('base_transaction_fees_ticker')  && !API.app.trading_pg.preimage_rpc_busy ? root.fees.total_fees : []
                         delegate: DefaultText
                         {
                             text: General.getFeesDetailText(

diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts
diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts
diff --git a/atomic_defi_design/assets/languages/atomic_defi_es.ts b/atomic_defi_design/assets/languages/atomic_defi_es.ts
diff --git a/atomic_defi_design/assets/languages/atomic_defi_fr.ts b/atomic_defi_design/assets/languages/atomic_defi_fr.ts
diff --git a/atomic_defi_design/assets/languages/atomic_defi_ru.ts b/atomic_defi_design/assets/languages/atomic_defi_ru.ts
diff --git a/atomic_defi_design/assets/languages/atomic_defi_tr.ts b/atomic_defi_design/assets/languages/atomic_defi_tr.ts