Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into nogeo
Browse files Browse the repository at this point in the history
  • Loading branch information
cipig committed Nov 23, 2021
2 parents c1793e9 + eed4fec commit d5695bd
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 0 deletions.
26 changes: 26 additions & 0 deletions assets/config/0.5.3-coins.json
Original file line number Diff line number Diff line change
Expand Up @@ -1863,6 +1863,32 @@
"explorer_tx_url": "transaction/",
"type": "UTXO"
},
"DUST": {
"coin": "DUST",
"name": "Dragonfairy",
"coinpaprika_id": "test-coin",
"coingecko_id": "test-coin",
"electrum": [
{
"url": "51.222.85.227:10001",
"ws_url": "51.222.85.227:9001"
},
{
"url": "78.141.233.64:10001",
"ws_url": "78.141.233.64:9001"
},
{
"url": "192.248.166.207:10001",
"ws_url": "192.248.166.207:9001"
}
],
"explorer_url": [
"http://dragonfairy.gives/"
],
"type": "Smart Chain",
"active": false,
"currently_enabled": false
},
"DGB": {
"active": false,
"coin": "DGB",
Expand Down
1 change: 1 addition & 0 deletions atomic_defi_design/Dex/Constants/Style.qml
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ QtObject {
"CRV": "#517AB5",
"DGC": "#BC7600",
"DIMI": "#0BFBE2",
"DUST": "#6A032F",
"EOS": "#4D4D4D",
"FET": "#202944",
"FTC": "#FFFFFF",
Expand Down
Binary file added atomic_defi_design/assets/images/coins/dust.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions atomic_defi_design/qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<file>assets/images/coins/doge.png</file>
<file>assets/images/coins/dot.png</file>
<file>assets/images/coins/dp.png</file>
<file>assets/images/coins/dust.png</file>
<file>assets/images/coins/dx.png</file>
<file>assets/images/coins/eca.png</file>
<file>assets/images/coins/efl.png</file>
Expand Down

0 comments on commit d5695bd

Please sign in to comment.