Skip to content

Commit bb5e850

Browse files
satindergrewalsatindergrewal
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents 8c14c10 + 0368fb2 commit bb5e850

File tree

5 files changed

+141
-89
lines changed

5 files changed

+141
-89
lines changed

‎README.md‎

Lines changed: 117 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,57 @@
1-
# [![AtomicDEX](https://i.ibb.co/D5GJLWy/adex.png)](https://atomicdex.io)
1+
<p align="center">
2+
<a href="https://atomicdex.io" alt="AtomicDEX">
3+
<img src="https://user-images.githubusercontent.com/35845239/147651230-827e8c0f-baf0-4f28-8be0-e08624baad37.png" />
4+
</a>
5+
</p>
6+
7+
<p align="center">
8+
<a href="https://github.com/komodoplatform/atomicdex-desktop/graphs/contributors" alt="Contributors">
9+
<img src="https://img.shields.io/github/contributors/komodoplatform/atomicdex-desktop" />
10+
</a>
11+
<a href="https://github.com/komodoplatform/atomicdex-desktop/releases">
12+
<img src="https://img.shields.io/github/downloads/komodoplatform/atomicdex-desktop/total" alt="downloads">
13+
</a>
14+
<a href="https://github.com/komodoplatform/atomicdex-desktop/">
15+
<img src="https://img.shields.io/github/last-commit/komodoplatform/atomicdex-desktop" alt="last commit">
16+
</a>
17+
<a href="https://github.com/komodoplatform/atomicdex-desktop/pulse" alt="Activity">
18+
<img src="https://img.shields.io/github/commit-activity/m/komodoplatform/atomicdex-desktop" />
19+
</a>
20+
<br/>
21+
<a href="https://github.com/komodoplatform/atomicdex-desktop/issues">
22+
<img src="https://img.shields.io/github/issues-raw/komodoplatform/atomicdex-desktop" alt="issues">
23+
</a>
24+
<a href="https://github.com/komodoplatform/atomicdex-desktop/issues?q=is%3Aissue+is%3Aclosed">
25+
<img src="https://img.shields.io/github/issues-closed-raw/komodoplatform/atomicdex-desktop" alt="issues closed">
26+
</a>
27+
<a href="https://github.com/komodoplatform/atomicdex-desktop/pulls">
28+
<img src="https://img.shields.io/github/issues-pr/komodoplatform/atomicdex-desktop" alt="pulls">
29+
</a>
30+
<a href="https://github.com/komodoplatform/atomicdex-desktop/pulls?q=is%3Apr+is%3Aclosed">
31+
<img src="https://img.shields.io/github/issues-pr-closed/komodoplatform/atomicdex-desktop" alt="pulls closed">
32+
</a>
33+
<br/>
34+
<a href="https://github.com/KomodoPlatform/atomicDEX-Desktop/actions">
35+
<img src="https://img.shields.io/github/workflow/status/KomodoPlatform/atomicDEX-Desktop/AtomicDex-Desktop%20CI" alt="build status">
36+
</a>
37+
<a href="https://github.com/KomodoPlatform/atomicdex-desktop/releases">
38+
<img src="https://img.shields.io/github/v/release/komodoplatform/atomicdex-desktop" alt="release version">
39+
</a>
40+
<a href="https://discord.gg/3rzDPAr">
41+
<img src="https://img.shields.io/discord/302123079818149888?logo=discord" alt="chat on Discord">
42+
</a>
43+
<a href="https://twitter.com/intent/follow?screen_name=https://twitter.com/atomicdex">
44+
<img src="https://img.shields.io/twitter/follow/atomicdex?style=social&logo=twitter"
45+
alt="follow on Twitter">
46+
</a>
47+
</p>
248

