Kate/dtra 357/ts contract audit files #23

kate-deriv · 2023-08-21T11:25:50Z

Changes:

TS migration of contract-audit.jsx, contract-audit-item.jsx, contract-details.jsx and contract-history.jsx file.
Refactoring

Screenshots:

Please provide some screenshots of the change.

…_contract_audit_files

kate-deriv · 2023-08-21T11:45:23Z

packages/trader/src/App/Components/Elements/ContractDrawer/contract-drawer.jsx

@@ -56,7 +56,6 @@ const ContractDrawer = observer(
                is_accumulator={is_accumulator}
                is_dark_theme={is_dark_theme}
                is_multiplier={is_multiplier}
-                is_smarttrader_contract={is_smarttrader_contract}


We don't need this props. From <ContractAudit /> props are passed to <ContractDetails /> and there is_smarttrader_contract is imported from @deriv/shared

kate-deriv · 2023-08-21T11:47:47Z

packages/trader/src/App/Components/Elements/ContractAudit/contract-audit.tsx

-    const onTabItemClick = tab_index => {
-        toggleHistoryTab(tab_index);
+    const onTabItemClick = (tab_index: number) => {
+        toggleHistoryTab(!!tab_index);


In ui-store toggleHistoryTab accepts boolean so I converted tab_index to it.

coveralls · 2023-08-21T12:18:03Z

Pull Request Test Coverage Report for Build 5949794685

6 of 15 (40.0%) changed or added relevant lines in 6 files are covered.
3 unchanged lines in 2 files lost coverage.
Overall coverage decreased (-0.001%) to 10.119%

Changes Missing Coverage	Changed/Added Lines	%
packages/trader/src/App/Components/Elements/ContractAudit/contract-history.tsx	1	0.0%
packages/shared/src/utils/helpers/logic.ts	2	0.0%
packages/trader/src/App/Components/Elements/ContractAudit/contract-audit.tsx	6	0.0%

Files with Coverage Reduction	New Missed Lines	%
packages/trader/src/Modules/Trading/Components/Form/Purchase/value-movement.tsx	1	0%
packages/shared/src/utils/helpers/logic.ts	2	0%

Totals
Change from base Build 5948428013:	-0.001%
Covered Lines:	10149
Relevant Lines:	83753

💛 - Coveralls

…ts_contract_audit_files

github-actions · 2023-08-21T14:09:38Z

⏳ Generating Lighthouse report...

packages/trader/src/App/Components/Elements/ContractAudit/contract-audit.tsx

packages/trader/src/App/Components/Elements/ContractAudit/__tests__/contract-details.spec.tsx

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx

packages/trader/src/App/Components/Elements/ContractAudit/contract-history.tsx

packages/trader/src/App/Components/Elements/ContractAudit/contract-audit-item.tsx

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx

packages/trader/src/Modules/Trading/Components/Form/TradeParams/barrier.tsx

matin-deriv · 2023-08-23T03:56:18Z

packages/trader/src/Modules/Trading/Components/Form/Purchase/value-movement.tsx

+type TValueMovement = Partial<
+    Pick<
+        React.ComponentProps<typeof ContractInfo>,
+        'is_turbos' | 'is_vanilla' | 'currency' | 'has_increased' | 'proposal_info'


Is it possible not to hard-code this values here or at least make them reusable.

I don't see this being used in more than one place in the file. She's just picking certain props from <ContractInfo/ >. Props picked here are quite unique/specific to this particular component as well, hence, not exported out to common-props.types

matin-deriv · 2023-08-23T03:56:45Z

packages/trader/src/Modules/Trading/Components/Form/Purchase/contract-info.tsx

-    growth_rate: number;
+type TContractInfo = Pick<
+    ReturnType<typeof useTraderStore>,
+    'basis' | 'growth_rate' | 'is_accumulator' | 'is_turbos' | 'is_vanilla' | 'is_multiplier' | 'currency'


I just picked some types in order not to write their types by my own. Same explanation as Henry left above

matin-deriv · 2023-08-23T04:03:01Z

packages/trader/src/App/Components/Elements/ContractAudit/contract-history.tsx

-                            Math.abs(+item.order_amount) !== 0 ? (
+                            Math.abs(Number(item.order_amount)) !== 0 ? (
                                <React.Fragment>
-                                    {+item.order_amount < 0 && <strong>-</strong>}
+                                    {Number(item.order_amount) < 0 && <strong>-</strong>}


Why do we need this change? are you expecting item.order_amount to a different value than number or a string?

wrapping it with Number function gets rid of item.order_amount being undefined error

packages/trader/src/App/Components/Elements/ContractAudit/contract-audit.tsx

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx

…ts_contract_audit_files

* fix: ts-migrate trade-params * fix: sonarcloud * fix: pull in changes from tech debt 2 package * fix: resolve comments * fix: move type to common prop types * fix: move type to common prop types * fix: move type to common prop types file * fix: resolve comments * Kate / DTRA-321 / TS migration of trade-params and trade-params-mobile (#6) * refactor: migrate trade params and started mobile version * refactor: ts migration of trade params mobile * chore: add nessasary prop * refactor: apply suggestions * chore: change todo text * refactor: add import * fix: circleCI error * fix: ts migrate trade-footer-extensions.jsx * fix: fix import * fix: remove progress-slider-stream since its not used * fix: resolve comments * fix: reset with master * fix: reset with master * fix: reset with master * fix: reset with master * fix: circleCI * fix: togglePositions folder * fix: dtra-346 marketisclosed and marketcountdowntimer migration * fix: bug * Maryia/dtra-270/TS migration: trade-store (#5) * chore: prepare for migration * chore: add more types to trade-store * chore: add more types to trade-store * chore: add more types to trade-store * chore: add more types to trade-store * chore: migrated trade-store to ts * chore: improve types in trade-store * fix: type * revert: hooks package installation * refactor: address review * fix: resolve comments * feat: add ts migartion of store * refactor: add prev changes * chore: empty commit * fix: add lost mocked * fix: resolve comments * Kate / DTRA-354 / Components/Form/Purchase files in Trader package (#21) * refactor: ts migartion of purchase files * refactor: remove duplicated types * refactor: apply suggestions * maryia/fix: sonarcloud warnings (#7) * fix: sonarcloud warnings * fix: Unexpected end of JSON input * fix: bug * fix: sonarcloud * fix: reorder props * fix: test cases * fix: coveralls * fix: coveralls * fix: this component doesnt exist anymore, hence test was also removed * henry/dtra-356/fix: ts-migration-digitsJSX (#24) * fix: initial commit * fix: ts migrate digits JSX * fix: small type change * fix: comment * chore: removed unused state * Maryia/dtra-355/Migrate ContractDrawer files to TS (#22) * feat: migrated swipeable-components to TS * feat: migrated market-closed-contract-overlay & index to TS * chore: migrated contract-drawer-card.tsx to ts * build: fix type * chore: migrated contract-drawer to ts * chore: fixed existing types in digits and logic * chore: sort types properties in alphabetical order * Kate/dtra 357/ts contract audit files (#23) * refactor: apply suggestion from prev pr * refactor: start ts migration of contract audit * chore: change comment * refactor: ts of contract audit item * refactor: ts migration of contract details * refactor: ts migration of contract history * refactor: add preprepared types * refactor: tests * chore: apply nit * refactor: apply suggestions * refactor: apply suggestions * chore: fix of sonar cloud * Maryia/dtra-373/remove localize from ContractCardHeader component (#25) * refactor: remove localize from contract-card-header * refactor: use Localize component instead of localize helper * build: install RTL deps in shared package * fix: sonar cloud codesmells * fix: build TS errors (#32) * refactor: tests * fix: more conflicts * chore: empty commit * maryia/fix: type issues on package 4 (#41) * fix: type issues * chore: file change from package 3 * chore: keep small changes from package 3 * chore: removed unnecessary todo comment * refactor: apply suggestions * fix: types in tests * fix: test extention * fix: wallet file * fix: add turbos to types --------- Co-authored-by: Henry Hein <henry@regentmarkets.com> Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> Co-authored-by: henry-deriv <118344354+henry-deriv@users.noreply.github.com>

* fix: ts-migrate trade-params * fix: sonarcloud * fix: pull in changes from tech debt 2 package * fix: resolve comments * fix: move type to common prop types * fix: move type to common prop types * fix: move type to common prop types file * fix: resolve comments * Kate / DTRA-321 / TS migration of trade-params and trade-params-mobile (#6) * refactor: migrate trade params and started mobile version * refactor: ts migration of trade params mobile * chore: add nessasary prop * refactor: apply suggestions * chore: change todo text * refactor: add import * fix: circleCI error * fix: ts migrate trade-footer-extensions.jsx * fix: fix import * fix: remove progress-slider-stream since its not used * fix: resolve comments * fix: reset with master * fix: reset with master * fix: reset with master * fix: reset with master * fix: circleCI * fix: togglePositions folder * fix: dtra-346 marketisclosed and marketcountdowntimer migration * fix: bug * Maryia/dtra-270/TS migration: trade-store (#5) * chore: prepare for migration * chore: add more types to trade-store * chore: add more types to trade-store * chore: add more types to trade-store * chore: add more types to trade-store * chore: migrated trade-store to ts * chore: improve types in trade-store * fix: type * revert: hooks package installation * refactor: address review * fix: resolve comments * feat: add ts migartion of store * refactor: add prev changes * chore: empty commit * fix: add lost mocked * fix: resolve comments * Kate / DTRA-354 / Components/Form/Purchase files in Trader package (#21) * refactor: ts migartion of purchase files * refactor: remove duplicated types * refactor: apply suggestions * maryia/fix: sonarcloud warnings (#7) * fix: sonarcloud warnings * fix: Unexpected end of JSON input * fix: bug * fix: sonarcloud * fix: reorder props * fix: test cases * fix: coveralls * fix: coveralls * fix: this component doesnt exist anymore, hence test was also removed * henry/dtra-356/fix: ts-migration-digitsJSX (#24) * fix: initial commit * fix: ts migrate digits JSX * fix: small type change * fix: comment * chore: removed unused state * Maryia/dtra-355/Migrate ContractDrawer files to TS (#22) * feat: migrated swipeable-components to TS * feat: migrated market-closed-contract-overlay & index to TS * chore: migrated contract-drawer-card.tsx to ts * build: fix type * chore: migrated contract-drawer to ts * chore: fixed existing types in digits and logic * chore: sort types properties in alphabetical order * Kate/dtra 357/ts contract audit files (#23) * refactor: apply suggestion from prev pr * refactor: start ts migration of contract audit * chore: change comment * refactor: ts of contract audit item * refactor: ts migration of contract details * refactor: ts migration of contract history * refactor: add preprepared types * refactor: tests * chore: apply nit * refactor: apply suggestions * refactor: apply suggestions * chore: fix of sonar cloud * Maryia/dtra-373/remove localize from ContractCardHeader component (#25) * refactor: remove localize from contract-card-header * refactor: use Localize component instead of localize helper * build: install RTL deps in shared package * feat: merge previous tech debt branch * fix: sonar cloud codesmells * Merge branch kate/ts_migration_trader_package_4 into kate/ts_migration_trader_package_5 * Kate / DTRA-378 / TS migration: Multiplier components and containers in Trader package (#26) * refactor: ts of cancel deal and risk managment info * fix: types in dialog tsx * refactor: start ts of multiplier options * refactor: ts of mult amount modal * refactor: remove default val from basis component * fix: type of amount mobile * refactor: applied suggestions * refactor: ts of multiplier info (#28) * Henry/dtra 376/fix: ts migration positionsdrawer folder (#27) * fix: positions drawer folder * fix: coveralls * fix: where is my commit * fix: found commits * fix: file rename * fix: comments * fix: comments * fix: correct logic * fix: remove unused props * fix: types * refactor: remove code mells * fix: ts-migrate-populate header (#30) * Maryia/DTRA-377/TS migration: TradingDatePicker + TradingTimePicker + TimePicker + Dialog (#29) * chore: timepicker to ts * chore: trading timepicker to ts * chore: add types for TradingDatePicker & DatePicker * refactor: added default values * refactor: remove code small * chore: empty commit * fix: not using index as key (#31) * fix: ternary bug * fix: build TS errors (#32) * refactor: apply suggestions * refactor: change type of time * chore: empty commit * refactor: tests * fix: conflicts * fix: conflicts * fix: tests * fix: types in tests * fix: test extention * fix: add turbos to types back * fix: add backup for target name * fix: revert empty strings --------- Co-authored-by: Henry Hein <henry@regentmarkets.com> Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> Co-authored-by: henry-deriv <118344354+henry-deriv@users.noreply.github.com>

kate-deriv added 5 commits August 15, 2023 11:31

refactor: apply suggestion from prev pr

74aa9fc

refactor: start ts migration of contract audit

ffa5961

chore: change comment

33167a9

refactor: ts of contract audit item

987e9d8

Merge branch kate/ts_migration_trader_package_4 into kate/DTRA-357/ts…

1aa3703

…_contract_audit_files

kate-deriv commented Aug 21, 2023

View reviewed changes

kate-deriv added 3 commits August 21, 2023 16:01

refactor: ts migration of contract details

de0d6f9

refactor: ts migration of contract history

1598e22

Merge branch 'kate/ts_migration_trader_package_4' into kate/DTRA-357/…

1b2ba02

…ts_contract_audit_files

kate-deriv added 2 commits August 22, 2023 16:19

refactor: add preprepared types

19dac89

refactor: tests

fd75213

maryia-deriv reviewed Aug 22, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-audit.tsx Outdated Show resolved Hide resolved

maryia-deriv reviewed Aug 22, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/__tests__/contract-details.spec.tsx Outdated Show resolved Hide resolved

maryia-deriv reviewed Aug 22, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx Outdated Show resolved Hide resolved

maryia-deriv reviewed Aug 22, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-history.tsx Outdated Show resolved Hide resolved

chore: apply nit

50379f4

henry-deriv reviewed Aug 23, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-audit-item.tsx Outdated Show resolved Hide resolved

henry-deriv reviewed Aug 23, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx Show resolved Hide resolved

henry-deriv reviewed Aug 23, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx Show resolved Hide resolved

henry-deriv reviewed Aug 23, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx Show resolved Hide resolved

matin-deriv reviewed Aug 23, 2023

View reviewed changes

akmal-deriv reviewed Aug 23, 2023

View reviewed changes

packages/trader/src/App/Components/Elements/ContractAudit/contract-details.tsx Outdated Show resolved Hide resolved

kate-deriv added 3 commits August 23, 2023 11:39

Merge branch 'kate/ts_migration_trader_package_4' into kate/DTRA-357/…

39b1ec3

…ts_contract_audit_files

refactor: apply suggestions

ac7664a

refactor: apply suggestions

4ced44b

maryia-deriv approved these changes Aug 23, 2023

View reviewed changes

henry-deriv approved these changes Aug 24, 2023

View reviewed changes

kate-deriv merged commit 070a003 into kate/ts_migration_trader_package_4 Aug 24, 2023
2 of 3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kate/dtra 357/ts contract audit files #23

Kate/dtra 357/ts contract audit files #23

kate-deriv commented Aug 21, 2023

kate-deriv Aug 21, 2023

kate-deriv Aug 21, 2023

coveralls commented Aug 21, 2023 •

edited

Loading

github-actions bot commented Aug 21, 2023 •

edited

Loading

matin-deriv Aug 23, 2023

henry-deriv Aug 23, 2023 •

edited

Loading

matin-deriv Aug 23, 2023

kate-deriv Aug 23, 2023

matin-deriv Aug 23, 2023

henry-deriv Aug 23, 2023

Kate/dtra 357/ts contract audit files #23

Kate/dtra 357/ts contract audit files #23

Conversation

kate-deriv commented Aug 21, 2023

Changes:

Screenshots:

kate-deriv Aug 21, 2023

Choose a reason for hiding this comment

kate-deriv Aug 21, 2023

Choose a reason for hiding this comment

coveralls commented Aug 21, 2023 • edited Loading

Pull Request Test Coverage Report for Build 5949794685

💛 - Coveralls

github-actions bot commented Aug 21, 2023 • edited Loading

matin-deriv Aug 23, 2023

Choose a reason for hiding this comment

henry-deriv Aug 23, 2023 • edited Loading

Choose a reason for hiding this comment

matin-deriv Aug 23, 2023

Choose a reason for hiding this comment

kate-deriv Aug 23, 2023

Choose a reason for hiding this comment

matin-deriv Aug 23, 2023

Choose a reason for hiding this comment

henry-deriv Aug 23, 2023

Choose a reason for hiding this comment

coveralls commented Aug 21, 2023 •

edited

Loading

github-actions bot commented Aug 21, 2023 •

edited

Loading

henry-deriv Aug 23, 2023 •

edited

Loading