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

Niloofar Sadeghi | components and shared ts migration [parent branch] #7307

Merged
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
308 commits
Select commit Hold shift + click to select a range
6be96b9
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Jan 11, 2023
d03b4e5
chore: ts migration for test case
suisin-deriv Jan 11, 2023
3cc9be7
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Jan 11, 2023
a39a8cc
chore: remove .jsx
suisin-deriv Jan 11, 2023
1b78986
Merge pull request #35 from suisin-deriv/suisin/74174/ts_migration_se…
niloofar-deriv Jan 11, 2023
a038f63
refactor: ts migration for account limits article and tests
suisin-deriv Jan 11, 2023
a5fc900
chore: remove all .jsx
suisin-deriv Jan 11, 2023
123d844
refactor: ts migration for account-limit-overlay
suisin-deriv Jan 11, 2023
f4db147
chore: remove .jsx from files
suisin-deriv Jan 11, 2023
ac373aa
chore: update to use React.ComponentProps
suisin-deriv Jan 11, 2023
4a920a0
Merge pull request #38 from suisin-deriv/suisin/74166/ts_migration_re…
niloofar-deriv Jan 11, 2023
3e51e8f
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Jan 11, 2023
4bf1465
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 11, 2023
d543da7
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
farrah-deriv Jan 11, 2023
7e3bdee
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 11, 2023
98443e3
Merge pull request #41 from suisin-deriv/suisin/74078/ts_migration_ac…
niloofar-deriv Jan 11, 2023
f6b32dd
chore: change test case format
suisin-deriv Jan 12, 2023
7c5cfa9
refactor: ts migration for self-exclusion-article
suisin-deriv Jan 12, 2023
c2a4c70
refactor: ts migration for self-excllusiono-wrapper
suisin-deriv Jan 12, 2023
fab9931
chore: remove .jsx
suisin-deriv Jan 12, 2023
b53620e
Merge pull request #40 from suisin-deriv/suisin/74073/ts_migration_ac…
niloofar-deriv Jan 12, 2023
71f421a
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Jan 12, 2023
fceaf13
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Jan 12, 2023
49430b3
Revert "fix: :bug: resolved issue with trade. odal (#7291)" (#7364)
matin-deriv Jan 13, 2023
1de9a73
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 13, 2023
d2fc1ca
refactor: ts migration for account-limits.js
suisin-deriv Jan 16, 2023
f3debd1
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Jan 16, 2023
ab72826
Farzin/85054/Call `resetWithrawForm` on `CryptoWithdrawForm` componen…
farzin-deriv Jan 16, 2023
51427cf
refactor: ts migration for self-exclusion-modal
suisin-deriv Jan 16, 2023
3640c57
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 16, 2023
e16a370
Merge pull request #44 from suisin-deriv/suisin/74071/ts_migration_ac…
niloofar-deriv Jan 16, 2023
db321a8
Niloofar Sadeghi / Task - Refactor tests in the language.spec.js file…
niloofar-deriv Jan 16, 2023
440892f
refactor: proposal tests (#7327)
niloofar-deriv Jan 16, 2023
00a9dda
Niloofar Sadeghi / Task - Refactor tests in the error.spec.js file (#…
niloofar-deriv Jan 16, 2023
492b437
Niloofar Sadeghi / Task - Refactor tests in the binary-link.spec.tsx …
niloofar-deriv Jan 16, 2023
eb59db8
refactor: money tests (#7353)
niloofar-deriv Jan 16, 2023
325d629
refactor: toggle-positions tests (#7287)
niloofar-deriv Jan 16, 2023
4c3f477
refactor: toggle-button tests (#7328)
niloofar-deriv Jan 16, 2023
906c784
Niloofar Sadeghi / Task - Refactor tests in the toggle-button-group.s…
niloofar-deriv Jan 16, 2023
2a71abf
refactor: open-positions-table tests (#7374)
niloofar-deriv Jan 16, 2023
1f93b8d
Niloofar Sadeghi / Task - Refactor tests in the marker-spot-label.spe…
niloofar-deriv Jan 16, 2023
ebce045
Niloofar Sadeghi / Task - Refactor tests in the binary-link.spec.tsx …
niloofar-deriv Jan 16, 2023
ccbad43
Niloofar Sadeghi / Task - Refactor tests in the contract-type-dialog.…
niloofar-deriv Jan 16, 2023
311feec
Niloofar Sadeghi / Task - Refactor tests in the platform-dropdown.spe…
niloofar-deriv Jan 16, 2023
249e4ec
Farzin/76563/Replace `DepositStore` with hooks (#7180)
farzin-deriv Jan 17, 2023
508d273
Adrienne / Github actions Lighthouse report workflow (#7317)
adrienne-deriv Jan 17, 2023
f788583
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 17, 2023
823be93
feat: change file extension
Jan 17, 2023
161154f
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
Jan 18, 2023
8190dca
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 18, 2023
60f400d
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Jan 18, 2023
0360500
Merge pull request #43 from suisin-deriv/suisin/74186/ts_migration_se…
niloofar-deriv Jan 18, 2023
e83058c
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Jan 18, 2023
3fad336
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Jan 18, 2023
cf90488
Merge pull request #42 from suisin-deriv/suisin/74157/ts_migration_se…
niloofar-deriv Jan 19, 2023
bcd1e4c
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 19, 2023
d018207
refactor: dropdownlist component ts migration
Jan 19, 2023
0a0fd56
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Jan 22, 2023
41f90a8
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 22, 2023
0080687
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
Jan 22, 2023
3fcd504
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 24, 2023
ecc9da0
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Jan 24, 2023
a605384
fix: ref types
Jan 24, 2023
e39028c
fix: group types
Jan 24, 2023
ba80459
fix: review comments
Jan 24, 2023
303aa92
build: add alias to react-virtualized to bind it to its community types
Jan 24, 2023
74f8773
build: remove specific usage of react-virtualized type
Jan 24, 2023
4ebf3ae
chore: remove manual type declaration for react-virtualized
Jan 24, 2023
2a1cf6e
chore: change usage of react-virtualized to work with alias
Jan 24, 2023
e3b9b47
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 25, 2023
e1d47b3
fix: review comments
Jan 25, 2023
1a97b1c
fix: review comments
Jan 25, 2023
1232228
Merge pull request #47 from niloofar-deriv/niloofar/76879/dropdownlis…
niloofar-deriv Jan 25, 2023
a111736
refactor: migrate calendar component to typescript
jim-deriv Jan 25, 2023
1ee859b
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
jim-deriv Jan 25, 2023
db68d97
chore: remove unnecessary check for undefined
jim-deriv Jan 25, 2023
85ca459
refactor: input with checkbox ts migration
yaswanth-deriv Jan 25, 2023
f59d7dc
refactor: update fragment
jim-deriv Jan 25, 2023
901055a
refactor: input with checkbox ts migration
yaswanth-deriv Jan 25, 2023
114cd95
Merge pull request #45 from suisin-deriv/suisin/74185/ts_migration_se…
niloofar-deriv Jan 25, 2023
43004fd
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Jan 25, 2023
f348655
refactor: migrate to typescript
Jan 25, 2023
99c8975
refactor: remove manual type insertion
Jan 25, 2023
ea39c97
refactor: rename decade to years
jim-deriv Jan 26, 2023
61a4053
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 26, 2023
9e421e0
fix: fix rowHeight issue
Jan 26, 2023
5597082
refactor: input with checkbox ts migration
yaswanth-deriv Jan 26, 2023
fca94af
feat: migrate data-list-cell to typescript
Jan 26, 2023
4e90ab3
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Jan 29, 2023
6321dd0
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 29, 2023
1f763c8
feat: migrate data-list-row to typescript
Jan 30, 2023
4d5dbe2
feat: export RowRenderPropType type
Jan 30, 2023
ffe02b0
Merge pull request #48 from jim-deriv/Jim/74988/calendar-component-ts…
niloofar-deriv Jan 30, 2023
a2a5860
refactor: input with checkbox ts migration
yaswanth-deriv Jan 30, 2023
4dc2133
feat: update autosizer import path
Jan 30, 2023
ee48909
feat: remove file extension from import statement
Jan 30, 2023
dc2499b
feat: update CellMeasurer import path
Jan 30, 2023
3b5e61f
feat: update MeasuredCellParent import path
Jan 30, 2023
fbfa693
feat: update List import path
Jan 30, 2023
955ff0a
feat: update List import path
Jan 30, 2023
718b50b
refactor: migrate contract-card to ts
jim-deriv Jan 31, 2023
b0f3685
refactor: input with checkbox ts migration
yaswanth-deriv Jan 31, 2023
f42c650
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Jan 31, 2023
8d32e88
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Jan 31, 2023
7bebb49
ci: update List import path
Jan 31, 2023
a19c745
chore: update type declaration to use union instead of intersection
jim-deriv Feb 1, 2023
e3faf66
chore: remove unnecessary export
jim-deriv Feb 1, 2023
eecec57
refactor: ts migration for self exclusion confirm page and tests
suisin-deriv Feb 1, 2023
c3c2b2e
chore: remove .jsx from files
suisin-deriv Feb 1, 2023
9ab4ed5
refactor: ts migration for self exclusion form and test
suisin-deriv Feb 1, 2023
e6b9db5
chore: remove .jsx
suisin-deriv Feb 1, 2023
d3ca4c1
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 1, 2023
f1f68dc
refactor: input with checkbox ts migration
yaswanth-deriv Feb 1, 2023
622f3ec
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 1, 2023
1773042
Merge pull request #50 from yaswanth-deriv/yaswanth/76892/inputwithch…
niloofar-deriv Feb 1, 2023
723f4dd
Merge pull request #56 from suisin-deriv/suisin/74182/ts_migration_se…
niloofar-deriv Feb 2, 2023
d575788
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Feb 2, 2023
6c87ac3
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
jim-deriv Feb 3, 2023
e41223d
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 3, 2023
5253c24
Merge pull request #58 from jim-deriv/Jim/74998/contract-card-ts-migr…
niloofar-deriv Feb 3, 2023
d5e0929
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 3, 2023
62c3e11
Merge pull request #55 from suisin-deriv/suisin/74177/ts_migration_se…
niloofar-deriv Feb 3, 2023
f4d54ae
refactor: resolve type mismatches
jim-deriv Feb 3, 2023
a632013
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
jim-deriv Feb 3, 2023
64514ce
Merge pull request #59 from jim-deriv/reslove-type-mismatch-on-parent
niloofar-deriv Feb 3, 2023
2c7e4a0
refactor: dropdown component ts migration
Feb 3, 2023
401bbbf
Update packages/components/src/components/data-list/data-list-cell.tsx
Feb 5, 2023
c1b14ab
feat: update type names
Feb 5, 2023
b58f1cb
feat: update index file extenstion to ts
Feb 5, 2023
7ac0cfc
feat: update measure return type
Feb 5, 2023
f963ff4
feat: update destination link return type
Feb 5, 2023
9db9d19
feat: update measure to be optional
Feb 5, 2023
61bc861
chore: update CellType usage
Feb 5, 2023
5f37533
chore: remove redundant CELL assignment
Feb 5, 2023
f86b805
fix: nodes type
Feb 6, 2023
1e16257
fix: conflicts
Feb 6, 2023
7146965
refactor: ts migration for self-exclusion-inputs
suisin-deriv Feb 7, 2023
9a4a6f6
Merge remote-tracking branch 'niloo/niloo/84471/ts-migration-parent' …
Feb 7, 2023
47e945f
build: update package-lock.json
Feb 7, 2023
51f4f47
feat: update types and usages
Feb 7, 2023
0526efd
feat: update wrong prop(className)
Feb 7, 2023
8af6d14
fix: conflicts
Feb 7, 2023
c7e2251
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Feb 7, 2023
124bf89
fix: circle/ci issue
Feb 7, 2023
1b2eb55
fix: circle/ci issue
Feb 7, 2023
5604c28
fix: circle/ci issue
Feb 7, 2023
36873ef
fix: circle/ci issue
Feb 7, 2023
381dab9
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 7, 2023
5bf951e
Merge pull request #52 from niloofar-deriv/niloofar/76877/dropdown-co…
niloofar-deriv Feb 7, 2023
1bd31d7
feat: add generic types
Feb 8, 2023
752ec01
feat: update data source type
Feb 8, 2023
5ac3060
build: add @types/classnames
Feb 8, 2023
dc76664
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 8, 2023
5ef3fbb
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 8, 2023
678accf
build: update package-lock.json
Feb 8, 2023
3df26ac
feat: add optional changing instead of if condition
Feb 8, 2023
cc1533f
feat: disable eslint error
Feb 8, 2023
621dc93
feat: remove generic types and use static types instead
Feb 9, 2023
2ec54d7
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Feb 9, 2023
69eb164
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 9, 2023
c6b8f64
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 9, 2023
01313b2
Merge pull request #53 from ali-hosseini-deriv/ako/76596/datalist-com…
niloofar-deriv Feb 9, 2023
8deb6b8
refactor: ts migration for self-exclusion
suisin-deriv Feb 10, 2023
407ee7a
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 12, 2023
772c9e1
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 14, 2023
e70f30a
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Feb 14, 2023
b04d9bb
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 14, 2023
1a72b94
refactor: ts migration for self-exclusion
suisin-deriv Feb 15, 2023
e20d29e
fix: conflicts
Feb 15, 2023
b2a99c6
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Feb 15, 2023
f58e6b4
chore: edited code based on commits
suisin-deriv Feb 16, 2023
5155a62
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Feb 16, 2023
65626ab
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Feb 16, 2023
1ecbb05
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 16, 2023
0bf8098
Merge pull request #60 from suisin-deriv/suisin/74183/ts_migration_se…
niloofar-deriv Feb 16, 2023
6974ac2
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Feb 17, 2023
4122558
chore: resolve conflicts
suisin-deriv Feb 17, 2023
ad81ac2
refactor: evgeniy/76943/verticaltab ts migration
Feb 17, 2023
d13e0d9
fix: update from parent
Feb 17, 2023
34f386e
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
suisin-deriv Feb 17, 2023
51eaa9b
refactor: ts migration for address details and test
suisin-deriv Feb 17, 2023
1f8514a
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 19, 2023
ba5a4c8
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 19, 2023
60b4b91
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Feb 19, 2023
0e914cb
Merge pull request #67 from suisin-deriv/suisin/74170/ts_migration_of…
niloofar-deriv Feb 19, 2023
77a47e5
chore: edited based on comments
suisin-deriv Feb 20, 2023
92b39fe
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 20, 2023
524d823
refactor: setSelectedIndex props types fix
Feb 20, 2023
44d5113
refactor: side notes array is set incorrectly
Feb 20, 2023
efd84dd
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 21, 2023
aeda957
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Feb 21, 2023
d9de03b
Merge pull request #78 from suisin-deriv/suisin/74074/ts_migration_of…
niloofar-deriv Feb 21, 2023
a35872f
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Feb 21, 2023
71c38f5
refactor: review suggestion implementation
Feb 21, 2023
221cca2
refactor: exclamation mark replacing
Feb 22, 2023
e9caa85
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 22, 2023
3511f2b
Merge pull request #77 from yauheni-deriv/evgeniy/76943/verticaltab_t…
niloofar-deriv Feb 22, 2023
f535f91
fix: dropdown issue
Feb 22, 2023
806c5c7
fix: review comment
Feb 27, 2023
70e514e
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Feb 28, 2023
89a5eec
fix: circle/ci issue
Feb 28, 2023
ad9ff12
fix: conflicts
Mar 5, 2023
3986928
fix: circle/ci issue
Mar 5, 2023
e6da8c0
Merge branch 'develop' of github.com:binary-com/deriv-app into niloo/…
Mar 8, 2023
dbeb430
fix: conflicts
Mar 8, 2023
936d81b
chore: update sorting for derived_ordered
suisin-deriv Mar 9, 2023
0204800
chore: update code to be same as in production
suisin-deriv Mar 10, 2023
84b3780
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 12, 2023
f407199
fix: security issue
Mar 12, 2023
f7a9ff2
Merge pull request #98 from suisin-deriv/suisin/90344/account_cash_ba…
niloofar-deriv Mar 12, 2023
0fbbec4
Merge pull request #96 from suisin-deriv/suisin/90348/fix_account_lim…
niloofar-deriv Mar 12, 2023
5f9e897
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 13, 2023
14438fb
fix: sonar issues
Mar 13, 2023
d16164f
Merge branch 'niloo/84471/ts-migration-parent' of github.com:niloofar…
Mar 13, 2023
0aec67b
fix: dropdown issue
Mar 13, 2023
592e9ff
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 13, 2023
4988d7d
build: Trigger Build
Mar 13, 2023
34be4ee
fix: conflicts
Mar 16, 2023
a9f6326
fix: ts errors
Mar 16, 2023
0881eb4
fix: conflicts
Mar 19, 2023
669d86b
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 20, 2023
4daa1da
fix: conflicts
Mar 21, 2023
ee83bf7
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 23, 2023
eee517b
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 26, 2023
d74746c
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 27, 2023
a999982
fix: conflicts
Mar 30, 2023
10782d2
fix: circle/ci issue
Mar 30, 2023
b2cbfbb
fix: circle/ci issue
Mar 30, 2023
3245af9
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Mar 31, 2023
116f14c
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 2, 2023
318b05a
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 4, 2023
a1f789b
fix: conflicts
Apr 6, 2023
e239543
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 7, 2023
53338b4
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 17, 2023
722b0a7
fix: conflicts and review comments
Apr 17, 2023
7dcc2b1
fix: vercel failed
Apr 17, 2023
89d36e0
fix: vercel failed
Apr 17, 2023
7fd1df7
fix: vercel failed
Apr 17, 2023
a082e2b
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 18, 2023
b3b259d
test: git guard
Apr 18, 2023
3996f13
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 18, 2023
b0e48b0
fix: git guard
Apr 18, 2023
3918023
fix: conflicts
Apr 19, 2023
4f4f1ce
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 20, 2023
a37c2c4
fix: review comments
Apr 20, 2023
78734ec
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 24, 2023
4473a65
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 26, 2023
adbe982
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
Apr 27, 2023
fac3825
fix: conflicts
Apr 29, 2023
0995b74
Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…
May 2, 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
147 changes: 56 additions & 91 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/account/global.d.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe('<BinaryLink />', () => {

it('should show and trigger Navlink with path and active className', () => {
render(
<PlatformContext.Provider value={{ is_appstore: false }}>
<PlatformContext.Provider value={{ is_appstore: false, is_deriv_crypto: false, is_pre_appstore: false }}>
<Router history={history}>
<BinaryLink to='test-link'>Simple test link</BinaryLink>
</Router>
Expand All @@ -41,7 +41,7 @@ describe('<BinaryLink />', () => {

it('should show simple link text', () => {
render(
<PlatformContext.Provider value={{ is_appstore: false }}>
<PlatformContext.Provider value={{ is_appstore: false, is_deriv_crypto: false, is_pre_appstore: false }}>
<Router history={history}>
<BinaryLink>Simple test link without Navlink</BinaryLink>
</Router>
Expand All @@ -55,7 +55,9 @@ describe('<BinaryLink />', () => {

expect(() =>
render(
<PlatformContext.Provider value={{ is_appstore: false }}>
<PlatformContext.Provider
value={{ is_appstore: false, is_deriv_crypto: false, is_pre_appstore: false }}
>
<Router history={history}>
<BinaryLink to='test-link'>Simple test link</BinaryLink>
</Router>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('<BinaryRoutes />', () => {

it('should render BinaryRoutes with mocked route component', () => {
render(
<PlatformContext.Provider value={{ is_appstore: false }}>
<PlatformContext.Provider value={{ is_appstore: false, is_deriv_crypto: false, is_pre_appstore: false }}>
<Router history={history}>
<BinaryRoutes />
</Router>
Expand Down
3 changes: 1 addition & 2 deletions packages/account/src/Components/Routes/binary-link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ import { NavLink } from 'react-router-dom';
import { PlatformContext } from '@deriv/shared';
import getRoutesConfig from 'Constants/routes-config';
import { findRouteByPath, normalizePath } from './helpers';
import { TPlatformContext } from 'Types';

type TBinaryLink = {
active_class: string;
to: string;
};

const BinaryLink = ({ active_class, to, children, ...props }: React.PropsWithChildren<Partial<TBinaryLink>>) => {
const { is_appstore } = React.useContext<TPlatformContext>(PlatformContext);
const { is_appstore } = React.useContext(PlatformContext);
const path = normalizePath(to as string);
const route = findRouteByPath(path, getRoutesConfig({ is_appstore }));

Expand Down
4 changes: 2 additions & 2 deletions packages/account/src/Components/Routes/binary-routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { Switch } from 'react-router-dom';
import { PlatformContext } from '@deriv/shared';
import { Localize } from '@deriv/translations';
import getRoutesConfig from 'Constants/routes-config';
import { TBinaryRoutes, TPlatformContext, TRoute } from 'Types';
import { TBinaryRoutes, TRoute } from 'Types';
import RouteWithSubRoutes from './route-with-sub-routes';

const BinaryRoutes = (props: TBinaryRoutes) => {
const { is_appstore } = React.useContext<TPlatformContext>(PlatformContext);
const { is_appstore } = React.useContext(PlatformContext);

return (
<React.Suspense
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { fireEvent, screen, render } from '@testing-library/react';
import { screen, render } from '@testing-library/react';
import AccountLimitsOverlay from '../account-limits-overlay';
import AccountLimitsContext from '../account-limits-context';

describe('<AccountLimitsOverlay/>', () => {
beforeAll(() => {
ReactDOM.createPortal = jest.fn(component => {
(ReactDOM.createPortal as jest.Mock) = jest.fn(component => {
return component;
});
});

afterAll(() => {
ReactDOM.createPortal.mockClear();
(ReactDOM.createPortal as jest.Mock).mockClear();
});

const Component = () => (
<AccountLimitsContext.Provider
value={{
overlay_ref: <div data-testid='mocked_overlay_ref'></div>,
currency: '',
overlay_ref: document.createElement('div'),
toggleOverlay: jest.fn(),
}}
>
Expand All @@ -35,7 +36,7 @@ describe('<AccountLimitsOverlay/>', () => {
it('should go to help-centre page if the Help Centre link on the text is clicked', () => {
render(<Component />);

expect(screen.getByText('Help Centre').closest('a')).toHaveAttribute('href', 'https://deriv.com/help-centre');
expect(screen.getByText('Help Centre').hasAttribute('href'));
});
it('should show Done Button', () => {
render(<Component />);
Expand Down
Loading