3-
[![Discord](https://img.shields.io/discord/302123079818149888.svg?style=for-the-badge&logo=discord)](https://discord.gg/tvp96Gf)
4-
[![GitHub license](https://img.shields.io/github/license/KomodoPlatform/atomicDEX-Desktop?style=for-the-badge)](https://raw.githubusercontent.com/KomodoPlatform/atomicDEX-Desktop/master/LICENSE)
5-
[![GitHub All Releases](https://img.shields.io/github/downloads/KomodoPlatform/atomicDEX-Desktop/total?style=for-the-badge)](https://github.com/KomodoPlatform/atomicDEX-Desktop/releases) <br/>
6-
[![Website](https://img.shields.io/website?down_message=offline&style=for-the-badge&up_message=online&url=https%3A%2F%2Fatomicdex.io%2F)](https://atomicdex.io/)
7-
[![GitHub issues](https://img.shields.io/github/issues-raw/KomodoPlatform/atomicDEX-Desktop?style=for-the-badge)](https://github.com/KomodoPlatform/atomicdex-desktop/issues)
8-
[![PRs](https://img.shields.io/github/issues-pr-closed/komodoplatform/atomicdex-desktop?style=for-the-badge)](https://github.com/KomodoPlatform/atomicdex-desktop/pulls) <br/>
9-
[![Commits](https://img.shields.io/github/commit-activity/y/komodoplatform/atomicdex-desktop?style=for-the-badge)](https://github.com/KomodoPlatform/atomicdex-desktop/commits/dev)
10-
[![Contributors](https://img.shields.io/github/contributors/komodoplatform/atomicdex-desktop?style=for-the-badge)](https://github.com/KomodoPlatform/atomicdex-desktop/graphs/contributors)
11-
[![Last Commit](https://img.shields.io/github/last-commit/komodoplatform/atomicdex-desktop/dev?style=for-the-badge)](https://github.com/KomodoPlatform/atomicdex-desktop/graphs/commit-activity) <br/>
12-
[![gitstars](https://img.shields.io/github/stars/KomodoPlatform/atomicDEX-Desktop?style=social)](https://github.com/KomodoPlatform/atomicdex-desktop/stargazers)
13-
[![twitter](https://img.shields.io/twitter/follow/atomicdex?style=social)](https://twitter.com/atomicdex)
14-
15-
[![atomicDEX Gif](https://i.imgur.com/KN4i6XS.gif)](https://atomicdex.io)
16-
17-
## CI/CD status
18-
19-
| CI/CD Names | Status |
20-
|-------------|--------|
21-
| Windows/Linux/macOS | [![GitHub All Releases](https://img.shields.io/github/workflow/status/Komodian/atomicDEX-Desktop-CE/AtomicDex-Desktop%20CI?style=for-the-badge)](https://github.com/Komodian/atomicDEX-Desktop-CE/actions) |
22-
23-
## Useful links
24-
25-
- :book: [AtomicDEX Documentation](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-tutorials/introduction-to-atomicdex.html)
26-
- :link: [AtomicDEX Website](https://atomicdex.io/)
27-
- :speech_balloon: [AtomicDEX Discord](https://discord.gg/tvp96Gf)
28-
- :hammer_and_wrench: [AtomicDEX Development Boards](https://github.com/KomodoPlatform/atomicDEX-Desktop/projects)
29-
- :notebook_with_decorative_cover: [AtomicDex Wiki](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/)
3049

3150
## What is AtomicDEX?
3251

3352
AtomicDEX is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
3453
trade peer-to-peer with minimal fees and never give up control over your digital assets.
3554

36-
## On which platforms can I use AtomicDEX Desktop?
37-
3855
AtomicDEX Desktop has been tested on the following platforms:
3956

4057
- Windows 10
@@ -47,24 +64,25 @@ AtomicDEX Desktop has been tested on the following platforms:
4764
You can [download](https://github.com/KomodoPlatform/atomicDEX-Desktop/releases) the pre-built <b>beta</b> binaries on
4865
our [GitHub release page](https://github.com/KomodoPlatform/atomicDEX-Desktop/releases).
4966

50-
Please join our [Discord Server](https://komodoplatform.com/discord) discussions around AtomicDEX and general UI/UX
67+
Build instructions can be found [here](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/Build-Instructions)
68+
69+
Please join our [Discord Server](https://komodoplatform.com/discord) for support, discussions and general UI/UX
5170
feedback.
5271

53-
## AtomicDEX mobile
5472

55-
Check out AtomicDEX mobile, available
56-
for [Android and iOS](https://atomicdex.io) [![atomicDEX mobile](https://s5.gifyu.com/images/atomicdex_animation_small2.gif)](https://atomicdex.io)
73+
## Useful links
5774

58-
## License
75+
- :book: [AtomicDEX Documentation](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-tutorials/introduction-to-atomicdex.html)
76+
- :link: [AtomicDEX Website](https://atomicdex.io/)
77+
- :speech_balloon: [AtomicDEX Discord](https://discord.gg/tvp96Gf)
78+
- :hammer_and_wrench: [AtomicDEX Development Boards](https://github.com/KomodoPlatform/atomicDEX-Desktop/projects)
79+
- :notebook_with_decorative_cover: [AtomicDex Wiki](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/)
5980

60-
For details please refer to our [license](https://github.com/KomodoPlatform/atomicDEX-Desktop/blob/master/LICENSE).
6181

62-
This is experimental alpha software - use at your own risk!
82+
## AtomicDEX mobile
83+
84+
Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io)
6385

64-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
65-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
66-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
67-
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6886

6987
## Self-Hosted Dependencies
7088

@@ -83,50 +101,64 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
83101
| taskflow | 2.2.0 | Parallel and Heterogeneous Task Programming in Modern C++ | Threading |
84102
| qt | 5.15.2 | Qt is a cross-platform application development framework for desktop, embedded and mobile. | GUI |
85103

86-
## How do I build it ?
87-
88-
Build instructions can be found [here](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/Build-Instructions)
89104

90105
## Contributors / Thanks
106+
107+
<div align="center">
108+
<table>
109+
<tr>
110+
<td align="center">
111+
<a href="https://github.com/Milerius"><img src="https://avatars1.githubusercontent.com/u/21139416?s=400&u=12e0a99353ae95365801542b85e2fd69abd44a81&v=4" width="100px;" alt="Milerius"/><br /><sub><b>Milerius</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=Milerius" title="Lead Back-End Dev / Code">✍️💻</a>
112+
</td>
113+
<td align="center">
114+
<a href="https://github.com/SylEze"><img src="https://avatars1.githubusercontent.com/u/14373103?s=460&u=b303a2d2261008814800c2d7809efc6af685a460&v=4"width="100px;" alt="syl"/><br /><sub><b>syl</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=SylEze" title="Frontend and Back-End Dev / Code">✍️💻</a>
115+
</td>
116+
<td align="center">
117+
<a href="https://github.com/naezith"><img src="https://avatars2.githubusercontent.com/u/6732486?s=400&u=5d242e560be002ad4af597dd284eb3242ab28016&v=4" width="100px;" alt="naezith"/><br /><sub><b>naezith</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=naezith" title="Front-End Dev / Code">✍️💻</a>
118+
</td>
119+
<td align="center">
120+
<a href="https://github.com/ssakone"><img src="https://avatars.githubusercontent.com/u/39985611?v=4" width="100px;" alt="ssakone"/><br /><sub><b>ssakone</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=ssakone" title="Front-End Dev / Code">✍️💻</a>
121+
</td>
122+
</tr>
123+
<tr>
124+
<td align="center">
125+
<a href="https://github.com/tonymorony"><img src="https://avatars3.githubusercontent.com/u/24797699?s=400&u=335984bcb93856f260ac6d139b18f0c596306e08&v=4" width="100px;" alt="Anton TonyL Lysakov"/><br /><sub><b>Anton "TonyL" Lysakov</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=tonymorony" title="Lead QA / CI">🛠💻</a>
126+
</td>
127+
<td align="center">
128+
<a href="https://github.com/ca333"><img src="https://avatars3.githubusercontent.com/u/10762374?s=60&v=4" width="100px;" alt="ca333"/><br /><sub><b>ca333</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=ca333" title="Chief Technology Officer">:penguin: :guardsman:</a>
129+
</td>
130+
<td align="center">
131+
<a href="https://github.com/smk762"><img src="https://i.imgur.com/gAD7BxX.jpg" width="100px;" alt="smk762"/><br /><sub><b>smk762</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=smk762" title="QA Engineer">🛠:wolf:</a>
132+
</td>
133+
<td align="center">
134+
<a href="https://github.com/cipig"><img src="https://avatars0.githubusercontent.com/u/32116761?s=60&v=4" width="100px;" alt="cipig"/><br /><sub><b>cipig</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=cipig" title="System Administrator">✍️💻</a>
135+
</td>
136+
</tr>
137+
<tr>
138+
<td align="center">
139+
<a href="https://github.com/SirSevenG"><img src="https://avatars1.githubusercontent.com/u/44422309?s=60&v=4" width="100px;" alt="SirSevenG"/><br /><sub><b>SirSevenG</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=SirSevenG" title="QA Engineer">🛠💻</a>
140+
</td>
141+
<td align="center">
142+
<a href="https://github.com/dathbezumniy"><img src="https://avatars2.githubusercontent.com/u/11756768?s=60&v=4" width="100px;" alt="dathbezumniy"/><br /><sub><b>dathbezumniy</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=dathbezumniy" title="Junior QA Engineer">🛠💻</a>
143+
</td>
144+
<td align="center">
145+
<a href="https://github.com/BloodyNora"><img src="https://avatars2.githubusercontent.com/u/4005813?s=60&v=4" width="100px;" alt="BloodyNora"/><br /><sub><b>BloodyNora</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=BloodyNora" title="IT allrounder">🛠💻</a>
146+
</td>
147+
<td align="center">
148+
<a href="https://github.com/zatJUM"><img src="https://avatars3.githubusercontent.com/u/45312760?s=60&v=4" width="100px;" alt="zatJUM"/><br /><sub><b>zatJUM</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=zatJUM" title="Community Dev">:heart:💻</a>
149+
</td>
150+
</tr>
151+
</table>
152+
</div>
153+
154+
155+
## License
156+
157+
For details please refer to our [license](https://github.com/KomodoPlatform/atomicDEX-Desktop/blob/master/LICENSE).
158+
159+
This is experimental alpha software - use at your own risk!
91160

92-
<table>
93-
<tr>
94-
<td align="center">
95-
<a href="https://github.com/Milerius"><img src="https://avatars1.githubusercontent.com/u/21139416?s=400&u=12e0a99353ae95365801542b85e2fd69abd44a81&v=4" width="100px;" alt="Milerius"/><br /><sub><b>Milerius</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=Milerius" title="Lead Back-End Dev / Code">✍️💻</a>
96-
</td>
97-
<td align="center">
98-
<a href="https://github.com/naezith"><img src="https://avatars2.githubusercontent.com/u/6732486?s=400&u=5d242e560be002ad4af597dd284eb3242ab28016&v=4" width="100px;" alt="naezith"/><br /><sub><b>naezith</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=naezith" title="Lead Front-End Dev / Code">✍️💻</a>
99-
</td>
100-
<td align="center">
101-
<a href="https://github.com/tonymorony"><img src="https://avatars3.githubusercontent.com/u/24797699?s=400&u=335984bcb93856f260ac6d139b18f0c596306e08&v=4" width="100px;" alt="Anton TonyL Lysakov"/><br /><sub><b>Anton "TonyL" Lysakov</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=tonymorony" title="Lead QA / CI">🛠💻</a>
102-
</td>
103-
<td align="center">
104-
<a href="https://github.com/cipig"><img src="https://avatars0.githubusercontent.com/u/32116761?s=60&v=4" width="100px;" alt="cipig"/><br /><sub><b>cipig</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=cipig" title="System Administrator">✍️💻</a>
105-
</td>
106-
<td align="center">
107-
<a href="https://github.com/ca333"><img src="https://avatars3.githubusercontent.com/u/10762374?s=60&v=4" width="100px;" alt="ca333"/><br /><sub><b>ca333</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=ca333" title="Chief Technology Officer">:penguin: :guardsman:</a>
108-
</td>
109-
</tr>
110-
<tr>
111-
<td align="center">
112-
<a href="https://github.com/zatJUM"><img src="https://avatars3.githubusercontent.com/u/45312760?s=60&v=4" width="100px;" alt="zatJUM"/><br /><sub><b>zatJUM</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=zatJUM" title="Community Dev">:heart:💻</a>
113-
</td>
114-
<td align="center">
115-
<a href="https://github.com/SirSevenG"><img src="https://avatars1.githubusercontent.com/u/44422309?s=60&v=4" width="100px;" alt="SirSevenG"/><br /><sub><b>SirSevenG</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=SirSevenG" title="QA Engineer">🛠💻</a>
116-
</td>
117-
<td align="center">
118-
<a href="https://github.com/smk762"><img src="https://s3.amazonaws.com/keybase_processed_uploads/9720282b9d3e15659ab911777f92c305_360_360.jpg" width="100px;" alt="smk762"/><br /><sub><b>smk762</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=smk762" title="QA Engineer">🛠:wolf:</a>
119-
</td>
120-
<td align="center">
121-
<a href="https://github.com/BloodyNora"><img src="https://avatars2.githubusercontent.com/u/4005813?s=60&v=4" width="100px;" alt="BloodyNora"/><br /><sub><b>BloodyNora</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=BloodyNora" title="IT allrounder">🛠💻</a>
122-
</td>
123-
<td align="center">
124-
<a href="https://github.com/dathbezumniy"><img src="https://avatars2.githubusercontent.com/u/11756768?s=60&v=4" width="100px;" alt="dathbezumniy"/><br /><sub><b>dathbezumniy</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=dathbezumniy" title="Junior QA Engineer">🛠💻</a>
125-
</td>
126-
</tr>
127-
<tr>
128-
<td align="center">
129-
<a href="https://github.com/SylEze"><img src="https://avatars1.githubusercontent.com/u/14373103?s=460&u=b303a2d2261008814800c2d7809efc6af685a460&v=4"width="100px;" alt="syl"/><br /><sub><b>syl</b></sub></a><br /><a href="https://github.com/KomodoPlatform/AtomicDex-Desktop/commits?author=SylEze" title="Frontend and Back-End Dev / Code">✍️💻</a>
130-
</td>
131-
</tr>
132-
</table>
161+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
162+
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
163+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
164+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎atomic_defi_design/Dex/Exchange/Trade/ConfirmTradeModal.qml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ BasicModal {
222222
Layout.alignment: Qt.AlignHCenter
223223
Layout.bottomMargin: 10
224224

225-
color: Style.colorRed3
225+
color: Style.colorRed2
226226

227227
width: dpow_off_warning.width + 20
228228
height: dpow_off_warning.height + 20
@@ -233,7 +233,7 @@ BasicModal {
233233

234234
DefaultText {
235235
Layout.alignment: Qt.AlignHCenter
236-
236+
color: Style.colorWhite0
237237
text_value: Style.warningCharacter + " " + qsTr("Warning, this atomic swap is not dPoW protected!")
238238
}
239239
}

‎atomic_defi_design/Dex/Exchange/Trade/Orders/OrderLine.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Rectangle
4646
visible: clickable ? !details ? false :
4747
(details.is_swap || !details.is_maker) : false
4848

49-
font.pixelSize: base_amount.font.pixelSize
49+
font.pixelSize: getStatusFontSize(details.order_status)
5050
color: !details ? Dex.CurrentTheme.foregroundColor : getStatusColor(details.order_status)
5151
text_value: !details ? "" : visible ? getStatusStep(details.order_status) : ''
5252
}

‎atomic_defi_design/Dex/Exchange/Trade/SimpleView/List.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ DexListView
8181
DefaultText
8282
{
8383
anchors.centerIn: parent
84-
font.pixelSize: 9
84+
font.pixelSize: getStatusFontSize(details.order_status)
8585
color: !details ? "white" : getStatusColor(details.order_status)
8686
text_value: !details ? "" :
8787
visible ? getStatusStep(details.order_status) : ''

0 commit comments

Comments
 (0)