Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 7586eaa

Browse files
habib-derivhabib-deriv
authored
Revert "Konstantinos / Fix Conflicts 2 (#4362)" (#4363)
This reverts commit 4a04c42.
1 parent 4a04c42 commit 7586eaa

File tree

20 files changed

+838
-984
lines changed

20 files changed

+838
-984
lines changed

‎src/pages/home/platform-carousel/_utils.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ export const platform_details_row: TPlatformDetails[] = [
8787
{ type: 'linux', url: dmt5_linux_url, label: 'Linux' },
8888
{ type: 'browser', link_type: 'mt5', label: 'Browser' },
8989
{ type: 'google_play', url: dmt5_android_url, label: 'Android' },
90-
{ type: 'app_store', url: dmt5_ios_url, label: 'App Store' },
9190
{ type: 'app_gallery', url: dmt5_app_gallery, label: 'App gallery' },
9291
],
9392
},
@@ -178,7 +177,6 @@ export const platform_details_eu: TPlatformDetails[] = [
178177
{ type: 'linux', url: dmt5_linux_url, label: 'Linux' },
179178
{ type: 'browser', link_type: 'mt5', label: 'Browser' },
180179
{ type: 'google_play', url: dmt5_android_url, label: 'Android' },
181-
{ type: 'app_store', url: dmt5_ios_url, label: 'App Store' },
182180
{ type: 'app_gallery', url: dmt5_app_gallery, label: 'App gallery' },
183181
],
184182
},

‎src/pages/markets/static/style/_markets-style.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,6 @@ export const StyledText = styled(Text)<StyledTextProps>`
216216
font-size: 14px;
217217
}
218218
`
219-
export const SymbolText = styled(Header)`
220-
font-weight: normal;
221-
@media ${device.tabletL} {
222-
max-width: 100px;
223-
max-height: 28px;
224-
}
225-
`
226219

227220
export const SymbolContainer = styled(Flex)`
228221
width: fit-content;
@@ -252,6 +245,15 @@ export const SymbolContainer = styled(Flex)`
252245
}
253246
}
254247
`
248+
export const SymbolText = styled(Header)`
249+
font-weight: normal;
250+
251+
@media ${device.tabletL} {
252+
max-width: 100px;
253+
max-height: 28px;
254+
}
255+
`
256+
255257
export const Title = styled(Text)`
256258
text-align: center;
257259
font-weight: bold;

