Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maryia/67492/task_add_accumulators #6406

Merged
Merged
Show file tree
Hide file tree
Changes from 249 commits
Commits
Show all changes
250 commits
Select commit Hold shift + click to select a range
4c51a61
Merge '67492_accumulators_purchase' into 'maryia/67492/task_add_accum…
maryia-deriv Sep 6, 2022
9392c25
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Sep 6, 2022
1661a72
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 6, 2022
12e1849
Merge branch 'binary-com:master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 8, 2022
2ba9961
Maryia/75617/add_accu_to_trade_params (#3)
maryia-deriv Sep 9, 2022
f131d8f
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 15, 2022
2ed0c93
maryia/72761/task_add_recent_positions_drawer (#4)
maryia-deriv Sep 15, 2022
3b95e0c
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 16, 2022
f3e57e4
maryia/76528/task_implement_contract_details_drawer (#5)
maryia-deriv Sep 16, 2022
72cd090
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 19, 2022
ce990f9
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 20, 2022
020c8ed
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 21, 2022
a9f127b
maryia/72769/add_ticks_history_stats_widget (#6)
maryia-deriv Sep 23, 2022
2aa41c0
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 27, 2022
b6ceb3b
maryia/77261/task_manual_for_history_widget (#8)
maryia-deriv Sep 27, 2022
be26e5d
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 28, 2022
e57ab3d
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 28, 2022
c135a53
maryia/75621/task_add_tests_and_restyle_contract_card (#9)
maryia-deriv Sep 29, 2022
30a7122
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Sep 29, 2022
92a5bc5
maryia/75621/part_2_task_accu_barriers (#10)
maryia-deriv Oct 3, 2022
adbee15
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 3, 2022
43f79f6
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Oct 4, 2022
f7560b0
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Oct 6, 2022
5e575f1
maryia/75621/add barriers for stay in contract on trader page (#12)
maryia-deriv Oct 6, 2022
8e71982
chore: adjusted open contract profit label (#13)
maryia-deriv Oct 10, 2022
4859666
yauheni/77994/trader add break out contract type (#14)
yauheni-deriv Oct 11, 2022
a42964a
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 11, 2022
85f94fa
yauheni/78429/update styles of tick history widget (#15)
yauheni-deriv Oct 11, 2022
14ec3fd
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 11, 2022
7330c8c
chore: prepared data for connecting API (#16)
maryia-deriv Oct 12, 2022
4eaebbe
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 12, 2022
0018360
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 12, 2022
c353963
Maryia/78473/part 2 prepare for api + improvements (#18)
maryia-deriv Oct 12, 2022
93890a8
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 12, 2022
608e7de
chore: added price tags for barriers in contract details (#19)
maryia-deriv Oct 12, 2022
41ff84b
feat: initialized AccumulatorsProfitLossTooltip (#20)
maryia-deriv Oct 13, 2022
86b4fed
yauheni/78477/update params with buttons for responsive (#17)
yauheni-deriv Oct 14, 2022
de4a82c
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Oct 14, 2022
d39d586
yauheni/resolve build errors (#21)
yauheni-deriv Oct 15, 2022
5b1ac6d
Yauheni/78633/update styles for tick history widget (#22)
yauheni-deriv Oct 17, 2022
d084fad
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Oct 18, 2022
d9a78fc
maryia/78839/complete_sold_labels (#23)
maryia-deriv Oct 18, 2022
ff4209a
maryia/improvements for stats and tooltip (#24)
maryia-deriv Oct 18, 2022
b4e00ae
maryia/improvements for sold contract label
maryia-deriv Oct 19, 2022
80df8bd
maryia/78574/add_barriers_to_contract_details
maryia-deriv Oct 21, 2022
7a0ec06
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Oct 21, 2022
5bd77a1
maryia/79085/remove_break_out_history_from_stats_widget (#26)
maryia-deriv Oct 24, 2022
68521a2
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 24, 2022
b3d2f23
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 25, 2022
719604e
Yauheni/77995/update trade params for stayin breakout (#25)
yauheni-deriv Oct 25, 2022
d30a038
maryia/fix: styles & fonts for responsive trade types
maryia-deriv Oct 25, 2022
4d96abd
Maryia/79549/part 1: update tick markers for ACCU in contract details…
maryia-deriv Oct 26, 2022
a69042a
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 26, 2022
59cf048
yauheni/79530/remove breakout contract (#28)
yauheni-deriv Oct 26, 2022
3b68507
maryia/styling improvements
maryia-deriv Oct 26, 2022
bf963c2
maryia/fix: forcing Div100vh to re-render when height_offset for resp…
maryia-deriv Oct 27, 2022
54c2ad0
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 27, 2022
1c570b9
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Oct 31, 2022
42649a6
maryia/fix: observables + markers
maryia-deriv Oct 31, 2022
839f9ce
maryia/chore: prevented barriers, labels and markers from going outsi…
maryia-deriv Oct 31, 2022
fe95b4f
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Oct 31, 2022
5ed2729
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 1, 2022
c6b26c9
maryia/79969/set_default_chart_type_and_interval_to_Area_and_1_tick
maryia-deriv Nov 1, 2022
c86d1f4
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 2, 2022
d207bb3
maryia/chore: changed trade type name to Accumulators
maryia-deriv Nov 2, 2022
eb3d93c
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Nov 2, 2022
f72ae8e
maryia/80163/set growth rate based on default value from BE contracts…
maryia-deriv Nov 2, 2022
a820d2a
yauheni/80091/hide chart mode icon for accumulators (#33)
yauheni-deriv Nov 3, 2022
2481b9d
maryia/80166/connect_to_available_API (#34)
maryia-deriv Nov 4, 2022
bc649f3
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 4, 2022
6684b93
maryia/80163/add-growth-rate-to-purchase-button
maryia-deriv Nov 4, 2022
ca5d9a1
maryia/refactored purchase button growth_rate text
maryia-deriv Nov 5, 2022
7263b4c
maryia/chore: removed unused code for outside barriers
maryia-deriv Nov 8, 2022
1c0fb55
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Nov 8, 2022
ac2cb6f
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Nov 11, 2022
9ce9b2d
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Nov 14, 2022
63b0ced
maryia/fix: barrier shade color for ongoing contract
maryia-deriv Nov 15, 2022
4738385
feat: restore chart mode set for non accumulators contract after swit…
yauheni-deriv Nov 15, 2022
5f55abc
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 15, 2022
8b775de
yauheni/80158/update ui according to latest design (design flow 1-2) …
yauheni-deriv Nov 16, 2022
4bc98b8
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 21, 2022
a82c9c7
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 22, 2022
df93a46
Maryia/80686/feat: profit text animation for ongoing contract (#39)
maryia-deriv Nov 23, 2022
7208a63
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 23, 2022
fec4976
fix: maryia/80686/profit text color
maryia-deriv Nov 23, 2022
4fdbbff
fix: maryia/using default growth rate only if no stored growth rate
maryia-deriv Nov 23, 2022
555f2cf
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Nov 24, 2022
32ecfe9
feat: allow accumulators only for demo account (#40)
yauheni-deriv Nov 28, 2022
bf81999
Yauheni/80158/update UI according to latest design part 2 (#38)
yauheni-deriv Nov 28, 2022
ecd40c4
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 28, 2022
21930ea
maryia/80687/ticks_contract_details (#41)
maryia-deriv Nov 28, 2022
8c82107
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Nov 28, 2022
057dd8c
chore: maryia/added opacity to profit text + connected contracts_for …
maryia-deriv Nov 29, 2022
64e6f3c
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Nov 29, 2022
da1a52c
chore: improved tick stream for ACCU in contract details + stats alig…
maryia-deriv Nov 30, 2022
1a81d22
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Dec 1, 2022
34a4f83
chore: maryia/handled undefined profit & updated opacity animation ti…
maryia-deriv Dec 5, 2022
12fd706
chore: temporary dummy api connection
maryia-deriv Dec 5, 2022
c7a15ba
fix: maryia/hide profit if undefined, display if number
maryia-deriv Dec 5, 2022
c5ba4a6
revert: dummi api
maryia-deriv Dec 6, 2022
7d2d02a
feat: implement last design part 1 (#43)
yauheni-deriv Dec 7, 2022
ceb6692
Maryia/82425/task highlight crossing tick (#42)
maryia-deriv Dec 7, 2022
ce2af92
Maryia/83069/task: replace image with video manual (#44)
maryia-deriv Dec 8, 2022
a66b02b
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Dec 8, 2022
2b7f227
style: removed extra margin-bottom
maryia-deriv Dec 8, 2022
3eeeba4
feat: implement last design part 2 (#45)
yauheni-deriv Dec 9, 2022
3b25182
refactor: accu sold contract tooltip animation change (#49)
yauheni-deriv Dec 12, 2022
72f7470
Maryia/82257/Contract Details tick markers + AccumulatorsProfitLossTe…
maryia-deriv Dec 12, 2022
4634c17
refactor: tooltip style and tests (#51)
yauheni-deriv Dec 12, 2022
b95bc4c
Maryia/83311/Refactoring, tests, TS migration (#50)
maryia-deriv Dec 12, 2022
c8b5674
fix: maryia/circleci eslint error
maryia-deriv Dec 12, 2022
a162a00
feat: maryia/added dark theme video manual for stats + fix for circleci
maryia-deriv Dec 12, 2022
4f115e0
test: maryia/added tests for AccumulatorsInfoDisplay & LabeledQuantit…
maryia-deriv Dec 12, 2022
6331217
chore: merge master into maryia/67492/task_add_accumulators + fix con…
maryia-deriv Dec 12, 2022
0d6f524
chore: maryia/ address review comments + updated videos
maryia-deriv Dec 13, 2022
4aecc4d
fix: maryia/open positions: auto-select Accumulators if has open ACCU…
maryia-deriv Dec 13, 2022
a5176a6
refactor: accumulatorschartelements test added (#52)
yauheni-deriv Dec 13, 2022
a4df999
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Dec 13, 2022
99902ce
style: maryia/apply review suggestions
maryia-deriv Dec 13, 2022
e69d311
style: maryia/apply review suggestions
maryia-deriv Dec 13, 2022
19ede9b
refactor: maryia/refactoring + small improvements & adjustments
maryia-deriv Dec 14, 2022
0d2c360
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Dec 14, 2022
095d1f4
chore: add built icons file
maryia-deriv Dec 14, 2022
2cd1722
fix: circleci tests + improvements
maryia-deriv Dec 14, 2022
17f596f
chore: refactoring + added loader before video manual first loads
maryia-deriv Dec 14, 2022
c20032b
refactor: improvements + addressed review comments
maryia-deriv Dec 16, 2022
860858f
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Dec 16, 2022
605c630
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Dec 20, 2022
736536e
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Dec 21, 2022
e221cb2
yauheni/qa checks refactoring 1 (#53)
yauheni-deriv Dec 22, 2022
5a23c5c
fix: last truncated counter in responsive (#54)
maryia-deriv Dec 22, 2022
b8b4040
Maryia/83807/stake validation (part 1) (#55)
maryia-deriv Dec 22, 2022
c57bef4
fix: growth rate title alignment (#56)
yauheni-deriv Dec 23, 2022
92dd36e
maryia/83807/fix: stake validation for ACCU broken because of barrier…
maryia-deriv Dec 23, 2022
d5d1b9e
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Dec 23, 2022
b523932
fix: check if selected growth_rate is available on symbol change (#58)
maryia-deriv Dec 23, 2022
0e1bc01
fix: able to buy multiply contract / growth rate fix BO change (#59)
yauheni-deriv Dec 26, 2022
0fe1cb4
revert: maryia/revert change of last_contract computed
maryia-deriv Dec 26, 2022
07f5c42
fix: accumulator is shown for real account (#60)
yauheni-deriv Dec 27, 2022
cc5c7db
feat: make cursor not allowd for overlay (#61)
yauheni-deriv Dec 27, 2022
723c8e0
chore: built icons.js
maryia-deriv Dec 27, 2022
55aa108
revert: maryia/ unnecessary bot file change
maryia-deriv Dec 27, 2022
1d1db0c
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Dec 28, 2022
992d6a2
refactor: contract categories in contract-type-widget.jsx
maryia-deriv Dec 28, 2022
2d565c8
refactor: according to pr review comments
maryia-deriv Dec 28, 2022
f1798ad
refactor: open positions + add keys to fix console warning
maryia-deriv Dec 28, 2022
9656d1d
fix: disable accu for real account, disable button having bought one …
yauheni-deriv Dec 29, 2022
e2633d3
refactor: purchase.jsx
maryia-deriv Dec 29, 2022
48a8be2
refactor: according to pr reviews
maryia-deriv Dec 29, 2022
c813900
refactor: able to buy contract per every available underlying (#63)
yauheni-deriv Dec 30, 2022
075dbfe
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Dec 30, 2022
2b3d14f
Trigger Build
Jan 4, 2023
b9fcb17
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 4, 2023
f04e678
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 6, 2023
17062da
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 9, 2023
d366b6a
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 10, 2023
4704f53
yauheni/85032/ fix chart issue with dots and circles
yauheni-deriv Jan 10, 2023
3d86877
fix: exit spot styles
Jan 11, 2023
3b3d3dd
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 11, 2023
51d565f
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 12, 2023
b315e2d
refactor: make barrier values string as on BE
Jan 17, 2023
31e87e3
refactor: update from master
Jan 17, 2023
8715b5b
fix: unable accumulators for real
Jan 18, 2023
87cfb7a
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Jan 18, 2023
622a680
maryia/refactor_accu_branch (#66)
maryia-deriv Jan 19, 2023
e013e61
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Jan 19, 2023
59c0687
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 20, 2023
3708412
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Jan 23, 2023
142fdd1
fix: 86705/ticks are not displayed correctly on chart in contract det…
Jan 24, 2023
5ebfe09
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 25, 2023
181551a
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Jan 25, 2023
c09cdb2
maryia/86953/build: bump up deriv-charts version to 1.1.0 + improveme…
maryia-deriv Jan 25, 2023
022d70d
build: maryia/removed extra package-lock.jsons
maryia-deriv Jan 26, 2023
e52a2b2
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Jan 31, 2023
2a0a729
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Jan 31, 2023
f12e8c6
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Jan 31, 2023
a2327bd
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Jan 31, 2023
3a9f3c4
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 1, 2023
33d770d
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 1, 2023
423670f
evgeniy /87215/87226/ info description / glitch while switching accou…
yauheni-deriv Feb 1, 2023
51a6084
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 1, 2023
d1d0f8e
henry/87329/fix: FE not showing error message when accu trading is su…
henry-deriv Feb 2, 2023
d31a8d0
refactor: glitching fix and deleted odd css (#73)
yauheni-deriv Feb 2, 2023
fb5cd06
Maryia/86616/feat: calculating accu barriers based on ticks from tick…
maryia-deriv Feb 2, 2023
81641f4
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Feb 6, 2023
8a00851
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Feb 7, 2023
f856ece
build: updated package-lock & icons + fixed conflicts + linting
maryia-deriv Feb 7, 2023
ade14d7
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Feb 8, 2023
24e332d
Merge branch 'master' into maryia/67492/task_add_accumulators
yauheni-deriv Feb 8, 2023
7504d13
fix: max stake validation is missing (#81)
yauheni-deriv Feb 8, 2023
71016f2
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 9, 2023
2cd0d50
fix: maryia/87948/chart empty issue + profit text effects clean-up
maryia-deriv Feb 9, 2023
fddb418
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 14, 2023
f3e37f2
henry/87958/feat: Add Dropdown for rates in Accumulator (#86)
henry-deriv Feb 15, 2023
110c267
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 15, 2023
1219325
Maryia/86616/make 2 last ticks bold + refactoring (#84)
maryia-deriv Feb 15, 2023
478f7ae
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 16, 2023
9105dbc
style: updated All rates casing
maryia-deriv Feb 16, 2023
5424c2d
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Feb 20, 2023
1fba588
build: update package-lock
maryia-deriv Feb 20, 2023
6b362af
Henry/87958/feat add all rates dropdown accumulator (#89)
henry-deriv Feb 20, 2023
4e41eed
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 20, 2023
c678a15
refactor: open-positions
maryia-deriv Feb 21, 2023
9f8f218
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 21, 2023
e802d04
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 21, 2023
a966da6
fix: remove unused eslint disable
maryia-deriv Feb 21, 2023
373562f
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 22, 2023
05cffee
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 22, 2023
16dc943
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Feb 23, 2023
e6dd70c
revert: package-lock
maryia-deriv Feb 23, 2023
6b9a893
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Feb 23, 2023
6d49c4e
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 24, 2023
5b0370c
fix: sell button disappearing in mobile accumulators (#92)
henry-deriv Feb 27, 2023
764d9e2
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 27, 2023
c5c58fc
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Feb 27, 2023
b91b210
Henry/89489/fix sell button missing accumulator (#95)
henry-deriv Mar 1, 2023
a024f22
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Mar 1, 2023
b91f104
maryia/89432/fix: show barriers for current symbol correctly (#94)
maryia-deriv Mar 1, 2023
a67fa6c
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Mar 2, 2023
22453a3
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Mar 3, 2023
a15f0a6
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Mar 9, 2023
7eec09e
Maryia/test: added tests for getAccumulatorBarriers function (#99)
maryia-deriv Mar 10, 2023
869298e
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Mar 12, 2023
76ed056
Maryia/89927_2/fix: ticks_history not forgotten because of chart mode…
maryia-deriv Mar 12, 2023
f329a6d
fix: maryia/fixed logics for chart mode switching
maryia-deriv Mar 12, 2023
4265889
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Mar 13, 2023
1ee907b
Merge branch 'master' of github.com:binary-com/deriv-app into maryia/…
maryia-deriv Mar 13, 2023
606555b
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Mar 13, 2023
4b8b1cf
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Mar 14, 2023
5da0534
refactor: maryia/address review comments
maryia-deriv Mar 14, 2023
9cc9c80
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Mar 15, 2023
47bab44
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Mar 15, 2023
cfe8dab
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Mar 15, 2023
ed73314
Update vanilla-options-card-body.jsx
maryia-deriv Mar 15, 2023
6999d29
fix: vanillas + accumulators adjustments
maryia-deriv Mar 16, 2023
e35107e
fix: maryia/restore overriden accu change
maryia-deriv Mar 16, 2023
2a0ab40
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Mar 16, 2023
fb3eba8
fix: maryia/vanillas+accumulators adjustment
maryia-deriv Mar 16, 2023
42f05f3
fix: maryia/ improvements + refactoring to address review comments
maryia-deriv Mar 19, 2023
e16f327
Merge branch master of github.com:binary-com/deriv-app into maryia/67…
maryia-deriv Mar 19, 2023
d041b70
fix: maryia/ update c.details chart when end_epoch is defined
maryia-deriv Mar 19, 2023
c0d5639
Merge branch 'master' into maryia/67492/task_add_accumulators
matin-deriv Mar 20, 2023
2eff881
Merge branch 'master' into maryia/67492/task_add_accumulators
maryia-deriv Mar 21, 2023
c8a9f05
fix: reset accu barriers data on every contract type change
maryia-deriv Mar 21, 2023
b766aca
fix: revert ui-store to master
Mar 21, 2023
021f924
Merge pull request #107 from henry-deriv/henry/revert-changes-back-to…
henry-deriv Mar 21, 2023
d76bf4b
Merge branch 'binary-com:master' into maryia/67492/task_add_accumulators
henry-deriv Mar 21, 2023
d00c2f5
fix: chart mode change when switching to symbol without accu
maryia-deriv Mar 21, 2023
788b521
fix: purchase button styling for accumulators (#109)
henry-deriv Mar 22, 2023
a64b60f
Merge branch 'master' into maryia/67492/task_add_accumulators
hirad-deriv Mar 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import TickCounterBar from '../tick-counter-bar';

describe('TickCounterBar', () => {
const mock_props = {
current_tick: 12345,
label: 'Ticks',
max_ticks_duration: 67890,
};
it('should render properly', () => {
render(<TickCounterBar {...mock_props} />);

const ticks_info_el = screen.getByText('12345/67890 Ticks');
expect(ticks_info_el).toHaveClass('dc-tick-counter-bar__text');
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
import classNames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import { isCryptocurrency, getLimitOrderAmount, isValidToSell } from '@deriv/shared';
import ContractCardItem from './contract-card-item.jsx';
import ToggleCardDialog from './toggle-card-dialog.jsx';
import Icon from '../../icon';
import MobileWrapper from '../../mobile-wrapper';
import Money from '../../money';
import { ResultStatusIcon } from '../result-overlay/result-overlay.jsx';

const AccumulatorCardBody = ({
addToast,
connectWithContractUpdate,
contract_info,
contract_update,
currency,
current_focus,
error_message_alignment,
getCardLabels,
getContractById,
indicative,
is_sold,
onMouseLeave,
removeToast,
setCurrentFocus,
status,
is_positions,
}) => {
const { buy_price, profit, limit_order, sell_price } = contract_info;
const { take_profit } = getLimitOrderAmount(contract_update || limit_order);
const is_valid_to_sell = isValidToSell(contract_info);
const { CURRENT_STAKE, STAKE, TAKE_PROFIT, TOTAL_PROFIT_LOSS } = getCardLabels();

return (
<React.Fragment>
<div className='dc-contract-card-items-wrapper'>
<ContractCardItem header={STAKE} className='dc-contract-card__stake'>
<Money amount={buy_price} currency={currency} />
</ContractCardItem>
<ContractCardItem header={CURRENT_STAKE} className='dc-contract-card__current-stake'>
<div
className={classNames({
'dc-contract-card--profit': +profit > 0,
'dc-contract-card--loss': +profit < 0,
})}
>
<Money amount={sell_price || indicative} currency={currency} />
</div>
<div
className={classNames('dc-contract-card__indicative--movement', {
'dc-contract-card__indicative--movement-complete': is_sold,
})}
>
{status === 'profit' && <Icon icon='IcProfit' />}
{status === 'loss' && <Icon icon='IcLoss' />}
maryia-deriv marked this conversation as resolved.
Show resolved Hide resolved
</div>
</ContractCardItem>
<ContractCardItem
header={TOTAL_PROFIT_LOSS}
is_crypto={isCryptocurrency(currency)}
is_loss={+profit < 0}
is_won={+profit > 0}
>
<Money amount={profit} currency={currency} />
<div
className={classNames('dc-contract-card__indicative--movement', {
'dc-contract-card__indicative--movement-complete': is_sold,
})}
>
{status === 'profit' && <Icon icon='IcProfit' />}
{status === 'loss' && <Icon icon='IcLoss' />}
maryia-deriv marked this conversation as resolved.
Show resolved Hide resolved
</div>
</ContractCardItem>
<ContractCardItem header={TAKE_PROFIT} className='dc-contract-card__take-profit'>
{take_profit ? <Money amount={take_profit} currency={currency} /> : <strong>-</strong>}
{is_valid_to_sell && (
<ToggleCardDialog
addToast={addToast}
connectWithContractUpdate={connectWithContractUpdate}
contract_id={contract_info.contract_id}
current_focus={current_focus}
error_message_alignment={error_message_alignment}
getCardLabels={getCardLabels}
getContractById={getContractById}
is_accumulator
onMouseLeave={onMouseLeave}
removeToast={removeToast}
setCurrentFocus={setCurrentFocus}
status={status}
/>
)}
</ContractCardItem>
</div>
{!!is_sold && (
<MobileWrapper>
<div
className={classNames('dc-contract-card__status', {
'dc-contract-card__status--accumulator-mobile-positions': is_positions,
})}
>
<ResultStatusIcon getCardLabels={getCardLabels} is_contract_won={+profit > 0} />
</div>
</MobileWrapper>
)}
</React.Fragment>
);
};

AccumulatorCardBody.propTypes = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indicative is missed here in propTypes

addToast: PropTypes.func,
connectWithContractUpdate: PropTypes.func,
contract_info: PropTypes.object,
contract_update: PropTypes.object,
currency: PropTypes.string,
current_focus: PropTypes.string,
error_message_alignment: PropTypes.string,
getCardLabels: PropTypes.func,
getContractById: PropTypes.func,
indicative: PropTypes.number,
is_positions: PropTypes.bool,
is_sold: PropTypes.bool,
onMouseLeave: PropTypes.func,
removeToast: PropTypes.func,
setCurrentFocus: PropTypes.func,
status: PropTypes.string,
};

export default React.memo(AccumulatorCardBody);
Loading