Skip to content

Commit

Permalink
Merge pull request #480 from KomodoPlatform/0_3_0_rc_fix
Browse files Browse the repository at this point in the history 
subject(rc): rc #1 fixes
  • Loading branch information
@Milerius
Milerius authored Oct 2, 2020
2 parents 60b1e1b + 3df7a8d commit 9b90b6e
Show file tree
Hide file tree
Showing 16 changed files with 186 additions and 74 deletions.
39 changes: 28 additions & 11 deletions atomic_defi_design/assets/languages/atomic_defi_en.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1134,25 +1134,25 @@
<context>
<name>MultiOrder</name>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="74"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="75"/>
<source>%1 price is zero!</source>
<comment>TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="82"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="83"/>
<source>%1 receive volume is lower than minimum trade amount</source>
<comment>TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="147"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="148"/>
<source>You&apos;ll receive %1</source>
<comment>AMOUNT TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="157"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="158"/>
<source>Price</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -2235,6 +2235,13 @@
<source>How is trading on AtomicDEX different from trading on other DEXs?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="153"/>
<source>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.

AtomicDEX 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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="165"/>
<source>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.</source>
Expand All @@ -2245,6 +2252,16 @@
<source>How are the fees on AtomicDEX calculated?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="170"/>
<source>There are two fee categories to consider when trading on AtomicDEX.

1. AtomicDEX 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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="180"/>
<source>Yes! AtomicDEX offers support through the &lt;a href=&quot;https://komodoplatform.com/discord&quot;&gt;Komodo Discord server&lt;/a&gt;. The team and the community are always happy to help!</source>
Expand Down Expand Up @@ -2355,40 +2372,40 @@
<context>
<name>Toast</name>
<message>
<location filename="../../qml/Components/Toast.qml" line="53"/>
<location filename="../../qml/Components/Toast.qml" line="51"/>
<source>Click here to see the details</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Trade</name>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="317"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="318"/>
<source>Placed the order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="504"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="505"/>
<source>Multi-Order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="520"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="521"/>
<source>Select additional assets for multi-order creation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="529"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="530"/>
<source>Same funds will be used until an order matches.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="534"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="535"/>
<source>Submit Trade</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="308"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="309"/>
<source>Failed to place the order</source>
<translation type="unfinished"></translation>
</message>
Expand Down
39 changes: 28 additions & 11 deletions atomic_defi_design/assets/languages/atomic_defi_fr.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1169,25 +1169,25 @@
<context>
<name>MultiOrder</name>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="74"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="75"/>
<source>%1 price is zero!</source>
<comment>TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="82"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="83"/>
<source>%1 receive volume is lower than minimum trade amount</source>
<comment>TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="147"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="148"/>
<source>You&apos;ll receive %1</source>
<comment>AMOUNT TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="157"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="158"/>
<source>Price</source>
<translation type="unfinished">Prix</translation>
</message>
Expand Down Expand Up @@ -2482,6 +2482,13 @@
<source>How is trading on AtomicDEX different from trading on other DEXs?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="153"/>
<source>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.

AtomicDEX 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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="165"/>
<source>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.</source>
Expand All @@ -2492,6 +2499,16 @@
<source>How are the fees on AtomicDEX calculated?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="170"/>
<source>There are two fee categories to consider when trading on AtomicDEX.