‎src/translations/ach.json

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@
201201
"306846388": "crwdns453990:0crwdne453990:0",
202202
"307902006": "crwdns1149240:0crwdne1149240:0",
203203
"308070472": "crwdns1490469:0crwdne1490469:0",
204-
"308788732": "crwdns1781181:0crwdne1781181:0",
205204
"309051736": "crwdns1613133:0crwdne1613133:0",
206205
"309993304": "crwdns453994:0crwdne453994:0",
207206
"310298121": "crwdns453996:0crwdne453996:0",
@@ -218,7 +217,6 @@
218217
"323564058": "crwdns454020:0crwdne454020:0",
219218
"325128398": "crwdns454022:0crwdne454022:0",
220219
"326242312": "crwdns454024:0crwdne454024:0",
221-
"326551423": "crwdns1781157:0crwdne1781157:0",
222220
"327728169": "crwdns1732527:0crwdne1732527:0",
223221
"328362983": "crwdns454026:0crwdne454026:0",
224222
"332441329": "crwdns454028:0crwdne454028:0",
@@ -337,6 +335,7 @@
337335
"487236738": "crwdns454264:0crwdne454264:0",
338336
"489679731": "crwdns454270:0crwdne454270:0",
339337
"491908760": "crwdns454272:0crwdne454272:0",
338+
"492205969": "crwdns454274:0crwdne454274:0",
340339
"492590863": "crwdns454276:0crwdne454276:0",
341340
"493240844": "crwdns454278:0crwdne454278:0",
342341
"493622337": "crwdns454280:0crwdne454280:0",
@@ -492,7 +491,6 @@
492491
"704465777": "crwdns454600:0crwdne454600:0",
493492
"704532260": "crwdns454602:0crwdne454602:0",
494493
"706069088": "crwdns454604:0crwdne454604:0",
495-
"706240885": "crwdns1781183:0crwdne1781183:0",
496494
"710137133": "crwdns454606:0crwdne454606:0",
497495
"710468393": "crwdns454608:0crwdne454608:0",
498496
"712547410": "crwdns454610:0crwdne454610:0",
@@ -684,6 +682,7 @@
684682
"948545552": "crwdns1079472:0crwdne1079472:0",
685683
"949617971": "crwdns454996:0crwdne454996:0",
686684
"955451911": "crwdns454998:0crwdne454998:0",
685+
"955743387": "crwdns1328425:0crwdne1328425:0",
687686
"958430760": "crwdns455000:0crwdne455000:0",
688687
"959971586": "crwdns455002:0crwdne455002:0",
689688
"960618190": "crwdns455004:0crwdne455004:0",
@@ -765,7 +764,6 @@
765764
"1054141122": "crwdns455138:0crwdne455138:0",
766765
"1055401343": "crwdns1174954:0crwdne1174954:0",
767766
"1057239639": "crwdns455142:0crwdne455142:0",
768-
"1058270788": "crwdns1781185:0crwdne1781185:0",
769767
"1058440967": "crwdns455144:0crwdne455144:0",
770768
"1061987610": "crwdns838548:0crwdne838548:0",
771769
"1062240703": "crwdns455146:0crwdne455146:0",
@@ -849,7 +847,6 @@
849847
"1178873929": "crwdns455304:0crwdne455304:0",
850848
"1179169693": "crwdns455306:0crwdne455306:0",
851849
"1179825750": "crwdns1400439:0crwdne1400439:0",
852-
"1180514365": "crwdns1781187:0crwdne1781187:0",
853850
"1181506313": "crwdns455310:0crwdne455310:0",
854851
"1182198798": "crwdns455312:0crwdne455312:0",
855852
"1182470294": "crwdns455314:0crwdne455314:0",
@@ -955,7 +952,6 @@
955952
"1324376913": "crwdns455490:0crwdne455490:0",
956953
"1324779616": "crwdns455492:0crwdne455492:0",
957954
"1326235397": "crwdns455494:0crwdne455494:0",
958-
"1326906476": "crwdns1781189:0crwdne1781189:0",
959955
"1327067520": "crwdns455496:0crwdne455496:0",
960956
"1329552872": "crwdns1308083:0crwdne1308083:0",
961957
"1332168410": "crwdns455498:0crwdne455498:0",
@@ -1325,7 +1321,6 @@
13251321
"1786089908": "crwdns456172:0crwdne456172:0",
13261322
"1786747559": "crwdns456174:0crwdne456174:0",
13271323
"1791730321": "crwdns456178:0crwdne456178:0",
1328-
"1796444434": "crwdns1781191:0crwdne1781191:0",
13291324
"1798765888": "crwdns456182:0crwdne456182:0",
13301325
"1799377913": "crwdns456184:0{{market_name}}crwdne456184:0",
13311326
"1802409084": "crwdns456186:0crwdne456186:0",
@@ -1435,6 +1430,7 @@
14351430
"1925006841": "crwdns456378:0crwdne456378:0",
14361431
"1925717346": "crwdns456380:0crwdne456380:0",
14371432
"1926519171": "crwdns456382:0crwdne456382:0",
1433+
"1927849367": "crwdns1328441:0crwdne1328441:0",
14381434
"1928930389": "crwdns456384:0crwdne456384:0",
14391435
"1929213891": "crwdns456386:0crwdne456386:0",
14401436
"1931163835": "crwdns456388:0crwdne456388:0",
@@ -1508,6 +1504,7 @@
15081504
"2028163119": "crwdns456516:0crwdne456516:0",
15091505
"2032401971": "crwdns456522:0crwdne456522:0",
15101506
"2032565787": "crwdns456524:0crwdne456524:0",
1507+
"2032665208": "crwdns456526:0crwdne456526:0",
15111508
"2035207280": "crwdns456528:0crwdne456528:0",
15121509
"2035670983": "crwdns456530:0crwdne456530:0",
15131510
"2036526456": "crwdns456532:0crwdne456532:0",
@@ -2529,23 +2526,18 @@
25292526
"-721191908": "crwdns458730:0crwdne458730:0",
25302527
"-1202623711": "crwdns458732:0crwdne458732:0",
25312528
"-190375337": "crwdns458734:0crwdne458734:0",
2532-
"-991739393": "crwdns1781193:0crwdne1781193:0",
2533-
"-433514243": "crwdns1781195:0crwdne1781195:0",
2529+
"-75787346": "crwdns458736:0crwdne458736:0",
2530+
"-257478628": "crwdns458738:0crwdne458738:0",
25342531
"-690460725": "crwdns458740:0crwdne458740:0",
25352532
"-2075222222": "crwdns1381133:0crwdne1381133:0",
25362533
"-931072662": "crwdns458742:0crwdne458742:0",
25372534
"-1522453105": "crwdns458744:0crwdne458744:0",
25382535
"-1848325573": "crwdns458746:0crwdne458746:0",
25392536
"-1650735154": "crwdns458748:0crwdne458748:0",
25402537
"-754071100": "crwdns458750:0crwdne458750:0",
2541-
"-483901177": "crwdns1781197:0crwdne1781197:0",
2542-
"-959426804": "crwdns1781199:0crwdne1781199:0",
2538+
"-1164156648": "crwdns458752:0crwdne458752:0",
25432539
"-475767247": "crwdns458754:0crwdne458754:0",
25442540
"-2035089048": "crwdns458756:0crwdne458756:0",
2545-
"-75787346": "crwdns458736:0crwdne458736:0",
2546-
"-257478628": "crwdns458738:0crwdne458738:0",
2547-
"-1014166738": "crwdns1781201:0crwdne1781201:0",
2548-
"-1972084136": "crwdns1781203:0crwdne1781203:0",
25492541
"-1312740087": "crwdns458758:0crwdne458758:0",
25502542
"-467543474": "crwdns458760:0crwdne458760:0",
25512543
"-12379677": "crwdns458762:0crwdne458762:0",
@@ -2559,8 +2551,6 @@
25592551
"-1064775608": "crwdns458778:0crwdne458778:0",
25602552
"-1262587128": "crwdns458780:0crwdne458780:0",
25612553
"-2051729853": "crwdns1174942:0crwdne1174942:0",
2562-
"-816110209": "crwdns1732529:0crwdne1732529:0",
2563-
"-1288044380": "crwdns1732531:0crwdne1732531:0",
25642554
"-1941767726": "crwdns882744:0crwdne882744:0",
25652555
"-2109480025": "crwdns1174948:0crwdne1174948:0",
25662556
"-505645949": "crwdns1658917:0crwdne1658917:0",
@@ -2658,6 +2648,8 @@
26582648
"-2082672713": "crwdns458876:0crwdne458876:0",
26592649
"-549581742": "crwdns458878:0crwdne458878:0",
26602650
"-456885316": "crwdns458880:0crwdne458880:0",
2651+
"-816110209": "crwdns1732529:0crwdne1732529:0",
2652+
"-1288044380": "crwdns1732531:0crwdne1732531:0",
26612653
"-1649127643": "crwdns458882:0crwdne458882:0",
26622654
"-2068763730": "crwdns458884:0crwdne458884:0",
26632655
"-2083395832": "crwdns458886:0crwdne458886:0",
@@ -2781,11 +2773,18 @@
27812773
"-1041794680": "crwdns456920:0crwdne456920:0",
27822774
"-673235114": "crwdns456922:0crwdne456922:0",
27832775
"-924984243": "crwdns456924:0crwdne456924:0",
2776+
"-2132201373": "crwdns456926:0crwdne456926:0",
2777+
"-728074978": "crwdns456928:0crwdne456928:0",
2778+
"-1716483520": "crwdns456930:0crwdne456930:0",
2779+
"-1053983183": "crwdns456932:0crwdne456932:0",
2780+
"-1544332806": "crwdns456934:0crwdne456934:0",
2781+
"-1665600393": "crwdns456936:0crwdne456936:0",
2782+
"-1042921151": "crwdns456938:0crwdne456938:0",
2783+
"-268393254": "crwdns456942:0crwdne456942:0",
2784+
"-1832944205": "crwdns456940:0crwdne456940:0",
2785+
"-1263216758": "crwdns456944:0crwdne456944:0",
27842786
"-1992816438": "crwdns456946:0crwdne456946:0",
27852787
"-1589264806": "crwdns1098518:0crwdne1098518:0",
2786-
"-1665600393": "crwdns456936:0crwdne456936:0",
2787-
"-1053983183": "crwdns456932:0crwdne456932:0",
2788-
"-728074978": "crwdns456928:0crwdne456928:0",
27892788
"-1715779049": "crwdns456950:0crwdne456950:0",
27902789
"-295267372": "crwdns456952:0crwdne456952:0",
27912790
"-603371864": "crwdns456954:0crwdne456954:0",
@@ -2801,18 +2800,11 @@
28012800
"-319008586": "crwdns456972:0crwdne456972:0",
28022801
"-133464964": "crwdns456974:0crwdne456974:0",
28032802
"-1684534627": "crwdns456976:0crwdne456976:0",
2804-
"-1042921151": "crwdns456938:0crwdne456938:0",
28052803
"-1706019560": "crwdns456978:0crwdne456978:0",
28062804
"-1313979648": "crwdns456980:0crwdne456980:0",
28072805
"-347466324": "crwdns456982:0crwdne456982:0",
28082806
"-1318380319": "crwdns456984:0crwdne456984:0",
28092807
"-958406243": "crwdns456986:0crwdne456986:0",
2810-
"-2132201373": "crwdns456926:0crwdne456926:0",
2811-
"-1716483520": "crwdns456930:0crwdne456930:0",
2812-
"-1544332806": "crwdns456934:0crwdne456934:0",
2813-
"-268393254": "crwdns456942:0crwdne456942:0",
2814-
"-1832944205": "crwdns456940:0crwdne456940:0",
2815-
"-1263216758": "crwdns456944:0crwdne456944:0",
28162808
"-80483273": "crwdns1328443:0crwdne1328443:0",
28172809
"-1649952399": "crwdns456990:0crwdne456990:0",
28182810
"-33169776": "crwdns456992:0crwdne456992:0",
@@ -2859,8 +2851,9 @@
28592851
"-112814932": "crwdns459134:0crwdne459134:0",
28602852
"-2019617323": "crwdns459140:0crwdne459140:0",
28612853
"-689442324": "crwdns459142:0crwdne459142:0",
2862-
"-1352186495": "crwdns1781159:0crwdne1781159:0",
2854+
"-1695679942": "crwdns1220235:0crwdne1220235:0",
28632855
"-1019769067": "crwdns914436:0crwdne914436:0",
2856+
"-1103896380": "crwdns1220237:0crwdne1220237:0",
28642857
"-1089385344": "crwdns459146:0crwdne459146:0",
28652858
"-386585223": "crwdns1490925:0crwdne1490925:0",
28662859
"-1179448605": "crwdns459150:0crwdne459150:0",
@@ -3189,7 +3182,6 @@
31893182
"-3618456": "crwdns459730:0crwdne459730:0",
31903183
"-1277783292": "crwdns459734:0crwdne459734:0",
31913184
"-1369524546": "crwdns1117608:0crwdne1117608:0",
3192-
"-2049472334": "crwdns1794203:0crwdne1794203:0",
31933185
"-216767904": "crwdns459736:0crwdne459736:0",
31943186
"-197772643": "crwdns459738:0crwdne459738:0",
31953187
"-290006480": "crwdns459740:0crwdne459740:0",

0 commit comments

Comments
 (0)