1. AtomicDEX 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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="180"/>
<source>Yes! AtomicDEX offers support through the &lt;a href=&quot;https://komodoplatform.com/discord&quot;&gt;Komodo Discord server&lt;/a&gt;. The team and the community are always happy to help!</source>
Expand Down Expand Up @@ -2609,7 +2626,7 @@
<context>
<name>Toast</name>
<message>
<location filename="../../qml/Components/Toast.qml" line="53"/>
<location filename="../../qml/Components/Toast.qml" line="51"/>
<source>Click here to see the details</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -2633,32 +2650,32 @@
<translation type="vanished">Impossible de placer l&apos;ordre.</translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="317"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="318"/>
<source>Placed the order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="504"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="505"/>
<source>Multi-Order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="520"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="521"/>
<source>Select additional assets for multi-order creation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="529"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="530"/>
<source>Same funds will be used until an order matches.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="534"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="535"/>
<source>Submit Trade</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="308"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="309"/>
<source>Failed to place the order</source>
<translation type="unfinished"></translation>
</message>
Expand Down
39 changes: 28 additions & 11 deletions atomic_defi_design/assets/languages/atomic_defi_tr.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1163,25 +1163,25 @@
<context>
<name>MultiOrder</name>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="74"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="75"/>
<source>%1 price is zero!</source>
<comment>TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="82"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="83"/>
<source>%1 receive volume is lower than minimum trade amount</source>
<comment>TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="147"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="148"/>
<source>You&apos;ll receive %1</source>
<comment>AMOUNT TICKER</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="157"/>
<location filename="../../qml/Exchange/Trade/MultiOrder.qml" line="158"/>
<source>Price</source>
<translation type="unfinished">Fiyat</translation>
</message>
Expand Down Expand Up @@ -2481,6 +2481,13 @@
<source>How is trading on AtomicDEX different from trading on other DEXs?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="153"/>
<source>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.

AtomicDEX 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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="165"/>
<source>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.</source>
Expand All @@ -2491,6 +2498,16 @@
<source>How are the fees on AtomicDEX calculated?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="170"/>
<source>There are two fee categories to consider when trading on AtomicDEX.

1. AtomicDEX 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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Support/Support.qml" line="180"/>
<source>Yes! AtomicDEX offers support through the &lt;a href=&quot;https://komodoplatform.com/discord&quot;&gt;Komodo Discord server&lt;/a&gt;. The team and the community are always happy to help!</source>
Expand Down Expand Up @@ -2608,7 +2625,7 @@
<context>
<name>Toast</name>
<message>
<location filename="../../qml/Components/Toast.qml" line="53"/>
<location filename="../../qml/Components/Toast.qml" line="51"/>
<source>Click here to see the details</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -2628,32 +2645,32 @@
<translation type="vanished">Al-Sat</translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="317"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="318"/>
<source>Placed the order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="504"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="505"/>
<source>Multi-Order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="520"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="521"/>
<source>Select additional assets for multi-order creation.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="529"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="530"/>
<source>Same funds will be used until an order matches.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="534"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="535"/>
<source>Submit Trade</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="308"/>
<location filename="../../qml/Exchange/Trade/Trade.qml" line="309"/>
<source>Failed to place the order</source>
<translation type="unfinished"></translation>
</message>
Expand Down
10 changes: 4 additions & 6 deletions atomic_defi_design/qml/Components/Toast.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ AnimatedRectangle {
animation.start();
}

property bool selfDestroying: false

id: root

readonly property real defaultTime: 2000
Expand All @@ -27,7 +25,7 @@ AnimatedRectangle {
property real margin: 10

anchors {
horizontalCenter: parent.horizontalCenter
horizontalCenter: !parent ? undefined : parent.horizontalCenter
margins: margin
}

Expand Down Expand Up @@ -58,7 +56,7 @@ AnimatedRectangle {
running: false

NumberAnimation {
to: .7
to: .9
duration: fadeTime
}

Expand All @@ -72,7 +70,7 @@ AnimatedRectangle {
}

onRunningChanged: {
if (!running && selfDestroying) root.destroy()
if (!running) toast.model.remove(index)
}
}

Expand All @@ -85,7 +83,7 @@ AnimatedRectangle {
onClicked: {
if(details !== "") {
showError(title, details)
root.visible = false
animation.running = false
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions atomic_defi_design/qml/Exchange/OrderModal.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ BasicModal {
if(!details) root.close()
}

onOpened: swap_progress.updateSimulatedTime()

onClosed: details = undefined

ModalContent {
Expand Down
Loading

0 comments on commit 9b90b6e

Please sign in to comment.